projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed assumed position of screen keyboard for Android platform
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index afa406a28c3eb8d3ca98d0e7527c538556ec4940..727dcf30be2cfe03197b82bd9d436bf4dfdb808c 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-1964,8
+1964,9
@@
static void InitGraphicCompatibilityInfo(void)
ClearRectangle(bitmap, 514, 66, 32, 480);
}
ClearRectangle(bitmap, 514, 66, 32, 480);
}
- // special compatibility handling for "Jue" (2007) graphics set
- if (strPrefix(leveldir_current->graphics_set, "jue0"))
+ // special compatibility handling for "Jue" graphics sets (2007 and 2019)
+ boolean supports_score_info = (menu.draw_xoffset[GAME_MODE_SCOREINFO] != 0);
+ if (strPrefix(artwork.gfx_current_identifier, "jue") && !supports_score_info)
{
int font_title[] =
{
{
int font_title[] =
{
@@
-2001,9
+2002,10
@@
static void InitGraphicCompatibilityInfo(void)
{
for (j = 0; j < 2; j++)
{
{
for (j = 0; j < 2; j++)
{
+ boolean jue0 = strEqual(artwork.gfx_current_identifier, "jue0");
int font_nr = (j == 0 ? font_text[i] : FONT_ACTIVE(font_text[i]));
int font_bitmap_id = font_info[font_nr].special_bitmap_id[mode_old];
int font_nr = (j == 0 ? font_text[i] : FONT_ACTIVE(font_text[i]));
int font_bitmap_id = font_info[font_nr].special_bitmap_id[mode_old];
- int font_yoffset =
10
;
+ int font_yoffset =
(jue0 ? 10 : 5)
;
gfx.font_bitmap_info[font_bitmap_id].draw_yoffset = font_yoffset;
}
gfx.font_bitmap_info[font_bitmap_id].draw_yoffset = font_yoffset;
}
@@
-6181,7
+6183,7
@@
static void InitOverrideArtwork(void)
#endif
}
#endif
}
-static char *
g
etNewArtworkIdentifier(int type)
+static char *
s
etNewArtworkIdentifier(int type)
{
static char *last_leveldir_identifier[3] = { NULL, NULL, NULL };
static char *last_artwork_identifier[3] = { NULL, NULL, NULL };
{
static char *last_leveldir_identifier[3] = { NULL, NULL, NULL };
static char *last_artwork_identifier[3] = { NULL, NULL, NULL };
@@
-6246,6
+6248,7
@@
static char *getNewArtworkIdentifier(int type)
// (we cannot compare string pointers here, so copy string content itself)
setString(&last_artwork_identifier[type], artwork_current_identifier);
// (we cannot compare string pointers here, so copy string content itself)
setString(&last_artwork_identifier[type], artwork_current_identifier);
+ // ---------- set new artwork identifier ----------
*(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type)) = artwork_current_identifier;
// ---------- do not reload directly after starting -------------------------
*(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type)) = artwork_current_identifier;
// ---------- do not reload directly after starting -------------------------
@@
-6257,6
+6260,13
@@
static char *getNewArtworkIdentifier(int type)
return artwork_new_identifier;
}
return artwork_new_identifier;
}
+static void InitArtworkIdentifier(void)
+{
+ setNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
+ setNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
+ setNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
+}
+
void ReloadCustomArtwork(int force_reload)
{
int last_game_status = game_status; // save current game status
void ReloadCustomArtwork(int force_reload)
{
int last_game_status = game_status; // save current game status
@@
-6273,9
+6283,9
@@
void ReloadCustomArtwork(int force_reload)
AdjustGraphicsForEMC();
AdjustSoundsForEMC();
AdjustGraphicsForEMC();
AdjustSoundsForEMC();
- gfx_new_identifier =
g
etNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
- snd_new_identifier =
g
etNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
- mus_new_identifier =
g
etNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
+ gfx_new_identifier =
s
etNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
+ snd_new_identifier =
s
etNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
+ mus_new_identifier =
s
etNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
reload_needed = (gfx_new_identifier != NULL || force_reload_gfx ||
snd_new_identifier != NULL || force_reload_snd ||
reload_needed = (gfx_new_identifier != NULL || force_reload_gfx ||
snd_new_identifier != NULL || force_reload_snd ||
@@
-6299,6
+6309,8
@@
void ReloadCustomArtwork(int force_reload)
UPDATE_BUSY_STATE();
UPDATE_BUSY_STATE();
+ InitMissingFileHash();
+
if (gfx_new_identifier != NULL || force_reload_gfx)
{
#if 0
if (gfx_new_identifier != NULL || force_reload_gfx)
{
#if 0
@@
-6435,6
+6447,8
@@
void OpenAll(void)
InitSimpleRandom(NEW_RANDOMIZE);
InitBetterRandom(NEW_RANDOMIZE);
InitSimpleRandom(NEW_RANDOMIZE);
InitBetterRandom(NEW_RANDOMIZE);
+ InitMissingFileHash();
+
print_timestamp_time("[init global stuff]");
InitSetup();
print_timestamp_time("[init global stuff]");
InitSetup();
@@
-6502,6
+6516,9
@@
void OpenAll(void)
InitOverrideArtwork(); // needs to know current level directory
print_timestamp_time("InitOverrideArtwork");
InitOverrideArtwork(); // needs to know current level directory
print_timestamp_time("InitOverrideArtwork");
+ InitArtworkIdentifier(); // needs to know current level directory
+ print_timestamp_time("InitArtworkIdentifier");
+
InitImages(); // needs to know current level directory
print_timestamp_time("InitImages");
InitImages(); // needs to know current level directory
print_timestamp_time("InitImages");