From b57e2ed8e4250cb4077951884e33430b794c432a Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Mon, 7 Jun 2010 11:32:35 +0200
Subject: [PATCH] Made (use of) keyalias enumeration and new constant
 CONTROLS_LENGTH.

---
 game/config.c   | 28 +++++++++----------
 game/game.c     | 26 ++++++++---------
 game/logic.c    | 68 ++++++++++++++++++++++-----------------------
 game/mainmenu.c |  2 +-
 game/options.c  | 74 ++++++++++++++++++++++++-------------------------
 game/options.h  | 23 +++++++++++++--
 menu/menu.c     |  4 +--
 7 files changed, 122 insertions(+), 103 deletions(-)

diff --git a/game/config.c b/game/config.c
index 2ceba5b..d12b5ca 100644
--- a/game/config.c
+++ b/game/config.c
@@ -58,14 +58,14 @@ void loadconfig(void)
   option.soundvolume=1.0f;
   option.musicvolume=1.0f;
 
-  control[0].key[0]=SCAN_LEFT;
-  control[0].key[1]=SCAN_RIGHT;
-  control[0].key[2]=SCAN_DOWN;
-  control[0].key[3]=SCAN_UP;
-  control[0].key[4]=SCAN_A;
-  control[0].key[5]=SCAN_SPACE;
-  control[0].key[6]=SCAN_S;
-  control[0].key[7]=SCAN_D;
+  control[0].key[KEYALIAS_LEFT]=SCAN_LEFT;
+  control[0].key[KEYALIAS_RIGHT]=SCAN_RIGHT;
+  control[0].key[KEYALIAS_DOWN]=SCAN_DOWN;
+  control[0].key[KEYALIAS_UP]=SCAN_UP;
+  control[0].key[KEYALIAS_STICK]=SCAN_A;
+  control[0].key[KEYALIAS_JUMP]=SCAN_SPACE;
+  control[0].key[KEYALIAS_SLIDE]=SCAN_S;
+  control[0].key[KEYALIAS_HEAVY]=SCAN_D;
   control[0].joysticknum=0;
   control[0].axis[0]=0;
   control[0].axis[1]=1;
@@ -121,12 +121,12 @@ void loadconfig(void)
   if (count!=-1)
     option.musicvolume=(float)count/100.0f;
 
