summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-12-12 12:24:38 (GMT)
committer Simon <simon@hardwired.org.uk>2010-12-12 12:24:38 (GMT)
commitf1df4cae6ad83902a1166a14327643692490dd3b (patch)
treea5984a47c4bc215359b21f12caa9f3f8088db6be /src/main.c
parent2bdb662825d9b24ac81c57cc2723f69b455b8030 (diff)
parentaf72702434b11a57576ffbafb9112201c092dbae (diff)
downloadpowder-f1df4cae6ad83902a1166a14327643692490dd3b.zip
powder-f1df4cae6ad83902a1166a14327643692490dd3b.tar.gz
Merge latest cracker changes
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 95d7a5c..49d1701 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1371,11 +1371,11 @@ int main(int argc, char *argv[])
}
if(sdl_key=='9')
{
- set_cmode(CM_CRACK);
+ set_cmode(CM_GRAD);
}
if(sdl_key=='0')
{
- set_cmode(CM_GRAD);
+ set_cmode(CM_CRACK);
}
if(sdl_key==SDLK_TAB)
{
@@ -1463,6 +1463,8 @@ int main(int argc, char *argv[])
}
if(sdl_key=='d')
DEBUG_MODE = !DEBUG_MODE;
+ if(sdl_key=='r')
+ GENERATION = 0;
if(sdl_key=='i')
{
int nx, ny;
@@ -2264,7 +2266,7 @@ int main(int argc, char *argv[])
sprintf(uitext, "Version %d Beta %d FPS:%d Parts:%d", SAVE_VERSION, MINOR_VERSION, FPSB, NUM_PARTS);
#else
if(DEBUG_MODE)
- sprintf(uitext, "Version %d Beta %d FPS:%d Parts:%d", SAVE_VERSION, MINOR_VERSION, FPSB, NUM_PARTS);
+ sprintf(uitext, "Version %d Beta %d FPS:%d Parts:%d Generation:%d", SAVE_VERSION, MINOR_VERSION, FPSB, NUM_PARTS,GENERATION);
else
sprintf(uitext, "Version %d.%d FPS:%d", SAVE_VERSION, MINOR_VERSION, FPSB);
#endif