From d99888e472bf1c33941e944eb8cc667be5cfc858 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 23 Apr 2006 03:14:44 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@94
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/source/duke3d.h  |  2 +-
 polymer/eduke32/source/game.c    | 11 ++++++++++-
 polymer/eduke32/source/gamedef.c | 15 +++++++++++----
 polymer/eduke32/source/gamedef.h |  2 --
 polymer/eduke32/source/global.c  |  2 +-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index 93e560dec..dec466d37 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -433,7 +433,7 @@ extern char buf[1024]; //My own generic input buffer
 
 #define MAXQUOTELEN 64
 
-extern char *fta_quotes[NUMOFFIRSTTIMEACTIVE];
+extern char *fta_quotes[NUMOFFIRSTTIMEACTIVE],*redefined_quotes[NUMOFFIRSTTIMEACTIVE];
 extern char scantoasc[128],ready2send;
 extern char scantoascwithshift[128];
 
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 1b8c0dc41..970c73977 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -6298,7 +6298,7 @@ char cheatquotes[][MAXCHEATLEN] = {
                                       "keys",         // 23
                                       "debug",        // 24
                                       "<RESERVED>",   // 25
-                                      "screamforme",  // 26
+                                      "sfm",  // 26
                                   };
 
 enum cheats {
@@ -7967,6 +7967,8 @@ void loadtmb(void)
 
 void Shutdown( void )
 {
+    int i;
+
     SoundShutdown();
     MusicShutdown();
     uninittimer();
@@ -7974,6 +7976,13 @@ void Shutdown( void )
     CONTROL_Shutdown();
     CONFIG_WriteSetup();
     KB_Shutdown();
+    for(i=0;i<NUMOFFIRSTTIMEACTIVE;i++)
+    {
+        if(fta_quotes[i] != NULL)
+            Bfree(fta_quotes[i]);
+        if(redefined_quotes[i] != NULL)
+            Bfree(redefined_quotes[i]);
+    }
 }
 
 /*
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index e4f30aaa4..6222b9cc1 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -41,7 +41,6 @@ signed char checking_switch = 0, current_event = -1;
 char labelsonly = 0, nokeywordcheck = 0, dynamicremap = 0;
 static short num_braces = 0;    // init to some sensible defaults
 
-char *redefined_quotes[NUMOFFIRSTTIMEACTIVE];
 int redefined_quote_count = 0;
 
 long *aplWeaponClip[MAX_WEAPONS];       // number of items in magazine
@@ -4542,6 +4541,11 @@ repeatcase:
         {
             if(fta_quotes[k] == NULL)
                 fta_quotes[k] = Bmalloc(sizeof(char) * MAXQUOTELEN);
+            if (!fta_quotes[k])
+            {
+                fta_quotes[k] = NULL;
+                gameexit("Failed allocating 64 byte quote text buffer.");
+            }
             scriptptr--;
         }
 
@@ -4555,6 +4559,11 @@ repeatcase:
             redefined_quote_count++;
             if(redefined_quotes[redefined_quote_count] == NULL)
                 redefined_quotes[redefined_quote_count] = Bmalloc(sizeof(char) * MAXQUOTELEN);
+            if (!redefined_quotes[redefined_quote_count])
+            {
+                redefined_quotes[redefined_quote_count] = NULL;
+                gameexit("Failed allocating 64 byte quote text buffer.");
+            }
         }
 
         while( *textptr != 0x0a && *textptr != 0x0d && *textptr != 0 )
@@ -4914,9 +4923,7 @@ void FreeGameVars(void)
         aGameVars[i].dwFlags=0;
 
         if(aGameVars[i].plValues)
-        {
-            Bfree(aGameVars[i].plValues); // crash point
-        }
+            Bfree(aGameVars[i].plValues);
 
         aGameVars[i].plValues=NULL;
     }
diff --git a/polymer/eduke32/source/gamedef.h b/polymer/eduke32/source/gamedef.h
index cd4c95301..4d2989422 100644
--- a/polymer/eduke32/source/gamedef.h
+++ b/polymer/eduke32/source/gamedef.h
@@ -39,8 +39,6 @@ extern long *actorLoadEventScrptr[MAXTILES];
 
 extern long *apScriptGameEvent[MAXGAMEEVENTS];
 
-extern char *redefined_quotes[NUMOFFIRSTTIMEACTIVE];
-
 extern short otherp;
 extern long g_currentweapon;
 extern long g_gun_pos;
diff --git a/polymer/eduke32/source/global.c b/polymer/eduke32/source/global.c
index 07e90be89..9ef52f24f 100644
--- a/polymer/eduke32/source/global.c
+++ b/polymer/eduke32/source/global.c
@@ -42,7 +42,7 @@ short animatesect[MAXANIMATES];
 long msx[2048],msy[2048];
 short cyclers[MAXCYCLERS][6],numcyclers;
 
-char *fta_quotes[NUMOFFIRSTTIMEACTIVE];
+char *fta_quotes[NUMOFFIRSTTIMEACTIVE],*redefined_quotes[NUMOFFIRSTTIMEACTIVE];
 
 char tempbuf[2048], packbuf[576];