Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-10 04:27:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed string constants

Browse source
This commit is contained in:
smallmodel 2023-08-10 12:08:53 +02:00
parent ba931cbedf
commit 3ca09613e1
No known key found for this signature in database
GPG key ID: A96F163ED4891440
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
code/fgame/navigate.cpp
View file

@ -3640,7 +3640,7 @@ AttractiveNode::AttractiveNode()
m_fMaxDistanceSquared = m_fMaxDistance * m_fMaxDistance; m_fMaxDistanceSquared = m_fMaxDistance * m_fMaxDistance;
m_fRespawnTime = 15.0f; // set to default 15 seconds m_fRespawnTime = 15.0f; // set to default 15 seconds
m_bUse = false; m_bUse = false;
m_csTeam = STRING_NONE; m_csTeam = STRING_EMPTY;
m_iTeam = TEAM_NONE; m_iTeam = TEAM_NONE;
attractiveNodes.AddObject( this ); attractiveNodes.AddObject( this );
@ -3786,7 +3786,7 @@ void AttractiveNode::SetTeam
{ {
if( ev->IsNilAt( 1 ) ) if( ev->IsNilAt( 1 ) )
{ {
m_csTeam = STRING_NONE; m_csTeam = STRING_EMPTY;
m_iTeam = TEAM_NONE; m_iTeam = TEAM_NONE;
return; return;
} }
@ -3795,7 +3795,7 @@ void AttractiveNode::SetTeam
switch( m_csTeam ) switch( m_csTeam )
{ {
case STRING_NONE: case STRING_EMPTY:
m_iTeam = TEAM_NONE; m_iTeam = TEAM_NONE;
break; break;
case STRING_SPECTATOR: case STRING_SPECTATOR:

7
code/fgame/scriptmaster.cpp
View file

@ -289,9 +289,10 @@ const char *ScriptMaster::ConstStrings[] =
"turndone", "turndone",
"anim/no_anim_killed.scr", "anim/no_anim_killed.scr",
"mg42", "mp40", "mg42", "mp40",
"remove", "delete", "auto",
"respawn", "both",
"none" "runandshoot",
"respawn"
}; };
ScriptMaster::~ScriptMaster() ScriptMaster::~ScriptMaster()

5
code/qcommon/const_str.h
View file

@ -123,9 +123,10 @@ enum
STRING_TURNDONE, STRING_TURNDONE,
STRING_ANIM_NO_KILLED_SCR, STRING_ANIM_NO_KILLED_SCR,
STRING_MG42, STRING_MP40, STRING_MG42, STRING_MP40,
STRING_REMOVE, STRING_DELETE, STRING_AUTO,
STRING_BOTH,
STRING_RUNANDSHOOT,
STRING_RESPAWN, STRING_RESPAWN,
STRING_NONE,
STRING_LENGTH_ STRING_LENGTH_
}; };

2
code/qcommon/listener.cpp
View file

@ -3631,7 +3631,7 @@ void Listener::Unregister( const_str name )
if( listener ) if( listener )
{ {
if( listener == this && ( name == STRING_REMOVE || name == STRING_DELETE || bDeleteSelf ) ) if( listener == this && ( bDeleteSelf ) )
{ {
continue; continue;
} }