Fixed Hexen: Fatal error attempting to play Deathkings of the Dark Ci…

…tadel.
skyjake · Apr 9, 2010 · 0a5a41b · 0a5a41b
1 parent 15bca57
commit 0a5a41b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/doomsday/plugins/jhexen/src/p_mapinfo.c b/doomsday/plugins/jhexen/src/p_mapinfo.c
@@ -224,6 +224,12 @@ void P_InitMapInfo(void)
             {
             case MCMD_CLUSTER:
                 SC_MustGetNumber();
+                if(sc_Number < 1)
+                {
+                    char buf[40];
+                    dd_snprintf(buf, 40, "Invalid cluster %i", sc_Number);
+                    SC_ScriptError(buf);
+                }
                 info->cluster = sc_Number;
                 break;
 
@@ -340,7 +346,8 @@ uint P_TranslateMap(uint map)
     uint i;
     for(i = 0; i < 99; ++i)
     {
-        if(MapInfo[i].warpTrans == map)
+        const mapinfo_t* info = &MapInfo[i];
+        if(info->cluster && info->warpTrans == map)
             return i;
     }
     return 0; // Not found, default to map zero.

diff --git a/doomsday/plugins/jhexen/src/p_spec.c b/doomsday/plugins/jhexen/src/p_spec.c
@@ -111,7 +111,7 @@ void P_InitSky(uint map)
     fval = 0;
     Rend_SkyParams(0, DD_OFFSET, &fval);
     Rend_SkyParams(1, DD_OFFSET, &fval);
-    if(doubleSky)
+    if(doubleSky && sky2Material)
     {
         Rend_SkyParams(0, DD_ENABLE, NULL);
         ival = DD_NO;