dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3562) Remove pointless buffer copies

Browse Source
This commit is contained in:
tron
2006-02-06 08:28:31 +00:00
parent 34a9da4a32
commit 286876b9d7
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
players.c
View File

@@ -988,16 +988,13 @@ int8 SaveHighScoreValue(const Player *p)
for (i = 0; i < lengthof(_highscore_table[0]); i++) { for (i = 0; i < lengthof(_highscore_table[0]); i++) {
/* You are in the TOP5. Move all values one down and save us there */ /* You are in the TOP5. Move all values one down and save us there */
if (hs[i].score <= score) { if (hs[i].score <= score) {
char buf[sizeof(hs[i].company)];
// move all elements one down starting from the replaced one // move all elements one down starting from the replaced one
memmove(&hs[i + 1], &hs[i], sizeof(HighScore) * (lengthof(_highscore_table[0]) - i - 1)); memmove(&hs[i + 1], &hs[i], sizeof(HighScore) * (lengthof(_highscore_table[0]) - i - 1));
SetDParam(0, p->president_name_1); SetDParam(0, p->president_name_1);
SetDParam(1, p->president_name_2); SetDParam(1, p->president_name_2);
SetDParam(2, p->name_1); SetDParam(2, p->name_1);
SetDParam(3, p->name_2); SetDParam(3, p->name_2);
GetString(buf, STR_HIGHSCORE_NAME); // get manager/company name string GetString(hs[i].company, STR_HIGHSCORE_NAME); // get manager/company name string
ttd_strlcpy(hs[i].company, buf, sizeof(buf));
hs[i].score = score; hs[i].score = score;
hs[i].title = EndGameGetPerformanceTitleFromValue(score); hs[i].title = EndGameGetPerformanceTitleFromValue(score);
return i; return i;
@@ -1040,16 +1037,12 @@ int8 SaveHighScoreValueNetwork(void)
/* Copy over Top5 companies */ /* Copy over Top5 companies */
for (i = 0; i < lengthof(_highscore_table[LAST_HS_ITEM]) && i < count; i++) { for (i = 0; i < lengthof(_highscore_table[LAST_HS_ITEM]) && i < count; i++) {
char buf[sizeof(_highscore_table[0]->company)];
hs = &_highscore_table[LAST_HS_ITEM][i]; hs = &_highscore_table[LAST_HS_ITEM][i];
SetDParam(0, (*p_cur)->president_name_1); SetDParam(0, (*p_cur)->president_name_1);
SetDParam(1, (*p_cur)->president_name_2); SetDParam(1, (*p_cur)->president_name_2);
SetDParam(2, (*p_cur)->name_1); SetDParam(2, (*p_cur)->name_1);
SetDParam(3, (*p_cur)->name_2); SetDParam(3, (*p_cur)->name_2);
GetString(buf, STR_HIGHSCORE_NAME); // get manager/company name string GetString(hs->company, STR_HIGHSCORE_NAME); // get manager/company name string
ttd_strlcpy(hs->company, buf, sizeof(buf));
hs->score = (*p_cur)->old_economy[0].performance_history; hs->score = (*p_cur)->old_economy[0].performance_history;
hs->title = EndGameGetPerformanceTitleFromValue(hs->score); hs->title = EndGameGetPerformanceTitleFromValue(hs->score);