From 317eece28d25dedcdc4edb1292e3f18d219c5224 Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 8 Apr 2020 22:20:26 -0700 Subject: [PATCH] Remove useless variable game.coins It kept getting set to 0 and getting incremented sometimes, but without it ever actually getting checked, it's a useless variable. --- desktop_version/src/Entity.cpp | 1 - desktop_version/src/Game.cpp | 7 ------- desktop_version/src/Game.h | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index b746ffad..f42f57b4 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -2498,7 +2498,6 @@ void entityclass::updateentities( int i ) //wait for collision if (entities[i].state == 1) { - game.coins++; music.playef(4); collect[entities[i].para] = 1; diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 30277864..ebd48f72 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -4736,8 +4736,6 @@ void Game::customstart() savepoint = 0; gravitycontrol = savegc; - coins = 0; - //state = 2; deathseq = -1; lifeseq = 10; //Not dead, in game initilisation state state = 0; deathseq = -1; @@ -4762,8 +4760,6 @@ void Game::start() savepoint = 0; gravitycontrol = savegc; - coins = 0; - //state = 2; deathseq = -1; lifeseq = 10; //Not dead, in game initilisation state state = 0; deathseq = -1; @@ -4859,7 +4855,6 @@ void Game::startspecial( int t ) savepoint = 0; gravitycontrol = savegc; - coins = 0; state = 0; deathseq = -1; lifeseq = 0; @@ -4931,8 +4926,6 @@ void Game::starttrial( int t ) savepoint = 0; gravitycontrol = savegc; - coins = 0; - //state = 2; deathseq = -1; lifeseq = 10; //Not dead, in game initilisation state state = 0; deathseq = -1; diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h index 42c72a66..0e68289b 100644 --- a/desktop_version/src/Game.h +++ b/desktop_version/src/Game.h @@ -247,7 +247,7 @@ public: int deathseq, lifeseq; - int coins, trinkets(), crewmates(); + int trinkets(), crewmates(); int savepoint, teleport, teleportxpos; int edteleportent; bool completestop;