summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/fios.cpp4
-rw-r--r--src/music/bemidi.h2
-rw-r--r--src/music/dmusic.cpp3
-rw-r--r--src/music/extmidi.h2
-rw-r--r--src/music/null_m.cpp1
-rw-r--r--src/music/os2_m.h2
-rw-r--r--src/music/qtmidi.h2
-rw-r--r--src/music/win32_m.cpp20
-rw-r--r--src/music_gui.cpp9
-rw-r--r--src/newgrf_sound.cpp2
-rw-r--r--src/sound/cocoa_s.h2
-rw-r--r--src/sound/sdl_s.cpp5
-rw-r--r--src/sound/win32_s.h2
-rw-r--r--src/video/cocoa_v.h2
-rw-r--r--src/win32.cpp15
15 files changed, 29 insertions, 44 deletions
diff --git a/src/fios.cpp b/src/fios.cpp
index 80f562ec1..fac9e3219 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -186,9 +186,7 @@ bool FileExists(const char *filename)
{
#if defined(WINCE)
/* There is always one platform that doesn't support basic commands... */
- HANDLE hand;
-
- hand = CreateFile(OTTD2FS(filename), 0, 0, NULL, OPEN_EXISTING, 0, NULL);
+ HANDLE hand = CreateFile(OTTD2FS(filename), 0, 0, NULL, OPEN_EXISTING, 0, NULL);
if (hand == INVALID_HANDLE_VALUE) return 1;
CloseHandle(hand);
return 0;
diff --git a/src/music/bemidi.h b/src/music/bemidi.h
index 10ead59ff..1b3d4f3de 100644
--- a/src/music/bemidi.h
+++ b/src/music/bemidi.h
@@ -7,4 +7,4 @@
extern const HalMusicDriver _bemidi_music_driver;
-#endif
+#endif /* MUSIC_BEMIDI_H */
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index 9c2c6a2cd..c52e6f99b 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -1,9 +1,8 @@
/* $Id$ */
-#include "../stdafx.h"
-
#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
+#include "../stdafx.h"
#include "../debug.h"
#include "../win32.h"
#include "dmusic.h"
diff --git a/src/music/extmidi.h b/src/music/extmidi.h
index 681c34bd6..f118f933a 100644
--- a/src/music/extmidi.h
+++ b/src/music/extmidi.h
@@ -7,4 +7,4 @@
extern const HalMusicDriver _extmidi_music_driver;
-#endif
+#endif /* MUSIC_EXTERNAL_H */
diff --git a/src/music/null_m.cpp b/src/music/null_m.cpp
index c76a60211..b2b83877c 100644
--- a/src/music/null_m.cpp
+++ b/src/music/null_m.cpp
@@ -1,7 +1,6 @@
/* $Id$ */
#include "../stdafx.h"
-#include "../openttd.h"
#include "null_m.h"
static const char* NullMidiStart(const char* const* parm) { return NULL; }
diff --git a/src/music/os2_m.h b/src/music/os2_m.h
index 173f096a5..fef15b91f 100644
--- a/src/music/os2_m.h
+++ b/src/music/os2_m.h
@@ -7,4 +7,4 @@
extern const HalMusicDriver _os2_music_driver;
-#endif
+#endif /* MUSIC_OS2_H */
diff --git a/src/music/qtmidi.h b/src/music/qtmidi.h
index 727ce25e1..0b9e5ff2e 100644
--- a/src/music/qtmidi.h
+++ b/src/music/qtmidi.h
@@ -7,4 +7,4 @@
extern const HalMusicDriver _qtime_music_driver;
-#endif /* !MUSIC_MACOSX_QUICKTIME_H */
+#endif /* MUSIC_MACOSX_QUICKTIME_H */
diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index 36b79b30b..1096584d9 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -1,7 +1,6 @@
/* $Id$ */
#include "../stdafx.h"
-#include "../openttd.h"
#include "win32_m.h"
#include <windows.h>
#include <mmsystem.h>
@@ -50,7 +49,7 @@ static MCIERROR CDECL MidiSendCommand(const char* cmd, ...)
char buf[512];
va_start(va, cmd);
- vsprintf(buf, cmd, va);
+ vsnprintf(buf, lengthof(buf), cmd, va);
va_end(va);
return mciSendStringA(buf, NULL, 0, 0);
}
@@ -58,12 +57,9 @@ static MCIERROR CDECL MidiSendCommand(const char* cmd, ...)
static bool MidiIntPlaySong(const char *filename)
{
MidiSendCommand("close all");
- if (MidiSendCommand("open \"%s\" type sequencer alias song", filename) != 0)
- return false;
+ if (MidiSendCommand("open \"%s\" type sequencer alias song", filename) != 0) return false;
- if (MidiSendCommand("play song from 0") != 0)
- return false;
- return true;
+ return MidiSendCommand("play song from 0") == 0;
}
static void MidiIntStopSong(void)
@@ -104,9 +100,7 @@ static DWORD WINAPI MidiThread(LPVOID arg)
s[0] = '\0';
// Delay somewhat in case we don't manage to play.
- if (!_midi.playing) {
- Sleep(5000);
- }
+ if (!_midi.playing) Sleep(5000);
}
if (_midi.stop_song && _midi.playing) {
@@ -115,8 +109,7 @@ static DWORD WINAPI MidiThread(LPVOID arg)
MidiIntStopSong();
}
- if (_midi.playing && !MidiIntIsSongPlaying())
- _midi.playing = false;
+ if (_midi.playing && !MidiIntIsSongPlaying()) _midi.playing = false;
WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 1000);
} while (!_midi.terminate);
@@ -148,8 +141,7 @@ static const char *Win32MidiStart(const char * const *parm)
}
}
- if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL)
- return "Failed to create thread";
+ if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL) return "Failed to create thread";
return NULL;
}
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index 49d7b7ef8..143f252d9 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -422,12 +422,11 @@ static void MusicWindowWndProc(Window *w, WindowEvent *e)
case 5: // start playing
msf.playing = true;
break;
- case 6:{ // volume sliders
- byte *vol,new_vol;
+ case 6: { // volume sliders
+ byte *vol, new_vol;
int x = e->we.click.pt.x - 88;
- if (x < 0)
- return;
+ if (x < 0) return;
vol = &msf.music_vol;
if (x >= 106) {
@@ -435,7 +434,7 @@ static void MusicWindowWndProc(Window *w, WindowEvent *e)
x -= 106;
}
- new_vol = min(max(x-21,0)*2,127);
+ new_vol = min(max(x - 21, 0) * 2, 127);
if (new_vol != *vol) {
*vol = new_vol;
if (vol == &msf.music_vol)
diff --git a/src/newgrf_sound.cpp b/src/newgrf_sound.cpp
index 16990faf5..7bc44e04b 100644
--- a/src/newgrf_sound.cpp
+++ b/src/newgrf_sound.cpp
@@ -37,7 +37,7 @@ void InitializeSoundPool(void)
FileEntry *GetSound(uint index)
{
- if (index >= _sound_count) return NULL;
+ if (index >= GetNumSounds()) return NULL;
return GetSoundInternal(index);
}
diff --git a/src/sound/cocoa_s.h b/src/sound/cocoa_s.h
index 7db5f7023..92f67cb10 100644
--- a/src/sound/cocoa_s.h
+++ b/src/sound/cocoa_s.h
@@ -7,4 +7,4 @@
extern const HalSoundDriver _cocoa_sound_driver;
-#endif
+#endif /* SOUND_COCOA_H */
diff --git a/src/sound/sdl_s.cpp b/src/sound/sdl_s.cpp
index 8ec31e9fb..cf6d06981 100644
--- a/src/sound/sdl_s.cpp
+++ b/src/sound/sdl_s.cpp
@@ -1,10 +1,9 @@
/* $Id$ */
-#include "../stdafx.h"
-
#ifdef WITH_SDL
-#include "../openttd.h"
+#include "../stdafx.h"
+
#include "../driver.h"
#include "../mixer.h"
#include "../sdl.h"
diff --git a/src/sound/win32_s.h b/src/sound/win32_s.h
index 65c6a957d..b91495edd 100644
--- a/src/sound/win32_s.h
+++ b/src/sound/win32_s.h
@@ -7,4 +7,4 @@
extern const HalSoundDriver _win32_sound_driver;
-#endif
+#endif /* SOUND_WIN32_H */
diff --git a/src/video/cocoa_v.h b/src/video/cocoa_v.h
index 1512a0b64..3e39ec966 100644
--- a/src/video/cocoa_v.h
+++ b/src/video/cocoa_v.h
@@ -10,4 +10,4 @@
extern const HalVideoDriver _cocoa_video_driver;
-#endif
+#endif /* VIDEO_COCOA_H */
diff --git a/src/win32.cpp b/src/win32.cpp
index 5279f64e9..dceda5e86 100644
--- a/src/win32.cpp
+++ b/src/win32.cpp
@@ -868,12 +868,12 @@ void ShowInfo(const char *str)
int _set_error_mode(int);
#endif
-#if defined(WINCE)
-int APIENTRY WinMain
-#else
-int APIENTRY _tWinMain
-#endif
- (HINSTANCE hInstance, HINSTANCE hPrevInstance,
+#if defined(WINCE) && !defined(_tWinMain)
+/* GCC crosscompiler for WINCE doesn't support wide version */
+# define _tWinMain WinMain
+#endif /* WINCE */
+
+int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPTSTR lpCmdLine, int nCmdShow)
{
int argc;
@@ -922,12 +922,11 @@ int APIENTRY _tWinMain
#if defined(WINCE)
void GetCurrentDirectoryW(int length, wchar_t *path)
{
- wchar_t *pDest = NULL;
/* Get the name of this module */
GetModuleFileName(NULL, path, length);
/* Remove the executable name, this we call CurrentDir */
- pDest = wcsrchr(path, '\\');
+ wchar_t *pDest = wcsrchr(path, '\\');
if (pDest != NULL) {
int result = pDest - path + 1;
path[result] = '\0';
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-30 19:14:16 +0000