From ca4b20eb0838999f006e9727e7021fe014a1b3c2 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sun, 13 May 2012 14:40:11 +0200 Subject: [PATCH] Fix several bugs from iodoom3 bugtracker rhyskidd@gmail.com found them (with PVS studio IIRC), reported them and posted patches. Some of the patches were incorrect so I rewrote them. --- game/Game_local.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/game/Game_local.cpp b/game/Game_local.cpp index 3b99f75..0f9cbae 100644 --- a/game/Game_local.cpp +++ b/game/Game_local.cpp @@ -1257,8 +1257,8 @@ bool idGameLocal::InitFromSaveGame( const char *mapName, idRenderWorld *renderWo if ( !InhibitEntitySpawn( mapEnt->epairs ) ) { CacheDictionaryMedia( &mapEnt->epairs ); - const char *classname = mapEnt->epairs.GetString( "classname" ); - if ( classname != '\0' ) { + const char *classname; + if ( mapEnt->epairs.GetString( "classname", "", &classname ) ) { FindEntityDef( classname, false ); } } @@ -1626,8 +1626,9 @@ void idGameLocal::GetShakeSounds( const idDict *dict ) { const char *soundShaderName; idStr soundName; - soundShaderName = dict->GetString( "s_shader" ); - if ( soundShaderName != '\0' && dict->GetFloat( "s_shakes" ) != 0.0f ) { + if ( dict->GetString( "s_shader", "", &soundShaderName ) + && dict->GetFloat( "s_shakes" ) != 0.0f ) + { soundShader = declManager->FindSound( soundShaderName ); for ( int i = 0; i < soundShader->GetNumSounds(); i++ ) {