]> git.jsancho.org Git - lugaru.git/commitdiff
Fix hardcoded clothes paths in maps
authorRémi Verschelde <rverschelde@gmail.com>
Sun, 4 Dec 2016 16:43:59 +0000 (17:43 +0100)
committerRémi Verschelde <rverschelde@gmail.com>
Sun, 4 Dec 2016 17:44:59 +0000 (18:44 +0100)
Also fix loading those paths with the proper Folder function.
Remove bogus piece of cloth "1.0 1.0 1.0.png".
Part of #21.

79 files changed:
Data/Maps/Start1
Data/Maps/Start10
Data/Maps/Start11
Data/Maps/Start12
Data/Maps/Start13
Data/Maps/Start14
Data/Maps/Start15
Data/Maps/Start16
Data/Maps/Start17
Data/Maps/Start18
Data/Maps/Start19
Data/Maps/Start2
Data/Maps/Start20
Data/Maps/Start21
Data/Maps/Start22
Data/Maps/Start23
Data/Maps/Start24
Data/Maps/Start25
Data/Maps/Start26
Data/Maps/Start27
Data/Maps/Start28
Data/Maps/Start29
Data/Maps/Start3
Data/Maps/Start30
Data/Maps/Start4
Data/Maps/Start5
Data/Maps/Start6
Data/Maps/Start7
Data/Maps/Start8
Data/Maps/Start9
Data/Maps/map1
Data/Maps/map10
Data/Maps/map11
Data/Maps/map12
Data/Maps/map13
Data/Maps/map14
Data/Maps/map2
Data/Maps/map3
Data/Maps/map4
Data/Maps/map5
Data/Maps/map6
Data/Maps/map7
Data/Maps/map8
Data/Maps/map9
Data/Maps/raidercamp
Data/Maps/svenalpha
Data/Maps/svencanyon
Data/Maps/svenchasm
Data/Maps/svenclimb
Data/Maps/svencouncil
Data/Maps/svendawn
Data/Maps/svendecoy
Data/Maps/svendefend
Data/Maps/svendoor
Data/Maps/svenearl
Data/Maps/svenfireice
Data/Maps/svenforest
Data/Maps/svenfort
Data/Maps/svengrotto
Data/Maps/svenheaven
Data/Maps/svenmeeting
Data/Maps/svenninja
Data/Maps/svenninjabefore
Data/Maps/svenredbw
Data/Maps/svenredbw2
Data/Maps/svenredbw3
Data/Maps/svenredbw4
Data/Maps/svenredbw5
Data/Maps/svenredbwafter
Data/Maps/svenroad
Data/Maps/svenruins
Data/Maps/svenshan
Data/Maps/svenskip
Data/Maps/svensthwrong
Data/Maps/sventemple
Data/Maps/sventemple2
Data/Maps/sventhrone
Data/Maps/tutorial
Source/Person.cpp

