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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/company_gui.cpp
#	src/core/math_func.hpp
#	src/highscore.cpp
#	src/tests/math_func.cpp
This commit is contained in:
Jonathan G Rennison
2023-09-12 18:25:49 +01:00
parent 627eb1effc f814c86389
commit 1b61dfabe3
15 changed files with 164 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/highscore.h
View File

@@ -15,17 +15,14 @@
#include "settings_type.h"
struct HighScore {
/**
* The name of the company and president.
* The + 5 is for the comma and space or possibly other characters
* that join the two names in this single string and the '\0'.
*/
char company[(MAX_LENGTH_COMPANY_NAME_CHARS + MAX_LENGTH_PRESIDENT_NAME_CHARS + 5) * MAX_CHAR_LENGTH];
StringID title; ///< NOSAVE, has troubles with changing string-numbers.
uint16 score; ///< The score for this high score. Do NOT change type, will break hs.dat
std::string name; ///< The name of the companyy and president.
StringID title = INVALID_STRING_ID; ///< NOSAVE, has troubles with changing string-numbers.
uint16 score = 0; ///< The score for this high score. Do NOT change type, will break hs.dat
};
extern HighScore _highscore_table[SP_HIGHSCORE_END][5];
using HighScores = std::array<HighScore, 5>; ///< Record 5 high scores
using HighScoresTable = std::array<HighScores, SP_HIGHSCORE_END>; ///< Record high score for each of the difficulty levels
extern HighScoresTable _highscore_table;
void SaveToHighScore();
void LoadFromHighScore();