From e8a731adc502d19a8ae3bfeee5b985f90ab8a507 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 25 Jun 2011 04:41:38 +0300
Subject: [PATCH] added correct data to new images, added comments in main.cpp

---
 data/gravel.png      | Bin 0 -> 591 bytes
 data/mossycobble.png | Bin 0 -> 965 bytes
 src/main.cpp         |   6 ++++++
 3 files changed, 6 insertions(+)

diff --git a/data/gravel.png b/data/gravel.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f08666ad9347cd736071d5cfb2ce951f956ce45c 100644
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00003b3#c}2nYz<
z;ZNWI000SaNLh0L01m_e01m_fl`9S#0005<Nkl<ZD3MK)!HU{Y6o!w95(GJmYh^-W
zcOht@!c@jZ>Y|~WEQD@c`Vf7AK0x2YrAyc2Vyp}W7j-e(G?eKKp&6<dxru}@!_dV~
zL$kQ#ob#WP|9m%<z#qhkB%;Z9wBGELlFXvt>r7{JWQeHW>nxV5IFVh~sWJ<^l_{m<
zbT+q5F`dnc2n{F^k^a&WX_mK|!n-(se0tu7QQNXxP4V+rY@31`^)$;LpPpMyfo2V6
zh-k4~ZNrF&l#<&p>bg#xNM_M>oqn%F|DGxltv5SJVY)0UB}*LyL{$0w=_7ie@P{5k
zr6gd$IyRZk=K8~*eead~`(Y3DV!4vX6IdBFYFqX;jEou?M*Z^YdNLkW0)N0PFg{MC
zZ3>*F8D@c%Aka#$FyjxsuIqp`2Ejc}+Z0+^_@DYVjPQ{-kzj~T{Gq46dpl4{8b&?v
zy@TA}-re8c-KSZeW_jRyo15?;_aB1y-+zS6!a94QYZ`H*UKF`Jo{A!m6WO-x{XyEM
zkjGQtdtbhO+uVe0%T`Lt<4Heji8RX*6A^~BExRakkg-hxR%w<SHPYX_b`W!;PDJu}
z@-EIVudY!>5`T?RBY)^=fHN77a82bkPsSr=!7Tit2Oi8~z1dZPtR%Zwu9yW7AvvAR
d%S-6G&R?|RF*S&NQ40V7002ovPDHLkV1nn54afih

literal 0
HcmV?d00001

diff --git a/data/mossycobble.png b/data/mossycobble.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fad1b33ff7dadc8147da9e75df67b303a14ad5a5 100644
GIT binary patch
literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<UXGugsR5*=2kxfin1pt7*zE<7>^tHql
zQb5v?(lS$Z{75VWgUaFpBZ^Zd7!y3O?67d~=OBruF)^GVCey>*jLTFsURF$C#%Rz8
znIs@Dj3Tx`p_J7Y+m#l|YoYIXAnrSU$M4g%w6thuvl)N#9@#CZt*yoFb|cF&ZEbB>
ztyXT0-{2@N5R1h~RBUj`{VsO99lzg?zNe?h)7ja{nVJTYT8vk_E|SmZX>M+2Y;27A
z`FY-at)Jy>nfBHfS=j!AY$`{^$trTW90pC(h(sckm6ZXozP^slW}~>cm_n<8DwCaP
zG|HumS4gMRh(AdLl71%fQf0DZScxps(9poG@f$pI`dO;0s~MZP$^S@_#MNIvM)XP#
z-Qer*QBqRE#KZ)8O%Xf}hl7q6x|o`pVtRTSLy-=n*~q_v6#f1E1pnF~q6>1m^a<8i
zHpplx?geC)LNfYdx9YKIm1vrV!{MN=u8tKsKvv7J@%I+1JIes*w~eeW1*va-5`aL+
z4}jp38re(+C@3f(pU)#n5~@)_mlAO{o#K4!D-<4@85$bG<M9v(`3Z#l)Koe6^uz1u
zF&%jlyK(BBP5gNG2Nss+2!#B!J>5=p_daFja$GJKnM{VC|C}W1OQMt~s1ct+RaJDO
zqodj<zkGz4l*pP>h{@wvH73__F;kAqy@LpXz*iGrAS6#92m(&0leM)q1WnVpcI8_D
zTv8(dxv-9bfdTsZ`T&@moMdKZhIBH`;^HDlQU+gSf$r{ZbRE6zn*7@`hPn(csgZOz
z%g)XY!^6Y)d_ELK!D6u>%Q8`A>*31X&;f}=0t0|3ioAX9eQY)xs;YAByQ^IP{xiyp
zY<Rt1n$Di#a_=DD-1!oKbTZAz$O!Rx9R1KcA9!3Y7e=EIK@cz+jU4W&L=s`rhe;k-
z!jy{T%q`9GM#oze2@=7`Du;V2m6es~4-5A_!N@A%2b+|aJjTu2pY!s$3#4NEoIm>#
z^%ZVzFMZ9X93hszPpQeuDXX1>g99W<LhrOa?$N{}#1kUHe^x1dq>}ypeHJ(8&<+Il
z_V(DCkD-55C9xZ)>-lcHUN1^vij_?tf@)MyqAGVoQ(Snim)6!+W><a(K$c~)*({<c
nA}JOC?#zyJ(s8^x6F%ZU)9iuRPZ9-q00000NkvXXu0mjfRP)At

literal 0
HcmV?d00001

diff --git a/src/main.cpp b/src/main.cpp
index fa0439dee..41da310f4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -354,6 +354,12 @@ TODO: Add a per-sector database to store surface stuff as simple flags/values
 TODO: Restart irrlicht completely when coming back to main menu from game.
 	- This gets rid of everything that is stored in irrlicht's caches.
 
+TODO: Merge bahamada's audio stuff (clean patch available)
+
+TODO: Merge spongie's chest/furnace direction (by hand)
+
+TODO: Merge key configuration menu (no clean patch available)
+
 Making it more portable:
 ------------------------
  
-- 
GitLab