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

(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).

Browse Source
This commit is contained in:
darkvater
2004-09-12 22:03:14 +00:00
parent e295e46e3e
commit 989ed101bc
8 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ttd.c
View File

@@ -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