projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981025-1
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index ed3ca8f9d0d03d2e970436305245fd230f88ab46..ab56a797895f45dd7832e58624089ee8e1fe4b06 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1211,7
+1211,7
@@
static void drawPlayerSetupInputInfo(int player_nr)
DrawText(SX + 3*32, SY + ypos*32,
(setup.input[player_nr].use_joystick ?
custom[i].text :
DrawText(SX + 3*32, SY + ypos*32,
(setup.input[player_nr].use_joystick ?
custom[i].text :
- getKey
SymName
(*custom[i].keysym)),
+ getKey
NameFromKeySym
(*custom[i].keysym)),
FS_BIG, FC_YELLOW);
}
}
FS_BIG, FC_YELLOW);
}
}
@@
-1383,7
+1383,8
@@
void CustomizeKeyboard(int player_nr)
DrawText(SX, SY + (2+2*step_nr+1)*32,
"Key:", FS_BIG, FC_RED);
DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
DrawText(SX, SY + (2+2*step_nr+1)*32,
"Key:", FS_BIG, FC_RED);
DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
- getKeySymName(*customize_step[step_nr].keysym), FS_BIG, FC_BLUE);
+ getKeyNameFromKeySym(*customize_step[step_nr].keysym),
+ FS_BIG, FC_BLUE);
while(!finished)
{
while(!finished)
{
@@
-1422,7
+1423,7
@@
void CustomizeKeyboard(int player_nr)
DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
" ", FS_BIG, FC_YELLOW);
DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
" ", FS_BIG, FC_YELLOW);
DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
- getKey
SymName
(key), FS_BIG, FC_YELLOW);
+ getKey
NameFromKeySym
(key), FS_BIG, FC_YELLOW);
step_nr++;
/* un-highlight last query */
step_nr++;
/* un-highlight last query */
@@
-1445,7
+1446,7
@@
void CustomizeKeyboard(int player_nr)
DrawText(SX, SY+(2+2*step_nr+1)*32,
"Key:", FS_BIG, FC_RED);
DrawText(SX + 4*32, SY+(2+2*step_nr+1)*32,
DrawText(SX, SY+(2+2*step_nr+1)*32,
"Key:", FS_BIG, FC_RED);
DrawText(SX + 4*32, SY+(2+2*step_nr+1)*32,
- getKey
SymName
(*customize_step[step_nr].keysym),
+ getKey
NameFromKeySym
(*customize_step[step_nr].keysym),
FS_BIG, FC_BLUE);
}
break;
FS_BIG, FC_BLUE);
}
break;