-  for (count=0;count<4;count++)
+  for (count=0;count<CONTROLS_LENGTH;count++)
     {
-    for (count2=0;count2<16;count2++)
+    for (count2=0;count2<KEYALIAS_LENGTH;count2++)
       {
       sprintf(tempstr,"player%dkey%d=",count+1,count2+1);
-      optionreadint(&control[count].key[count2],tempstr);
+      optionreadint((int*)&control[count].key[count2],tempstr);
       }
 
     sprintf(tempstr,"player%djoysticknum=",count+1);
@@ -185,12 +185,12 @@ void saveconfig(void)
   count=option.musicvolume*100.0f;
   optionwriteint(fp, &count,"musicvolume=");
 
-  for (count=0;count<4;count++)
+  for (count=0;count<CONTROLS_LENGTH;count++)
     {
-    for (count2=0;count2<16;count2++)
+    for (count2=0;count2<KEYALIAS_LENGTH;count2++)
       {
       sprintf(tempstr,"player%dkey%d=",count+1,count2+1);
-      optionwriteint(fp, &control[count].key[count2],tempstr);
+      optionwriteint(fp, (int*)&control[count].key[count2],tempstr);
       }
 
     sprintf(tempstr,"player%djoysticknum=",count+1);
diff --git a/game/game.c b/game/game.c
index c869584..d3ca00f 100644
--- a/game/game.c
+++ b/game/game.c
@@ -251,7 +251,7 @@ void gameloop(void)
         count2=0;
         if (game.dialogdelay==0)
           count2=1;
-        for (count=4;count<8;count++)
+        for (count=4;count<KEYALIAS_LENGTH;count++)
         if (keyboard[control[0].key[count]] && !prevkeyboard[control[0].key[count]])
           count2=1;
         if (control[0].joysticknum!=-1)
@@ -277,9 +277,9 @@ void gameloop(void)
       else
         {
         count2=0;
-        if (keyboard[control[0].key[2]] && !prevkeyboard[control[0].key[2]])
+        if (keyboard[control[0].key[KEYALIAS_DOWN]] && !prevkeyboard[control[0].key[KEYALIAS_DOWN]])
           count2=1;
-        if (keyboard[control[0].key[3]] && !prevkeyboard[control[0].key[3]])
+        if (keyboard[control[0].key[KEYALIAS_UP]] && !prevkeyboard[control[0].key[KEYALIAS_UP]])
           count2=1;
         if (control[0].joysticknum!=-1)
           {
@@ -297,7 +297,7 @@ void gameloop(void)
           }
 
         count2=0;
-        for (count=4;count<8;count++)
+        for (count=4;count<KEYALIAS_LENGTH;count++)
         if (keyboard[control[0].key[count]] && !prevkeyboard[control[0].key[count]])
           count2=1;
         if (control[0].joysticknum!=-1)
@@ -765,23 +765,23 @@ void getinputs(void)
     object[count].axis[1]=0.0f;
     object[count].button=0;
     }
-  for (count=0;count<4;count++)
+  for (count=0;count<CONTROLS_LENGTH;count++)
     {
-    if (keyboard[control[count].key[0]])
+    if (keyboard[control[count].key[KEYALIAS_LEFT]])
       object[count].axis[0]-=1.0f;
-    if (keyboard[control[count].key[1]])
+    if (keyboard[control[count].key[KEYALIAS_RIGHT]])
       object[count].axis[0]+=1.0f;
-    if (keyboard[control[count].key[2]])
+    if (keyboard[control[count].key[KEYALIAS_DOWN]])
       object[count].axis[1]-=1.0f;
-    if (keyboard[control[count].key[3]])
+    if (keyboard[control[count].key[KEYALIAS_UP]])
       object[count].axis[1]+=1.0f;
-    if (keyboard[control[count].key[4]])
+    if (keyboard[control[count].key[KEYALIAS_STICK]])
       object[count].button|=1;
-    if (keyboard[control[count].key[5]])
+    if (keyboard[control[count].key[KEYALIAS_JUMP]])
       object[count].button|=2;
-    if (keyboard[control[count].key[6]])
+    if (keyboard[control[count].key[KEYALIAS_SLIDE]])
       object[count].button|=4;
-    if (keyboard[control[count].key[7]])
+    if (keyboard[control[count].key[KEYALIAS_HEAVY]])
       object[count].button|=8;
 
     if (control[count].joysticknum!=-1)
diff --git a/game/logic.c b/game/logic.c
index 4663328..21afaf6 100644
--- a/game/logic.c
+++ b/game/logic.c
@@ -1320,18 +1320,18 @@ void gamedisplay(void)
     if (object[0].position[1]>=level.area[1][1] && object[0].position[1]<level.area[1][3])
       {
       count=68;
-      drawtext(TXT_TUTORIAL_LINE1,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[6]]);
+      drawtext(TXT_TUTORIAL_LINE1,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_SLIDE]]);
       count+=12;
       drawtext(TXT_TUTORIAL_LINE2,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f);
       count+=12;
 
-      keyhighlight=control[0].key[6];
+      keyhighlight=control[0].key[KEYALIAS_SLIDE];
       }
     if (object[0].position[0]>=level.area[2][0] && object[0].position[0]<level.area[2][2])
     if (object[0].position[1]>=level.area[2][1] && object[0].position[1]<level.area[2][3])
       {
       count=68;
-      drawtext(TXT_TUTORIAL_LINE3,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[6]]);
+      drawtext(TXT_TUTORIAL_LINE3,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_SLIDE]]);
       count+=12;
       drawtext(TXT_TUTORIAL_LINE4,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f);
       count+=12;
@@ -1340,21 +1340,21 @@ void gamedisplay(void)
     if (object[0].position[1]>=level.area[3][1] && object[0].position[1]<level.area[3][3])
       {
       count=68;
-      drawtext(TXT_TUTORIAL_LINE5,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[4]]);
+      drawtext(TXT_TUTORIAL_LINE5,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_STICK]]);
       count+=12;
-      drawtext(TXT_TUTORIAL_LINE6,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[3]]);
+      drawtext(TXT_TUTORIAL_LINE6,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_UP]]);
       count+=12;
       drawtext(TXT_TUTORIAL_LINE7,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f);
       count+=12;
 
