diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 7acd1c51..c0af5401 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -307,7 +307,6 @@ void Game::init(void) supercrewmate = false; scmhurt = false; scmprogress = 0; - scmmoveme = false; swncolstate = 0; swncoldelay = 0; swnrecord = 0; @@ -4946,10 +4945,6 @@ void Game::readmaingamesave(const char* savename, tinyxml2::XMLDocument& doc) { scmprogress = help.Int(pText); } - else if (SDL_strcmp(pKey, "scmmoveme") == 0) - { - scmmoveme = help.Int(pText); - } else if (SDL_strcmp(pKey, "frames") == 0) { frames = help.Int(pText); @@ -5152,10 +5147,6 @@ void Game::customloadquick(const std::string& savfile) { scmprogress = help.Int(pText); } - else if (SDL_strcmp(pKey, "scmmoveme") == 0) - { - scmmoveme = help.Int(pText); - } else if (SDL_strcmp(pKey, "frames") == 0) { frames = help.Int(pText); @@ -5525,7 +5516,6 @@ std::string Game::writemaingamesave(tinyxml2::XMLDocument& doc) xml::update_tag(msgs, "supercrewmate", (int) supercrewmate); xml::update_tag(msgs, "scmprogress", scmprogress); - xml::update_tag(msgs, "scmmoveme", (int) scmmoveme); xml::update_tag(msgs, "frames", frames); @@ -5661,7 +5651,6 @@ bool Game::customsavequick(const std::string& savfile) xml::update_tag(msgs, "supercrewmate", (int) supercrewmate); xml::update_tag(msgs, "scmprogress", scmprogress); - xml::update_tag(msgs, "scmmoveme", (int) scmmoveme); xml::update_tag(msgs, "frames", frames); diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h index a79e8e63..7ea392dd 100644 --- a/desktop_version/src/Game.h +++ b/desktop_version/src/Game.h @@ -305,7 +305,7 @@ public: int swnrecord, swnbestrank, swnrank, swnmessage; //SuperCrewMate Stuff - bool supercrewmate, scmhurt, scmmoveme; + bool supercrewmate, scmhurt; int scmprogress; //Accessibility Options diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index b9915292..f3761a31 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -1544,15 +1544,7 @@ void gamelogic(void) obj.createentity(10, 177, 24, graphics.crewcolour(game.lastsaved), 2); break; case 3: - if (game.scmmoveme) - { - obj.createentity(obj.entities[obj.getplayer()].xp, 185, 24, graphics.crewcolour(game.lastsaved), 2); - game.scmmoveme = false; - } - else - { - obj.createentity(10, 177, 24, graphics.crewcolour(game.lastsaved), 2); - } + obj.createentity(10, 177, 24, graphics.crewcolour(game.lastsaved), 2); break; case 4: obj.createentity(10, 185, 24, graphics.crewcolour(game.lastsaved), 2); @@ -1586,17 +1578,6 @@ void gamelogic(void) break; } } - - if (game.scmmoveme) - { - int scm = obj.getscm(); - int player = obj.getplayer(); - if (INBOUNDS_VEC(scm, obj.entities) && INBOUNDS_VEC(player, obj.entities)) - { - obj.entities[scm].xp = obj.entities[player].xp; - } - game.scmmoveme = false; - } break; } } diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index c8ba50b9..8c5c4bdb 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -888,14 +888,6 @@ void mapclass::resetplayer(const bool player_died) { game.scmprogress = game.roomx - 40; } - if (game.scmprogress != 0) - { - game.scmmoveme = true; - } - else - { - game.scmmoveme = false; - } } } diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index 3e9c57ff..aba1da93 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -3155,7 +3155,6 @@ void scriptclass::hardreset(void) game.supercrewmate = false; game.scmhurt = false; game.scmprogress = 0; - game.scmmoveme = false; game.swncolstate = 0; game.swncoldelay = 0; game.swnrank = 0;