Skip to content
Browse files

Fix several bugs from iodoom3 bugtracker

Apply 94cd0ee to d3xp as well.
  • Loading branch information...
1 parent 89071f1 commit df81835de056cd83c1692e0cc2ec432873f7ab2b @DanielGibson DanielGibson committed with dhewg May 13, 2012
Showing with 5 additions and 4 deletions.
  1. +5 −4 neo/d3xp/Game_local.cpp
View
9 neo/d3xp/Game_local.cpp
@@ -1387,8 +1387,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 );
}
}
@@ -1799,8 +1799,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++ ) {

0 comments on commit df81835

Please sign in to comment.
Something went wrong with that request. Please try again.