Remove the C++11 requirement for now.

It's better to keep it C++98 for another release, afterwards there can be
a proper migration to C++11.

diff --git a/Makefile b/Makefile
index 4d1e1072a045a9877a3bf110c51ca0816903e6d8..3e69cbf3a1e287b2eb3cbd2292d47c548835a32e 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,6 @@ LOCALEDIR ?= $(PREFIX)/share/locale/
 MEDAL_SERVER_HOST = www.parallelrealities.co.uk
 MEDAL_SERVER_PORT = 80
 
-CXXFLAGS += -std=c++11
 CXXFLAGS += `pkg-config --cflags sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
 CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
 CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)

diff --git a/Makefile.windows b/Makefile.windows
index ec57cef1b1df1228bf6db2c86696911f610b253b..245b9518ca3b3b779593c5b6855f0a774bf35f40 100755 (executable)
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -20,7 +20,7 @@ MEDAL_SERVER_PORT = 80
 
 CXX = i686-w64-mingw32-g++
 
-CXXFLAGS += -std=c++11 -Dmain=SDL_main
+CXXFLAGS += -Dmain=SDL_main
 CXXFLAGS += -I/your/mingw/include
 CXXFLAGS += -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
 CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"\" -DGAMEPLAYMANUAL=\"doc/index.html\" -Wall

diff --git a/src/CJoystick.cpp b/src/CJoystick.cpp
index 3a624d81d66bdd2dc5914192a2bfbf75dbb0f972..eb4623d2dd042ad7252e682b0c619dd7862f6e50 100644 (file)
--- a/src/CJoystick.cpp
+++ b/src/CJoystick.cpp
@@ -22,7 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "headers.h"
 
 Joystick::Joystick():
-       sensitivity(25000),
-       control{-2, -2, -2, -2, 1, 0, 3, 7 ,6}
+       sensitivity(25000)
 {
+       static int defaultValue[CONTROL::MAX] = {-2, -2, -2, -2, 1, 0, 3, 7, 6};
+
+       for (int i = 0; i < CONTROL::MAX; i++)
+               control[i] = defaultValue[i];
 }

diff --git a/src/init.cpp b/src/init.cpp
index 3c333cc10d8d3ed632c712b57ad9fd174e55e5fb..4376c4185ceefa713f53d2d84bd868e4f4bad30b 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -293,7 +293,7 @@ void initSystem()
        }
 
        // Increase the size of the window if we have large desktop resolutions
-       SDL_DisplayMode displayMode{0};
+       SDL_DisplayMode displayMode = {0};
        SDL_GetDesktopDisplayMode(0, &displayMode);
        int w = graphics.screen->w;
        int h = graphics.screen->h;