From ad09f3040e7e08bbe2d5b256a2933d148a2a8e3d Mon Sep 17 00:00:00 2001
From: Bryan Hoyle <starfoxprime@gmail.com>
Date: Tue, 16 Aug 2011 12:45:44 -0400
Subject: [PATCH] Revert "Revert "added lua command: tpt.setfpscap(int
 FPSCap)""

This reverts commit a5db1d53da133a78493be443b0ec9094ea3eeb65.
---
 Makefile              | 5 +++++
 includes/defines.h    | 1 +
 includes/luaconsole.h | 1 +
 src/graphics.c        | 3 ++-
 src/luaconsole.c      | 7 +++++++
 src/main.c            | 3 ++-
 6 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ef98391ef..4a77ce051 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,11 @@ powder-64-sse3-opengl: $(SOURCES)
 	$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE3) $(SOURCES) $(LFLAGS) -DLIN64 -lGL -lGLU -DOpenGL
 	strip $@
 	mv $@ build
+powder-sse3-opengl: $(SOURCES)
+	$(PYCOMMAND)
+	$(COMPILER) -m32 -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE3) $(SOURCES) $(LFLAGS) -DLIN32 -lGL -lGLU -DOpenGL
+	strip $@
+	mv $@ build
 powder-64-sse3: $(SOURCES)
 	$(PYCOMMAND)
 	$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE3) $(SOURCES) $(LFLAGS) -DLIN64
diff --git a/includes/defines.h b/includes/defines.h
index e112c71f7..1b5afdffa 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -156,6 +156,7 @@ extern int aheat_enable;
 extern int decorations_enable;
 extern int hud_enable;
 extern int debug_flags;
+int limitFPS;
 
 extern int active_menu;
 
diff --git a/includes/luaconsole.h b/includes/luaconsole.h
index ff65cbf80..036327ae7 100644
--- a/includes/luaconsole.h
+++ b/includes/luaconsole.h
@@ -66,4 +66,5 @@ int luatpt_error(lua_State* l);
 int luatpt_heat(lua_State* l);
 int luatpt_setfire(lua_State* l);
 int luatpt_setdebug(lua_State* l);
+int luatpt_setfpscap(lua_State* l);
 #endif
diff --git a/src/graphics.c b/src/graphics.c
index 033d2199e..14367aebb 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1125,8 +1125,9 @@ int drawtextwrap(pixel *vid, int x, int y, int w, const char *s, int r, int g, i
 			}
 		}
 	}
-#endif
+
 	return rh;
+	#endif
 }
 
 //draws a rectange, (x,y) are the top left coords.
diff --git a/src/luaconsole.c b/src/luaconsole.c
index 78b633dcf..186764d3e 100644
--- a/src/luaconsole.c
+++ b/src/luaconsole.c
@@ -55,6 +55,7 @@ void luacon_open(){
 		{"heat", &luatpt_heat},
 		{"setfire", &luatpt_setfire},
 		{"setdebug", &luatpt_setdebug},
+		{"setfpscap",&luatpt_setfpscap},
 		{NULL,NULL}
 	};
 
@@ -1055,4 +1056,10 @@ int luatpt_setdebug(lua_State* l)
 	debug_flags = debug;
 	return 0;
 }
+int luatpt_setfpscap(lua_State* l)
+{
+int fpscap = luaL_optint(l, 1, 0);
+limitFPS = fpscap;
+return 0;
+}
 #endif
diff --git a/src/main.c b/src/main.c
index 4837236c8..4c5b23995 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1598,6 +1598,7 @@ int main(int argc, char *argv[])
 #else
 int main(int argc, char *argv[])
 {
+	limitFPS = 60;
 	pixel *part_vbuf; //Extra video buffer
 	pixel *part_vbuf_store;
 #ifdef BETA
@@ -1607,7 +1608,7 @@ int main(int argc, char *argv[])
 	char heattext[256] = "";
 	char coordtext[128] = "";
 	int currentTime = 0;
-	int FPS = 0, pastFPS = 0, elapsedTime = 0, limitFPS = 60;
+	int FPS = 0, pastFPS = 0, elapsedTime = 0; 
 	void *http_ver_check, *http_session_check = NULL;
 	char *ver_data=NULL, *check_data=NULL, *tmp;
 	//char console_error[255] = "";