Fix demo loop crash.

doomhack · Dec 13, 2019 · 614f308 · 614f308
1 parent 82fe766
commit 614f308
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 49 deletions.
diff --git a/source/d_main.c b/source/d_main.c
@@ -354,69 +354,57 @@ static struct
 }
 
 const demostates[][4] =
-  {
+{
     {
-      {D_DrawTitle1, "TITLEPIC"},
-      {D_DrawTitle1, "TITLEPIC"},
-      {D_DrawTitle2, "TITLEPIC"},
-      {D_DrawTitle1, "TITLEPIC"},
+        {D_DrawTitle1, "TITLEPIC"},
+        {D_DrawTitle1, "TITLEPIC"},
+        {D_DrawTitle2, "TITLEPIC"},
+        {D_DrawTitle1, "TITLEPIC"},
     },
 
     {
-      {G_DeferedPlayDemo, "demo1"},
-      {G_DeferedPlayDemo, "demo1"},
-      {G_DeferedPlayDemo, "demo1"},
-      {G_DeferedPlayDemo, "demo1"},
+        {G_DeferedPlayDemo, "demo1"},
+        {G_DeferedPlayDemo, "demo1"},
+        {G_DeferedPlayDemo, "demo1"},
+        {G_DeferedPlayDemo, "demo1"},
     },
     {
-      {D_SetPageName, NULL},
-      {D_SetPageName, NULL},
-      {D_SetPageName, NULL},
-      {D_SetPageName, NULL},
+        {D_SetPageName, "TITLEPIC"},
+        {D_SetPageName, "TITLEPIC"},
+        {D_SetPageName, "TITLEPIC"},
+        {D_SetPageName, "TITLEPIC"},
     },
 
     {
-      {G_DeferedPlayDemo, "demo2"},
-      {G_DeferedPlayDemo, "demo2"},
-      {G_DeferedPlayDemo, "demo2"},
-      {G_DeferedPlayDemo, "demo2"},
+        {G_DeferedPlayDemo, "demo2"},
+        {G_DeferedPlayDemo, "demo2"},
+        {G_DeferedPlayDemo, "demo2"},
+        {G_DeferedPlayDemo, "demo2"},
     },
 
     {
-      {D_SetPageName, "HELP2"},
-      {D_SetPageName, "HELP2"},
-      {D_SetPageName, "CREDIT"},
-      {D_DrawTitle1,  "TITLEPIC"},
+        {D_SetPageName, "TITLEPIC"},
+        {D_SetPageName, "TITLEPIC"},
+        {D_SetPageName, "TITLEPIC"},
+        {D_SetPageName, "TITLEPIC"},
     },
 
     {
-      {G_DeferedPlayDemo, "demo3"},
-      {G_DeferedPlayDemo, "demo3"},
-      {G_DeferedPlayDemo, "demo3"},
-      {G_DeferedPlayDemo, "demo3"},
+        {G_DeferedPlayDemo, "demo3"},
+        {G_DeferedPlayDemo, "demo3"},
+        {G_DeferedPlayDemo, "demo3"},
+        {G_DeferedPlayDemo, "demo3"},
     },
 
     {
-      {NULL},
-      {NULL},
-      {NULL},
-      {D_SetPageName, "CREDIT"},
-    },
+        {NULL, NULL},
+        {NULL, NULL},
+        {NULL, NULL},
+        {NULL, NULL},
+    }
 
-    {
-      {NULL},
-      {NULL},
-      {NULL},
-      {G_DeferedPlayDemo, "demo4"},
-    },
 
-    {
-      {NULL},
-      {NULL},
-      {NULL},
-      {NULL},
-    }
-  };
+};
 
 /*
  * This cycles through the demo sequences.
@@ -435,8 +423,8 @@ void D_DoAdvanceDemo(void)
 
   if (!demostates[++_g->demosequence][_g->gamemode].func)
       _g->demosequence = 0;
-  demostates[_g->demosequence][_g->gamemode].func
-          (demostates[_g->demosequence][_g->gamemode].name);
+
+  demostates[_g->demosequence][_g->gamemode].func(demostates[_g->demosequence][_g->gamemode].name);
 }
 
 //

diff --git a/source/doom_iwad.c b/source/doom_iwad.c
@@ -1,4 +1,4 @@
-#include "iwad/doom1.gba.h"
+#include "iwad/doomu.gba.h"
 
 #include "doom_iwad.h"
 

diff --git a/source/r_hotpath.iwram.c b/source/r_hotpath.iwram.c
@@ -1602,9 +1602,6 @@ static void R_DrawColumnInCache(const column_t* patch, byte* cache, int originy,
 #define CACHE_ENTRY(c, t) ((c << 16 | t))
 #define CACHE_HASH(c, t) (((c >> 4) ^ t) & CACHE_KEY_MASK)
 
-#define CACHE_HASH2(c, t) ((((unsigned int)t | (unsigned int)c << 16)*2654435761u) & CACHE_KEY_MASK)
-
-
 static unsigned int FindColumnCacheItem(unsigned int texture, unsigned int column)
 {
     //static unsigned int looks, peeks;