diff options
| author | darkvater <darkvater@openttd.org> | 2004-09-12 22:03:14 +0000 |
|---|---|---|
| committer | darkvater <darkvater@openttd.org> | 2004-09-12 22:03:14 +0000 |
| commit | 989ed101bc9ff659736354f42ac22dfd23809e92 (patch) | |
| tree | 059fa9da5c30ef18e3f8d338d639a6d1f3d67e0d /ttd.c | |
| parent | e295e46e3eccd58626ce2b02aab24b96c025636b (diff) | |
| download | openttd-989ed101bc9ff659736354f42ac22dfd23809e92.tar.xz | |
(svn r224) -Fix: Music now finally works on WinXP. DirectMusic is now default for an OS >= WinNT4 (WinNT4, Win2k, WinXP), and MIDI driver for lower OS's (Win95, Win98, WinME, etc).
Diffstat (limited to 'ttd.c')
| -rw-r--r-- | ttd.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -52,6 +52,7 @@ extern void HalGameLoop(); uint32 _pixels_redrawn; bool _dbg_screen_rect; bool disable_computer; +static byte _os_version = 0; void CDECL error(const char *s, ...) { va_list va; @@ -192,7 +193,7 @@ static const DriverDesc *ChooseDefaultDriver(const DriverDesc *dd) const DriverDesc *best = NULL; int best_pri = -1; do { - if ((int)(dd->flags&DF_PRIORITY_MASK) > best_pri) { + if ((int)(dd->flags&DF_PRIORITY_MASK) > best_pri && _os_version >= (byte)dd->flags) { best_pri = dd->flags&DF_PRIORITY_MASK; best = dd; } @@ -571,6 +572,7 @@ int ttd_main(int argc, char* argv[]) // Sample catalogue DEBUG(misc, 1) ("Loading sound effects..."); + _os_version = GetOSVersion(); MxInitialize(11025, "sample.cat"); // This must be done early, since functions use the InvalidateWindow* calls |