mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r2737) static, const and don't make variables public nobody else needs to know about

release/0.4.5
tron 2005-07-28 09:41:09 +00:00
parent 04f4d8237b
commit ff61e34d6c
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
driver.c
View File

@ -24,22 +24,28 @@
#include "video/sdl_v.h" #include "video/sdl_v.h"
#include "video/win32_v.h" #include "video/win32_v.h"
typedef struct { typedef struct DriverDesc {
const char* name;
const char* longname;
const void* drv;
} DriverDesc;
typedef struct DriverClass {
const DriverDesc *descs; const DriverDesc *descs;
const char *name; const char *name;
void *var; void *var;
} DriverClass; } DriverClass;
static DriverClass _driver_classes[] = { static const DriverDesc _video_driver_descs[];
static const DriverDesc _sound_driver_descs[];
static const DriverDesc _music_driver_descs[];
static const DriverClass _driver_classes[] = {
{_video_driver_descs, "video", &_video_driver}, {_video_driver_descs, "video", &_video_driver},
{_sound_driver_descs, "sound", &_sound_driver}, {_sound_driver_descs, "sound", &_sound_driver},
{_music_driver_descs, "music", &_music_driver}, {_music_driver_descs, "music", &_music_driver},
}; };
enum {
DF_PRIORITY_MASK = 0xF,
};
static const DriverDesc* GetDriverByName(const DriverDesc* dd, const char* name) static const DriverDesc* GetDriverByName(const DriverDesc* dd, const char* name)
{ {
for (; dd->name != NULL; dd++) { for (; dd->name != NULL; dd++) {
@ -156,7 +162,7 @@ void GetDriverList(char* p)
} }
const DriverDesc _music_driver_descs[] = { static const DriverDesc _music_driver_descs[] = {
#ifdef __BEOS__ #ifdef __BEOS__
{ "bemidi", "BeOS MIDI Driver", &_bemidi_music_driver }, { "bemidi", "BeOS MIDI Driver", &_bemidi_music_driver },
#endif #endif
@ -178,7 +184,7 @@ const DriverDesc _music_driver_descs[] = {
{ NULL, NULL, NULL} { NULL, NULL, NULL}
}; };
const DriverDesc _sound_driver_descs[] = { static const DriverDesc _sound_driver_descs[] = {
#ifdef WIN32 #ifdef WIN32
{ "win32", "Win32 WaveOut Driver", &_win32_sound_driver }, { "win32", "Win32 WaveOut Driver", &_win32_sound_driver },
#endif #endif
@ -189,7 +195,7 @@ const DriverDesc _sound_driver_descs[] = {
{ NULL, NULL, NULL} { NULL, NULL, NULL}
}; };
const DriverDesc _video_driver_descs[] = { static const DriverDesc _video_driver_descs[] = {
#ifdef WIN32 #ifdef WIN32
{ "win32", "Win32 GDI Video Driver", &_win32_video_driver }, { "win32", "Win32 GDI Video Driver", &_win32_video_driver },
#endif #endif

10
hal.h
View File

@ -37,12 +37,6 @@ typedef struct {
void (*set_volume)(byte vol); void (*set_volume)(byte vol);
} HalMusicDriver; } HalMusicDriver;
typedef struct {
const char *name;
const char *longname;
const void *drv;
} DriverDesc;
enum { enum {
HALERR_OK = 0, HALERR_OK = 0,
HALERR_ERROR = 1, HALERR_ERROR = 1,
@ -52,10 +46,6 @@ VARDEF HalMusicDriver *_music_driver;
VARDEF HalSoundDriver *_sound_driver; VARDEF HalSoundDriver *_sound_driver;
VARDEF HalVideoDriver *_video_driver; VARDEF HalVideoDriver *_video_driver;
extern const DriverDesc _video_driver_descs[];
extern const DriverDesc _sound_driver_descs[];
extern const DriverDesc _music_driver_descs[];
enum DriverType { enum DriverType {
VIDEO_DRIVER = 0, VIDEO_DRIVER = 0,
SOUND_DRIVER = 1, SOUND_DRIVER = 1,