Skip to content

Commit

Permalink
Made (use of) keyalias enumeration and new constant CONTROLS_LENGTH.
Browse files Browse the repository at this point in the history
  • Loading branch information
@FrozenCow
FrozenCow committed Jun 7, 2010
1 parent 7e53a88 commit b57e2ed
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 103 deletions.
28 changes: 14 additions & 14 deletions game/config.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
26 changes: 13 additions & 13 deletions game/game.c
View file
Expand Up @@ -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)
Expand All @@ -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)
{
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
68 changes: 34 additions & 34 deletions game/logic.c
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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)
Expand All @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion game/mainmenu.c
View file
Expand Up @@ -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]])
{
Expand Down

0 comments on commit b57e2ed

Please sign in to comment.