diff options
| author | rubidium <rubidium@openttd.org> | 2009-10-17 15:15:00 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-10-17 15:15:00 +0000 |
| commit | d0d4cd7b8a558e56219aacf56ff334ee73626c63 (patch) | |
| tree | 655875d8595c8dbbe01a046631e7327889a08b3b | |
| parent | c37029d5e1bbf2be998a2aca7735711358972f5a (diff) | |
| download | openttd-d0d4cd7b8a558e56219aacf56ff334ee73626c63.tar.xz | |
(svn r17788) -Fix [FS#3268] (r16702): don't fail hard when no soundcard could be detected; just fall back on the null-driver
| -rw-r--r-- | src/music/null_m.h | 2 | ||||
| -rw-r--r-- | src/sound/allegro_s.h | 2 | ||||
| -rw-r--r-- | src/sound/null_s.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/music/null_m.h b/src/music/null_m.h index a98cdf679..16137356c 100644 --- a/src/music/null_m.h +++ b/src/music/null_m.h @@ -32,7 +32,7 @@ public: class FMusicDriver_Null: public MusicDriverFactory<FMusicDriver_Null> { public: - static const int priority = 0; + static const int priority = 1; /* virtual */ const char *GetName() { return "null"; } /* virtual */ const char *GetDescription() { return "Null Music Driver"; } /* virtual */ Driver *CreateInstance() { return new MusicDriver_Null(); } diff --git a/src/sound/allegro_s.h b/src/sound/allegro_s.h index 5eeeae248..cca292b16 100644 --- a/src/sound/allegro_s.h +++ b/src/sound/allegro_s.h @@ -26,7 +26,7 @@ public: class FSoundDriver_Allegro: public SoundDriverFactory<FSoundDriver_Allegro> { public: - static const int priority = 5; + static const int priority = 4; /* virtual */ const char *GetName() { return "allegro"; } /* virtual */ const char *GetDescription() { return "Allegro Sound Driver"; } /* virtual */ Driver *CreateInstance() { return new SoundDriver_Allegro(); } diff --git a/src/sound/null_s.h b/src/sound/null_s.h index 050f39fc9..34f12e70e 100644 --- a/src/sound/null_s.h +++ b/src/sound/null_s.h @@ -24,7 +24,7 @@ public: class FSoundDriver_Null: public SoundDriverFactory<FSoundDriver_Null> { public: - static const int priority = 0; + static const int priority = 1; /* virtual */ const char *GetName() { return "null"; } /* virtual */ const char *GetDescription() { return "Null Sound Driver"; } /* virtual */ Driver *CreateInstance() { return new SoundDriver_Null(); } |