changed handling some conditions

diff --git a/src/screens.c b/src/screens.c
index a26d2d11859e56c132691dc7e9e3e6a3fbba26ef..b506dbbb5b5f8d413a3f370a24104c293f8d606c 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1079,9 +1079,11 @@ static char *getInfoTextBuffer_BD(char *text_raw)
 
 static char *getLevelSetInfoBuffer(void)
 {
-  if (level.game_engine_type == GAME_ENGINE_TYPE_BD &&
-      level.native_bd_level->caveset != NULL &&
-      level.native_bd_level->caveset->story != NULL)
+  if (level.game_engine_type != GAME_ENGINE_TYPE_BD ||
+      level.native_bd_level->caveset == NULL)
+    return NULL;
+
+  if (level.native_bd_level->caveset->story != NULL)
     return getInfoTextBuffer_BD(level.native_bd_level->caveset->story);
 
   return NULL;
@@ -1089,9 +1091,11 @@ static char *getLevelSetInfoBuffer(void)
 
 static char *getLevelInfoBuffer(void)
 {
-  if (level.game_engine_type == GAME_ENGINE_TYPE_BD &&
-      level.native_bd_level->cave != NULL &&
-      level.native_bd_level->cave->story != NULL)
+  if (level.game_engine_type != GAME_ENGINE_TYPE_BD ||
+      level.native_bd_level->cave == NULL)
+    return NULL;
+
+  if (level.native_bd_level->cave->story != NULL)
     return getInfoTextBuffer_BD(level.native_bd_level->cave->story);
 
   return NULL;