-      keyhighlight=control[0].key[4];
-      keyhighlight2=control[0].key[3];
+      keyhighlight=control[0].key[KEYALIAS_STICK];
+      keyhighlight2=control[0].key[KEYALIAS_UP];
       }
     if (object[0].position[0]>=level.area[4][0] && object[0].position[0]<level.area[4][2])
     if (object[0].position[1]>=level.area[4][1] && object[0].position[1]<level.area[4][3])
       {
       count=68;
-      drawtext(TXT_TUTORIAL_LINE8,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[5]]);
+      drawtext(TXT_TUTORIAL_LINE8,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_JUMP]]);
       count+=12;
       drawtext(TXT_TUTORIAL_LINE9,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f);
       count+=12;
@@ -1376,60 +1376,60 @@ void gamedisplay(void)
         }
 
       if (maxy-miny<1.6f && maxy-level.area[4][1]<2.0f)
-        keyhighlight=control[0].key[5];
+        keyhighlight=control[0].key[KEYALIAS_JUMP];
       if (object[0].velocity[1]>0.02f)
-        keyhighlight2=control[0].key[3];
+        keyhighlight2=control[0].key[KEYALIAS_UP];
       if (object[0].velocity[1]<-0.02f)
-        keyhighlight2=control[0].key[2];
+        keyhighlight2=control[0].key[KEYALIAS_DOWN];
       }
     if (object[0].position[0]>=level.area[5][0] && object[0].position[0]<level.area[5][2])
     if (object[0].position[1]>=level.area[5][1] && object[0].position[1]<level.area[5][3])
       {
       count=68;
-      drawtext(TXT_TUTORIAL_LINE13,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[7]]);
+      drawtext(TXT_TUTORIAL_LINE13,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_HEAVY]]);
       count+=12;
       drawtext(TXT_TUTORIAL_LINE14,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f);
       count+=12;
 
-      keyhighlight=control[0].key[7];
+      keyhighlight=control[0].key[KEYALIAS_HEAVY];
       }
     if (object[0].position[0]>=level.area[6][0] && object[0].position[0]<level.area[6][2])
     if (object[0].position[1]>=level.area[6][1] && object[0].position[1]<level.area[6][3])
       {
       count=68;
-      drawtext(TXT_TUTORIAL_LINE15,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[4]]);
+      drawtext(TXT_TUTORIAL_LINE15,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_STICK]]);
       count+=12;
-      drawtext(TXT_TUTORIAL_LINE16,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[3]]);
+      drawtext(TXT_TUTORIAL_LINE16,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_UP]]);
       count+=12;
-      drawtext(TXT_TUTORIAL_LINE17,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[0]]);
+      drawtext(TXT_TUTORIAL_LINE17,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f,keyboardlabel[control[0].key[KEYALIAS_LEFT]]);
       count+=12;
       drawtext(TXT_TUTORIAL_LINE18,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f);
       count+=12;
       drawtext(TXT_TUTORIAL_LINE19,(320|TEXT_CENTER),count,12,1.0f,1.0f,1.0f,1.0f);
       count+=12;
 
