projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor whitespace change
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 6866a4b64ebed84ea96ecebf5e5526fabbd4bd79..4a980dffc748708fd4485a8f9b72d4e89252ab4e 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
@@
-8686,7
+8693,9
@@
static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores)
// The following values are intentionally not reset here:
// - last_level_nr
// - last_entry_nr
// The following values are intentionally not reset here:
// - last_level_nr
// - last_entry_nr
- // - was_just_playing
+ // - next_level_nr
+ // - continue_playing
+ // - continue_on_return
}
static void setScoreInfoToDefaults(void)
}
static void setScoreInfoToDefaults(void)
@@
-9319,6
+9328,7
@@
void SaveServerScoreFromFile(int nr, boolean tape_saved,
void LoadLocalAndServerScore(int nr, boolean download_score)
{
int last_added_local = scores.last_added_local;
void LoadLocalAndServerScore(int nr, boolean download_score)
{
int last_added_local = scores.last_added_local;
+ boolean force_last_added = scores.force_last_added;
// needed if only showing server scores
setScoreInfoToDefaults();
// needed if only showing server scores
setScoreInfoToDefaults();
@@
-9338,6
+9348,9
@@
void LoadLocalAndServerScore(int nr, boolean download_score)
// merge local scores with scores from server
MergeServerScore();
}
// merge local scores with scores from server
MergeServerScore();
}
+
+ if (force_last_added)
+ scores.force_last_added = force_last_added;
}
}
@@
-10831,6
+10844,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);