summaryrefslogtreecommitdiff
path: root/includes/interface.h
diff options
context:
space:
mode:
authorBryan Hoyle <starfoxprime@gmail.com>2011-08-24 00:29:26 (GMT)
committer Bryan Hoyle <starfoxprime@gmail.com>2011-08-24 00:29:26 (GMT)
commit578144c48a1b35ae8d0763637752d935169663ac (patch)
treead0407b144aca61502e8419c96fc385a9f5aea28 /includes/interface.h
parentf577c319db982e6b3d3b3731f1980c89182da982 (diff)
parent6581c29bf7eaf07483178804199f090b1c0e43ff (diff)
downloadpowder-578144c48a1b35ae8d0763637752d935169663ac.zip
powder-578144c48a1b35ae8d0763637752d935169663ac.tar.gz
Merge remote branch 'origin/master'
Diffstat (limited to 'includes/interface.h')
-rw-r--r--includes/interface.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/interface.h b/includes/interface.h
index aff63e4..8beea20 100644
--- a/includes/interface.h
+++ b/includes/interface.h
@@ -33,9 +33,10 @@ typedef struct menu_wall menu_wall;
#define SC_NUCLEAR 8
#define SC_SPECIAL 9
#define SC_LIFE 10
+#define SC_TOOL 11
#define SC_CRACKER 13
#define SC_CRACKER2 14
-#define SC_TOTAL 11
+#define SC_TOTAL 12
static menu_section msections[] = //doshow does not do anything currently.
{
@@ -50,6 +51,7 @@ static menu_section msections[] = //doshow does not do anything currently.
{"\xC6", "Radioactive", 0, 1},
{"\xCC", "Special", 0, 1},
{"\xD2", "Life", 0, 1},
+ {"\xD7", "Tools", 0, 1},
{"\xD2", "More Life", 0, 1},
{"\xC8", "", 0, 0},
{"\xC8", "Cracker", 0, 0},
@@ -132,7 +134,7 @@ typedef struct ui_richtext ui_richtext;
int SLALT;
extern SDLMod sdl_mod;
-extern int sdl_key, sdl_wheel, sdl_caps, sdl_ascii, sdl_zoom_trig;
+extern int sdl_key, sdl_rkey, sdl_wheel, sdl_caps, sdl_ascii, sdl_zoom_trig;
#if (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11)
extern SDL_SysWMinfo sdl_wminfo;
extern Atom XA_CLIPBOARD, XA_TARGETS;