summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-02-24 18:04:08 (GMT)
committer Simon <simon@hardwired.org.uk>2011-02-24 18:04:08 (GMT)
commit669a672b3d083af22c6aeb37a636903ce30bcf6c (patch)
tree0b10afbd19452a207dd0b55bea1af753cdb7327c /src/main.c
parentfd6f6c5406c3af9bcb679e5381800b8708ba3d8a (diff)
downloadpowder-669a672b3d083af22c6aeb37a636903ce30bcf6c.zip
powder-669a672b3d083af22c6aeb37a636903ce30bcf6c.tar.gz
Pretty transparent console
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c40
1 files changed, 22 insertions, 18 deletions
diff --git a/src/main.c b/src/main.c
index 6de200a..1657425 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1677,7 +1677,7 @@ int main(int argc, char *argv[])
if (sdl_key==SDLK_BACKQUOTE)
{
console_mode = !console_mode;
- hud_enable = !console_mode;
+ //hud_enable = !console_mode;
}
if (sdl_key=='g')
{
@@ -1906,23 +1906,6 @@ int main(int argc, char *argv[])
}*/
}
}
- if(console_mode)
- {
- char *console;
- //char error[255] = "error!";
- sys_pause = 1;
- console = console_ui(vid_buf,console_error);
- console = mystrdup(console);
- strcpy(console_error,"");
- if(process_command(vid_buf,console,&console_error)==-1)
- {
- free(console);
- break;
- }
- free(console);
- if(!console_mode)
- hud_enable = 1;
- }
bq = b;
b = SDL_GetMouseState(&x, &y);
@@ -1982,6 +1965,7 @@ int main(int argc, char *argv[])
}
}
}
+
mx = x;
my = y;
if (update_flag)
@@ -2743,7 +2727,27 @@ int main(int argc, char *argv[])
}
fillrect(vid_buf, 12, 12, textwidth(uitext)+8, 15, 0, 0, 0, 140);
drawtext(vid_buf, 16, 16, uitext, 32, 216, 255, 200);
+
+ }
+
+ if(console_mode)
+ {
+ char *console;
+ //char error[255] = "error!";
+ sys_pause = 1;
+ console = console_ui(vid_buf,console_error);
+ console = mystrdup(console);
+ strcpy(console_error,"");
+ if(process_command(vid_buf,console,&console_error)==-1)
+ {
+ free(console);
+ break;
+ }
+ free(console);
+ if(!console_mode)
+ hud_enable = 1;
}
+
sdl_blit(0, 0, XRES+BARSIZE, YRES+MENUSIZE, vid_buf, XRES+BARSIZE);
//Setting an element for the stick man