Merge pull request #792 from royfalk/task_imgui_1

Upgrade SDL to version 2

engine/src/cmd/json.cpp

@@ -5,6 +5,8 @@
 #include "json.h"
 #include <string.h>
 
+#include "vs_logging.h"
+
 /*! \brief Checks for an empty string
  *
  * @param str The string to check
@@ -388,6 +390,12 @@ std::vector<std::string> json::parsing::parse_array(const char *input)
     // Initalize the result
     std::vector<std::string> result;
 
+    if (input != nullptr) {
+        VS_LOG_AND_FLUSH(debug, boost::format("JSON Data: %s") % input);
+    } else {
+        VS_LOG_AND_FLUSH(debug, "Invalid JSON Input - NULL Pointer");
+    }
+
     const char *index = json::parsing::tlws(input);
     if (*index != '[') throw json::parsing_error("Input was not an array");
     index++;

engine/src/cmd/upgradeable_unit.cpp

@@ -38,6 +38,7 @@
 #include "unit_generic.h"
 #include "weapon_info.h"
 #include "vega_cast_utils.h"
+#include "vs_logging.h"
 
 std::vector<std::string> ParseUnitUpgrades(const std::string &upgrades) {
     if(upgrades.size() == 0) {
@@ -141,6 +142,14 @@ bool UpgradeableUnit::UpgradeMounts(const Unit *up,
         return true;
     }
 
+    // there needs to be some mounts to be able to mount to
+    if (num_mounts == 0) {
+        // would be nice to make this more meaningful but that's a little harder given
+        // the casting of `unit` from `this`.
+        VS_LOG(debug, "No mounts to attach to.");
+        return false;
+    }
+
     int j = mountoffset;
     int i = 0;
     bool cancompletefully = true;

engine/src/command.cpp

@@ -33,7 +33,7 @@
 #include <vector>
 
 #ifdef HAVE_SDL
-#   include <SDL/SDL.h>
+#   include <SDL2/SDL.h>
 #endif
 
 #include <string>
@@ -1605,9 +1605,6 @@ void BringConsole(const KBData &, KBSTATE newState) {
         if (CommandInterpretor) {
             winsys_set_keyboard_func((winsys_keyboard_func_t) &commandI::keypress);
             CommandInterpretor->console = true;
-#ifdef HAVE_SDL
-            SDL_EnableUNICODE(true);
-#endif
         }
     }
 }

engine/src/config_xml.cpp

@@ -42,6 +42,7 @@
 #include "python/python_compile.h"
 #include "gfx/screenshot.h"
 #include "vs_logging.h"
+#include "sdl_key_converter.h"
 
 /* *********************************************************** */
 
@@ -355,8 +356,8 @@ void GameVegaConfig::checkBind(configNode *node) {
         VS_LOG(warning, "not a bind node ");
         return;
     }
-    std::string tmp = node->attr_value("modifier");
-    int modifier = getModifier(tmp.c_str());
+    std::string modifier_string = node->attr_value("modifier");
+    int modifier = getModifier(modifier_string);
 
     string cmdstr = node->attr_value("command");
     string player_bound = node->attr_value("player");
