projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed code to type name to support different last screens
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 44b0a5cbb10da6c37d001c37d0818bad679d1abe..bae10aff54191ef28f82dba28b61dd6c8ea1892c 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-333,6
+333,8
@@
static int getFontBitmapID(int font_nr)
special = game_status;
else if (game_status == GAME_MODE_PSEUDO_TYPENAME)
special = GFX_SPECIAL_ARG_MAIN;
special = game_status;
else if (game_status == GAME_MODE_PSEUDO_TYPENAME)
special = GFX_SPECIAL_ARG_MAIN;
+ else if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
+ special = GFX_SPECIAL_ARG_NAMES;
if (special != -1)
return font_info[font_nr].special_bitmap_id[special];
if (special != -1)
return font_info[font_nr].special_bitmap_id[special];
@@
-1695,6
+1697,7
@@
static void InitGraphicInfo(void)
IMG_BACKGROUND_TITLE_INITIAL,
IMG_BACKGROUND_TITLE,
IMG_BACKGROUND_MAIN,
IMG_BACKGROUND_TITLE_INITIAL,
IMG_BACKGROUND_TITLE,
IMG_BACKGROUND_MAIN,
+ IMG_BACKGROUND_NAMES,
IMG_BACKGROUND_LEVELS,
IMG_BACKGROUND_LEVELNR,
IMG_BACKGROUND_SCORES,
IMG_BACKGROUND_LEVELS,
IMG_BACKGROUND_LEVELNR,
IMG_BACKGROUND_SCORES,
@@
-4909,6
+4912,8
@@
static void InitGlobal(void)
global.anim_status = global.anim_status_next = GAME_MODE_LOADING;
global.use_envelope_request = FALSE;
global.anim_status = global.anim_status_next = GAME_MODE_LOADING;
global.use_envelope_request = FALSE;
+
+ global.user_names = NULL;
}
static void Execute_Command(char *command)
}
static void Execute_Command(char *command)
@@
-5181,6
+5186,9
@@
static void Execute_Command(char *command)
static void InitSetup(void)
{
static void InitSetup(void)
{
+ LoadUserNames(); // global user names
+ LoadUserSetup(); // global user number
+
LoadSetup(); // global setup info
LoadSetup_AutoSetup(); // global auto setup info
LoadSetup(); // global setup info
LoadSetup_AutoSetup(); // global auto setup info