added some safety checks

diff --git a/src/game_bd/bd_caveset.c b/src/game_bd/bd_caveset.c
index d83a1b97780a28b9c2eb7854e00a9f7ff4c81931..0ee9c3b82d9ee59208d0bd0b0d2c2bc8f2f6ee25 100644 (file)
--- a/src/game_bd/bd_caveset.c
+++ b/src/game_bd/bd_caveset.c
@@ -87,7 +87,8 @@ GdCavesetData *gd_caveset_data_new(void)
 
   gd_struct_set_defaults_from_array(data, gd_caveset_properties, caveset_defaults);
 
-  data->levelset_subdir = getStringCopy(leveldir_current->subdir);
+  if (leveldir_current != NULL)
+    data->levelset_subdir = getStringCopy(leveldir_current->subdir);
 
   return data;
 }
@@ -129,7 +130,9 @@ void gd_caveset_clear(void)
   // always newly create this
   // create pseudo cave containing default values
   gd_caveset_data = gd_caveset_data_new();
-  gd_strcpy(gd_caveset_data->name, leveldir_current->name);
+
+  if (leveldir_current != NULL)
+    gd_strcpy(gd_caveset_data->name, leveldir_current->name);
 }
 
 // return number of caves currently in memory.

diff --git a/src/tools.c b/src/tools.c
index 954e7a63c83ed8adb95db77cbb2d981e77d4ba32..a4cabfdaddd20b15192ed0c13287a84ec14ea1ff 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -10710,6 +10710,9 @@ void InitGraphicInfo_BD(void)
 {
   int i, j;
 
+  if (graphic_info == NULL)            // still at startup phase
+    return;
+
   // always start with reliable default values
   for (i = 0; i < O_MAX_ALL; i++)
   {