matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "added lua command: tpt.setfpscap(int FPSCap)"

Browse Source 
This reverts commit aa56eca5c0.
This commit is contained in:
Bryan Hoyle 2011-08-16 12:43:50 -04:00
parent ed392c9724
commit a5db1d53da
6 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -57,11 +57,6 @@ powder-64-sse3-opengl: $(SOURCES)
$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE3) $(SOURCES) $(LFLAGS) -DLIN64 -lGL -lGLU -DOpenGL $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE3) $(SOURCES) $(LFLAGS) -DLIN64 -lGL -lGLU -DOpenGL
strip $@ strip $@
mv $@ build 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) powder-64-sse3: $(SOURCES)
$(PYCOMMAND) $(PYCOMMAND)
$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE3) $(SOURCES) $(LFLAGS) -DLIN64 $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(MFLAGS_SSE3) $(SOURCES) $(LFLAGS) -DLIN64

1
includes/defines.h
View File

@ -156,7 +156,6 @@ extern int aheat_enable;
extern int decorations_enable; extern int decorations_enable;
extern int hud_enable; extern int hud_enable;
extern int debug_flags; extern int debug_flags;
int limitFPS;
extern int active_menu; extern int active_menu;

1
includes/luaconsole.h
View File

@ -66,5 +66,4 @@ int luatpt_error(lua_State* l);
int luatpt_heat(lua_State* l); int luatpt_heat(lua_State* l);
int luatpt_setfire(lua_State* l); int luatpt_setfire(lua_State* l);
int luatpt_setdebug(lua_State* l); int luatpt_setdebug(lua_State* l);
int luatpt_setfpscap(lua_State* l);
#endif #endif

3
src/graphics.c
View File

@ -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; return rh;
#endif
} }
//draws a rectange, (x,y) are the top left coords. //draws a rectange, (x,y) are the top left coords.

7
src/luaconsole.c
View File

@ -55,7 +55,6 @@ void luacon_open(){
{"heat", &luatpt_heat}, {"heat", &luatpt_heat},
{"setfire", &luatpt_setfire}, {"setfire", &luatpt_setfire},
{"setdebug", &luatpt_setdebug}, {"setdebug", &luatpt_setdebug},
{"setfpscap",&luatpt_setfpscap},
{NULL,NULL} {NULL,NULL}
}; };
@ -1056,10 +1055,4 @@ int luatpt_setdebug(lua_State* l)
debug_flags = debug; debug_flags = debug;
return 0; return 0;
} }
int luatpt_setfpscap(lua_State* l)
{
int fpscap = luaL_optint(l, 1, 0);
limitFPS = fpscap;
return 0;
}
#endif #endif

3
src/main.c
View File

@ -1598,7 +1598,6 @@ int main(int argc, char *argv[])
#else #else
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
limitFPS = 60;
pixel *part_vbuf; //Extra video buffer pixel *part_vbuf; //Extra video buffer
pixel *part_vbuf_store; pixel *part_vbuf_store;
#ifdef BETA #ifdef BETA
@ -1608,7 +1607,7 @@ int main(int argc, char *argv[])
char heattext[256] = ""; char heattext[256] = "";
char coordtext[128] = ""; char coordtext[128] = "";
int currentTime = 0; 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; void *http_ver_check, *http_session_check = NULL;
char *ver_data=NULL, *check_data=NULL, *tmp; char *ver_data=NULL, *check_data=NULL, *tmp;
//char console_error[255] = ""; //char console_error[255] = "";