From: Rémi Verschelde Date: Sun, 4 Dec 2016 16:43:59 +0000 (+0100) Subject: Fix hardcoded clothes paths in maps X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=8a6a4b71914b97fb154abdceef4db768633e71df;p=lugaru.git Fix hardcoded clothes paths in maps 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. --- diff --git a/Data/Maps/Start1 b/Data/Maps/Start1 index 3158705..5b05a08 100644 Binary files a/Data/Maps/Start1 and b/Data/Maps/Start1 differ diff --git a/Data/Maps/Start10 b/Data/Maps/Start10 index 79d5e17..cc9bf6d 100644 Binary files a/Data/Maps/Start10 and b/Data/Maps/Start10 differ diff --git a/Data/Maps/Start11 b/Data/Maps/Start11 index 547bb3c..e4e7971 100644 Binary files a/Data/Maps/Start11 and b/Data/Maps/Start11 differ diff --git a/Data/Maps/Start12 b/Data/Maps/Start12 index 055dd63..245d5b6 100644 Binary files a/Data/Maps/Start12 and b/Data/Maps/Start12 differ diff --git a/Data/Maps/Start13 b/Data/Maps/Start13 index a383f82..a717d56 100644 Binary files a/Data/Maps/Start13 and b/Data/Maps/Start13 differ diff --git a/Data/Maps/Start14 b/Data/Maps/Start14 index b06be60..ddc38e9 100644 Binary files a/Data/Maps/Start14 and b/Data/Maps/Start14 differ diff --git a/Data/Maps/Start15 b/Data/Maps/Start15 index 64e431a..9203a87 100644 Binary files a/Data/Maps/Start15 and b/Data/Maps/Start15 differ diff --git a/Data/Maps/Start16 b/Data/Maps/Start16 index 9aabd00..4b20439 100644 Binary files a/Data/Maps/Start16 and b/Data/Maps/Start16 differ diff --git a/Data/Maps/Start17 b/Data/Maps/Start17 index 45a0b22..d3a6d46 100644 Binary files a/Data/Maps/Start17 and b/Data/Maps/Start17 differ diff --git a/Data/Maps/Start18 b/Data/Maps/Start18 index 768af0e..8a98c23 100644 Binary files a/Data/Maps/Start18 and b/Data/Maps/Start18 differ diff --git a/Data/Maps/Start19 b/Data/Maps/Start19 index 7da1f08..62b3b1c 100644 Binary files a/Data/Maps/Start19 and b/Data/Maps/Start19 differ diff --git a/Data/Maps/Start2 b/Data/Maps/Start2 index 8df7cca..992c072 100644 Binary files a/Data/Maps/Start2 and b/Data/Maps/Start2 differ diff --git a/Data/Maps/Start20 b/Data/Maps/Start20 index d80cdd7..1f9fae2 100644 Binary files a/Data/Maps/Start20 and b/Data/Maps/Start20 differ diff --git a/Data/Maps/Start21 b/Data/Maps/Start21 index 6b35097..0c5ff8a 100644 Binary files a/Data/Maps/Start21 and b/Data/Maps/Start21 differ diff --git a/Data/Maps/Start22 b/Data/Maps/Start22 index 09a4ce4..66bff46 100644 Binary files a/Data/Maps/Start22 and b/Data/Maps/Start22 differ diff --git a/Data/Maps/Start23 b/Data/Maps/Start23 index 16665b5..9eb95b3 100644 Binary files a/Data/Maps/Start23 and b/Data/Maps/Start23 differ diff --git a/Data/Maps/Start24 b/Data/Maps/Start24 index 690bf40..a8c51df 100644 Binary files a/Data/Maps/Start24 and b/Data/Maps/Start24 differ diff --git a/Data/Maps/Start25 b/Data/Maps/Start25 index 6566cee..220a745 100644 Binary files a/Data/Maps/Start25 and b/Data/Maps/Start25 differ diff --git a/Data/Maps/Start26 b/Data/Maps/Start26 index d1dee3c..29d7c95 100644 Binary files a/Data/Maps/Start26 and b/Data/Maps/Start26 differ diff --git a/Data/Maps/Start27 b/Data/Maps/Start27 index ec28bcd..b039b7f 100644 Binary files a/Data/Maps/Start27 and b/Data/Maps/Start27 differ diff --git a/Data/Maps/Start28 b/Data/Maps/Start28 index edbf320..38241a3 100644 Binary files a/Data/Maps/Start28 and b/Data/Maps/Start28 differ diff --git a/Data/Maps/Start29 b/Data/Maps/Start29 index 22fb902..9ea4c82 100644 Binary files a/Data/Maps/Start29 and b/Data/Maps/Start29 differ diff --git a/Data/Maps/Start3 b/Data/Maps/Start3 index 0586faa..fab2377 100644 Binary files a/Data/Maps/Start3 and b/Data/Maps/Start3 differ diff --git a/Data/Maps/Start30 b/Data/Maps/Start30 index bfdd7af..55cfedd 100644 Binary files a/Data/Maps/Start30 and b/Data/Maps/Start30 differ diff --git a/Data/Maps/Start4 b/Data/Maps/Start4 index 2689636..54c33c3 100644 Binary files a/Data/Maps/Start4 and b/Data/Maps/Start4 differ diff --git a/Data/Maps/Start5 b/Data/Maps/Start5 index 178bf87..fd4c9ba 100644 Binary files a/Data/Maps/Start5 and b/Data/Maps/Start5 differ diff --git a/Data/Maps/Start6 b/Data/Maps/Start6 index 21bdad5..1248068 100644 Binary files a/Data/Maps/Start6 and b/Data/Maps/Start6 differ diff --git a/Data/Maps/Start7 b/Data/Maps/Start7 index 5499242..f8af5fc 100644 Binary files a/Data/Maps/Start7 and b/Data/Maps/Start7 differ diff --git a/Data/Maps/Start8 b/Data/Maps/Start8 index b299c6d..d0c5c94 100644 Binary files a/Data/Maps/Start8 and b/Data/Maps/Start8 differ diff --git a/Data/Maps/Start9 b/Data/Maps/Start9 index 61bf1fe..5ee0b22 100644 Binary files a/Data/Maps/Start9 and b/Data/Maps/Start9 differ diff --git a/Data/Maps/map1 b/Data/Maps/map1 index aa53130..db8adf8 100644 Binary files a/Data/Maps/map1 and b/Data/Maps/map1 differ diff --git a/Data/Maps/map10 b/Data/Maps/map10 index 4c4785c..8d26aaf 100644 Binary files a/Data/Maps/map10 and b/Data/Maps/map10 differ diff --git a/Data/Maps/map11 b/Data/Maps/map11 index ee11078..fa535ee 100644 Binary files a/Data/Maps/map11 and b/Data/Maps/map11 differ diff --git a/Data/Maps/map12 b/Data/Maps/map12 index 77d4316..4a5f4ac 100644 Binary files a/Data/Maps/map12 and b/Data/Maps/map12 differ diff --git a/Data/Maps/map13 b/Data/Maps/map13 index b2c3021..92c38bd 100644 Binary files a/Data/Maps/map13 and b/Data/Maps/map13 differ diff --git a/Data/Maps/map14 b/Data/Maps/map14 index bbf5559..65c7f64 100644 Binary files a/Data/Maps/map14 and b/Data/Maps/map14 differ diff --git a/Data/Maps/map2 b/Data/Maps/map2 index b88d82f..792b1e2 100644 Binary files a/Data/Maps/map2 and b/Data/Maps/map2 differ diff --git a/Data/Maps/map3 b/Data/Maps/map3 index 798d649..cbdb765 100644 Binary files a/Data/Maps/map3 and b/Data/Maps/map3 differ diff --git a/Data/Maps/map4 b/Data/Maps/map4 index 4640d08..21a9296 100644 Binary files a/Data/Maps/map4 and b/Data/Maps/map4 differ diff --git a/Data/Maps/map5 b/Data/Maps/map5 index 7328124..6531e21 100644 Binary files a/Data/Maps/map5 and b/Data/Maps/map5 differ diff --git a/Data/Maps/map6 b/Data/Maps/map6 index c7f8adf..76028b3 100644 Binary files a/Data/Maps/map6 and b/Data/Maps/map6 differ diff --git a/Data/Maps/map7 b/Data/Maps/map7 index 53def78..a0a5471 100644 Binary files a/Data/Maps/map7 and b/Data/Maps/map7 differ diff --git a/Data/Maps/map8 b/Data/Maps/map8 index 94d6e35..945083e 100644 Binary files a/Data/Maps/map8 and b/Data/Maps/map8 differ diff --git a/Data/Maps/map9 b/Data/Maps/map9 index 89426f1..dac4b95 100644 Binary files a/Data/Maps/map9 and b/Data/Maps/map9 differ diff --git a/Data/Maps/raidercamp b/Data/Maps/raidercamp index f30fd24..0dae12e 100644 Binary files a/Data/Maps/raidercamp and b/Data/Maps/raidercamp differ diff --git a/Data/Maps/svenalpha b/Data/Maps/svenalpha index 353137e..8ea7942 100644 Binary files a/Data/Maps/svenalpha and b/Data/Maps/svenalpha differ diff --git a/Data/Maps/svencanyon b/Data/Maps/svencanyon index 4baff8d..8d8e52b 100644 Binary files a/Data/Maps/svencanyon and b/Data/Maps/svencanyon differ diff --git a/Data/Maps/svenchasm b/Data/Maps/svenchasm index d907ade..42a5b20 100644 Binary files a/Data/Maps/svenchasm and b/Data/Maps/svenchasm differ diff --git a/Data/Maps/svenclimb b/Data/Maps/svenclimb index 36a4a8e..cf4fc6a 100644 Binary files a/Data/Maps/svenclimb and b/Data/Maps/svenclimb differ diff --git a/Data/Maps/svencouncil b/Data/Maps/svencouncil index 140f86d..a6a4a2a 100644 Binary files a/Data/Maps/svencouncil and b/Data/Maps/svencouncil differ diff --git a/Data/Maps/svendawn b/Data/Maps/svendawn index 547dab4..7938eb4 100644 Binary files a/Data/Maps/svendawn and b/Data/Maps/svendawn differ diff --git a/Data/Maps/svendecoy b/Data/Maps/svendecoy index 1adb98c..8cba585 100644 Binary files a/Data/Maps/svendecoy and b/Data/Maps/svendecoy differ diff --git a/Data/Maps/svendefend b/Data/Maps/svendefend index 8624f0f..8120203 100644 Binary files a/Data/Maps/svendefend and b/Data/Maps/svendefend differ diff --git a/Data/Maps/svendoor b/Data/Maps/svendoor index 550ed83..3609aa4 100644 Binary files a/Data/Maps/svendoor and b/Data/Maps/svendoor differ diff --git a/Data/Maps/svenearl b/Data/Maps/svenearl index 745a227..89d0675 100644 Binary files a/Data/Maps/svenearl and b/Data/Maps/svenearl differ diff --git a/Data/Maps/svenfireice b/Data/Maps/svenfireice index c71de20..3331c62 100644 Binary files a/Data/Maps/svenfireice and b/Data/Maps/svenfireice differ diff --git a/Data/Maps/svenforest b/Data/Maps/svenforest index 6e56b28..055a586 100644 Binary files a/Data/Maps/svenforest and b/Data/Maps/svenforest differ diff --git a/Data/Maps/svenfort b/Data/Maps/svenfort index 1fcc63e..3949821 100644 Binary files a/Data/Maps/svenfort and b/Data/Maps/svenfort differ diff --git a/Data/Maps/svengrotto b/Data/Maps/svengrotto index 03ce0e7..15eba23 100644 Binary files a/Data/Maps/svengrotto and b/Data/Maps/svengrotto differ diff --git a/Data/Maps/svenheaven b/Data/Maps/svenheaven index 6b99a2e..56acf04 100644 Binary files a/Data/Maps/svenheaven and b/Data/Maps/svenheaven differ diff --git a/Data/Maps/svenmeeting b/Data/Maps/svenmeeting index 4ffd0a4..c04862d 100644 Binary files a/Data/Maps/svenmeeting and b/Data/Maps/svenmeeting differ diff --git a/Data/Maps/svenninja b/Data/Maps/svenninja index abe3ba1..2e69c14 100644 Binary files a/Data/Maps/svenninja and b/Data/Maps/svenninja differ diff --git a/Data/Maps/svenninjabefore b/Data/Maps/svenninjabefore index c489cf0..9f47da0 100644 Binary files a/Data/Maps/svenninjabefore and b/Data/Maps/svenninjabefore differ diff --git a/Data/Maps/svenredbw b/Data/Maps/svenredbw index 67f433d..9bc75de 100644 Binary files a/Data/Maps/svenredbw and b/Data/Maps/svenredbw differ diff --git a/Data/Maps/svenredbw2 b/Data/Maps/svenredbw2 index 1d72656..34f7bd2 100644 Binary files a/Data/Maps/svenredbw2 and b/Data/Maps/svenredbw2 differ diff --git a/Data/Maps/svenredbw3 b/Data/Maps/svenredbw3 index a81c0c3..38c55da 100644 Binary files a/Data/Maps/svenredbw3 and b/Data/Maps/svenredbw3 differ diff --git a/Data/Maps/svenredbw4 b/Data/Maps/svenredbw4 index 99d1ff0..1815836 100644 Binary files a/Data/Maps/svenredbw4 and b/Data/Maps/svenredbw4 differ diff --git a/Data/Maps/svenredbw5 b/Data/Maps/svenredbw5 index 26efac5..478a84a 100644 Binary files a/Data/Maps/svenredbw5 and b/Data/Maps/svenredbw5 differ diff --git a/Data/Maps/svenredbwafter b/Data/Maps/svenredbwafter index 4cfb605..4510336 100644 Binary files a/Data/Maps/svenredbwafter and b/Data/Maps/svenredbwafter differ diff --git a/Data/Maps/svenroad b/Data/Maps/svenroad index b031db7..1e67f19 100644 Binary files a/Data/Maps/svenroad and b/Data/Maps/svenroad differ diff --git a/Data/Maps/svenruins b/Data/Maps/svenruins index b44f631..cda6d26 100644 Binary files a/Data/Maps/svenruins and b/Data/Maps/svenruins differ diff --git a/Data/Maps/svenshan b/Data/Maps/svenshan index a938686..ed5b99b 100644 Binary files a/Data/Maps/svenshan and b/Data/Maps/svenshan differ diff --git a/Data/Maps/svenskip b/Data/Maps/svenskip index c6597bb..68e4532 100644 Binary files a/Data/Maps/svenskip and b/Data/Maps/svenskip differ diff --git a/Data/Maps/svensthwrong b/Data/Maps/svensthwrong index 4f2ae4c..e4d4a12 100644 Binary files a/Data/Maps/svensthwrong and b/Data/Maps/svensthwrong differ diff --git a/Data/Maps/sventemple b/Data/Maps/sventemple index 9191d2e..8e105ec 100644 Binary files a/Data/Maps/sventemple and b/Data/Maps/sventemple differ diff --git a/Data/Maps/sventemple2 b/Data/Maps/sventemple2 index 3542fed..6465170 100644 Binary files a/Data/Maps/sventemple2 and b/Data/Maps/sventemple2 differ diff --git a/Data/Maps/sventhrone b/Data/Maps/sventhrone index 8181eaa..6bb20b0 100644 Binary files a/Data/Maps/sventhrone and b/Data/Maps/sventhrone differ diff --git a/Data/Maps/tutorial b/Data/Maps/tutorial index 50a7a42..b0e7acd 100644 Binary files a/Data/Maps/tutorial and b/Data/Maps/tutorial differ diff --git a/Source/Person.cpp b/Source/Person.cpp index 9e2bc9f..59994f8 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -26,6 +26,7 @@ along with Lugaru. If not, see . #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?