index 3158705c4a5a7208e504da185061a8e62d09b73f..5b05a081bce30f60689b6f9a67498680142041c2 100644 (file)
Binary files a/Data/Maps/Start1 and b/Data/Maps/Start1 differ
index 79d5e17741e691b2a896c776f3900c730581db14..cc9bf6dd89a6dc4832eab2b48981d2883407a2c1 100644 (file)
Binary files a/Data/Maps/Start10 and b/Data/Maps/Start10 differ
index 547bb3c02421cacaa660aa079ba517dfa24b2000..e4e79717e5a28743de9abae91f0b3b4fb9ae0312 100644 (file)
Binary files a/Data/Maps/Start11 and b/Data/Maps/Start11 differ
index 055dd63872901c3a584553e61cac4f417f0c5aff..245d5b6117201e3d0cb08b8af3a5e41994cc847f 100644 (file)
Binary files a/Data/Maps/Start12 and b/Data/Maps/Start12 differ
index a383f82cd97c4404005e8b4c0182b67398c7278a..a717d56cbc6d27cc60cce1dd2c1d7d888d645e76 100644 (file)
Binary files a/Data/Maps/Start13 and b/Data/Maps/Start13 differ
index b06be60bc3b30a0300314d5abb6d7183998b08f8..ddc38e9d26a50c78341a1f5b057276cd80b2a3e8 100644 (file)
Binary files a/Data/Maps/Start14 and b/Data/Maps/Start14 differ
index 64e431ad52a00d946da314b3fe8dee2a87874b05..9203a87d9e1dd91834bdfbd21998ab8aa6875830 100644 (file)
Binary files a/Data/Maps/Start15 and b/Data/Maps/Start15 differ
index 9aabd00cdd8a65be30f79ea4fb85128552819262..4b2043905b640a04620f225ee2807444786cafbb 100644 (file)
Binary files a/Data/Maps/Start16 and b/Data/Maps/Start16 differ
index 45a0b224c5a22106aab8972ac45add0bb81a8b15..d3a6d4658fa3d082adab1a05cc8300ed1dbc98fe 100644 (file)
Binary files a/Data/Maps/Start17 and b/Data/Maps/Start17 differ
index 768af0efeb244879f84f019f5181b7c420f3c30b..8a98c23f3340b06299d79ebda925d1de32769a36 100644 (file)
Binary files a/Data/Maps/Start18 and b/Data/Maps/Start18 differ
index 7da1f0827892d33ff5be0198425136a0570ef1dd..62b3b1c8bc548549d27e5d19a313b40173e0d071 100644 (file)
Binary files a/Data/Maps/Start19 and b/Data/Maps/Start19 differ
index 8df7cca04ce3f962e021bbce61643edc4fdbabb8..992c072bde7901ff1a2d0748a8d63a263946b518 100644 (file)
Binary files a/Data/Maps/Start2 and b/Data/Maps/Start2 differ
index d80cdd70ad8bba0b4764b4213d01168ae511e9b5..1f9fae249507862c221dcf827e422d5c64f31bc4 100644 (file)
Binary files a/Data/Maps/Start20 and b/Data/Maps/Start20 differ
index 6b35097fc2f7e98cf3b017849c48ed86b7d8420e..0c5ff8a204756048ff3a73d5fbd9eeae19e0fc47 100644 (file)
Binary files a/Data/Maps/Start21 and b/Data/Maps/Start21 differ
index 09a4ce472ea52c520e5d1892d804babf6e3ec67e..66bff464b2ca8d43b808b08b8c62946cfe47bca6 100644 (file)
Binary files a/Data/Maps/Start22 and b/Data/Maps/Start22 differ
index 16665b507c3983a9e4e13b1c55ee7fa80233c800..9eb95b38e0a370bc9c7ca228fbc4beaa40049e97 100644 (file)
Binary files a/Data/Maps/Start23 and b/Data/Maps/Start23 differ
index 690bf408fac729318de442f9347a0661c5b7da9e..a8c51df10f269d09dff76033c0b41134a80d70bc 100644 (file)
Binary files a/Data/Maps/Start24 and b/Data/Maps/Start24 differ
index 6566ceeabe063839ef2cd14e7a10babc47638f75..220a745d0919ea3bc2974ddeb192201820e4784d 100644 (file)
Binary files a/Data/Maps/Start25 and b/Data/Maps/Start25 differ
index d1dee3cd5eb50fc9226c67e55f7d60b2a5c9e3df..29d7c956a4e5008b40a4f0a626eefccee0766031 100644 (file)
Binary files a/Data/Maps/Start26 and b/Data/Maps/Start26 differ
index ec28bcdea0f46f2853f92663bf1466e6f190f1df..b039b7f65d8b229531ab7ad0e74ad05c6807d761 100644 (file)
Binary files a/Data/Maps/Start27 and b/Data/Maps/Start27 differ
index edbf3206ddcb659594ee95c8090c757b19c2d660..38241a36441327ffcb0b7b98c00e932743cbc8da 100644 (file)
Binary files a/Data/Maps/Start28 and b/Data/Maps/Start28 differ
index 22fb9024bfb0ef93a31b35086612aa4c903a9595..9ea4c82e517b8b0f0cf543a40d6ed9cf26b385dd 100644 (file)
Binary files a/Data/Maps/Start29 and b/Data/Maps/Start29 differ
index 0586faa084473cf39941e06cfba61369ec541aed..fab2377c0b86f8f0be484746c4fa50a7b98a676b 100644 (file)
Binary files a/Data/Maps/Start3 and b/Data/Maps/Start3 differ
index bfdd7af85ba77ca0c33fbfb477a4f9fd1dc639ec..55cfedd4b6f563f8ba500e0b4b1cc44bcf3d629f 100644 (file)
Binary files a/Data/Maps/Start30 and b/Data/Maps/Start30 differ
index 268963602d45122bb94ff2da06d126c306f22f77..54c33c3834dc67ae3b220c45f6566186d026648c 100644 (file)
Binary files a/Data/Maps/Start4 and b/Data/Maps/Start4 differ
index 178bf8755e408a3113f4182f373dde05e350e197..fd4c9ba33ea2d0de9c169dd2bda12ff3572959d0 100644 (file)
Binary files a/Data/Maps/Start5 and b/Data/Maps/Start5 differ
index 21bdad577334cedb47cd9b46db769d43f8e2c14d..1248068f1d788f1cbca53e2b04b4ffbb9ae98aa1 100644 (file)
Binary files a/Data/Maps/Start6 and b/Data/Maps/Start6 differ
index 549924238f8c09b29fa051dc1481566e991ed8b8..f8af5fc4988d731163118725d5dea3444a19f137 100644 (file)
Binary files a/Data/Maps/Start7 and b/Data/Maps/Start7 differ
index b299c6d8523c23956c93163b93e6c0410cd85c9e..d0c5c9494b7501f4e6b06db20a599ac638eb055a 100644 (file)
Binary files a/Data/Maps/Start8 and b/Data/Maps/Start8 differ
index 61bf1fefb52cb6ecd5c115c4f967d26f7d211f7e..5ee0b22d414fc56ad81fc7a01cc510fbb017bf72 100644 (file)
Binary files a/Data/Maps/Start9 and b/Data/Maps/Start9 differ
index aa53130ad004c949175d70f9724474cc114b1666..db8adf880ce834109861cc0b630d152308034a02 100644 (file)
Binary files a/Data/Maps/map1 and b/Data/Maps/map1 differ
index 4c4785cf52d6d42c6a53807b2e899ae9aa6d2201..8d26aafa6ccee3444394758e030dc29665e0db1e 100644 (file)
Binary files a/Data/Maps/map10 and b/Data/Maps/map10 differ
index ee11078b67e1a4eecff362502935a50e524a6448..fa535eef1a04bae147e76d0ef84eea522064ed39 100644 (file)
Binary files a/Data/Maps/map11 and b/Data/Maps/map11 differ
index 77d43161056524c1f78c0d8a058972dc3af49ca2..4a5f4acbeaba5e0f2b06125a991a015508f81c28 100644 (file)
Binary files a/Data/Maps/map12 and b/Data/Maps/map12 differ
index b2c3021caba8371322251a250ac261289cb111a5..92c38bd66eafd3ed2c90edd71777c98b1b8401c5 100644 (file)
Binary files a/Data/Maps/map13 and b/Data/Maps/map13 differ
index bbf5559cc58f32a24676c406ccdeb80c32a680cc..65c7f64d0976674745a5bcc20135379089e4c16c 100644 (file)
Binary files a/Data/Maps/map14 and b/Data/Maps/map14 differ
index b88d82f6bb9bc76cf207bf54d5c262b7ccbfd943..792b1e24e890afa4c0b3daf9dd310c94d52a1605 100644 (file)
Binary files a/Data/Maps/map2 and b/Data/Maps/map2 differ
index 798d649053ba08fd009273be68629ee28b831c00..cbdb765c675724eda0ff6556ad688cad71bb966e 100644 (file)
Binary files a/Data/Maps/map3 and b/Data/Maps/map3 differ
index 4640d08a8a4cc139c67237bf7d7d6418371b4da8..21a929692858f68734ede6dc960b01e07b10245e 100644 (file)
Binary files a/Data/Maps/map4 and b/Data/Maps/map4 differ
index 7328124acfe06a740d0866ebb4ceb48a609bcbc8..6531e21e4427139254cc43e399727a416afa1283 100644 (file)
Binary files a/Data/Maps/map5 and b/Data/Maps/map5 differ
index c7f8adfaaaf862b5eb742ad5548baa283ae1200a..76028b377b3a62bc2e0fa507c01fa20338bb46ef 100644 (file)
Binary files a/Data/Maps/map6 and b/Data/Maps/map6 differ
index 53def78a8b3c1217e55a4a2e148f904ea992a742..a0a5471c9313f8b252ec690db4ee9a3781e9500c 100644 (file)
Binary files a/Data/Maps/map7 and b/Data/Maps/map7 differ
index 94d6e35b60e05e55f0a731fe360b9efcf1e3072b..945083e0c0b187ee13fffc40d8151120c68bd62b 100644 (file)
Binary files a/Data/Maps/map8 and b/Data/Maps/map8 differ
index 89426f15448c8896f8be41f40cc85e635a38d22d..dac4b956e95092ad5a3b521d4ce94a5365253b32 100644 (file)
Binary files a/Data/Maps/map9 and b/Data/Maps/map9 differ
index f30fd24f862c4dd4f890e83a0680bef8ace6501c..0dae12e7928c02d8052d353ffc9eeddb5bea4523 100644 (file)
Binary files a/Data/Maps/raidercamp and b/Data/Maps/raidercamp differ
index 353137ef61e4cf76f24ebb96c13ed242af95a6df..8ea7942f6be8183ebf633eea8dfc183bc809a9df 100644 (file)
Binary files a/Data/Maps/svenalpha and b/Data/Maps/svenalpha differ
index 4baff8dcfb2f8026c24160e71442e08a1dfb77b2..8d8e52b4853b8e2287d7da056180c93b4396e253 100644 (file)
Binary files a/Data/Maps/svencanyon and b/Data/Maps/svencanyon differ
index d907ade9d0724059eeef9bc894ddd62c9bf6a724..42a5b20bdf27437a46f31070d5e76d06a5f226c9 100644 (file)
Binary files a/Data/Maps/svenchasm and b/Data/Maps/svenchasm differ
index 36a4a8e33ea15814021c3f6b6de6df3695a55136..cf4fc6a5f429a1a2ef5101da7fc71200a81d4cb5 100644 (file)
Binary files a/Data/Maps/svenclimb and b/Data/Maps/svenclimb differ
index 140f86d6ee90e7d793fd84a7df19bfe3959f586a..a6a4a2a019132bc20ce5eb2e5980429b57db4445 100644 (file)
Binary files a/Data/Maps/svencouncil and b/Data/Maps/svencouncil differ
index 547dab4231df7aae331f416b32dab1d590036636..7938eb421857867de2c3b745f17134dab478c96b 100644 (file)
Binary files a/Data/Maps/svendawn and b/Data/Maps/svendawn differ
index 1adb98c9e8ee81b83a6ab8c181b4c6baecfb6ea0..8cba585045224ffd866fd300e53257c8c46cb07e 100644 (file)
Binary files a/Data/Maps/svendecoy and b/Data/Maps/svendecoy differ
index 8624f0f6197e246903d58ef43aeed44ed2a75ab7..8120203659933b7fceecb9e1925cf68bc9753dc7 100644 (file)
Binary files a/Data/Maps/svendefend and b/Data/Maps/svendefend differ
index 550ed8364fb495273f2d5ec025e3d0048fcd6381..3609aa41ae1209e6e8d8772163c3b2c8d4c7354b 100644 (file)
Binary files a/Data/Maps/svendoor and b/Data/Maps/svendoor differ
index 745a22776516c2ae511e7e42cacd6180890955bf..89d0675c08d21520b07a460a3591280f4c5a00a3 100644 (file)
Binary files a/Data/Maps/svenearl and b/Data/Maps/svenearl differ
index c71de209a25167364fe995dadeae86bdae403e74..3331c62ba427d2d48e043c871275288096c73efd 100644 (file)
Binary files a/Data/Maps/svenfireice and b/Data/Maps/svenfireice differ
index 6e56b28af7063e5dde8d1ae79d9b52ffeab8a39f..055a586066dc867110e20f1ed59db0d206f1d29f 100644 (file)
Binary files a/Data/Maps/svenforest and b/Data/Maps/svenforest differ
index 1fcc63e33d049ba3f501f0d13b03dcdc1337a5d1..3949821bb3557bbb84480be1f182a00cc745de22 100644 (file)
Binary files a/Data/Maps/svenfort and b/Data/Maps/svenfort differ
index 03ce0e7b730c5b5c15c7c5ae236939ef390cfe26..15eba23a01abb78312747d73f23148704f8d0575 100644 (file)
Binary files a/Data/Maps/svengrotto and b/Data/Maps/svengrotto differ
index 6b99a2e780b01197520beaa3e5cf08235ebb62fb..56acf0441258f74a1b555006bd4ff1dd4c0d03fe 100644 (file)
Binary files a/Data/Maps/svenheaven and b/Data/Maps/svenheaven differ
index 4ffd0a41eaf2e97d3c562c46646aedb2e40f2510..c04862d42267aa1baeb3868806a97d25c8f7bae5 100644 (file)
Binary files a/Data/Maps/svenmeeting and b/Data/Maps/svenmeeting differ
index abe3ba1629a44b42bdd443f2a76e4aad9a8db2d3..2e69c1414eb9e80c8921a272c53666c96f180f3a 100644 (file)
Binary files a/Data/Maps/svenninja and b/Data/Maps/svenninja differ
index c489cf07957a7b805779cdb7117e60ad30fb755c..9f47da0c9043db28b95ca73c9d8793b9897addb8 100644 (file)
Binary files a/Data/Maps/svenninjabefore and b/Data/Maps/svenninjabefore differ
index 67f433de86c8c2a00069cad40ced0b3faeff0741..9bc75de11fcc3fe76dfc0d0efd47bc5c7e0a3654 100644 (file)
Binary files a/Data/Maps/svenredbw and b/Data/Maps/svenredbw differ
index 1d72656b34766aee92c3c308a11c20ea9a6299a9..34f7bd2cc0d3131f46107e428766dd709b45d9de 100644 (file)
Binary files a/Data/Maps/svenredbw2 and b/Data/Maps/svenredbw2 differ
index a81c0c301745500b5d095633ff9f95d4f417e908..38c55da0780791ceeac8245b74ad334c2cbb494a 100644 (file)
Binary files a/Data/Maps/svenredbw3 and b/Data/Maps/svenredbw3 differ
index 99d1ff0c3531522a668022360efef82f077fdbc2..1815836c779e0a22faf194d0b3d9991f35be6fa3 100644 (file)
Binary files a/Data/Maps/svenredbw4 and b/Data/Maps/svenredbw4 differ
index 26efac5b76659e359b7d3192da7ec9ada44147de..478a84a601fec09067a67a4448fd15743bee6fdd 100644 (file)
Binary files a/Data/Maps/svenredbw5 and b/Data/Maps/svenredbw5 differ
index 4cfb605d4ff8659a233c183399d91faa22df934e..45103365fbdeb12c44ba9b9b4a8542bd22968df2 100644 (file)
Binary files a/Data/Maps/svenredbwafter and b/Data/Maps/svenredbwafter differ
index b031db7bdc8b5b35e5dada377105fb822d756471..1e67f195c7f61d15c932e68e1b58969f0f7f1c48 100644 (file)
Binary files a/Data/Maps/svenroad and b/Data/Maps/svenroad differ
index b44f63184d7946e4f08f5155dc9b1af3a1ebcb22..cda6d2629c7704376fd75fa692404f12cee51819 100644 (file)
Binary files a/Data/Maps/svenruins and b/Data/Maps/svenruins differ
index a9386862925dd5f2a9ac68eb9ffaa3c4521cee2b..ed5b99bdc01075ea2b36bfabb6bb24c4dedc417d 100644 (file)
Binary files a/Data/Maps/svenshan and b/Data/Maps/svenshan differ
index c6597bbfb4e7176ae5bd77534cbe71a4208c1f8f..68e45325718d6e69a21c2072a7e0db1f4216a5d4 100644 (file)
Binary files a/Data/Maps/svenskip and b/Data/Maps/svenskip differ
index 4f2ae4c23e53750bb5a13f3e7b79a91e8224747b..e4d4a12fb452dc9787bab50c185ded97d6b21d7f 100644 (file)
Binary files a/Data/Maps/svensthwrong and b/Data/Maps/svensthwrong differ
index 9191d2e7fa74a91d0e0ef88f6386d4c44fc014b7..8e105ec273ab4a2d32784d7c9318baa7a07f8845 100644 (file)
Binary files a/Data/Maps/sventemple and b/Data/Maps/sventemple differ
index 3542fedee291e5de3eac03010d2a81affd11a8af..646517003a0e28977c8306a840fb1f21f7c7f6cd 100644 (file)
Binary files a/Data/Maps/sventemple2 and b/Data/Maps/sventemple2 differ
index 8181eaa6b8f593a5865ed3ca4efd8e220882a423..6bb20b072e77bcd02100fd5578479469dc426f47 100644 (file)
Binary files a/Data/Maps/sventhrone and b/Data/Maps/sventhrone differ
index 50a7a425c0c970d1bf5fed5325077d2fde85b6b5..b0e7acddac344124cbe1f1aa010610f931bd1064 100644 (file)
Binary files a/Data/Maps/tutorial and b/Data/Maps/tutorial differ
index 9e2bc9f4bf7d6cc01604ac4ba46ea205c54cc3b8..59994f890a4284b714593c85d3130db8ed4baa82 100644 (file)
@@ -26,6 +26,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Awards.h"
 #include "Game.h"
 #include "Dialog.h"
+#include "Utils/Folders.h"
 
 extern float multiplier;
 extern Terrain terrain;
@@ -6790,7 +6791,7 @@ bool Person::addClothes(const int& clothesId)
 
     //Load Image
     ImageRec texture;
-    bool opened = load_image(fileName, texture);
+    bool opened = load_image(Folders::getResourcePath(fileName).c_str(), texture);
 
     float alphanum;
     //Is it valid?