More includes and some braces to build with gcc 4.3.0

SVN-Revision: 5361

diff --git a/src/badguy/ghosttree.cpp b/src/badguy/ghosttree.cpp
index 61b5d57..82c74cd 100644 (file)
--- a/src/badguy/ghosttree.cpp
+++ b/src/badguy/ghosttree.cpp
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <config.h>
+#include <algorithm>
 
 #include "ghosttree.hpp"
 #include "treewillowisp.hpp"

diff --git a/src/sector.cpp b/src/sector.cpp
index 686efc9..fdae3ff 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -443,8 +443,8 @@ Sector::fix_old_tiles()
        // lava or lavaflow
        if ((id == 173) || (id == 1700) || (id == 1705) || (id == 1706)) {
          // space lights a bit
-         if (((tm->get_tile_id(x-1, y)) != tm->get_tile_id(x,y))
-             && (tm->get_tile_id(x, y-1) != tm->get_tile_id(x,y))
+         if ((((tm->get_tile_id(x-1, y)) != tm->get_tile_id(x,y))
+             && (tm->get_tile_id(x, y-1) != tm->get_tile_id(x,y)))
              || ((x % 3 == 0) && (y % 3 == 0))) {
            float pseudo_rnd = (float)((int)pos.x % 10) / 10;
            add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f)));

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index 8ed5f24..24f8021 100644 (file)
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -24,6 +24,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <iostream>
+#include <limits>
 #include <assert.h>
 #include <SDL.h>
 #include "video/drawing_context.hpp"

diff --git a/tools/miniswig/main.cpp b/tools/miniswig/main.cpp
index 46c5fa0..e7becc4 100644 (file)
--- a/tools/miniswig/main.cpp
+++ b/tools/miniswig/main.cpp
@@ -4,6 +4,7 @@
 #include <fstream>
 #include <vector>
 #include <string>
+#include <cstring>
 #include "tree.hpp"
 #include "globals.hpp"
 #include "create_wrapper.hpp"