@@ -371,7 +372,7 @@ void GameVegaConfig::checkBind(configNode *node) {
     string player_str = node->attr_value("player");
     string joy_str = node->attr_value("joystick");
     string mouse_str = node->attr_value("mouse");
-    string keystr = node->attr_value("key");
+    const std::string keystr = node->attr_value("key");
     string additional_data = node->attr_value("data");
     string buttonstr = node->attr_value("button");
     string hat_str = node->attr_value("hatswitch");
@@ -391,6 +392,7 @@ void GameVegaConfig::checkBind(configNode *node) {
         //normal keyboard key
         //now map the command to a callback function and bind it
         if (keystr.length() == 1) {
+            const int sdl_key_value = SDLKeyConverter::Convert(keystr);
             BindKey(keystr[0], modifier, XMLSupport::parse_int(player_bound), handler, KBData(additional_data));
         } else {
             int glut_key = key_map[keystr];

engine/src/gfx/coord_select.cpp

@@ -24,7 +24,6 @@
  * along with Vega Strike.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
 #include "cmd/unit_generic.h"
 #include "star_system.h"
 #include "loc_select.h"
@@ -38,10 +37,11 @@ int CoordinateSelectChange = 0;
 int CoordinateSelectmousex;
 int CoordinateSelectmousey;
 extern Vector MouseCoordinate(int mouseX, int mouseY);
-extern KBSTATE keyState[LAST_MODIFIER][KEYMAP_SIZE];
+
+extern KBSTATE mouseButtonState;
 
 void CoordinateSelect::MouseMoveHandle(KBSTATE, int x, int y, int, int, int) {
-    if (keyState[0]['z'] == DOWN) {
+    if (mouseButtonState == DOWN) {
         CoordinateSelectChange = 2;
     } else {
         CoordinateSelectChange = 1;

engine/src/gfx/loc_select.cpp

@@ -32,6 +32,8 @@
 #include "vs_globals.h"
 #include <stdio.h>
 
+extern KBSTATE mouseButtonState;
+
 LocationSelect::LocationSelect(Vector start, Vector Plane1,
         Vector Plane2 /*, System * par */ ) : LocSelAni("locationselect.ani",
         true,
@@ -64,14 +66,13 @@ LocationSelect::LocationSelect(Vector start, Vector Plane1, Vector Plane2,
     MoveLocation(start, Plane1, Plane2, Plane3);
 }
 
-extern KBSTATE keyState[LAST_MODIFIER][KEYMAP_SIZE];
 Vector DeltaPosition(0, 0, 0);
 bool changed = false;
 bool vert = false;
 #define DELTA_MOVEMENT
 
 void LocationSelect::MouseMoveHandle(KBSTATE kk, int x, int y, int delx, int dely, int mod) {
-    if (keyState[0]['z'] == DOWN) {
+    if (mouseButtonState == DOWN) {
 #ifdef DELTA_MOVEMENT
         if (kk == PRESS) {
             DeltaPosition.k = dely;

engine/src/gfx/mesh_gfx.cpp

@@ -438,15 +438,41 @@ Mesh::~Mesh() {
         vector<Mesh *> *hashers = bfxmHashTable.Get(hash_name);
         vector<Mesh *>::iterator finder;
         if (hashers) {
-            for (size_t i = hashers->size() - 1; i >= 0; --i) {
-                if (hashers->at(i) == this) {
-                    hashers->erase(hashers->begin() + i);
+            // the foollowing loop has several tricks to it:
+            // 1. `std::vector::erase()` can take an interator and remove it from the vector; but invalidates
+            //      the iterator in the process
+            // 2. To overcome the invalid iterator issue, the next previous iterator is cached
+            // 3. In the case that the previous iterator would be invalid (e.g it's at the start) then it needs
+            //      to restart the loop without the loop conditions, therefore a simple GOTO is used instead to
+            //      avoid the incrementing the iterator so that values are not skipped
+            // A reverse iterator could kind of help this; however, `std::vector::erase` unfortunately
+            // does not work on reverse iterators.
+            for (auto hashItem = hashers->begin(); hashItem != hashers->end(); ++hashItem) {
+retryEraseItem:
+                if (*hashItem == this) {
+                    bool resetIter = false;
+                    auto cachedHashItem = hashers->begin();
+                    if (hashItem != hashers->begin()) {
+                        cachedHashItem = hashItem - 1;
+                    } else {
+                        resetIter = true;
+                        cachedHashItem = hashItem + 1;
+                    }
+                    hashers->erase(hashItem);
                     if (hashers->empty()) {
                         bfxmHashTable.Delete(hash_name);
                         delete hashers;
                         hashers = nullptr;
                         break;
                     }
+
+                    if (resetIter) {
+                        hashItem = hashers->begin();
+                        // a necessary use of Goto as we do not want to use ++hashItem
+                        goto retryEraseItem;
+                    } else {
+                        hashItem = cachedHashItem;
+                    }
                 }
             }
         }

engine/src/gldrv/gl_init.cpp

@@ -595,8 +595,7 @@ void GFXInit(int argc, char **argv) {
     char vsname[12] = "Vega Strike";
     char vsicon[9] = "vega.ico";
     winsys_init(&argc, argv, &vsname[0], &vsicon[0]);
-    /* Ingore key-repeat messages */
-    winsys_enable_key_repeat(false);
+
 
     glViewport(0, 0, g_game.x_resolution, g_game.y_resolution);
     static GFXColor clearcol = vs_config->getColor("space_background");;