Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-29 06:07:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Moved eController to Entities.h

Browse source
This commit is contained in:
smallmodel 2023-08-14 19:21:07 +02:00
parent 8ea32fee31
commit 0b2a0634f5
No known key found for this signature in database
GPG key ID: A96F163ED4891440
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
code/fgame/Entities.h
View file

@ -25,6 +25,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "entity.h" #include "entity.h"
#include "animate.h" #include "animate.h"
typedef enum {
CONTROLLER_ALLIES,
CONTROLLER_AXIS,
CONTROLLER_BOTH
} eController;
class ProjectileTarget : public Entity class ProjectileTarget : public Entity
{ {
private: private:

2
code/fgame/dm_manager.cpp
View file

@ -1608,7 +1608,7 @@ void DM_Manager::StopTeamRespawn(eController controller)
{ {
if (controller == CONTROLLER_AXIS) { if (controller == CONTROLLER_AXIS) {
m_bAllowAxisRespawn = false; m_bAllowAxisRespawn = false;
} else if (controller == CONTROLLER_ALLIED) { } else if (controller == CONTROLLER_ALLIES) {
m_bAllowAlliedRespawn = false; m_bAllowAlliedRespawn = false;
} }
} }

6
code/fgame/dm_manager.h
View file

@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#pragma once #pragma once
#include "listener.h" #include "listener.h"
#include "Tow_Entities.h"
extern cvar_t *g_tempaxisscore; extern cvar_t *g_tempaxisscore;
extern cvar_t *g_tempaxiswinsinrow; extern cvar_t *g_tempaxiswinsinrow;
@ -151,11 +152,6 @@ public:
SimpleAmmoType(); SimpleAmmoType();
}; };
typedef enum {
CONTROLLER_ALLIED,
CONTROLLER_AXIS
} eController;
class Player; class Player;
class DM_Manager : public Listener class DM_Manager : public Listener

4
code/fgame/scriptthread.cpp
View file

@ -4071,11 +4071,11 @@ void ScriptThread::EventStopTeamRespawn(Event *ev)
dmManager.StopTeamRespawn(CONTROLLER_AXIS); dmManager.StopTeamRespawn(CONTROLLER_AXIS);
break; break;
case STRING_AMERICAN: case STRING_AMERICAN:
dmManager.StopTeamRespawn(CONTROLLER_ALLIED); dmManager.StopTeamRespawn(CONTROLLER_ALLIES);
break; break;
case STRING_BOTH: case STRING_BOTH:
dmManager.StopTeamRespawn(CONTROLLER_AXIS); dmManager.StopTeamRespawn(CONTROLLER_AXIS);
dmManager.StopTeamRespawn(CONTROLLER_ALLIED); dmManager.StopTeamRespawn(CONTROLLER_ALLIES);
break; break;
default: default:
ScriptError("stopteamrespawn must belong to 'american' or 'german' or 'both'"); ScriptError("stopteamrespawn must belong to 'american' or 'german' or 'both'");