summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-10-26 15:05:23 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-10-26 15:05:23 (GMT)
commite3a7b626ab6e8c97f8519c1bcca85667da6a265a (patch)
tree537a5a55461e1596b2e6fa7843e9351d217f08c9 /src
parent8c25ef733c9fc1424a14e98ed20d2400bdfa5e3a (diff)
downloadpowder-e3a7b626ab6e8c97f8519c1bcca85667da6a265a.zip
powder-e3a7b626ab6e8c97f8519c1bcca85667da6a265a.tar.gz
Revert "Revert "F1 to bring up intro message""
This reverts commit 8c25ef733c9fc1424a14e98ed20d2400bdfa5e3a.
Diffstat (limited to 'src')
-rw-r--r--src/main.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 3cccd43..ed5b91c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2415,10 +2415,22 @@ int main(int argc, char *argv[])
if (sdl_key==SDLK_SPACE)
sys_pause = !sys_pause;
if (sdl_key=='u')
-
aheat_enable = !aheat_enable;
- if (sdl_key=='h')
+ if (sdl_key=='h' && !(sdl_mod & KMOD_LCTRL))
+ {
hud_enable = !hud_enable;
+ }
+ if (sdl_key==SDLK_F1 || (sdl_key=='h' && (sdl_mod & KMOD_LCTRL)))
+ {
+ if(!it)
+ {
+ it = 8047;
+ }
+ else
+ {
+ it = 0;
+ }
+ }
if (sdl_key=='n')
pretty_powder = !pretty_powder;
if (sdl_key=='p')