Merge pull request #132 from z33ky/mb/breakablebrush_spawnobject

Fix console error on BreakableBrushes without spawnobject
mapbase-source · Sep 25, 2021 · d6822c6 · d6822c6
2 parents 4eae5f4 + 7ad1276
commit d6822c6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sp/src/game/server/func_break.cpp b/sp/src/game/server/func_break.cpp
@@ -221,6 +221,10 @@ bool CBreakable::KeyValue( const char *szKeyName, const char *szValue )
 		if ( object > 0 && object < ARRAYSIZE(pSpawnObjects) )
 			m_iszSpawnObject = MAKE_STRING( pSpawnObjects[object] );
 #ifdef MAPBASE
+		// "0" is the default value of a "choices" field in Hammer, representing nothing selected
+		// atoi() returning 0 may also indicate a failed conversion, so check szValue directly
+		else if ( FStrEq( szValue, "0" ) )
+			m_iszSpawnObject = NULL_STRING;
 		else
 			m_iszSpawnObject = AllocPooledString(szValue);
 #endif