projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added showing score even if not added to local score file
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 044dcbcc5f1110765abde36978323aa5d5de2166..d72bcfae125aa2042153356ca7c695e8714538d2 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-9326,6
+9326,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();
@@
-9345,6
+9346,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;
}
}
@@
-10838,6
+10842,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);