revert changing the lua/sdl includes and min/max changes

19 files changed, 51 insertions, 48 deletions

diff --git a/src/Config.h b/src/Config.h
index 385f216..12de570 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -183,10 +183,10 @@ extern unsigned char ZSIZE;
 #define strcasecmp stricmp
 #endif
 #if defined(_MSC_VER)
-#define fmin(a,b) (((a) < (b)) ? (a) : (b))
-#define fminf(a,b) (((a) < (b)) ? (a) : (b))
-#define fmax(a,b) (((a) > (b)) ? (a) : (b))
-#define fmaxf(a,b) (((a) > (b)) ? (a) : (b))
+#define fmin min
+#define fminf min
+#define fmax max
+#define fmaxf max
 #endif
 
 #if defined(_MSC_VER)
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index 9e79248..75c1861 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -3,9 +3,9 @@
 #include <map>
 #include <string>
 #include <time.h>
-#include "SDL/SDL.h"
+#include "SDL.h"
 #ifdef WIN
-#include "SDL/SDL_syswm.h"
+#include "SDL_syswm.h"
 #include <direct.h>
 #endif
 #include <iostream>
diff --git a/src/cat/LuaBit.cpp b/src/cat/LuaBit.cpp
index 349c2e4..c55f45a 100644
--- a/src/cat/LuaBit.cpp
+++ b/src/cat/LuaBit.cpp
@@ -30,9 +30,9 @@
 
 extern "C"
 {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
 }
 
 #ifdef _MSC_VER
diff --git a/src/cat/LuaButton.cpp b/src/cat/LuaButton.cpp
index a4fd1e7..01ca875 100644
--- a/src/cat/LuaButton.cpp
+++ b/src/cat/LuaButton.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
 }
 
 #include <iostream>
diff --git a/src/cat/LuaButton.h b/src/cat/LuaButton.h
index 5d0e936..012779d 100644
--- a/src/cat/LuaButton.h
+++ b/src/cat/LuaButton.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua5.1/lua.h"
-	#include "lua5.1/lauxlib.h"
-	#include "lua5.1/lualib.h"
+	#include "lua.h"
+	#include "lauxlib.h"
+	#include "lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/cat/LuaComponent.cpp b/src/cat/LuaComponent.cpp
index d943c1a..8c2d3a4 100644
--- a/src/cat/LuaComponent.cpp
+++ b/src/cat/LuaComponent.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
 }
 
 #include <iostream>
diff --git a/src/cat/LuaComponent.h b/src/cat/LuaComponent.h
index ff0ca2a..9e11b12 100644
--- a/src/cat/LuaComponent.h
+++ b/src/cat/LuaComponent.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua5.1/lua.h"
-	#include "lua5.1/lauxlib.h"
-	#include "lua5.1/lualib.h"
+	#include "lua.h"
+	#include "lauxlib.h"
+	#include "lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/cat/LuaLabel.cpp b/src/cat/LuaLabel.cpp
index f37219d..e2ca56d 100644
--- a/src/cat/LuaLabel.cpp
+++ b/src/cat/LuaLabel.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
 }
 
 #include <iostream>
diff --git a/src/cat/LuaLabel.h b/src/cat/LuaLabel.h
index 74e31b8..a80ea4f 100644
--- a/src/cat/LuaLabel.h
+++ b/src/cat/LuaLabel.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua5.1/lua.h"
-	#include "lua5.1/lauxlib.h"
-	#include "lua5.1/lualib.h"
+	#include "lua.h"
+	#include "lauxlib.h"
+	#include "lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/cat/LuaLuna.h b/src/cat/LuaLuna.h
index b5bf7ac..1d5d937 100644
--- a/src/cat/LuaLuna.h
+++ b/src/cat/LuaLuna.h
@@ -2,8 +2,8 @@
 //http://lua-users.org/wiki/SimplerCppBinding
 
 extern "C" {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
+#include "lua.h"
+#include "lauxlib.h"
 }
 
 template <typename T> class Luna
diff --git a/src/cat/LuaScriptInterface.h b/src/cat/LuaScriptInterface.h
index f7ebb04..5bee8e1 100644
--- a/src/cat/LuaScriptInterface.h
+++ b/src/cat/LuaScriptInterface.h
@@ -10,9 +10,9 @@
 
 extern "C"
 {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
 }
 
 #include "CommandInterface.h"
diff --git a/src/cat/LuaTextbox.cpp b/src/cat/LuaTextbox.cpp
index e3a20ba..fa5753c 100644
--- a/src/cat/LuaTextbox.cpp
+++ b/src/cat/LuaTextbox.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
 }
 
 #include <iostream>
diff --git a/src/cat/LuaTextbox.h b/src/cat/LuaTextbox.h
index 2c6b0bd..437875f 100644
--- a/src/cat/LuaTextbox.h
+++ b/src/cat/LuaTextbox.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua5.1/lua.h"
-	#include "lua5.1/lauxlib.h"
-	#include "lua5.1/lualib.h"
+	#include "lua.h"
+	#include "lauxlib.h"
+	#include "lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/cat/LuaWindow.cpp b/src/cat/LuaWindow.cpp
index c3f193b..16553d8 100644
--- a/src/cat/LuaWindow.cpp
+++ b/src/cat/LuaWindow.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
 }
 
 #include <iostream>
diff --git a/src/cat/LuaWindow.h b/src/cat/LuaWindow.h
index 55db229..be6af92 100644
--- a/src/cat/LuaWindow.h
+++ b/src/cat/LuaWindow.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua5.1/lua.h"
-	#include "lua5.1/lauxlib.h"
-	#include "lua5.1/lualib.h"
+	#include "lua.h"
+	#include "lauxlib.h"
+	#include "lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 5b52424..fadbaea 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -1468,7 +1468,7 @@ void GameView::OnTick(float dt)
 	}
 	if(introText)
 	{
-		introText -= int(dt)>0?std::min(int(dt), 5):1;
+		introText -= int(dt)>0?((int)dt < 5? dt:5):1;
 		if(introText < 0)
 			introText  = 0;
 	}
diff --git a/src/simulation/Element.h b/src/simulation/Element.h
index 3c28e2f..d9c7903 100644
--- a/src/simulation/Element.h
+++ b/src/simulation/Element.h
@@ -8,6 +8,9 @@
 #include "Gravity.h"
 #include "Misc.h"
 #include "ElementGraphics.h"
+#ifdef _MSC_VER
+#include <Windows.h>
+#endif
 
 #define IPL -257.0f
 #define IPH 257.0f
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index e4aa9bd..195676c 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -1,8 +1,10 @@
 //#include <cstdlib>
 #include <cmath>
 #include <math.h>
-#if !defined(WIN) || defined(__GNUC__)
+#if !defined(_MSC_VER)
 #include <strings.h>
+#else
+#include <windows.h>
 #endif
 #include "Config.h"
 #include "Simulation.h"
diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp
index d1cbc17..c2f5a38 100644
--- a/src/simulation/elements/SPRK.cpp
+++ b/src/simulation/elements/SPRK.cpp
@@ -277,11 +277,9 @@ int Element_SPRK::graphics(GRAPHICS_FUNC_ARGS)
 
 {
 	*firea = 80;
-	
 	*firer = 170;
 	*fireg = 200;
 	*fireb = 220;
-	//*pixel_mode |= FIRE_ADD;
 	*pixel_mode |= FIRE_ADD;
 	return 1;
 }