diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-16 16:43:50 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-16 16:43:50 (GMT) |
| commit | a5db1d53da133a78493be443b0ec9094ea3eeb65 (patch) | |
| tree | 97a93d5fd9e12219657c6b2ece7d1137146843c0 | |
| parent | ed392c9724878fc39fe5cbba2f882dacf7278979 (diff) | |
| download | powder-a5db1d53da133a78493be443b0ec9094ea3eeb65.zip powder-a5db1d53da133a78493be443b0ec9094ea3eeb65.tar.gz | |
Revert "added lua command: tpt.setfpscap(int FPSCap)"
This reverts commit aa56eca5c01359732f7331d2a572ce31d7ff3c23.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | includes/defines.h | 1 | ||||
| -rw-r--r-- | includes/luaconsole.h | 1 | ||||
| -rw-r--r-- | src/graphics.c | 3 | ||||
| -rw-r--r-- | src/luaconsole.c | 7 | ||||
| -rw-r--r-- | src/main.c | 3 |
6 files changed, 2 insertions, 18 deletions
@@ -57,11 +57,6 @@ 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 1b5afdf..e112c71 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -156,7 +156,6 @@ 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 036327a..ff65cbf 100644 --- a/includes/luaconsole.h +++ b/includes/luaconsole.h @@ -66,5 +66,4 @@ 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 14367ae..033d219 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1125,9 +1125,8 @@ 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 186764d..78b633d 100644 --- a/src/luaconsole.c +++ b/src/luaconsole.c @@ -55,7 +55,6 @@ void luacon_open(){ {"heat", &luatpt_heat}, {"setfire", &luatpt_setfire}, {"setdebug", &luatpt_setdebug}, - {"setfpscap",&luatpt_setfpscap}, {NULL,NULL} }; @@ -1056,10 +1055,4 @@ 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 @@ -1598,7 +1598,6 @@ 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 @@ -1608,7 +1607,7 @@ int main(int argc, char *argv[]) char heattext[256] = ""; char coordtext[128] = ""; int currentTime = 0; - int FPS = 0, pastFPS = 0, elapsedTime = 0; + int FPS = 0, pastFPS = 0, elapsedTime = 0, limitFPS = 60; void *http_ver_check, *http_session_check = NULL; char *ver_data=NULL, *check_data=NULL, *tmp; //char console_error[255] = ""; |