shithub: rott

Info  •  Files  •  Log  •  Branches

whoops forgot to clear the hashtable after game closes

--- a/rott/HashTable.c

+++ b/rott/HashTable.c

@@ -1,8 +1,3 @@

-/*

- * To change this license header, choose License Headers in Project Properties.

- * To change this template file, choose Tools | Templates

- * and open the template in the editor.

- */

 #include <stdlib.h>

 #include <stdio.h>

 #include "HashTable.h"

--- a/rott/modexlib.c

+++ b/rott/modexlib.c

@@ -457,7 +457,6 @@

     //if (sdl_fullscreen)

         //flags = SDL_FULLSCREEN;

-    //replaces sdl_surface

     window = SDL_CreateWindow("Rise of the Triad",

                                SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,

                                iGLOBAL_SCREENWIDTH, iGLOBAL_SCREENHEIGHT,

@@ -466,7 +465,7 @@

     //SDL_CreateWindowAndRenderer(iGLOBAL_SCREENWIDTH, iGLOBAL_SCREENHEIGHT, 0, &window, &renderer);

-    renderer = SDL_CreateRenderer(window, -1, 0);

+    renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);

     sdl_texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ABGR8888,

                                     SDL_TEXTUREACCESS_STREAMING, iGLOBAL_SCREENWIDTH,

--- a/rott/rt_in.c

+++ b/rott/rt_in.c

@@ -702,8 +702,6 @@

     def->joyMultYH = JoyScaleMax / (def->joyMaxY - def->threshMaxY);

 }

-

-

 //******************************************************************************

 //

 // IN_SetupJoy () - Sets up thresholding values and calls INL_SetJoyScale()

@@ -1043,7 +1041,12 @@

     IN_Started = true;

 }

+void ClearScanCodes()

+{

+    ClearHashTable(scancodes);

+}

+

 #if 0

 //******************************************************************************

 //

@@ -1352,17 +1355,7 @@

 {

     unsigned joybits = 0;

-#if USE_SDL

     joybits = sdl_sticks_joybits;

-

-#elif PLATFORM_DOS

-    joybits = inp (0x201);  // Get all the joystick buttons

-    joybits >>= 4;          // only the high bits are useful

-    joybits ^= 15;          // return with 1=pressed

-

-#else

-#error define your platform.

-#endif

     return (byte) joybits;

 }

--- a/rott/rt_in.h

+++ b/rott/rt_in.h

@@ -209,5 +209,6 @@

 int IN_InputUpdateKeyboard (void);

 void IN_PumpEvents (void);

 void QueueLetterInput (void);

+void ClearScanCodes();

 #endif

--- a/rott/rt_main.c

+++ b/rott/rt_main.c

@@ -459,7 +459,6 @@

     //SDL_WM_GrabInput( SDL_GRAB_ON );

     GameLoop();

-

     QuitGame();

     return 0;

@@ -1727,7 +1726,8 @@

         int time=GetTicCount();

         while (GetTicCount()==time) {}

     }

-

+    

+    

     PrintMapStats();

     PrintTileStats();

     SetTextMode();

@@ -1810,6 +1810,8 @@

     ShutDown();

 #endif

+    ClearScanCodes();

+    

     exit(0);

 }