Fixed console command input bug

ChangeLog

@@ -9,6 +9,8 @@
 	* Removed duplicated GL initialization code
 	* Removed duplicated TGA writing code from Texture
 	* Moved system_timer into time utilities, changed its API
+	* Fixed a bug that prevented input of console commands using
+	  the shift key for eg. uppercase letters or symbols
 
 	[ 20140306 ]
 	* Created utility library

include/SDLSystem.h

@@ -29,12 +29,6 @@ public:
      */
     virtual ~SDLSystem();
 
-    /*!
-     * \brief Get ticks
-     * \returns number of milliseconds since start of program
-     */
-    virtual unsigned int getTicks();
-
     /*
      * \brief Sets Event binding Cmd to Key press
      * \param cmd valid command string

include/System.h

@@ -68,12 +68,6 @@ public:
     virtual ~System();
 
     /*!
-     * \brief Gets the game tick
-     * \returns number of milliseconds since start of program
-     */
-    virtual unsigned int getTicks();
-
-    /*!
      * \brief Created a directory
      * \param path Directory to create
      * \returns -1 on error
@@ -144,8 +138,6 @@ public:
      */
     virtual int loadResourceFile(const char *filename);
 
-    static void resetTicks();
-
     virtual void resizeGL(unsigned int width, unsigned int height);
 
     virtual void runGame() = 0;

include/utils/time.h

@@ -22,11 +22,11 @@ extern struct timezone system_timer_tz; //!< System timer timezone info
  * \brief Read the system timer
  * \returns number of ticks
  */
-unsigned int system_timer();
+unsigned int systemTimerGet();
 
 /*!
  * \brief Reset the system timer
  */
-void system_timer_reset();
+void systemTimerReset();
 
 #endif

src/OpenRaider.cpp

@@ -16,6 +16,7 @@
 
 #include "World.h"
 #include "SkeletalModel.h"
+#include "utils/time.h"
 #include "OpenRaider.h"
 
 #include "games/TombRaider1.h" // tmp stop-gap
@@ -37,13 +38,6 @@ bool gStartServer = false;
 skeletal_model_t *gLaraModel = 0x0;
 char *gFontFilename = 0x0;
 
-unsigned int getTicks()
-{
-    OpenRaider *game = OpenRaider::Instance();
-
-    return game->getTicks();
-}
-
 
 ////////////////////////////////////////////////////////////
 // Constructors
@@ -69,8 +63,7 @@ void killOpenRaiderSingleton() {
     printf("Shutting down Game...\n");
 
     // Requires public deconstructor
-    //! \fixme Causes pointer-being-freed-not-allocated error!
-    //delete OpenRaider::Instance();
+    delete OpenRaider::Instance();
 
     printf("\nThanks for testing %s\n", VERSION);
     printf("Build date: %s @ %s\n", __DATE__, __TIME__);
@@ -616,8 +609,12 @@ void OpenRaider::handleConsoleKeyPressEvent(unsigned int key,unsigned int mod)
                 buffer[2] = 0;
                 break;
             default:
+                // Workaround until proper SDL2 text input is used
+                if ((key >= 1073742049) && (key <= 1073742051))
+                    break;
+
                 if (mod & (SYS_MOD_KEY_RSHIFT | SYS_MOD_KEY_LSHIFT) &&
-                        key > 96 && key < 122)
+                        key > 96 && key < 123)
                 {
                     buffer[i++] = (char)(key - 32);
                 }
@@ -918,7 +915,7 @@ void OpenRaider::start()
     gWorld.setFlag(World::fEnableHopping);
     // reenabled, what should be the new room movement? --xythobuz
 
-    resetTicks();
+    systemTimerReset();
 
     runGame();
 }
@@ -1168,7 +1165,7 @@ void OpenRaider::gameFrame()
 
 
     // Remember: ticks in milliseconds, time in hundredths
-    gNetTicks = ticks = getTicks();
+    gNetTicks = ticks = systemTimerGet();
     time = gNetTicks * 0.1f;
 
     switch (m_render.getMode())

src/SDLSystem.cpp

@@ -28,9 +28,11 @@ SDLSystem::SDLSystem() : System() {
 SDLSystem::~SDLSystem() {
 }
 
+/*
 unsigned int SDLSystem::getTicks() {
     return SDL_GetTicks();
 }
+*/
 
 #ifdef FIXME
 void SDLSystem::bindKeyCommand(const char *cmd, int key, int event) {

src/System.cpp

@@ -57,14 +57,6 @@ System::System() {
 System::~System() {
 }
 
-unsigned int System::getTicks() {
-    return system_timer();
-}
-
-void System::resetTicks() {
-    system_timer_reset();
-}
-
 int System::createDir(char *path) {
 #ifdef WIN32
     return _mkdir(path);

src/utils/time.cpp

@@ -12,7 +12,7 @@ struct timeval system_timer_start;
 struct timeval system_timer_stop;
 struct timezone system_timer_tz;
 
-unsigned int system_timer() {
+unsigned int systemTimerGet() {
     gettimeofday(&system_timer_stop, &system_timer_tz);
 
     if (system_timer_start.tv_usec > system_timer_stop.tv_usec) {
@@ -27,7 +27,7 @@ unsigned int system_timer() {
         + ((system_timer_stop.tv_usec - system_timer_start.tv_usec) / 1000);
 }
 
-void system_timer_reset() {
+void systemTimerReset() {
     gettimeofday(&system_timer_start, &system_timer_tz);
 }