From 905af46731a5681674df716ed5668912fa6d7ab8 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 15 Apr 2016 00:17:13 +1000 Subject: [PATCH] Adjusted file names for case sensitivity --- bin | 2 +- client/scenes/world.cpp | 4 ++-- rsc/graphics/sprites/Barrier/Visible #1.png | Bin 680 -> 0 bytes .../{Barrier => barrier}/barrier template.xcf | Bin 48741 -> 43114 bytes .../{Barrier/Base.png => barrier/base.png} | Bin 738 -> 738 bytes .../Colored.png => barrier/colored.png} | Bin 763 -> 763 bytes .../slot 1 green.png} | Bin 273 -> 273 bytes .../Slot 1 Red.png => barrier/slot 1 red.png} | Bin 270 -> 270 bytes .../slot 2 green.png} | Bin 305 -> 305 bytes .../Slot 2 Red.png => barrier/slot 2 red.png} | Bin 302 -> 302 bytes .../slot 3 green.png} | Bin 423 -> 423 bytes .../Slot 3 Red.png => barrier/slot 3 red.png} | Bin 422 -> 422 bytes .../slot 4 green.png} | Bin 301 -> 301 bytes .../Slot 4 Red.png => barrier/slot 4 red.png} | Bin 299 -> 299 bytes .../slot 5 green.png} | Bin 385 -> 385 bytes .../Slot 5 Red.png => barrier/slot 5 red.png} | Bin 383 -> 383 bytes .../slot 6 green.png} | Bin 412 -> 412 bytes .../Slot 6 Red.png => barrier/slot 6 red.png} | Bin 402 -> 402 bytes .../slot 7 green.png} | Bin 431 -> 431 bytes .../Slot 7 Red.png => barrier/slot 7 red.png} | Bin 429 -> 429 bytes .../slot 8 green.png} | Bin 407 -> 407 bytes .../Slot 8 Red.png => barrier/slot 8 red.png} | Bin 400 -> 400 bytes .../{Barrier/Slots.png => barrier/slots.png} | Bin 656 -> 656 bytes 23 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 rsc/graphics/sprites/Barrier/Visible #1.png rename rsc/graphics/sprites/{Barrier => barrier}/barrier template.xcf (80%) rename rsc/graphics/sprites/{Barrier/Base.png => barrier/base.png} (91%) rename rsc/graphics/sprites/{Barrier/Colored.png => barrier/colored.png} (91%) rename rsc/graphics/sprites/{Barrier/Slot 1 Green.png => barrier/slot 1 green.png} (76%) rename rsc/graphics/sprites/{Barrier/Slot 1 Red.png => barrier/slot 1 red.png} (76%) rename rsc/graphics/sprites/{Barrier/Slot 2 Green.png => barrier/slot 2 green.png} (79%) rename rsc/graphics/sprites/{Barrier/Slot 2 Red.png => barrier/slot 2 red.png} (78%) rename rsc/graphics/sprites/{Barrier/Slot 3 Green.png => barrier/slot 3 green.png} (84%) rename rsc/graphics/sprites/{Barrier/Slot 3 Red.png => barrier/slot 3 red.png} (89%) rename rsc/graphics/sprites/{Barrier/Slot 4 Green.png => barrier/slot 4 green.png} (78%) rename rsc/graphics/sprites/{Barrier/Slot 4 Red.png => barrier/slot 4 red.png} (88%) rename rsc/graphics/sprites/{Barrier/Slot 5 Green.png => barrier/slot 5 green.png} (83%) rename rsc/graphics/sprites/{Barrier/Slot 5 Red.png => barrier/slot 5 red.png} (83%) rename rsc/graphics/sprites/{Barrier/Slot 6 Green.png => barrier/slot 6 green.png} (84%) rename rsc/graphics/sprites/{Barrier/Slot 6 Red.png => barrier/slot 6 red.png} (84%) rename rsc/graphics/sprites/{Barrier/Slot 7 Green.png => barrier/slot 7 green.png} (87%) rename rsc/graphics/sprites/{Barrier/Slot 7 Red.png => barrier/slot 7 red.png} (85%) rename rsc/graphics/sprites/{Barrier/Slot 8 Green.png => barrier/slot 8 green.png} (84%) rename rsc/graphics/sprites/{Barrier/Slot 8 Red.png => barrier/slot 8 red.png} (84%) rename rsc/graphics/sprites/{Barrier/Slots.png => barrier/slots.png} (90%) diff --git a/bin b/bin index c653980..a788d99 160000 --- a/bin +++ b/bin @@ -1 +1 @@ -Subproject commit c65398019329fe3d28670cd57f84461b48082642 +Subproject commit a788d998fa1815c9fa1ff5a8914a46f2ce5545ff diff --git a/client/scenes/world.cpp b/client/scenes/world.cpp index 42b84f8..6a8a7b0 100644 --- a/client/scenes/world.cpp +++ b/client/scenes/world.cpp @@ -116,8 +116,8 @@ World::World(int* const argClientIndex, int* const argAccountIndex): "slot 7 red.png", "slot 8 red.png" }; - barrierMgr.LoadBaseImage(GetRenderer(), config["dir.sprites"] + "/barrier/base.png"); - barrierMgr.LoadTemplateImages(GetRenderer(), config["dir.sprites"] + "/barrier/", slotNames); + barrierMgr.LoadBaseImage(GetRenderer(), config["dir.sprites"] + "barrier/base.png"); + barrierMgr.LoadTemplateImages(GetRenderer(), config["dir.sprites"] + "barrier/", slotNames); std::cout << "Templates loaded: " << barrierMgr.GetTemplateContainer()->size() << std::endl; } diff --git a/rsc/graphics/sprites/Barrier/Visible #1.png b/rsc/graphics/sprites/Barrier/Visible #1.png deleted file mode 100644 index 54ecbbbc99b6014d055d0684d6fb6533038ecaa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 680 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgfl77ktm8BObBj~E!3Og&v3Ln>~)y?ZzR=HZ?2?B<==E(i7wYeoh`CWa&yh9ew@nWyMI z3SzNxxWmcNA;^#s@@`%$gG00JhPL^aIT=i>e(rqC(Qxdcydr~uz&~vkhNeUJof#Gs z2<{jDXAI=|{gY#2X!>xIQJizXG()`D=hUA&KAg4Msr|_M@14Ut|3XuFRR@ zN%{s15(^k^Tv>l#=aaE8!v#i$fJGmf8Dt$86=dvzToHytU@kBJ0x*Bd=N(d32`^qf zu5@ILmHGPY_r3Sam?az;cw%4kMu62b_bD>GU|`UAD8bag$Iu{z%-s>TvBh=a`uNwo zlLG~W)&KsCo>ddDyYPdhze}gX42!pw;jT7olnuUkv~*tB$`R~;aC%#@NC9_?o}P2C zSE70N)w-o;UPHsxh2wkdBZd^c2eUY`f0Q&V5SBa4t{{;pZO72aasCjy0!N~L4Fi{W z0pFq39~e1av@EW#<#V{b&T5YdlY@jE1Mjo{)(@E#Y<@DtDAX_<0W$gOD;h4b#z@)8 pLPa;9d)L+R>t58u*)#t#R+voO67gco3SgRI@O1TaS?83{1OQ<42#o*$ diff --git a/rsc/graphics/sprites/Barrier/barrier template.xcf b/rsc/graphics/sprites/barrier/barrier template.xcf similarity index 80% rename from rsc/graphics/sprites/Barrier/barrier template.xcf rename to rsc/graphics/sprites/barrier/barrier template.xcf index 9938fa6b0b9684a7f18839216bddb5563c61f050..71bac7d53deb142b087bdb9d3ef6a444ee204633 100644 GIT binary patch delta 1699 zcmZuxTWnNS6kVOZhIVMJGfAQR%-MEJRg23B!2N@P-8?CqcLJ4CW?(oKq*aaV6{Soqf+; zd*5@{JwGgZe!A+Jj^!P`_&_4B<2F!oKj41>sNMq9z7N#h2Q-`p8jk_a+rai8ft}lc z&fkE2qd@o9Kz}Qc;<|&60TaA8T@OMY+2>!ea%?31bg(5jC@Va(&Re=p2+IP%^C5e# z)dWP~;pZ8{-H>=*9RiA2|(h>$G z-`YelYO+(wUwpHp%r%5zX#gl&1(cTq6~~u%8dc%);R4enYMRJ~fX`{x3WTtvc%YM8 z)}V`oFboU>m1*FvI8b$+;@=k=EyoUgQZF{B{>3JOQIncA#ry>CFxL=MzX#FSoaUGz6{tfBh!I?^-TRnuThHF-P;=WIqmM}^i<(q z8f@9LVHz&Xw`tr%_Nwu4z)sa@r+U%qFhn-U#)!Xm2QB)VTRoBhnmCy=L7q~nNN>KG zs3rK6yyAr9gPFtf@u<%ka6hM~ijLFnU%BhiSzz-VutfsfDwi9^SX1_SSI95CM`Y1< z&A&~4t~3bXV_qWzKpLrrONg!+U;`8^m4At=ghkw)>C(Vz|(+R zorU0)?D`UTPA=2s%Frw+11%gJZN*ls7cLu3s0A;%r%5zd@t(*tkbUD zmsNK>XH}!Qv~yhEbD9?oVM)!N^E|B_T_l8I&qqMtMc~QHK%zZs+;#hN#?`uKojEo$at&4;(O!5>=a_)ge-t(#T$((7k^R?58OGquVmVW2d?>t3!+ZBS5JWvh{ zUSgdm^Fh65^4(3NYVyD>Pf?LR|Hfoz$q9KOQyLvAEF4F3k^C{tE!FLel^M delta 3160 zcmd^BZERG>6+Q3mdcEFVd;PIyu`#vl#1PR0FDC1{6&Q>|Od3cGBrYrgo-v!s*u+&$ zTJ^_z(~=@eND7QlC`qNHfD$UD6?(0dR&q;JC5_TbZT>|4Oq+zXQB}45Q}qLr>A5pw zt4pZV|Gm(*&IS2XOvv7@1vWH3DjZN7Qbg zoI2Fe*D>^&V(}sN5hJ2d_jJt+JRyB6{x_WwPz$1f{|a+lPFp0f@cFE&-;?DxKzuZ; zPc}!xzxoF}wSKfJEX3dP;^uiD?HE$)yN;`$CQ|wLB%BgBkU2@SX@-qRV3BMC>Ned+U#>vqSrt2329BmtDb zfn1%(dAv7^lM+~TK2QIP^mDu`qlQOX!tZn*_HAyf4d0pkyAnVN9Axe_mdX5PIRCO1 zU_~`>>muN`v#LJ1FPvJIa~s&>Ht+~JoOEw?MnEkfZ})zd-gUWmKSKWr`tKw5Gsn!i zqunmWRir(!>P$Y*aFM`)R6Sc*!573y2`qZXf!mp8{!7H^aCgrG5xdmBj&16te5dEB zATc#Cf3ghfon#{tIFPybQN9=Nh?5dn^gaW8>^$)Cr+_u>*VW|WHNRb`$!%(D>6rR* ze=7fVMv4RuWbXeS-?lz+QUZ(qH-Ld(0vlcjHr`3*Y*bxIpHM6BIIngL&Z@-?Q{lkI zq}z~QE<_&i=Fko6X%p+|-aiXFC9v4Udb+zC*urzW=d3AE^@+tN!`S9Iw>x=DTDwM~ ztPH=Po*i!LdYQKZ_tZ$hmKc5u*!l}#`_sUECPIxa9SqyHjxLm`O)))^%HLul7gCWD z7+KF-=I53Ekq7AKN$g;$?szpE9(j79L@n3M&Q$)%${69=`7Pd7Yb*Ube+=yYF0l7i zV05!7(~HZqUf8#*rP>xlk6rFSy9=b+H&;m_r!q|FidT7~Zm;w|m<2xdBl=epgJJT)U6EvRWPEyj-(<1lrd7)8KU$k` zAyfw%m3N@2YXz@mzK2Evw#0!ufvMfVXa4|vepp7-o{3Ml6@2t*4^iqobv1Plb)w)Q zr=D1LSPe~X%;w&QzK!16N<*C-99Pc_MsJNEm0QViPy47bR+LuESk<&5#!ASHoLX1d zqb3ioReLAm|2uJMftZ#frsarBhWJ;vJj!g>h8GWR^2-H&cIGso7wPv=@VT7DVnhmD zO19GS#b-uuWO*{$A`u_3uA)$YZq?W8ITY%kmuPCIRQuW2$~F304!VIQ73klG`^itD|WRso^_Dgt#c+OA)chZ z2G_5VzQoz#xO9crb`6(2*LGtvDtYC6$uKHiS(WXY)MRD0>&vLDF4t~mo26t}36Y#x zX0s$AXO#;t9ZGxZxw9Mo-#4oKUpJ~`Hp&%s$!FP1*_I+D?y(g0e^|cw%;=3QPe!Gv zOCPYVVtJ`#tGZIpfo>`4dBvhW8eV?*vFcb%{UAv|bc&w|K7b!P1N<9DTX&NH diff --git a/rsc/graphics/sprites/Barrier/Base.png b/rsc/graphics/sprites/barrier/base.png similarity index 91% rename from rsc/graphics/sprites/Barrier/Base.png rename to rsc/graphics/sprites/barrier/base.png index 68376b5ef3aa8578ffdebcee40037294963b38b7..07175fdc7282443b557e09e6e28cfc2fc3314662 100644 GIT binary patch delta 19 bcmaFF`iONxFb5wWCxgi3Z<97gw=)3%L8}I% delta 19 acmaFF`iONxFb4;(fsCg0u}2%D+nE4DiUzy@ diff --git a/rsc/graphics/sprites/Barrier/Colored.png b/rsc/graphics/sprites/barrier/colored.png similarity index 91% rename from rsc/graphics/sprites/Barrier/Colored.png rename to rsc/graphics/sprites/barrier/colored.png index 0f1c9b02930aedbe5d7ba3292b1364a42b88c3db..3a0ae052ac80197d7caf06b4ebbc752a6a0f82cb 100644 GIT binary patch delta 19 bcmey(`kQq^Fb5wWCxgi3Z<97gFJJ-yMPUZ+ delta 19 bcmey(`kQq^Fb4;(fsCg0u}2%D7cc<;MnDG# diff --git a/rsc/graphics/sprites/Barrier/Slot 1 Green.png b/rsc/graphics/sprites/barrier/slot 1 green.png similarity index 76% rename from rsc/graphics/sprites/Barrier/Slot 1 Green.png rename to rsc/graphics/sprites/barrier/slot 1 green.png index 9e26089afc4591ae852e16a5f2f60e06d6ca110e..879de76ea060c903c6708d3a50f4904cbb0681fb 100644 GIT binary patch delta 18 acmbQpG?8gSFb5wWCxgi3Z<8iQZvy}?wFU?P delta 18 ZcmbQpG?8gSFb4;(f%NwHV8@Bk+W;_X1-<|P diff --git a/rsc/graphics/sprites/Barrier/Slot 1 Red.png b/rsc/graphics/sprites/barrier/slot 1 red.png similarity index 76% rename from rsc/graphics/sprites/Barrier/Slot 1 Red.png rename to rsc/graphics/sprites/barrier/slot 1 red.png index 3049562d131d3dfde20f6ccc5a6f0469f340151e..dbefc13d2ccc7902c17d1124850f23846d16391d 100644 GIT binary patch delta 18 ZcmeBU>SLM^%)!UU$sjWM+oXxnn*lFO1^)m5 delta 18 ZcmeBU>SLM^%)!BHAiX_4*l}X?W&kh&1+@SG diff --git a/rsc/graphics/sprites/Barrier/Slot 2 Green.png b/rsc/graphics/sprites/barrier/slot 2 green.png similarity index 79% rename from rsc/graphics/sprites/Barrier/Slot 2 Green.png rename to rsc/graphics/sprites/barrier/slot 2 green.png index 495d98e1610e7eb43522273c78782f403c80acd8..b5ba3c32f264246f63ab4969ed1c02c354e5f7c5 100644 GIT binary patch delta 18 acmdnUw2^5-Fb5wWCxgi3Z<8iQUjqO%6$WSk delta 18 acmdnUw2^5-Fb4;(fz*MB diff --git a/rsc/graphics/sprites/Barrier/Slot 2 Red.png b/rsc/graphics/sprites/barrier/slot 2 red.png similarity index 78% rename from rsc/graphics/sprites/Barrier/Slot 2 Red.png rename to rsc/graphics/sprites/barrier/slot 2 red.png index 42ceecf4343ebb87e16ab0a7f50d4da2fd3a321a..4fedc1b457fee85779cc18398f3ea0491c579615 100644 GIT binary patch delta 18 acmZ3-w2o;)Fb5wWCxgi3Z<8iQUj_g(tOj2I delta 18 ZcmZ3-w2o;)Fb4;(f%NwHV8@BkmjN_k1{DAR diff --git a/rsc/graphics/sprites/Barrier/Slot 3 Green.png b/rsc/graphics/sprites/barrier/slot 3 green.png similarity index 84% rename from rsc/graphics/sprites/Barrier/Slot 3 Green.png rename to rsc/graphics/sprites/barrier/slot 3 green.png index c249d9894e3fb0ca5e03f2b04d049f94daba69a2..a4d8117e3c2c1885987591ffda3bf5b383441240 100644 GIT binary patch delta 19 acmZ3^yqtMLFb5wWhxMLjz3&^NeHZ~e#s*vf delta 19 acmZ3^yqtMLFb4;(fz*MB?zw diff --git a/rsc/graphics/sprites/Barrier/Slot 4 Green.png b/rsc/graphics/sprites/barrier/slot 4 green.png similarity index 78% rename from rsc/graphics/sprites/Barrier/Slot 4 Green.png rename to rsc/graphics/sprites/barrier/slot 4 green.png index f67fb242fe4a178ec173f18f61a11cd5e7e5cbfe..22e3859c07961c3191beda6322f5ab9623453a66 100644 GIT binary patch delta 18 acmZ3>w3cZ?Fb5wWhxMLjz3&sFF985IJO;}E delta 18 acmZ3>w3cZ?Fb4;(fz*MBTBnCSG delta 19 acmbQkJcoHgFb4;(fz*MBS$p$F^ diff --git a/rsc/graphics/sprites/Barrier/Slot 6 Red.png b/rsc/graphics/sprites/barrier/slot 6 red.png similarity index 84% rename from rsc/graphics/sprites/Barrier/Slot 6 Red.png rename to rsc/graphics/sprites/barrier/slot 6 red.png index 764a558a6a4cb8ed5fe9a044f8abb298a386d333..8b69f6d1af382e22f85491626694d8e872e5becc 100644 GIT binary patch delta 19 bcmbQlJc)TiFb5wWCxgi3Z<97gn==9cHHHPQ delta 19 acmbQlJc)TiFb4;(f%NwHV8@No=8OO}@dac6 diff --git a/rsc/graphics/sprites/Barrier/Slot 7 Green.png b/rsc/graphics/sprites/barrier/slot 7 green.png similarity index 87% rename from rsc/graphics/sprites/Barrier/Slot 7 Green.png rename to rsc/graphics/sprites/barrier/slot 7 green.png index db29c2f22d711e959a24121549a136111eba4b16..ea2ad98fe4256122b40801a139a094ea3ad27e46 100644 GIT binary patch delta 19 acmZ3_yqyq0-FFb5wWCxgi3Z<97g2QdNwIfw=S delta 19 acmZ3>yq0-FFb4;(f%NwHV8@NoL5u)7^98j4 diff --git a/rsc/graphics/sprites/Barrier/Slot 8 Green.png b/rsc/graphics/sprites/barrier/slot 8 green.png similarity index 84% rename from rsc/graphics/sprites/Barrier/Slot 8 Green.png rename to rsc/graphics/sprites/barrier/slot 8 green.png index 554b2ed685d74015e13a29c6f33dcfe4bab9f2d6..6506635b3d7e8b8cb95573277f6547cb3426b9ee 100644 GIT binary patch delta 19 acmbQvJe_$$Fb5wWhxMLjz3&^NZ5RPMW(F(( delta 19 acmbQvJe_$$Fb4;(fz*MB