summaryrefslogtreecommitdiff
path: root/ttd.c
diff options
context:
space:
mode:
authordarkvater <darkvater@openttd.org>2005-01-11 00:54:06 +0000
committerdarkvater <darkvater@openttd.org>2005-01-11 00:54:06 +0000
commit5fac6142e849c08279a893f24fe50e5840e94813 (patch)
treee10943405d0221995867614d413adaef452ac9b6 /ttd.c
parent085563653fb49794ca2c0ef09f544b08a80012f9 (diff)
downloadopenttd-5fac6142e849c08279a893f24fe50e5840e94813.tar.xz
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
-Added endgame score on 1 jan 2051 where you are added to the highscore if sufficiently large points have been accumulated. Game is paused while -These values are saved in hs.dat; added read/write functions for it -Added code to delete all windows to show charts. There is one issue left: somehow a news-gui pops up in front of the the chart at the end of the game.
Diffstat (limited to 'ttd.c')
-rw-r--r--ttd.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/ttd.c b/ttd.c
index d7b9a2614..24eb645fa 100644
--- a/ttd.c
+++ b/ttd.c
@@ -648,6 +648,7 @@ int ttd_main(int argc, char* argv[])
#endif
LoadFromConfig();
+ LoadFromHighScore();
// override config?
if (musicdriver[0]) ttd_strlcpy(_ini_musicdriver, musicdriver, sizeof(_ini_musicdriver));
@@ -748,6 +749,7 @@ int ttd_main(int argc, char* argv[])
_sound_driver->stop();
SaveToConfig();
+ SaveToHighScore();
// uninitialize airport state machines
UnInitializeAirports();
@@ -1176,9 +1178,11 @@ void BeforeSaveGame()
{
Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
- _saved_scrollpos_x = WP(w,vp_d).scrollpos_x;
- _saved_scrollpos_y = WP(w,vp_d).scrollpos_y;
- _saved_scrollpos_zoom = w->viewport->zoom;
+ if (w != NULL) {
+ _saved_scrollpos_x = WP(w,vp_d).scrollpos_x;
+ _saved_scrollpos_y = WP(w,vp_d).scrollpos_y;
+ _saved_scrollpos_zoom = w->viewport->zoom;
+ }
}
void ConvertTownOwner()