summaryrefslogtreecommitdiff
path: root/ttd.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-03-30 19:52:26 +0000
committertron <tron@openttd.org>2005-03-30 19:52:26 +0000
commit66989faab68ac7fa082aa9e6feb461e835a96d19 (patch)
treecae4aa874d2b93a6b7a6cf13a0a7950828bd93a3 /ttd.c
parent16a64d70006b1dc2110af76fa6967eb0bfff0bd7 (diff)
downloadopenttd-66989faab68ac7fa082aa9e6feb461e835a96d19.tar.xz
(svn r2112) -Fix: ExtMidi no longer halts the game while starting a song
-Fix: Redirect stdin/stdout/stderr of the ExtMidi process to /dev/null, to prevent it from writing to the terminal While here give the ExtMidi functions canonical names
Diffstat (limited to 'ttd.c')
-rw-r--r--ttd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ttd.c b/ttd.c
index 89853699a..430b20e6f 100644
--- a/ttd.c
+++ b/ttd.c
@@ -641,7 +641,6 @@ int ttd_main(int argc, char* argv[])
LoadDriver(SOUND_DRIVER, _ini_sounddriver);
LoadDriver(MUSIC_DRIVER, _ini_musicdriver);
LoadDriver(VIDEO_DRIVER, _ini_videodriver); // load video last, to prevent an empty window while sound and music loads
- MusicLoop();
_savegame_sort_order = 1; // default sorting of savegames is by date, newest first
#ifdef ENABLE_NETWORK
@@ -1165,8 +1164,7 @@ void GameLoop(void)
InputLoop();
- if (_game_mode != GM_MENU)
- MusicLoop();
+ MusicLoop();
}
void BeforeSaveGame(void)