gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-07-20 10:56:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r621) Merge r450 to trunk:

Browse Source 
Cleanups and #if 0 some unused debug code
This commit is contained in:
tron 2004-11-15 09:05:06 +00:00
parent 747d0fcca9
commit 95a3e4fe1f
1 changed files with 121 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
sdl.c
View File

@ -95,7 +95,7 @@ static const char sdl_files[] =
static SDLProcs _proc; static SDLProcs _proc;
static char *LoadSdlDLL() static char *LoadSdlDLL(void)
{ {
if (_proc.SDL_Init != NULL) if (_proc.SDL_Init != NULL)
return NULL; return NULL;
@ -122,12 +122,15 @@ static void SdlAbort(int sig)
static char *SdlOpen(uint32 x) static char *SdlOpen(uint32 x)
{ {
#if defined(DYNAMICALLY_LOADED_SDL) && defined(WIN32) #if defined(DYNAMICALLY_LOADED_SDL) && defined(WIN32)
{ char *s = LoadSdlDLL(); if (s) return s; } {
char *s = LoadSdlDLL();
if (s != NULL) return s;
}
#endif #endif
if (_sdl_usage++ == 0) { if (_sdl_usage++ == 0) {
if (SDL_CALL SDL_Init(x) == -1) if (SDL_CALL SDL_Init(x) == -1)
return SDL_CALL SDL_GetError(); return SDL_CALL SDL_GetError();
} else if (x) { } else if (x != 0) {
if (SDL_CALL SDL_InitSubSystem(x) == -1) if (SDL_CALL SDL_InitSubSystem(x) == -1)
return SDL_CALL SDL_GetError(); return SDL_CALL SDL_GetError();
} }
@ -141,7 +144,7 @@ static char *SdlOpen(uint32 x)
static void SdlClose(uint32 x) static void SdlClose(uint32 x)
{ {
if (x) if (x != 0)
SDL_CALL SDL_QuitSubSystem(x); SDL_CALL SDL_QuitSubSystem(x);
if (--_sdl_usage == 0) { if (--_sdl_usage == 0) {
SDL_CALL SDL_Quit(); SDL_CALL SDL_Quit();
@ -170,7 +173,8 @@ static void SdlVideoMakeDirty(int left, int top, int width, int height)
static SDL_Color pal[256]; static SDL_Color pal[256];
static void UpdatePalette(uint start, uint end) { static void UpdatePalette(uint start, uint end)
{
uint i; uint i;
byte *b; byte *b;
@ -184,11 +188,12 @@ static void UpdatePalette(uint start, uint end) {
SDL_CALL SDL_SetColors(_sdl_screen, pal, start, end); SDL_CALL SDL_SetColors(_sdl_screen, pal, start, end);
} }
static void InitPalette(void) { static void InitPalette(void)
{
UpdatePalette(0, 256); UpdatePalette(0, 256);
} }
static void CheckPaletteAnim() static void CheckPaletteAnim(void)
{ {
if(_pal_last_dirty != -1) { if(_pal_last_dirty != -1) {
UpdatePalette(_pal_first_dirty, _pal_last_dirty + 1); UpdatePalette(_pal_first_dirty, _pal_last_dirty + 1);
@ -196,24 +201,22 @@ static void CheckPaletteAnim()
} }
} }
static void DrawSurfaceToScreen() static void DrawSurfaceToScreen(void)
{ {
int n; int n = _num_dirty_rects;
if (n != 0) {
if ((n=_num_dirty_rects) != 0) {
_num_dirty_rects = 0; _num_dirty_rects = 0;
if (n > MAX_DIRTY_RECTS) if (n > MAX_DIRTY_RECTS)
SDL_CALL SDL_UpdateRect(_sdl_screen, 0, 0, 0, 0); SDL_CALL SDL_UpdateRect(_sdl_screen, 0, 0, 0, 0);
else { else
SDL_CALL SDL_UpdateRects(_sdl_screen, n, _dirty_rects); SDL_CALL SDL_UpdateRects(_sdl_screen, n, _dirty_rects);
} }
} }
}
static int CDECL compare_res(const void *pa, const void *pb) static int CDECL compare_res(const void *pa, const void *pb)
{ {
int x = ((const uint16*)pa)[0] - ((const uint16*)pb)[0]; int x = ((const uint16*)pa)[0] - ((const uint16*)pb)[0];
if (x) return x; if (x != 0) return x;
return ((const uint16*)pa)[1] - ((const uint16*)pb)[1]; return ((const uint16*)pa)[1] - ((const uint16*)pb)[1];
} }
@ -225,10 +228,11 @@ static const uint16 default_resolutions[][2] = {
{1280, 960}, {1280, 960},
{1280, 1024}, {1280, 1024},
{1400, 1050}, {1400, 1050},
{1600,1200}, {1600, 1200}
}; };
static void GetVideoModes(void) { static void GetVideoModes(void)
{
int i; int i;
SDL_Rect **modes; SDL_Rect **modes;
@ -292,8 +296,6 @@ static int GetAvailableVideoMode(int *w, int *h)
delta = newdelta; delta = newdelta;
} }
} }
// use the default mode
*w = _resolutions[best][0]; *w = _resolutions[best][0];
*h = _resolutions[best][1]; *h = _resolutions[best][1];
return 2; return 2;
@ -308,7 +310,7 @@ static bool CreateMainSurface(int w, int h)
DEBUG(misc, 0) ("sdl: using mode %dx%d", w, h); DEBUG(misc, 0) ("sdl: using mode %dx%d", w, h);
// DO NOT CHANGE TO HWSURFACE, IT DOES NOT WORK // DO NOT CHANGE TO HWSURFACE, IT DOES NOT WORK
newscreen = SDL_CALL SDL_SetVideoMode(w, h, 8, SDL_SWSURFACE + SDL_HWPALETTE + (_fullscreen?SDL_FULLSCREEN:SDL_RESIZABLE)); newscreen = SDL_CALL SDL_SetVideoMode(w, h, 8, SDL_SWSURFACE | SDL_HWPALETTE | (_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE));
if (newscreen == NULL) if (newscreen == NULL)
return false; return false;
@ -327,7 +329,7 @@ static bool CreateMainSurface(int w, int h)
return true; return true;
} }
typedef struct { typedef struct VkMapping {
uint16 vk_from; uint16 vk_from;
byte vk_count; byte vk_count;
byte map_to; byte map_to;
@ -372,24 +374,16 @@ static const VkMapping _vk_mapping[] = {
AS(SDLK_KP_MINUS, WKC_NUM_MINUS), AS(SDLK_KP_MINUS, WKC_NUM_MINUS),
AS(SDLK_KP_PLUS, WKC_NUM_PLUS), AS(SDLK_KP_PLUS, WKC_NUM_PLUS),
AS(SDLK_KP_ENTER, WKC_NUM_ENTER), AS(SDLK_KP_ENTER, WKC_NUM_ENTER),
AS(SDLK_KP_PERIOD, WKC_NUM_DECIMAL), AS(SDLK_KP_PERIOD, WKC_NUM_DECIMAL)
{0, 0, 0}
}; };
static uint32 ConvertSdlKeyIntoMy(SDL_keysym *sym) static uint32 ConvertSdlKeyIntoMy(SDL_keysym *sym)
{ {
const VkMapping *map = _vk_mapping - 1; const VkMapping *map;
uint from; uint key = 0;
uint key = sym->sym; for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
for(;;) { if ((uint)(sym->sym - map->vk_from) <= map->vk_count) {
map++; key = sym->sym - map->vk_from + map->map_to;
from = map->vk_from;
if (from == 0) {
key = 0;
break;
}
if ((uint)(key - from) <= map->vk_count) {
key = key - from + map->map_to;
break; break;
} }
} }
@ -397,29 +391,26 @@ static uint32 ConvertSdlKeyIntoMy(SDL_keysym *sym)
// check scancode for BACKQUOTE key, because we want the key left of "1", not anything else (on non-US keyboards) // check scancode for BACKQUOTE key, because we want the key left of "1", not anything else (on non-US keyboards)
#if defined(WIN32) #if defined(WIN32)
if (sym->scancode == 41) key |= WKC_BACKQUOTE; if (sym->scancode == 41) key |= WKC_BACKQUOTE;
#else #elif defined(__APPLE__)
#if defined(__APPLE__)
if (sym->scancode == 10) key |= WKC_BACKQUOTE; if (sym->scancode == 10) key |= WKC_BACKQUOTE;
#else #elif defined(__MORPHOS__)
#if defined(__MORPHOS__)
if (sym->scancode == 0) key |= WKC_BACKQUOTE; // yes, that key is code '0' under MorphOS :) if (sym->scancode == 0) key |= WKC_BACKQUOTE; // yes, that key is code '0' under MorphOS :)
#else #else
if (sym->scancode == 49) key |= WKC_BACKQUOTE; if (sym->scancode == 49) key |= WKC_BACKQUOTE;
#endif #endif
#endif
#endif
// META are the command keys on mac // META are the command keys on mac
if (sym->mod & KMOD_META) key |= WKC_META; if (sym->mod & KMOD_META) key |= WKC_META;
if (sym->mod & KMOD_SHIFT) key |= WKC_SHIFT; if (sym->mod & KMOD_SHIFT) key |= WKC_SHIFT;
if (sym->mod & KMOD_CTRL) key |= WKC_CTRL; if (sym->mod & KMOD_CTRL) key |= WKC_CTRL;
if (sym->mod & KMOD_ALT) key |= WKC_ALT; if (sym->mod & KMOD_ALT) key |= WKC_ALT;
// these two lines really helps porting hotkey combos. Uncomment to use -- Bjarni // these two lines really help porting hotkey combos. Uncomment to use -- Bjarni
//printf("scancode character pressed %d\n", sym->scancode); //printf("scancode character pressed %d\n", sym->scancode);
//printf("unicode character pressed %d\n", sym->unicode); //printf("unicode character pressed %d\n", sym->unicode);
return (key << 16) + sym->unicode; return (key << 16) + sym->unicode;
} }
static int PollEvent() { static int PollEvent(void)
{
SDL_Event ev; SDL_Event ev;
if (!SDL_CALL SDL_PollEvent(&ev)) if (!SDL_CALL SDL_PollEvent(&ev))
@ -448,19 +439,25 @@ static int PollEvent() {
if (_rightclick_emulate && (SDL_CALL SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL))) if (_rightclick_emulate && (SDL_CALL SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL)))
ev.button.button = SDL_BUTTON_RIGHT; ev.button.button = SDL_BUTTON_RIGHT;
if (ev.button.button == SDL_BUTTON_LEFT) { switch (ev.button.button) {
case SDL_BUTTON_LEFT:
_left_button_down = true; _left_button_down = true;
} else if (ev.button.button == SDL_BUTTON_RIGHT) { break;
case SDL_BUTTON_RIGHT:
_right_button_down = true; _right_button_down = true;
_right_button_clicked = true; _right_button_clicked = true;
} break;
#if !defined(WIN32) #if !defined(WIN32)
else if (ev.button.button == SDL_BUTTON_WHEELUP) { case SDL_BUTTON_WHEELUP:
_cursor.wheel--; _cursor.wheel--;
} else if (ev.button.button == SDL_BUTTON_WHEELDOWN) { break;
case SDL_BUTTON_WHEELDOWN:
_cursor.wheel++; _cursor.wheel++;
} break;
#endif #endif
default:
break;
}
break; break;
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
@ -485,7 +482,8 @@ static int PollEvent() {
break; break;
case SDL_KEYDOWN: case SDL_KEYDOWN:
if ((((ev.key.keysym.sym == SDLK_RETURN) || (ev.key.keysym.sym == SDLK_f)) && (ev.key.keysym.mod & KMOD_ALT)) || (((ev.key.keysym.sym == SDLK_RETURN) || (ev.key.keysym.sym == SDLK_f)) && (ev.key.keysym.mod & KMOD_META))) { if ((ev.key.keysym.mod & (KMOD_ALT | KMOD_META)) &&
(ev.key.keysym.sym == SDLK_RETURN || ev.key.keysym.sym == SDLK_f)) {
_fullscreen ^= true; _fullscreen ^= true;
GetVideoModes(); GetVideoModes();
CreateMainSurface(_screen.width, _screen.height); CreateMainSurface(_screen.width, _screen.height);
@ -496,15 +494,9 @@ static int PollEvent() {
break; break;
case SDL_VIDEORESIZE: { case SDL_VIDEORESIZE: {
int w, h; int w = clamp(ev.resize.w, 64, MAX_SCREEN_WIDTH);
w = ev.resize.w; int h = clamp(ev.resize.h, 64, MAX_SCREEN_HEIGHT);
h = ev.resize.h;
w = clamp(w, 64, MAX_SCREEN_WIDTH);
h = clamp(h, 64, MAX_SCREEN_HEIGHT);
ChangeResInGame(w, h); ChangeResInGame(w, h);
break; break;
} }
} }
@ -515,7 +507,8 @@ static const char *SdlVideoStart(char **parm)
{ {
char buf[30]; char buf[30];
{char *s;if ((s = SdlOpen(SDL_INIT_VIDEO)) != NULL) return s;} const char *s = SdlOpen(SDL_INIT_VIDEO);
if (s != NULL) return s;
SDL_CALL SDL_VideoDriverName(buf, 30); SDL_CALL SDL_VideoDriverName(buf, 30);
DEBUG(misc, 0) ("sdl: using driver '%s'", buf); DEBUG(misc, 0) ("sdl: using driver '%s'", buf);
@ -529,20 +522,22 @@ static const char *SdlVideoStart(char **parm)
return NULL; return NULL;
} }
static void SdlVideoStop() static void SdlVideoStop(void)
{ {
SdlClose(SDL_INIT_VIDEO); SdlClose(SDL_INIT_VIDEO);
} }
static int SdlVideoMainLoop() static int SdlVideoMainLoop(void)
{ {
uint32 next_tick = SDL_CALL SDL_GetTicks() + 30, cur_ticks, pal_tick = 0; uint32 next_tick = SDL_CALL SDL_GetTicks() + 30;
uint32 cur_ticks;
uint32 pal_tick = 0;
int i; int i;
uint32 mod; uint32 mod;
int numkeys; int numkeys;
Uint8 *keys; Uint8 *keys;
while (true) { for (;;) {
InteractiveRandom(); // randomness InteractiveRandom(); // randomness
while ((i = PollEvent()) == -1) {} while ((i = PollEvent()) == -1) {}
@ -553,10 +548,11 @@ static int SdlVideoMainLoop()
mod = SDL_CALL SDL_GetModState(); mod = SDL_CALL SDL_GetModState();
keys = SDL_CALL SDL_GetKeyState(&numkeys); keys = SDL_CALL SDL_GetKeyState(&numkeys);
#if defined(_DEBUG) #if defined(_DEBUG)
if (_shift_pressed) { if (_shift_pressed)
#else #else
if (keys[SDLK_TAB]) { if (keys[SDLK_TAB])
#endif #endif
{
if (!_networking) _fast_forward |= 2; if (!_networking) _fast_forward |= 2;
} else if (_fast_forward & 2) { } else if (_fast_forward & 2) {
_fast_forward = 0; _fast_forward = 0;
@ -575,9 +571,9 @@ static int SdlVideoMainLoop()
// determine which directional keys are down // determine which directional keys are down
_dirkeys = _dirkeys =
(keys[SDLK_LEFT] ? 1 : 0) + (keys[SDLK_LEFT] ? 1 : 0) |
(keys[SDLK_UP] ? 2 : 0) + (keys[SDLK_UP] ? 2 : 0) |
(keys[SDLK_RIGHT] ? 4 : 0) + (keys[SDLK_RIGHT] ? 4 : 0) |
(keys[SDLK_DOWN] ? 8 : 0); (keys[SDLK_DOWN] ? 8 : 0);
GameLoop(); GameLoop();
@ -617,25 +613,27 @@ const HalVideoDriver _sdl_video_driver = {
static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len)
{ {
MxMixSamples(_mixer, stream, len >> 2); MxMixSamples(_mixer, stream, len / 4);
} }
static char *SdlSoundStart(char **parm) static char *SdlSoundStart(char **parm)
{ {
SDL_AudioSpec spec; SDL_AudioSpec spec;
{char *s;if ((s = SdlOpen(SDL_INIT_AUDIO)) != NULL) return s;} char *s = SdlOpen(SDL_INIT_AUDIO);
if (s != NULL) return s;
spec.freq = GetDriverParamInt(parm, "hz", 11025); spec.freq = GetDriverParamInt(parm, "hz", 11025);
spec.format = AUDIO_S16SYS; spec.format = AUDIO_S16SYS;
spec.channels = 2; spec.channels = 2;
spec.samples = 512; spec.samples = 512;
*(void**)&spec.callback = fill_sound_buffer; spec.callback = fill_sound_buffer;
SDL_CALL SDL_OpenAudio(&spec, &spec); SDL_CALL SDL_OpenAudio(&spec, &spec);
SDL_CALL SDL_PauseAudio(0); SDL_CALL SDL_PauseAudio(0);
return NULL; return NULL;
} }
static void SdlSoundStop() static void SdlSoundStop(void)
{ {
SDL_CALL SDL_CloseAudio(); SDL_CALL SDL_CloseAudio();
SdlClose(SDL_INIT_AUDIO); SdlClose(SDL_INIT_AUDIO);
@ -647,6 +645,7 @@ const HalSoundDriver _sdl_sound_driver = {
}; };
#if 0 /* XXX what the heck is that? */
#include "viewport.h" #include "viewport.h"
void redsq_debug(int tile) void redsq_debug(int tile)
{ {
@ -664,4 +663,6 @@ static void DbgRedraw()
SdlVideoMakeDirty(0,0,_screen.width,_screen.height); SdlVideoMakeDirty(0,0,_screen.width,_screen.height);
DrawSurfaceToScreen(); DrawSurfaceToScreen();
} }
#endif
#endif // WITH_SDL #endif // WITH_SDL