Cleaned up some powerup implementations

mmatyas · Apr 7, 2024 · 2881cd0 · 2881cd0
1 parent 2ee0d7c
commit 2881cd0
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 386 deletions.
diff --git a/src/smw/objects/powerup/PU_BobombPowerup.cpp b/src/smw/objects/powerup/PU_BobombPowerup.cpp
@@ -1,46 +1,6 @@
-#include "objectgame.h"
+#include "PU_BobombPowerup.h"
 
-#include "eyecandy.h"
-#include "GameMode.h"
-#include "GameValues.h"
-#include "map.h"
-#include "movingplatform.h"
-#include "ObjectContainer.h"
-#include "objecthazard.h"
-#include "RandomNumberGenerator.h"
-#include "ResourceManager.h"
-#include "gamemodes/BonusHouse.h"
-#include "gamemodes/Chase.h"
-#include "gamemodes/Race.h"
-#include "gamemodes/Star.h"
-#include "gamemodes/MiniBoss.h"
-#include "gamemodes/MiniBoxes.h"
-#include "gamemodes/MiniPipe.h"
-
-#include <cstdlib> // abs()
-#include <cmath>
-
-extern short iKingOfTheHillZoneLimits[4][4];
-extern void PlayerKilledPlayer(short iKiller, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern void PlayerKilledPlayer(CPlayer * killer, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern bool SwapPlayers(short iUsingPlayerID);
-extern short scorepowerupoffsets[3][3];
-
-extern CPlayer * GetPlayerFromGlobalID(short iGlobalID);
-extern void CheckSecret(short id);
-extern SpotlightManager spotlightManager;
-extern CObjectContainer objectcontainer[3];
-
-extern CGM_Pipe_MiniGame * pipegamemode;
-
-extern CPlayer* list_players[4];
-extern short score_cnt;
-
-extern CMap* g_map;
-extern CEyecandyContainer eyecandy[3];
-
-extern CGameValues game_values;
-extern CResourceManager* rm;
+#include "player.h"
 
 //------------------------------------------------------------------------------
 // class bobomb powerup

diff --git a/src/smw/objects/powerup/PU_BombPowerup.cpp b/src/smw/objects/powerup/PU_BombPowerup.cpp
@@ -1,46 +1,6 @@
-#include "objectgame.h"
+#include "PU_BombPowerup.h"
 
-#include "eyecandy.h"
-#include "GameMode.h"
-#include "GameValues.h"
-#include "map.h"
-#include "movingplatform.h"
-#include "ObjectContainer.h"
-#include "objecthazard.h"
-#include "RandomNumberGenerator.h"
-#include "ResourceManager.h"
-#include "gamemodes/BonusHouse.h"
-#include "gamemodes/Chase.h"
-#include "gamemodes/Race.h"
-#include "gamemodes/Star.h"
-#include "gamemodes/MiniBoss.h"
-#include "gamemodes/MiniBoxes.h"
-#include "gamemodes/MiniPipe.h"
-
-#include <cstdlib> // abs()
-#include <cmath>
-
-extern short iKingOfTheHillZoneLimits[4][4];
-extern void PlayerKilledPlayer(short iKiller, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern void PlayerKilledPlayer(CPlayer * killer, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern bool SwapPlayers(short iUsingPlayerID);
-extern short scorepowerupoffsets[3][3];
-
-extern CPlayer * GetPlayerFromGlobalID(short iGlobalID);
-extern void CheckSecret(short id);
-extern SpotlightManager spotlightManager;
-extern CObjectContainer objectcontainer[3];
-
-extern CGM_Pipe_MiniGame * pipegamemode;
-
-extern CPlayer* list_players[4];
-extern short score_cnt;
-
-extern CMap* g_map;
-extern CEyecandyContainer eyecandy[3];
-
-extern CGameValues game_values;
-extern CResourceManager* rm;
+#include "player.h"
 
 //------------------------------------------------------------------------------
 // class bomb powerup

diff --git a/src/smw/objects/powerup/PU_BoomerangPowerup.cpp b/src/smw/objects/powerup/PU_BoomerangPowerup.cpp
@@ -1,46 +1,6 @@
-#include "objectgame.h"
+#include "PU_BoomerangPowerup.h"
 
-#include "eyecandy.h"
-#include "GameMode.h"
-#include "GameValues.h"
-#include "map.h"
-#include "movingplatform.h"
-#include "ObjectContainer.h"
-#include "objecthazard.h"
-#include "RandomNumberGenerator.h"
-#include "ResourceManager.h"
-#include "gamemodes/BonusHouse.h"
-#include "gamemodes/Chase.h"
-#include "gamemodes/Race.h"
-#include "gamemodes/Star.h"
-#include "gamemodes/MiniBoss.h"
-#include "gamemodes/MiniBoxes.h"
-#include "gamemodes/MiniPipe.h"
-
-#include <cstdlib> // abs()
-#include <cmath>
-
-extern short iKingOfTheHillZoneLimits[4][4];
-extern void PlayerKilledPlayer(short iKiller, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern void PlayerKilledPlayer(CPlayer * killer, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern bool SwapPlayers(short iUsingPlayerID);
-extern short scorepowerupoffsets[3][3];
-
-extern CPlayer * GetPlayerFromGlobalID(short iGlobalID);
-extern void CheckSecret(short id);
-extern SpotlightManager spotlightManager;
-extern CObjectContainer objectcontainer[3];
-
-extern CGM_Pipe_MiniGame * pipegamemode;
-
-extern CPlayer* list_players[4];
-extern short score_cnt;
-
-extern CMap* g_map;
-extern CEyecandyContainer eyecandy[3];
-
-extern CGameValues game_values;
-extern CResourceManager* rm;
+#include "player.h"
 
 //------------------------------------------------------------------------------
 // class boomerang powerup

diff --git a/src/smw/objects/powerup/PU_BulletBillPowerup.cpp b/src/smw/objects/powerup/PU_BulletBillPowerup.cpp
@@ -1,46 +1,6 @@
-#include "objectgame.h"
+#include "PU_BulletBillPowerup.h"
 
-#include "eyecandy.h"
-#include "GameMode.h"
-#include "GameValues.h"
-#include "map.h"
-#include "movingplatform.h"
-#include "ObjectContainer.h"
-#include "objecthazard.h"
-#include "RandomNumberGenerator.h"
-#include "ResourceManager.h"
-#include "gamemodes/BonusHouse.h"
-#include "gamemodes/Chase.h"
-#include "gamemodes/Race.h"
-#include "gamemodes/Star.h"
-#include "gamemodes/MiniBoss.h"
-#include "gamemodes/MiniBoxes.h"
-#include "gamemodes/MiniPipe.h"
-
-#include <cstdlib> // abs()
-#include <cmath>
-
-extern short iKingOfTheHillZoneLimits[4][4];
-extern void PlayerKilledPlayer(short iKiller, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern void PlayerKilledPlayer(CPlayer * killer, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern bool SwapPlayers(short iUsingPlayerID);
-extern short scorepowerupoffsets[3][3];
-
-extern CPlayer * GetPlayerFromGlobalID(short iGlobalID);
-extern void CheckSecret(short id);
-extern SpotlightManager spotlightManager;
-extern CObjectContainer objectcontainer[3];
-
-extern CGM_Pipe_MiniGame * pipegamemode;
-
-extern CPlayer* list_players[4];
-extern short score_cnt;
-
-extern CMap* g_map;
-extern CEyecandyContainer eyecandy[3];
-
-extern CGameValues game_values;
-extern CResourceManager* rm;
+#include "player.h"
 
 //------------------------------------------------------------------------------
 // class BulletBill powerup

diff --git a/src/smw/objects/powerup/PU_ClockPowerup.cpp b/src/smw/objects/powerup/PU_ClockPowerup.cpp
@@ -1,46 +1,6 @@
-#include "objectgame.h"
+#include "PU_ClockPowerup.h"
 
-#include "eyecandy.h"
-#include "GameMode.h"
-#include "GameValues.h"
-#include "map.h"
-#include "movingplatform.h"
-#include "ObjectContainer.h"
-#include "objecthazard.h"
-#include "RandomNumberGenerator.h"
-#include "ResourceManager.h"
-#include "gamemodes/BonusHouse.h"
-#include "gamemodes/Chase.h"
-#include "gamemodes/Race.h"
-#include "gamemodes/Star.h"
-#include "gamemodes/MiniBoss.h"
-#include "gamemodes/MiniBoxes.h"
-#include "gamemodes/MiniPipe.h"
-
-#include <cstdlib> // abs()
-#include <cmath>
-
-extern short iKingOfTheHillZoneLimits[4][4];
-extern void PlayerKilledPlayer(short iKiller, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern void PlayerKilledPlayer(CPlayer * killer, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern bool SwapPlayers(short iUsingPlayerID);
-extern short scorepowerupoffsets[3][3];
-
-extern CPlayer * GetPlayerFromGlobalID(short iGlobalID);
-extern void CheckSecret(short id);
-extern SpotlightManager spotlightManager;
-extern CObjectContainer objectcontainer[3];
-
-extern CGM_Pipe_MiniGame * pipegamemode;
-
-extern CPlayer* list_players[4];
-extern short score_cnt;
-
-extern CMap* g_map;
-extern CEyecandyContainer eyecandy[3];
-
-extern CGameValues game_values;
-extern CResourceManager* rm;
+#include "player.h"
 
 //------------------------------------------------------------------------------
 // class clock powerup

diff --git a/src/smw/objects/powerup/PU_CoinPowerup.cpp b/src/smw/objects/powerup/PU_CoinPowerup.cpp
@@ -1,43 +1,10 @@
-#include "objectgame.h"
+#include "PU_CoinPowerup.h"
 
-#include "eyecandy.h"
+#include "Game.h"
 #include "GameMode.h"
 #include "GameValues.h"
-#include "map.h"
-#include "movingplatform.h"
-#include "ObjectContainer.h"
-#include "objecthazard.h"
-#include "RandomNumberGenerator.h"
+#include "player.h"
 #include "ResourceManager.h"
-#include "gamemodes/BonusHouse.h"
-#include "gamemodes/Chase.h"
-#include "gamemodes/Race.h"
-#include "gamemodes/Star.h"
-#include "gamemodes/MiniBoss.h"
-#include "gamemodes/MiniBoxes.h"
-#include "gamemodes/MiniPipe.h"
-
-#include <cstdlib> // abs()
-#include <cmath>
-
-extern short iKingOfTheHillZoneLimits[4][4];
-extern void PlayerKilledPlayer(short iKiller, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern void PlayerKilledPlayer(CPlayer * killer, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern bool SwapPlayers(short iUsingPlayerID);
-extern short scorepowerupoffsets[3][3];
-
-extern CPlayer * GetPlayerFromGlobalID(short iGlobalID);
-extern void CheckSecret(short id);
-extern SpotlightManager spotlightManager;
-extern CObjectContainer objectcontainer[3];
-
-extern CGM_Pipe_MiniGame * pipegamemode;
-
-extern CPlayer* list_players[4];
-extern short score_cnt;
-
-extern CMap* g_map;
-extern CEyecandyContainer eyecandy[3];
 
 extern CGameValues game_values;
 extern CResourceManager* rm;

diff --git a/src/smw/objects/powerup/PU_ExtraGuyPowerup.cpp b/src/smw/objects/powerup/PU_ExtraGuyPowerup.cpp
@@ -1,42 +1,11 @@
-#include "objectgame.h"
+#include "PU_ExtraGuyPowerup.h"
 
 #include "eyecandy.h"
 #include "GameMode.h"
 #include "GameValues.h"
-#include "map.h"
-#include "movingplatform.h"
-#include "ObjectContainer.h"
-#include "objecthazard.h"
-#include "RandomNumberGenerator.h"
+#include "player.h"
 #include "ResourceManager.h"
-#include "gamemodes/BonusHouse.h"
-#include "gamemodes/Chase.h"
-#include "gamemodes/Race.h"
-#include "gamemodes/Star.h"
-#include "gamemodes/MiniBoss.h"
-#include "gamemodes/MiniBoxes.h"
-#include "gamemodes/MiniPipe.h"
 
-#include <cstdlib> // abs()
-#include <cmath>
-
-extern short iKingOfTheHillZoneLimits[4][4];
-extern void PlayerKilledPlayer(short iKiller, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern void PlayerKilledPlayer(CPlayer * killer, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern bool SwapPlayers(short iUsingPlayerID);
-extern short scorepowerupoffsets[3][3];
-
-extern CPlayer * GetPlayerFromGlobalID(short iGlobalID);
-extern void CheckSecret(short id);
-extern SpotlightManager spotlightManager;
-extern CObjectContainer objectcontainer[3];
-
-extern CGM_Pipe_MiniGame * pipegamemode;
-
-extern CPlayer* list_players[4];
-extern short score_cnt;
-
-extern CMap* g_map;
 extern CEyecandyContainer eyecandy[3];
 
 extern CGameValues game_values;

diff --git a/src/smw/objects/powerup/PU_ExtraHeartPowerup.cpp b/src/smw/objects/powerup/PU_ExtraHeartPowerup.cpp
@@ -1,43 +1,9 @@
-#include "objectgame.h"
+#include "PU_ExtraHeartPowerup.h"
 
-#include "eyecandy.h"
 #include "GameMode.h"
 #include "GameValues.h"
-#include "map.h"
-#include "movingplatform.h"
-#include "ObjectContainer.h"
-#include "objecthazard.h"
-#include "RandomNumberGenerator.h"
+#include "player.h"
 #include "ResourceManager.h"
-#include "gamemodes/BonusHouse.h"
-#include "gamemodes/Chase.h"
-#include "gamemodes/Race.h"
-#include "gamemodes/Star.h"
-#include "gamemodes/MiniBoss.h"
-#include "gamemodes/MiniBoxes.h"
-#include "gamemodes/MiniPipe.h"
-
-#include <cstdlib> // abs()
-#include <cmath>
-
-extern short iKingOfTheHillZoneLimits[4][4];
-extern void PlayerKilledPlayer(short iKiller, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern void PlayerKilledPlayer(CPlayer * killer, CPlayer * killed, short deathstyle, short KillStyle, bool fForce, bool fKillCarriedItem);
-extern bool SwapPlayers(short iUsingPlayerID);
-extern short scorepowerupoffsets[3][3];
-
-extern CPlayer * GetPlayerFromGlobalID(short iGlobalID);
-extern void CheckSecret(short id);
-extern SpotlightManager spotlightManager;
-extern CObjectContainer objectcontainer[3];
-
-extern CGM_Pipe_MiniGame * pipegamemode;
-
-extern CPlayer* list_players[4];
-extern short score_cnt;
-
-extern CMap* g_map;
-extern CEyecandyContainer eyecandy[3];
 
 extern CGameValues game_values;
 extern CResourceManager* rm;