projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed local variables only used for storing copy of global variable
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 31ecdbdd6a551a580708cb332599b24c5df41865..f783c164f8f0187e3bf438c03a8562332121410d 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-1106,7
+1106,7
@@
void ContinueMoving(int, int);
void Bang(int, int);
void InitMovDir(int, int);
void InitAmoebaNr(int, int);
void Bang(int, int);
void InitMovDir(int, int);
void InitAmoebaNr(int, int);
-
int
NewHighScore(int);
+
void
NewHighScore(int);
void TestIfGoodThingHitsBadThing(int, int, int);
void TestIfBadThingHitsGoodThing(int, int, int);
void TestIfGoodThingHitsBadThing(int, int, int);
void TestIfBadThingHitsGoodThing(int, int, int);
@@
-4960,7
+4960,6
@@
void GameEnd(void)
{
// used instead of "level_nr" (needed for network games)
int last_level_nr = levelset.level_nr;
{
// used instead of "level_nr" (needed for network games)
int last_level_nr = levelset.level_nr;
- int highlight_position;
game.LevelSolved_GameEnd = TRUE;
game.LevelSolved_GameEnd = TRUE;
@@
-5005,7
+5004,7
@@
void GameEnd(void)
}
// save score and score tape before potentially erasing tape below
}
// save score and score tape before potentially erasing tape below
-
highlight_position =
NewHighScore(last_level_nr);
+ NewHighScore(last_level_nr);
if (setup.increment_levels &&
level_nr < leveldir_current->last_level &&
if (setup.increment_levels &&
level_nr < leveldir_current->last_level &&
@@
-5022,11
+5021,11
@@
void GameEnd(void)
}
}
}
}
- if (
highlight_position
>= 0 && setup.show_scores_after_game)
+ if (
scores.last_added
>= 0 && setup.show_scores_after_game)
{
SetGameStatus(GAME_MODE_SCORES);
{
SetGameStatus(GAME_MODE_SCORES);
- DrawHallOfFame(last_level_nr
, highlight_position
);
+ DrawHallOfFame(last_level_nr);
}
else if (setup.auto_play_next_level && setup.increment_levels &&
last_level_nr < leveldir_current->last_level &&
}
else if (setup.auto_play_next_level && setup.increment_levels &&
last_level_nr < leveldir_current->last_level &&
@@
-5066,6
+5065,10
@@
static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry)
boolean entry_is_empty = (entry->score == 0 &&
entry->time == 0);
boolean entry_is_empty = (entry->score == 0 &&
entry->time == 0);
+ // prevent adding server score entries if also existing in local score file
+ if (strEqual(new_entry->tape_basename, entry->tape_basename))
+ return -1;
+
if (is_better || entry_is_empty)
{
// player has made it to the hall of fame
if (is_better || entry_is_empty)
{
// player has made it to the hall of fame
@@
-5107,7
+5110,7
@@
static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry)
return -1;
}
return -1;
}
-
int
NewHighScore(int level_nr)
+
void
NewHighScore(int level_nr)
{
struct ScoreEntry new_entry = {{ 0 }}; // (prevent warning from GCC bug 53119)
{
struct ScoreEntry new_entry = {{ 0 }}; // (prevent warning from GCC bug 53119)
@@
-5131,8
+5134,22
@@
int NewHighScore(int level_nr)
SaveServerScore(level_nr);
}
}
SaveServerScore(level_nr);
}
}
+}
+
+void MergeServerScore(void)
+{
+ int i;
+
+ for (i = 0; i < server_scores.num_entries; i++)
+ {
+ int pos = addScoreEntry(&scores, &server_scores.entry[i]);
+
+ if (pos >= 0 && pos <= scores.last_added)
+ scores.last_added++;
+ }
- return scores.last_added;
+ if (scores.last_added >= MAX_SCORE_ENTRIES)
+ scores.last_added = -1;
}
static int getElementMoveStepsizeExt(int x, int y, int direction)
}
static int getElementMoveStepsizeExt(int x, int y, int direction)