projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20130916-1-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 129d0263a5245b989de182c0644ee68a35cac52a..77b906030d440733ce5c9451365af96acec53d54 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1448,7
+1448,7
@@
static void gotoTopLevelDir()
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
{
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
{
- static unsigned
long
title_delay = 0;
+ static unsigned
int
title_delay = 0;
static int title_screen_nr = 0;
static int last_sound = -1, last_music = -1;
boolean return_to_main_menu = FALSE;
static int title_screen_nr = 0;
static int last_sound = -1, last_music = -1;
boolean return_to_main_menu = FALSE;
@@
-2335,7
+2335,7
@@
void DrawInfoScreen_Elements()
void HandleInfoScreen_Elements(int button)
{
void HandleInfoScreen_Elements(int button)
{
- static unsigned
long
info_delay = 0;
+ static unsigned
int
info_delay = 0;
static int num_anims;
static int num_pages;
static int page;
static int num_anims;
static int num_pages;
static int page;
@@
-4635,7
+4635,10
@@
static void drawSetupValue(int pos)
int ypos = MENU_SCREEN_START_YPOS + pos;
int startx = mSX + xpos * 32;
int starty = mSY + ypos * 32;
int ypos = MENU_SCREEN_START_YPOS + pos;
int startx = mSX + xpos * 32;
int starty = mSY + ypos * 32;
- int font_nr, font_width, font_height;
+ int font_nr, font_width;
+#if 0
+ int font_height;
+#endif
int type = setup_info[pos].type;
void *value = setup_info[pos].value;
char *value_string = getSetupValue(type, value);
int type = setup_info[pos].type;
void *value = setup_info[pos].value;
char *value_string = getSetupValue(type, value);
@@
-4671,7
+4674,9
@@
static void drawSetupValue(int pos)
starty = mSY + ypos * 32;
font_nr = getSetupValueFont(type, value);
font_width = getFontWidth(font_nr);
starty = mSY + ypos * 32;
font_nr = getSetupValueFont(type, value);
font_width = getFontWidth(font_nr);
+#if 0
font_height = getFontHeight(font_nr);
font_height = getFontHeight(font_nr);
+#endif
/* downward compatibility correction for Juergen Bonhagen's menu settings */
if (setup_mode != SETUP_MODE_INPUT)
/* downward compatibility correction for Juergen Bonhagen's menu settings */
if (setup_mode != SETUP_MODE_INPUT)
@@
-5913,7
+5918,7
@@
static struct
static void CreateScreenMenubuttons()
{
struct GadgetInfo *gi;
static void CreateScreenMenubuttons()
{
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
int i;
for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
int i;
for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
@@
-5966,7
+5971,7
@@
static void CreateScreenMenubuttons()
static void CreateScreenScrollbuttons()
{
struct GadgetInfo *gi;
static void CreateScreenScrollbuttons()
{
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
int i;
/* these values are not constant, but can change at runtime */
int i;
/* these values are not constant, but can change at runtime */
@@
-6046,7
+6051,7
@@
static void CreateScreenScrollbars()
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
int items_max, items_visible, item_position;
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
int items_max, items_visible, item_position;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
int num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
int id = scrollbar_info[i].gadget_id;
int num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
int id = scrollbar_info[i].gadget_id;