celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged dev changes 9/30/2019

Browse Source 
- Added DMG_PREVENT_PHYSICS_FORCE to dynamic interaction tests
- Fixed response context $ in base entities
- Miscellaneous code changes
This commit is contained in:
Blixibon
2019-09-30 15:49:42 +00:00
parent dd9f5ac766
commit 8ebe43d5d4
7 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sp/src/game/server/mapbase/GlobalStrings.cpp
View File

@@ -37,6 +37,7 @@ string_t gm_isz_class_Dropship;
string_t gm_isz_class_FloorTurret;
string_t gm_isz_class_CScanner;
string_t gm_isz_class_ClawScanner;
string_t gm_isz_class_Rollermine;
#endif
string_t gm_isz_class_Bullseye;
@@ -68,18 +69,6 @@ inline bool EntIsClass( CBaseEntity *ent, string_t str2 )
return ent->m_iClassname == str2;
}
inline void SetGlobalString( string_t &string, const char *text )
{
//string = AllocPooledString(text);
// Entities usually allocate global strings every time one of them spawns, meaning the string could've already been allocated either
// by the same type of entity already being spawned or some other means.
// If it's already allocated, we could easily just use "Find" instead of "Alloc". There's a fallback if we don't find it in the string pool.
string = FindPooledString( text );
if (string == NULL_STRING)
string = AllocPooledString( text );
}
// We know it hasn't been allocated yet
#define INITIALIZE_GLOBAL_STRING(string, text) string = AllocPooledString(text) //SetGlobalString(string, text)
@@ -104,6 +93,7 @@ void InitGlobalStrings()
INITIALIZE_GLOBAL_STRING(gm_isz_class_FloorTurret, "npc_turret_floor");
INITIALIZE_GLOBAL_STRING(gm_isz_class_CScanner, "npc_cscanner");
INITIALIZE_GLOBAL_STRING(gm_isz_class_ClawScanner, "npc_clawscanner");
INITIALIZE_GLOBAL_STRING(gm_isz_class_Rollermine, "npc_rollermine");
#endif
INITIALIZE_GLOBAL_STRING(gm_isz_class_Bullseye, "npc_bullseye");

3
sp/src/game/server/mapbase/GlobalStrings.h
View File

@@ -47,6 +47,7 @@ extern string_t gm_isz_class_Dropship;
extern string_t gm_isz_class_FloorTurret;
extern string_t gm_isz_class_CScanner;
extern string_t gm_isz_class_ClawScanner;
extern string_t gm_isz_class_Rollermine;
#endif
extern string_t gm_isz_class_Bullseye;
@@ -68,8 +69,6 @@ extern string_t gm_isz_name_activator;
// This function is for comparing global strings and allows us to change how we compare them quickly.
extern bool EntIsClass( CBaseEntity *ent, string_t str2 );
extern void SetGlobalString( string_t &string, const char *text );
// -------------------------------------------------------------
extern void InitGlobalStrings();