projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030411-1-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 4be05731dec021f68243748093166fa4a747d125..e9bd5ddafb579833420f042c1310960e14c79377 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-257,7
+257,7
@@
void DrawMainMenu()
DrawText(mSX + 32, mSY + 8*32, "Setup", FONT_MENU_1);
DrawText(mSX + 32, mSY + 9*32, "Quit", FONT_MENU_1);
DrawText(mSX + 32, mSY + 8*32, "Setup", FONT_MENU_1);
DrawText(mSX + 32, mSY + 9*32, "Quit", FONT_MENU_1);
- DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT);
+ DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT
_1
);
DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3),
FONT_VALUE_1);
DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3),
FONT_VALUE_1);
@@
-638,11
+638,7
@@
static int helpscreen_action[] =
IMG_WALL_CRUMBLED, -1, HA_NEXT,
IMG_WALL_CRUMBLED, -1, HA_NEXT,
- IMG_INFO_FONT_EM_1, 160,
- IMG_INFO_FONT_EM_2, 160,
- IMG_INFO_FONT_EM_3, 160,
- IMG_INFO_FONT_EM_4, 160,
- IMG_INFO_FONT_EM_5, 40, HA_NEXT,
+ IMG_FONT_GAME_INFO, -1, HA_NEXT,
IMG_EMERALD, -1, HA_NEXT,
IMG_EMERALD, -1, HA_NEXT,
@@
-713,9
+709,11
@@
static int helpscreen_action[] =
IMG_EXPLOSION, 16,
IMG_EMPTY_SPACE, 20, HA_NEXT,
IMG_EXPLOSION, 16,
IMG_EMPTY_SPACE, 20, HA_NEXT,
-
EL_DYNABOMB_INCREASE_NUMBER,
-1, HA_NEXT,
+
IMG_DYNABOMB_INCREASE_NUMBER,
-1, HA_NEXT,
- EL_DYNABOMB_INCREASE_SIZE, -1, HA_NEXT,
+ IMG_DYNABOMB_INCREASE_SIZE, -1, HA_NEXT,
+
+ IMG_DYNABOMB_INCREASE_POWER, -1, HA_NEXT,
IMG_SPACESHIP_RIGHT, 16,
IMG_SPACESHIP_UP, 16,
IMG_SPACESHIP_RIGHT, 16,
IMG_SPACESHIP_UP, 16,
@@
-845,6
+843,7
@@
static char *helpscreen_eltext[][2] =
{"Dyna Bomb: Explodes in 4 directions","with variable explosion size"},
{"Dyna Bomb: Increases the number of", "dyna bombs available at a time"},
{"Dyna Bomb: Increases the size of", "explosion of dyna bombs"},
{"Dyna Bomb: Explodes in 4 directions","with variable explosion size"},
{"Dyna Bomb: Increases the number of", "dyna bombs available at a time"},
{"Dyna Bomb: Increases the size of", "explosion of dyna bombs"},
+ {"Dyna Bomb: Increases the power of", "explosion of dyna bombs"},
{"Spaceship: Moves at the left side", "of walls; don't touch it!"},
{"Bug: Moves at the right side", "of walls; don't touch it!"},
{"Butterfly: Moves at the right side", "of walls; don't touch it!"},
{"Spaceship: Moves at the left side", "of walls; don't touch it!"},
{"Bug: Moves at the right side", "of walls; don't touch it!"},
{"Butterfly: Moves at the right side", "of walls; don't touch it!"},
@@
-1242,7
+1241,7
@@
void HandleHelpScreen(int button)
void HandleTypeName(int newxpos, Key key)
{
static int xpos = 0, ypos = 2;
void HandleTypeName(int newxpos, Key key)
{
static int xpos = 0, ypos = 2;
- int font_width = getFontWidth(FONT_INPUT_ACTIVE);
+ int font_width = getFontWidth(FONT_INPUT_
1_
ACTIVE);
int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
int startx = mSX + 32 + name_width;
int starty = mSY + ypos * 32;
int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
int startx = mSX + 32 + name_width;
int starty = mSY + ypos * 32;
@@
-1251,8
+1250,8
@@
void HandleTypeName(int newxpos, Key key)
{
xpos = newxpos;
{
xpos = newxpos;
- DrawText(startx, starty, setup.player_name, FONT_INPUT_ACTIVE);
- DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_ACTIVE);
+ DrawText(startx, starty, setup.player_name, FONT_INPUT_
1_
ACTIVE);
+ DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_
1_
ACTIVE);
return;
}
return;
}
@@
-1272,20
+1271,20
@@
void HandleTypeName(int newxpos, Key key)
setup.player_name[xpos + 1] = 0;
xpos++;
setup.player_name[xpos + 1] = 0;
xpos++;
- DrawText(startx, starty, setup.player_name, FONT_INPUT_ACTIVE);
- DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_ACTIVE);
+ DrawText(startx, starty, setup.player_name, FONT_INPUT_
1_
ACTIVE);
+ DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_
1_
ACTIVE);
}
else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
{
xpos--;
setup.player_name[xpos] = 0;
}
else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
{
xpos--;
setup.player_name[xpos] = 0;
- DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_ACTIVE);
+ DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_
1_
ACTIVE);
}
else if (key == KSYM_Return && xpos > 0)
{
}
else if (key == KSYM_Return && xpos > 0)
{
- DrawText(startx, starty, setup.player_name, FONT_INPUT);
- DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_ACTIVE);
+ DrawText(startx, starty, setup.player_name, FONT_INPUT
_1
);
+ DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_
1_
ACTIVE);
SaveSetup();
game_status = MAINMENU;
SaveSetup();
game_status = MAINMENU;
@@
-2010,7
+2009,7
@@
static void drawSetupValue(int pos)
if (setup_info[pos].type & TYPE_QUERY)
{
value_string = "<press key>";
if (setup_info[pos].type & TYPE_QUERY)
{
value_string = "<press key>";
- font_nr = FONT_INPUT_ACTIVE;
+ font_nr = FONT_INPUT_
1_
ACTIVE;
}
}
else if (setup_info[pos].type & TYPE_STRING)
}
}
else if (setup_info[pos].type & TYPE_STRING)
@@
-2312,7
+2311,7
@@
static void drawPlayerSetupInputInfo(int player_nr)
custom_key = setup.input[player_nr].key;
custom_key = setup.input[player_nr].key;
- DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +
1, 1), FONT_INPUT
_ACTIVE);
+ DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +
1, 1), FONT_INPUT_1
_ACTIVE);
#if 1
DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
#if 1
DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
@@
-2512,9
+2511,9
@@
void CustomizeKeyboard(int player_nr)
step_nr = 0;
DrawText(mSX, mSY + (2+2*step_nr)*32,
step_nr = 0;
DrawText(mSX, mSY + (2+2*step_nr)*32,
- customize_step[step_nr].text, FONT_INPUT_ACTIVE);
+ customize_step[step_nr].text, FONT_INPUT_
1_
ACTIVE);
DrawText(mSX, mSY + (2+2*step_nr+1)*32,
DrawText(mSX, mSY + (2+2*step_nr+1)*32,
- "Key:", FONT_INPUT_ACTIVE);
+ "Key:", FONT_INPUT_
1_
ACTIVE);
DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
@@
-2577,9
+2576,9
@@
void CustomizeKeyboard(int player_nr)
/* query next key binding */
DrawText(mSX, mSY+(2+2*step_nr)*32,
/* query next key binding */
DrawText(mSX, mSY+(2+2*step_nr)*32,
- customize_step[step_nr].text, FONT_INPUT_ACTIVE);
+ customize_step[step_nr].text, FONT_INPUT_
1_
ACTIVE);
DrawText(mSX, mSY+(2+2*step_nr+1)*32,
DrawText(mSX, mSY+(2+2*step_nr+1)*32,
- "Key:", FONT_INPUT_ACTIVE);
+ "Key:", FONT_INPUT_
1_
ACTIVE);
DrawText(mSX + 4*32, mSY+(2+2*step_nr+1)*32,
getKeyNameFromKey(*customize_step[step_nr].key),
FONT_VALUE_OLD);
DrawText(mSX + 4*32, mSY+(2+2*step_nr+1)*32,
getKeyNameFromKey(*customize_step[step_nr].key),
FONT_VALUE_OLD);