vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

NSTrigger: read 'globalname' key, used for level transitions.

Browse source
This commit is contained in:
Marco Cawthorne 2023-09-28 18:38:16 -07:00
parent 7d37cc228c
commit f76c169671
Signed by: eukara
GPG key ID: CE2032F0A2882A22
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shared/NSEntity.qc
View file

@ -830,7 +830,7 @@ void NSEntity::SpawnKey( string strKey, string strValue ) {
break;
#endif
default:
NSTrigger::SpawnKey( strKey, strValue );
super::SpawnKey( strKey, strValue );
break;
}
}

1
src/shared/NSTrigger.h
View file

@ -143,6 +143,7 @@ private:
#ifdef SERVER
string m_oldstrTarget; /* needed due to trigger_changetarget */
string m_strGlobalName;
string m_strGlobalState;
string m_strKillTarget;
string m_strMessage;

9
src/shared/NSTrigger.qc
View file

@ -227,6 +227,7 @@ NSTrigger::Save(float handle)
SaveFloat(handle, "team", team);
SaveInt(handle, "m_iValue", m_iValue);
SaveFloat(handle, "m_flDelay", m_flDelay);
SaveString(handle, "m_strGlobalName", m_strGlobalName);
}
void
NSTrigger::Restore(string strKey, string strValue)
@ -259,6 +260,9 @@ NSTrigger::Restore(string strKey, string strValue)
case "m_flDelay":
m_flDelay = ReadFloat(strValue);
break;
case "m_strGlobalName":
m_strGlobalName = ReadString(strValue);
break;
default:
super::Restore(strKey, strValue);
}
@ -318,9 +322,12 @@ NSTrigger::SpawnKey(string strKey, string strValue)
case "globalstate":
m_strGlobalState = strValue;
break;
case "globalname":
m_strGlobalName = strValue;
break;
#endif
default:
NSIO::SpawnKey(strKey, strValue);
super::SpawnKey(strKey, strValue);
break;
}
}