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
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 3278b0c6313441f19ef4535e6e2bd0ddce34fe9c..b0e376d295c568cf0493e1d1570fdc91e2e40c43 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-8340,6
+8340,13
@@
void LoadScoreTape(char *score_tape_basename, int nr)
LoadTapeFromFilename(filename);
}
LoadTapeFromFilename(filename);
}
+void LoadScoreCacheTape(char *score_tape_basename, int nr)
+{
+ char *filename = getScoreCacheTapeFilename(score_tape_basename, nr);
+
+ LoadTapeFromFilename(filename);
+}
+
static boolean checkSaveTape_SCRN(struct TapeInfo *tape)
{
// chunk required for team mode tapes with non-default screen size
static boolean checkSaveTape_SCRN(struct TapeInfo *tape)
{
// chunk required for team mode tapes with non-default screen size
@@
-8682,6
+8689,11
@@
static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores)
scores->uploaded = FALSE;
scores->tape_downloaded = FALSE;
scores->force_last_added = FALSE;
scores->uploaded = FALSE;
scores->tape_downloaded = FALSE;
scores->force_last_added = FALSE;
+
+ // The following values are intentionally not reset here:
+ // - last_level_nr
+ // - last_entry_nr
+ // - was_just_playing
}
static void setScoreInfoToDefaults(void)
}
static void setScoreInfoToDefaults(void)
@@
-10826,6
+10838,12
@@
void LoadSetup_Default(void)
// try to load setup values from default setup file
filename = getDefaultSetupFilename();
// try to load setup values from default setup file
filename = getDefaultSetupFilename();
+ if (fileExists(filename))
+ LoadSetupFromFilename(filename);
+
+ // try to load setup values from platform setup file
+ filename = getPlatformSetupFilename();
+
if (fileExists(filename))
LoadSetupFromFilename(filename);
if (fileExists(filename))
LoadSetupFromFilename(filename);