-      keyhighlight=control[0].key[4];
-      keyhighlight2=control[0].key[3];
+      keyhighlight=control[0].key[KEYALIAS_STICK];
+      keyhighlight2=control[0].key[KEYALIAS_UP];
       }
 
     drawtext(TXT_TUTORIAL_MOVEMENT,(536|TEXT_CENTER),(382|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
-    drawkeybitmap((512|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[0],keyhighlight,keyhighlight2);
-    drawkeybitmap((536|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[2],keyhighlight,keyhighlight2);
-    drawkeybitmap((560|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[1],keyhighlight,keyhighlight2);
-    drawkeybitmap((536|TEXT_CENTER),(400|TEXT_CENTER),12,12,control[0].key[3],keyhighlight,keyhighlight2);
+    drawkeybitmap((512|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_LEFT],keyhighlight,keyhighlight2);
+    drawkeybitmap((536|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_DOWN],keyhighlight,keyhighlight2);
+    drawkeybitmap((560|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_RIGHT],keyhighlight,keyhighlight2);
+    drawkeybitmap((536|TEXT_CENTER),(400|TEXT_CENTER),12,12,control[0].key[KEYALIAS_UP],keyhighlight,keyhighlight2);
 
     count=sizeof(TXT_TUTORIAL_STICK)*6+24;
     drawtext(TXT_TUTORIAL_STICK,(count|TEXT_CENTER),(406|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
-    drawkeybitmap((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[4],keyhighlight,keyhighlight2);
+    drawkeybitmap((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_STICK],keyhighlight,keyhighlight2);
     count+=(((sizeof(TXT_TUTORIAL_STICK)+sizeof(TXT_TUTORIAL_JUMP))/2)+1)*12;  //96;
     drawtext(TXT_TUTORIAL_JUMP,(count|TEXT_CENTER),(406|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
-    drawkeybitmap((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[5],keyhighlight,keyhighlight2);
+    drawkeybitmap((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_JUMP],keyhighlight,keyhighlight2);
     count+=(((sizeof(TXT_TUTORIAL_SLIDE)+sizeof(TXT_TUTORIAL_JUMP))/2)+1)*12;  //96;
     drawtext(TXT_TUTORIAL_SLIDE,(count|TEXT_CENTER),(406|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
-    drawkeybitmap((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[6],keyhighlight,keyhighlight2);
+    drawkeybitmap((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_SLIDE],keyhighlight,keyhighlight2);
     count+=(((sizeof(TXT_TUTORIAL_SLIDE)+sizeof(TXT_TUTORIAL_HEAVY))/2)+1)*12; //96;
     drawtext(TXT_TUTORIAL_HEAVY,(count|TEXT_CENTER),(406|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
-    drawkeybitmap((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[7],keyhighlight,keyhighlight2);
+    drawkeybitmap((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_HEAVY],keyhighlight,keyhighlight2);
     count+=96;
     }
   if (game.playreplay)
@@ -1439,44 +1439,44 @@ void gamedisplay(void)
     keyhighlight=0;
     if (object[0].axis[0]==-1.0f)
       keyhighlight=1;
-    drawkeybitmap2((512|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[0],keyhighlight);
+    drawkeybitmap2((512|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_LEFT],keyhighlight);
     keyhighlight=0;
     if (object[0].axis[1]==-1.0f)
       keyhighlight=1;
-    drawkeybitmap2((536|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[2],keyhighlight);
+    drawkeybitmap2((536|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_DOWN],keyhighlight);
     keyhighlight=0;
     if (object[0].axis[0]==1.0f)
       keyhighlight=1;
-    drawkeybitmap2((560|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[1],keyhighlight);
+    drawkeybitmap2((560|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_RIGHT],keyhighlight);
     keyhighlight=0;
     if (object[0].axis[1]==1.0f)
       keyhighlight=1;
-    drawkeybitmap2((536|TEXT_CENTER),(400|TEXT_CENTER),12,12,control[0].key[3],keyhighlight);
+    drawkeybitmap2((536|TEXT_CENTER),(400|TEXT_CENTER),12,12,control[0].key[KEYALIAS_UP],keyhighlight);
 
     count=64;
     drawtext(TXT_TUTORIAL_STICK,(count|TEXT_CENTER),(406|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
     keyhighlight=0;
     if ((object[0].button&1)==1)
       keyhighlight=1;
-    drawkeybitmap2((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[4],keyhighlight);
+    drawkeybitmap2((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_STICK],keyhighlight);
     count+=96;
     drawtext(TXT_TUTORIAL_JUMP,(count|TEXT_CENTER),(406|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
     keyhighlight=0;
     if ((object[0].button&2)==2)
       keyhighlight=1;
-    drawkeybitmap2((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[5],keyhighlight);
+    drawkeybitmap2((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_JUMP],keyhighlight);
     count+=96;
     drawtext(TXT_TUTORIAL_SLIDE,(count|TEXT_CENTER),(406|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
     keyhighlight=0;
     if ((object[0].button&4)==4)
       keyhighlight=1;
-    drawkeybitmap2((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[6],keyhighlight);
+    drawkeybitmap2((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_SLIDE],keyhighlight);
     count+=96;
     drawtext(TXT_TUTORIAL_HEAVY,(count|TEXT_CENTER),(406|TEXT_CENTER),12,0.75f,0.75f,0.75f,1.0f);
     keyhighlight=0;
     if ((object[0].button&8)==8)
       keyhighlight=1;
-    drawkeybitmap2((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[7],keyhighlight);
+    drawkeybitmap2((count|TEXT_CENTER),(424|TEXT_CENTER),12,12,control[0].key[KEYALIAS_HEAVY],keyhighlight);
     count+=96;
     }
   }
diff --git a/game/mainmenu.c b/game/mainmenu.c
index 041596c..ef97fa8 100644
--- a/game/mainmenu.c
+++ b/game/mainmenu.c
@@ -650,7 +650,7 @@ void introscreen(void)
       game.turbomode=1;
       }
 
-    for (count=0;count<8;count++)
+    for (count=0;count<KEYALIAS_LENGTH;count++)
       {
       if (keyboard[control[0].key[count]] && !prevkeyboard[control[0].key[count]])
         {
diff --git a/game/options.c b/game/options.c
index 5f565c4..a5b68da 100644
--- a/game/options.c
+++ b/game/options.c
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../video/texture.h"
 
 _option option;
-_control control[8];
+_control control[CONTROLS_LENGTH];
 
 void optionsmenu(void)
   {
@@ -231,7 +231,7 @@ void optionsmenu(void)
     count=0;
     drawtext(TXT_MOVE_LEFT,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[0]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_LEFT]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -247,7 +247,7 @@ void optionsmenu(void)
 
     drawtext(TXT_MOVE_RIGHT,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[1]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_RIGHT]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -263,7 +263,7 @@ void optionsmenu(void)
 
     drawtext(TXT_MOVE_DOWN,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[2]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_DOWN]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -279,7 +279,7 @@ void optionsmenu(void)
 
     drawtext(TXT_MOVE_UP,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[3]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_UP]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -295,7 +295,7 @@ void optionsmenu(void)
 
     drawtext(TXT_STICK,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[4]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_STICK]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -311,7 +311,7 @@ void optionsmenu(void)
 
     drawtext(TXT_JUMP,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[5]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_JUMP]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -327,7 +327,7 @@ void optionsmenu(void)
 
     drawtext(TXT_SLIDE,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[6]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_SLIDE]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -343,7 +343,7 @@ void optionsmenu(void)
 
     drawtext(TXT_HEAVY,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[7]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_HEAVY]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -375,7 +375,7 @@ void optionsmenu(void)
     count=0;
     drawtext(TXT_MOVE_LEFT,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[0]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_LEFT]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -391,7 +391,7 @@ void optionsmenu(void)
 
     drawtext(TXT_MOVE_RIGHT,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[1]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_RIGHT]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -407,7 +407,7 @@ void optionsmenu(void)
 
     drawtext(TXT_MOVE_DOWN,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[2]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_DOWN]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -423,7 +423,7 @@ void optionsmenu(void)
 
     drawtext(TXT_MOVE_UP,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[3]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_UP]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -439,7 +439,7 @@ void optionsmenu(void)
 
     drawtext(TXT_STICK,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[4]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_STICK]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -455,7 +455,7 @@ void optionsmenu(void)
 
     drawtext(TXT_JUMP,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[5]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_JUMP]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -471,7 +471,7 @@ void optionsmenu(void)
 
     drawtext(TXT_SLIDE,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[6]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_SLIDE]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -487,7 +487,7 @@ void optionsmenu(void)
 
     drawtext(TXT_HEAVY,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[7]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_HEAVY]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -514,7 +514,7 @@ void optionsmenu(void)
 
     SDL_GL_SwapBuffers();
 
-    for (count=0;count<8;count++)
+    for (count=0;count<KEYALIAS_LENGTH;count++)
     if (menuitem[count+1].active)
       {
       for (count2=1;count2<323;count2++)
@@ -550,7 +550,7 @@ void optionsmenu(void)
         {
         control[1].key[count]=count2;
 
-        for (count3=0;count3<8;count3++)
+        for (count3=0;count3<KEYALIAS_LENGTH;count3++)
         if (count3!=count)
         if (control[0].key[count3]==count2)
           control[0].key[count3]=0;
@@ -1067,7 +1067,7 @@ void optionsmenu2(void)
     count=0;
     drawtext(TXT_MOVE_LEFT,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[0]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_LEFT]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -1083,7 +1083,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_MOVE_RIGHT,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[1]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_RIGHT]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -1099,7 +1099,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_MOVE_DOWN,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[2]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_DOWN]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -1115,7 +1115,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_MOVE_UP,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[3]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_UP]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -1131,7 +1131,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_STICK,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[4]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_STICK]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -1147,7 +1147,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_JUMP,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[5]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_JUMP]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -1163,7 +1163,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_SLIDE,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[6]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_SLIDE]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -1179,7 +1179,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_HEAVY,0,144+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+1].active)
-      drawtext(keyboardlabel[control[count2].key[7]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_HEAVY]],320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,144+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+17].active)
@@ -1212,7 +1212,7 @@ void optionsmenu2(void)
     count=0;
     drawtext(TXT_MOVE_LEFT,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[0]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_LEFT]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -1228,7 +1228,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_MOVE_RIGHT,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[1]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_RIGHT]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -1244,7 +1244,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_MOVE_DOWN,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[2]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_DOWN]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -1260,7 +1260,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_MOVE_UP,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[3]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_UP]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -1276,7 +1276,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_STICK,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[4]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_STICK]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -1292,7 +1292,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_JUMP,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[5]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_JUMP]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -1308,7 +1308,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_SLIDE,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[6]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_SLIDE]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -1324,7 +1324,7 @@ void optionsmenu2(void)
 
     drawtext(TXT_HEAVY,0,336+count*16,16,0.75f,0.75f,0.75f,1.0f);
     if (!menuitem[count+9].active)
-      drawtext(keyboardlabel[control[count2].key[7]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
+      drawtext(keyboardlabel[control[count2].key[KEYALIAS_HEAVY]],320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     else
       drawtext("?",320,336+count*16,16,1.0f,1.0f,1.0f,1.0f);
     if (!menuitem[count+26].active)
@@ -1349,7 +1349,7 @@ void optionsmenu2(void)
 
     SDL_GL_SwapBuffers();
 
-    for (count=0;count<8;count++)
+    for (count=0;count<KEYALIAS_LENGTH;count++)
     if (menuitem[count+1].active)
       {
       for (count2=1;count2<323;count2++)
@@ -1358,7 +1358,7 @@ void optionsmenu2(void)
         {
         control[2].key[count]=count2;
 
-        for (count3=0;count3<8;count3++)
+        for (count3=0;count3<KEYALIAS_LENGTH;count3++)
         if (count3!=count)
         if (control[2].key[count3]==count2)
           control[2].key[count3]=0;
diff --git a/game/options.h b/game/options.h
index 2c3fe0a..da905db 100644
--- a/game/options.h
+++ b/game/options.h
@@ -21,11 +21,28 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#include "../input/keyboard.h"
+
+#define CONTROLS_LENGTH 4
+
 void optionsmenu(void);
 void videooptionsmenu(void);
 void drawsliderbars(void);
 void optionsmenu2(void);
 
+typedef enum {
+	KEYALIAS_LEFT = 0,
+	KEYALIAS_RIGHT = 1,
+	KEYALIAS_DOWN = 2,
+	KEYALIAS_UP = 3,
+	KEYALIAS_STICK = 4,
+	KEYALIAS_JUMP = 5,
+	KEYALIAS_SLIDE = 6,
+	KEYALIAS_HEAVY = 7,
+	KEYALIAS_LAST = KEYALIAS_HEAVY,
+	KEYALIAS_LENGTH = KEYALIAS_LAST+1
+} keyalias;
+
 typedef struct
   {
   int sound;
@@ -34,15 +51,17 @@ typedef struct
   float musicvolume;
   } _option;
 
+
+// TODO: MAKE ALL REFERENCES USE KEYALIAS.
 typedef struct
   {
-  int key[16];
+  keyboardkey key[KEYALIAS_LENGTH];
   int joysticknum;
   int axis[4];
   int button[16];
   } _control;
 
 extern _option option;
-extern _control control[8];
+extern _control control[CONTROLS_LENGTH];
 
 #endif /* GISH_GAME_OPTIONS_H */
diff --git a/menu/menu.c b/menu/menu.c
index a552865..8d0310a 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -132,9 +132,9 @@ void checkmenuitems(void)
         count2=-1;
       }
 
-    if (keyboard[control[0].key[3]] && !prevkeyboard[control[0].key[3]])
+    if (keyboard[control[0].key[KEYALIAS_UP]] && !prevkeyboard[control[0].key[KEYALIAS_UP]])
       count2=-1;
-    if (keyboard[control[0].key[2]] && !prevkeyboard[control[0].key[2]])
+    if (keyboard[control[0].key[KEYALIAS_DOWN]] && !prevkeyboard[control[0].key[KEYALIAS_DOWN]])
       count2=1;
 
     joymenunum+=count2;