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

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)

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>

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

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>

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"

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>

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"

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>

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"

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

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"

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>

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"

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>

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"

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;
 	}

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

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"

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;
 }