File tree Expand file tree Collapse file tree
GameEngine/Source/GameLogic/Object
GameEngine/Source/GameLogic/Object Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1477,7 +1477,7 @@ const WeaponTemplate *WeaponStore::findWeaponTemplate( const AsciiString& name )
14771477 if (name.compareNoCase (" None" ) == 0 )
14781478 return nullptr ;
14791479 const WeaponTemplate * wt = findWeaponTemplatePrivate ( TheNameKeyGenerator->nameToKey ( name ) );
1480- DEBUG_ASSERTCRASH (wt != nullptr , (" Weapon %s not found!" ,name));
1480+ DEBUG_ASSERTCRASH (wt != nullptr , (" Weapon %s not found!" , name. str () ));
14811481 return wt;
14821482}
14831483
Original file line number Diff line number Diff line change @@ -141,18 +141,16 @@ void GlobalLightOptions::applyAngle(Int lightIndex)
141141static void SpitLights ()
142142{
143143#ifdef DEBUG_LOGGING
144- CString lightstrings[100 ];
145144 DEBUG_LOG ((" GlobalLighting\n " ));
146145 Int redA, greenA, blueA;
147146 Int redD, greenD, blueD;
148147 Real x, y, z;
149- CString times[4 ];
150- CString lights[3 ];
148+ const char * times[4 ];
151149 times[0 ] = " Morning" ;
152150 times[1 ] = " Afternoon" ;
153151 times[2 ] = " Evening" ;
154152 times[3 ] = " Night" ;
155-
153+ const char * lights[ 3 ];
156154 lights[0 ] = " " ;
157155 lights[1 ] = " 2" ;
158156 lights[2 ] = " 3" ;
Original file line number Diff line number Diff line change @@ -1623,7 +1623,7 @@ const WeaponTemplate *WeaponStore::findWeaponTemplate( const AsciiString& name )
16231623 if (name.compareNoCase (" None" ) == 0 )
16241624 return nullptr ;
16251625 const WeaponTemplate * wt = findWeaponTemplatePrivate ( TheNameKeyGenerator->nameToKey ( name ) );
1626- DEBUG_ASSERTCRASH (wt != nullptr , (" Weapon %s not found!" ,name));
1626+ DEBUG_ASSERTCRASH (wt != nullptr , (" Weapon %s not found!" , name. str () ));
16271627 return wt;
16281628}
16291629
Original file line number Diff line number Diff line change @@ -141,18 +141,16 @@ void GlobalLightOptions::applyAngle(Int lightIndex)
141141static void SpitLights ()
142142{
143143#ifdef DEBUG_LOGGING
144- CString lightstrings[100 ];
145144 DEBUG_LOG ((" GlobalLighting\n " ));
146145 Int redA, greenA, blueA;
147146 Int redD, greenD, blueD;
148147 Real x, y, z;
149- CString times[4 ];
150- CString lights[3 ];
148+ const char * times[4 ];
151149 times[0 ] = " Morning" ;
152150 times[1 ] = " Afternoon" ;
153151 times[2 ] = " Evening" ;
154152 times[3 ] = " Night" ;
155-
153+ const char * lights[ 3 ];
156154 lights[0 ] = " " ;
157155 lights[1 ] = " 2" ;
158156 lights[2 ] = " 3" ;
You can’t perform that action at this time.
0 commit comments