diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 79cb7fa7..10b5b487 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -1958,7 +1958,7 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo //Check if it's already been collected entity.para = vx; - if (customcollect[vx] == 1) return; + if (customcollect[vx]) return; break; case 56: //Custom enemy entity.rule = 1; @@ -3098,7 +3098,7 @@ void entityclass::updateentities( int i ) { if (game.intimetrial) { - customcollect[entities[i].para] = 1; + customcollect[entities[i].para] = true; music.playef(27); } else @@ -3107,7 +3107,7 @@ void entityclass::updateentities( int i ) //music.haltdasmusik(); if(music.currentsong!=-1) music.silencedasmusik(); music.playef(27); - customcollect[entities[i].para] = 1; + customcollect[entities[i].para] = true; } removeentity(i); diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h index d81d8e41..ba91236d 100644 --- a/desktop_version/src/Entity.h +++ b/desktop_version/src/Entity.h @@ -186,7 +186,7 @@ public: std::vector blocks; std::vector flags; std::vector collect; - std::vector customcollect; + std::vector customcollect; bool skipblocks, skipdirblocks; diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index b1725b7b..0fc1b64d 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -5264,7 +5264,7 @@ void Game::customloadquick(std::string savfile) obj.customcollect.clear(); for(size_t i = 0; i < values.size(); i++) { - obj.customcollect.push_back(atoi(values[i].c_str())); + obj.customcollect.push_back((bool) atoi(values[i].c_str())); } } } @@ -6065,7 +6065,7 @@ void Game::customsavequick(std::string savfile) std::string customcollect; for(size_t i = 0; i < obj.customcollect.size(); i++ ) { - customcollect += help.String(obj.customcollect[i]) + ","; + customcollect += help.String((int) obj.customcollect[i]) + ","; } msg = new TiXmlElement( "customcollect" ); msg->LinkEndChild( new TiXmlText( customcollect.c_str() )); @@ -7638,5 +7638,5 @@ int Game::trinkets() int Game::crewmates() { - return std::count(obj.customcollect.begin(), obj.customcollect.end(), 1); + return std::count(obj.customcollect.begin(), obj.customcollect.end(), true); } diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index e2da61aa..25a2a548 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -1469,7 +1469,7 @@ void scriptclass::run() for (i = 0; i < 100; i++) { obj.collect[i] = false; - obj.customcollect[i] = 0; + obj.customcollect[i] = false; } game.deathcounts = 0; game.advancetext = false; @@ -3561,7 +3561,7 @@ void scriptclass::hardreset() for (i = 0; i < 100; i++) { obj.collect[i] = false; - obj.customcollect[i] = 0; + obj.customcollect[i] = false; } if (obj.getplayer() > -1){