No longer crashes on exit

ChangeLog.md

@@ -8,6 +8,7 @@
       in the header of the service they provide, making main.h useless
     * Also some more work on the way to making OR compilable under Windows
     * Not using glu.h anywhere anymore
+    * No longer segfaults on exit
 
     [ 20140516 ]
     * Finished moving the Entity/SkeletalModel logic into classes

include/Sprite.h

@@ -30,7 +30,6 @@ public:
     SpriteSequence(TombRaider &tr, unsigned int item, unsigned int sequence);
     ~SpriteSequence();
 
-    void add(Sprite &s);
     unsigned int size();
     Sprite &get(unsigned int index);
 

include/Texture.h

@@ -57,16 +57,6 @@ public:
     int getTextureCount();
 
     /*!
-     * \brief Dumps a screenshot to disk.
-     *
-     * Avoids overwriting files with same base name.
-     * \param base base filename
-     * \param width viewport width
-     * \param height viewport height
-     */
-    void glScreenShot(char *base, unsigned int width, unsigned int height);
-
-    /*!
      * \brief Sets up multitexture rendering with passed ids
      * \param texture0 first texture for multitexture
      * \param texture1 second texture for multitexture

src/Game.cpp

@@ -77,12 +77,10 @@ int Game::loadLevel(const char *level) {
 
     mName = bufferString("%s", level);
 
-    // Load the level pak into TombRaider
     getConsole().print("Loading %s", mName);
     int error = mTombRaider.Load(mName);
-    if (error != 0) {
+    if (error != 0)
         return error;
-    }
 
     // If required, load the external sound effect file MAIN.SFX into TombRaider
     if ((mTombRaider.getEngine() == TR_VERSION_2) || (mTombRaider.getEngine() == TR_VERSION_3)) {
@@ -98,9 +96,8 @@ int Game::loadLevel(const char *level) {
         strcpy(tmp + dir, "MAIN.SFX"); // overwrite the name itself with MAIN.SFX
         tmp[dir + 8] = '\0';
         error = mTombRaider.loadSFX(tmp);
-        if (error != 0) {
+        if (error != 0)
             getConsole().print("Could not load %s", tmp);
-        }
         delete [] tmp;
     }
 
@@ -112,23 +109,21 @@ int Game::loadLevel(const char *level) {
     processMoveables();
     processPakSounds();
 
-    // Free pak file
     mTombRaider.reset();
 
-    // Check if the level contains Lara
     if (mLara == -1) {
         getConsole().print("Can't find Lara entity in level pak!");
+        destroy();
         return -1;
+    } else {
+        mLoaded = true;
+        getRender().setMode(Render::modeVertexLight);
+        return 0;
     }
-
-    mLoaded = true;
-    getRender().setMode(Render::modeVertexLight);
-
-    return 0;
 }
 
 void Game::handleAction(ActionEvents action, bool isFinished) {
-    if (mLoaded) {
+    if (mLoaded && (!isFinished)) {
         if (action == forwardAction) {
             getLara().move('f');
         } else if (action == backwardAction) {

src/Menu.cpp

@@ -281,7 +281,7 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
 void Menu::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) {
     int items = (getWindow().mHeight - 110) / 25;
 
-    if ((!released) || (button != leftmouseKey))
+    if (released || (button != leftmouseKey))
         return;
 
     if ((y >= 100) && (y <= (unsigned int)(100 + (25 * items)))) {

src/OpenRaider.cpp

@@ -523,7 +523,7 @@ void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
         } else if (!getConsole().isVisible()) {
             for (int i = forwardAction; i < ActionEventCount; i++) {
                 if (keyBindings[i] == key) {
-                    getGame().handleAction((ActionEvents)i, pressed);
+                    getGame().handleAction((ActionEvents)i, !pressed);
                 }
             }
         } else {
@@ -555,7 +555,7 @@ void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton
     } else if (!getConsole().isVisible()) {
         for (int i = forwardAction; i < ActionEventCount; i++) {
             if (keyBindings[i] == button) {
-                getGame().handleAction((ActionEvents)i, !released);
+                getGame().handleAction((ActionEvents)i, released);
             }
         }
     }

src/Render.cpp

@@ -17,6 +17,7 @@
 #include "OpenRaider.h"
 #include "Render.h"
 #include "utils/strings.h"
+#include "utils/tga.h"
 
 Render::Render() {
     mSkyMesh = -1;
@@ -36,7 +37,35 @@ Render::~Render() {
 
 void Render::screenShot(char *filenameBase)
 {
-    mTexture.glScreenShot(filenameBase, getWindow().mWidth, getWindow().mHeight);
+    FILE *f;
+    int sz = getWindow().mWidth * getWindow().mHeight;
+    unsigned char *image = new unsigned char[sz * 3];
+    char *filename = NULL;
+    static int count = 0;
+    bool done = false;
+
+    assert(filenameBase != NULL);
+
+    // Don't overwrite files
+    while (!done) {
+        filename = bufferString("%s-%04i.tga", filenameBase, count++);
+
+        f = fopen(filename, "rb");
+
+        if (f)
+            fclose(f);
+        else
+            done = true;
+    }
+
+    // Capture frame buffer
+    glReadPixels(0, 0, getWindow().mWidth, getWindow().mHeight, GL_BGR_EXT, GL_UNSIGNED_BYTE, image);
+
+    tgaSaveFilename(image, getWindow().mWidth, getWindow().mHeight, 0, "%s", filename);
+    printf("Took screenshot '%s'.\n", filename);
+
+    delete [] filename;
+    delete [] image;
 }
 
 unsigned int Render::getFlags() {

src/Sprite.cpp

@@ -13,16 +13,12 @@
 
 SpriteSequence::SpriteSequence(TombRaider &tr, unsigned int item, unsigned int sequence) {
     for (int i = 0; i < (-tr.SpriteSequence()[sequence].negative_length); i++)
-        add(*new Sprite(tr, item, sequence, i));
+        sprites.push_back(new Sprite(tr, item, sequence, i));
 }
 
 SpriteSequence::~SpriteSequence() {
     for (unsigned int i = 0; i < sprites.size(); i++)
-        delete &sprites.at(i);
-}
-
-void SpriteSequence::add(Sprite &s) {
-    sprites.push_back(&s);
+        delete sprites.at(i);
 }
 
 unsigned int SpriteSequence::size() {

src/Texture.cpp

@@ -278,40 +278,6 @@ void Texture::bindTextureId(unsigned int n) {
     glBindTexture(GL_TEXTURE_2D, mTextureIds[n]);
 }
 
-void Texture::glScreenShot(char *base, unsigned int width, unsigned int height) {
-    FILE *f;
-    int sz = width * height;
-    unsigned char *image = new unsigned char[sz * 3];
-    char *filename = NULL;
-    static int count = 0;
-    bool done = false;
-
-    assert(base != NULL);
-    assert(width > 0);
-    assert(height > 0);
-
-    // Don't overwrite files
-    while (!done) {
-        filename = bufferString("%s-%04i.tga", base, count++);
-
-        f = fopen(filename, "rb");
-
-        if (f)
-            fclose(f);
-        else
-            done = true;
-    }
-
-    // Capture frame buffer
-    glReadPixels(0, 0, width, height, GL_BGR_EXT, GL_UNSIGNED_BYTE, image);
-
-    tgaSaveFilename(image, width, height, 0, "%s", filename);
-    printf("Took screenshot '%s'.\n", filename);
-
-    delete [] filename;
-    delete [] image;
-}
-
 int Texture::loadTGA(const char *filename) {
     FILE *f;
     unsigned char *image = NULL;