diff --git a/code/fgame/Entities.h b/code/fgame/Entities.h index 78e17c9e..74bad8d2 100644 --- a/code/fgame/Entities.h +++ b/code/fgame/Entities.h @@ -25,6 +25,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "entity.h" #include "animate.h" +typedef enum { + CONTROLLER_ALLIES, + CONTROLLER_AXIS, + CONTROLLER_BOTH +} eController; + class ProjectileTarget : public Entity { private: diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp index ac6b152e..1e28ab6e 100644 --- a/code/fgame/dm_manager.cpp +++ b/code/fgame/dm_manager.cpp @@ -1608,7 +1608,7 @@ void DM_Manager::StopTeamRespawn(eController controller) { if (controller == CONTROLLER_AXIS) { m_bAllowAxisRespawn = false; - } else if (controller == CONTROLLER_ALLIED) { + } else if (controller == CONTROLLER_ALLIES) { m_bAllowAlliedRespawn = false; } } diff --git a/code/fgame/dm_manager.h b/code/fgame/dm_manager.h index 25a7d4f5..c92d1717 100644 --- a/code/fgame/dm_manager.h +++ b/code/fgame/dm_manager.h @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #pragma once #include "listener.h" +#include "Tow_Entities.h" extern cvar_t *g_tempaxisscore; extern cvar_t *g_tempaxiswinsinrow; @@ -151,11 +152,6 @@ public: SimpleAmmoType(); }; -typedef enum { - CONTROLLER_ALLIED, - CONTROLLER_AXIS -} eController; - class Player; class DM_Manager : public Listener diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp index d6c53426..2418d036 100644 --- a/code/fgame/scriptthread.cpp +++ b/code/fgame/scriptthread.cpp @@ -4071,11 +4071,11 @@ void ScriptThread::EventStopTeamRespawn(Event *ev) dmManager.StopTeamRespawn(CONTROLLER_AXIS); break; case STRING_AMERICAN: - dmManager.StopTeamRespawn(CONTROLLER_ALLIED); + dmManager.StopTeamRespawn(CONTROLLER_ALLIES); break; case STRING_BOTH: dmManager.StopTeamRespawn(CONTROLLER_AXIS); - dmManager.StopTeamRespawn(CONTROLLER_ALLIED); + dmManager.StopTeamRespawn(CONTROLLER_ALLIES); break; default: ScriptError("stopteamrespawn must belong to 'american' or 'german' or 'both'");