author | bjarni |
Sat, 10 Dec 2005 11:16:45 +0000 | |
changeset 2736 | 1ea068235989 |
parent 2664 | fcefd29dd9d2 |
child 2952 | 6a26eeda9679 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
2189
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
3 |
#include "../stdafx.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
4 |
|
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
5 |
#ifdef WITH_SDL |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
6 |
|
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
7 |
#include "../openttd.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
8 |
#include "../debug.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
9 |
#include "../functions.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
10 |
#include "../gfx.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
11 |
#include "../macros.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
12 |
#include "../sdl.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
13 |
#include "../window.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
14 |
#include "../network.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
15 |
#include "../variables.h" |
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
16 |
#include "sdl_v.h" |
0 | 17 |
#include <SDL.h> |
18 |
||
19 |
static SDL_Surface *_sdl_screen; |
|
20 |
static bool _all_modes; |
|
21 |
||
22 |
#define MAX_DIRTY_RECTS 100 |
|
23 |
static SDL_Rect _dirty_rects[MAX_DIRTY_RECTS]; |
|
24 |
static int _num_dirty_rects; |
|
25 |
||
26 |
static void SdlVideoMakeDirty(int left, int top, int width, int height) |
|
27 |
{ |
|
28 |
if (_num_dirty_rects < MAX_DIRTY_RECTS) { |
|
29 |
_dirty_rects[_num_dirty_rects].x = left; |
|
30 |
_dirty_rects[_num_dirty_rects].y = top; |
|
31 |
_dirty_rects[_num_dirty_rects].w = width; |
|
32 |
_dirty_rects[_num_dirty_rects].h = height; |
|
33 |
} |
|
34 |
_num_dirty_rects++; |
|
35 |
} |
|
36 |
||
2226
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
37 |
static void UpdatePalette(uint start, uint count) |
423 | 38 |
{ |
2226
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
39 |
SDL_Color pal[256]; |
0 | 40 |
uint i; |
41 |
||
2226
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
42 |
for (i = 0; i != count; i++) { |
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
43 |
pal[i].r = _cur_palette[start + i].r; |
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
44 |
pal[i].g = _cur_palette[start + i].g; |
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
45 |
pal[i].b = _cur_palette[start + i].b; |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1891
diff
changeset
|
46 |
pal[i].unused = 0; |
0 | 47 |
} |
48 |
||
2226
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
49 |
SDL_CALL SDL_SetColors(_sdl_screen, pal, start, count); |
0 | 50 |
} |
51 |
||
423 | 52 |
static void InitPalette(void) |
53 |
{ |
|
0 | 54 |
UpdatePalette(0, 256); |
55 |
} |
|
56 |
||
423 | 57 |
static void CheckPaletteAnim(void) |
0 | 58 |
{ |
2226
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
59 |
if (_pal_last_dirty != -1) { |
efc1f77d27fc
(svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents:
2210
diff
changeset
|
60 |
UpdatePalette(_pal_first_dirty, _pal_last_dirty - _pal_first_dirty + 1); |
0 | 61 |
_pal_last_dirty = -1; |
62 |
} |
|
18
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
63 |
} |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
64 |
|
423 | 65 |
static void DrawSurfaceToScreen(void) |
18
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
66 |
{ |
423 | 67 |
int n = _num_dirty_rects; |
68 |
if (n != 0) { |
|
0 | 69 |
_num_dirty_rects = 0; |
70 |
if (n > MAX_DIRTY_RECTS) |
|
71 |
SDL_CALL SDL_UpdateRect(_sdl_screen, 0, 0, 0, 0); |
|
423 | 72 |
else |
0 | 73 |
SDL_CALL SDL_UpdateRects(_sdl_screen, n, _dirty_rects); |
74 |
} |
|
75 |
} |
|
76 |
||
77 |
static const uint16 default_resolutions[][2] = { |
|
423 | 78 |
{ 640, 480}, |
79 |
{ 800, 600}, |
|
80 |
{1024, 768}, |
|
81 |
{1152, 864}, |
|
1028
37e5cf7baa96
(svn r1529) -Feature: [1090950] Adding 16:10 resolutions for mainly laptops (doode)
darkvater
parents:
1022
diff
changeset
|
82 |
{1280, 800}, |
423 | 83 |
{1280, 960}, |
84 |
{1280, 1024}, |
|
85 |
{1400, 1050}, |
|
1028
37e5cf7baa96
(svn r1529) -Feature: [1090950] Adding 16:10 resolutions for mainly laptops (doode)
darkvater
parents:
1022
diff
changeset
|
86 |
{1600, 1200}, |
37e5cf7baa96
(svn r1529) -Feature: [1090950] Adding 16:10 resolutions for mainly laptops (doode)
darkvater
parents:
1022
diff
changeset
|
87 |
{1680, 1050}, |
37e5cf7baa96
(svn r1529) -Feature: [1090950] Adding 16:10 resolutions for mainly laptops (doode)
darkvater
parents:
1022
diff
changeset
|
88 |
{1920, 1200} |
0 | 89 |
}; |
90 |
||
423 | 91 |
static void GetVideoModes(void) |
92 |
{ |
|
0 | 93 |
int i; |
94 |
SDL_Rect **modes; |
|
95 |
||
96 |
modes = SDL_CALL SDL_ListModes(NULL, SDL_SWSURFACE + (_fullscreen ? SDL_FULLSCREEN : 0)); |
|
97 |
||
423 | 98 |
if (modes == NULL) |
245
4f6f81046437
(svn r246) -Fix: 64bit machine warnings for sdl.c (Tron)
darkvater
parents:
222
diff
changeset
|
99 |
error("sdl: no modes available"); |
119
82c0f4713cad
(svn r120) Fix: (SDL) same resolution was displayed more than once in game options
dominik
parents:
60
diff
changeset
|
100 |
|
245
4f6f81046437
(svn r246) -Fix: 64bit machine warnings for sdl.c (Tron)
darkvater
parents:
222
diff
changeset
|
101 |
_all_modes = (modes == (void*)-1); |
4f6f81046437
(svn r246) -Fix: 64bit machine warnings for sdl.c (Tron)
darkvater
parents:
222
diff
changeset
|
102 |
|
4f6f81046437
(svn r246) -Fix: 64bit machine warnings for sdl.c (Tron)
darkvater
parents:
222
diff
changeset
|
103 |
if (_all_modes) { |
0 | 104 |
// all modes available, put some default ones here |
105 |
memcpy(_resolutions, default_resolutions, sizeof(default_resolutions)); |
|
245
4f6f81046437
(svn r246) -Fix: 64bit machine warnings for sdl.c (Tron)
darkvater
parents:
222
diff
changeset
|
106 |
_num_resolutions = lengthof(default_resolutions); |
0 | 107 |
} else { |
128
28ebd80f6521
(svn r129) Fix: no more same multiple resolutions due to incorrect SDL implementation (Tron)
dominik
parents:
119
diff
changeset
|
108 |
int n = 0; |
423 | 109 |
for (i = 0; modes[i]; i++) { |
128
28ebd80f6521
(svn r129) Fix: no more same multiple resolutions due to incorrect SDL implementation (Tron)
dominik
parents:
119
diff
changeset
|
110 |
int w = modes[i]->w; |
28ebd80f6521
(svn r129) Fix: no more same multiple resolutions due to incorrect SDL implementation (Tron)
dominik
parents:
119
diff
changeset
|
111 |
int h = modes[i]->h; |
306
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
112 |
if (IS_INT_INSIDE(w, 640, MAX_SCREEN_WIDTH + 1) && |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
113 |
IS_INT_INSIDE(h, 480, MAX_SCREEN_HEIGHT + 1)) { |
128
28ebd80f6521
(svn r129) Fix: no more same multiple resolutions due to incorrect SDL implementation (Tron)
dominik
parents:
119
diff
changeset
|
114 |
int j; |
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
115 |
for (j = 0; j < n; j++) { |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
116 |
if (_resolutions[j][0] == w && _resolutions[j][1] == h) break; |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
117 |
} |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
118 |
|
128
28ebd80f6521
(svn r129) Fix: no more same multiple resolutions due to incorrect SDL implementation (Tron)
dominik
parents:
119
diff
changeset
|
119 |
if (j == n) { |
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
120 |
_resolutions[j][0] = w; |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
121 |
_resolutions[j][1] = h; |
245
4f6f81046437
(svn r246) -Fix: 64bit machine warnings for sdl.c (Tron)
darkvater
parents:
222
diff
changeset
|
122 |
if (++n == lengthof(_resolutions)) break; |
128
28ebd80f6521
(svn r129) Fix: no more same multiple resolutions due to incorrect SDL implementation (Tron)
dominik
parents:
119
diff
changeset
|
123 |
} |
0 | 124 |
} |
125 |
} |
|
126 |
_num_resolutions = n; |
|
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
127 |
SortResolutions(_num_resolutions); |
0 | 128 |
} |
129 |
} |
|
130 |
||
131 |
static int GetAvailableVideoMode(int *w, int *h) |
|
132 |
{ |
|
133 |
int i; |
|
306
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
134 |
int best; |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
135 |
uint delta; |
0 | 136 |
|
137 |
// all modes available? |
|
138 |
if (_all_modes) |
|
139 |
return 1; |
|
140 |
||
141 |
// is the wanted mode among the available modes? |
|
306
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
142 |
for (i = 0; i != _num_resolutions; i++) { |
0 | 143 |
if(*w == _resolutions[i][0] && *h == _resolutions[i][1]) |
144 |
return 1; |
|
145 |
} |
|
146 |
||
306
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
147 |
// use the closest possible resolution |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
148 |
best = 0; |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
149 |
delta = abs((_resolutions[0][0] - *w) * (_resolutions[0][1] - *h)); |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
150 |
for (i = 1; i != _num_resolutions; ++i) { |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
151 |
uint newdelta = abs((_resolutions[i][0] - *w) * (_resolutions[i][1] - *h)); |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
152 |
if (newdelta < delta) { |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
153 |
best = i; |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
154 |
delta = newdelta; |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
155 |
} |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
156 |
} |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
157 |
*w = _resolutions[best][0]; |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
158 |
*h = _resolutions[best][1]; |
0 | 159 |
return 2; |
160 |
} |
|
161 |
||
902
df8c96ee70d5
(svn r1388) Feature: [SDL] Show revision number in window title
dominik
parents:
810
diff
changeset
|
162 |
extern const char _openttd_revision[]; |
df8c96ee70d5
(svn r1388) Feature: [SDL] Show revision number in window title
dominik
parents:
810
diff
changeset
|
163 |
|
0 | 164 |
static bool CreateMainSurface(int w, int h) |
165 |
{ |
|
166 |
SDL_Surface *newscreen; |
|
1474
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1428
diff
changeset
|
167 |
char caption[50]; |
0 | 168 |
|
169 |
GetAvailableVideoMode(&w, &h); |
|
170 |
||
2210
58a293892a66
(svn r2728) -Fix/Feature: Change the driver probing algorithm
tron
parents:
2204
diff
changeset
|
171 |
DEBUG(driver, 1) ("sdl: using mode %dx%d", w, h); |
0 | 172 |
|
36
c1b3b884584e
(svn r37) Do not change to HWSURFACE since it's not working!
darkvater
parents:
34
diff
changeset
|
173 |
// DO NOT CHANGE TO HWSURFACE, IT DOES NOT WORK |
423 | 174 |
newscreen = SDL_CALL SDL_SetVideoMode(w, h, 8, SDL_SWSURFACE | SDL_HWPALETTE | (_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE)); |
175 |
if (newscreen == NULL) |
|
0 | 176 |
return false; |
177 |
||
306
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
178 |
_screen.width = newscreen->w; |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
179 |
_screen.height = newscreen->h; |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
180 |
_screen.pitch = newscreen->pitch; |
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
181 |
|
0 | 182 |
_sdl_screen = newscreen; |
183 |
InitPalette(); |
|
184 |
||
1474
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1428
diff
changeset
|
185 |
snprintf(caption, sizeof(caption), "OpenTTD %s", _openttd_revision); |
902
df8c96ee70d5
(svn r1388) Feature: [SDL] Show revision number in window title
dominik
parents:
810
diff
changeset
|
186 |
SDL_CALL SDL_WM_SetCaption(caption, caption); |
0 | 187 |
SDL_CALL SDL_ShowCursor(0); |
188 |
||
306
c44133836566
(svn r312) -Fix: [926105] ctrl + d bug. Longest outstanding bug has been fixed \o/ 2004-03-30 (Tron)
darkvater
parents:
302
diff
changeset
|
189 |
GameSizeChanged(); |
0 | 190 |
|
191 |
return true; |
|
192 |
} |
|
193 |
||
423 | 194 |
typedef struct VkMapping { |
0 | 195 |
uint16 vk_from; |
196 |
byte vk_count; |
|
197 |
byte map_to; |
|
198 |
} VkMapping; |
|
199 |
||
423 | 200 |
#define AS(x, z) {x, 0, z} |
201 |
#define AM(x, y, z, w) {x, y - x, z} |
|
0 | 202 |
|
203 |
static const VkMapping _vk_mapping[] = { |
|
204 |
// Pageup stuff + up/down |
|
423 | 205 |
AM(SDLK_PAGEUP, SDLK_PAGEDOWN, WKC_PAGEUP, WKC_PAGEDOWN), |
0 | 206 |
AS(SDLK_UP, WKC_UP), |
207 |
AS(SDLK_DOWN, WKC_DOWN), |
|
208 |
AS(SDLK_LEFT, WKC_LEFT), |
|
209 |
AS(SDLK_RIGHT, WKC_RIGHT), |
|
210 |
||
211 |
AS(SDLK_HOME, WKC_HOME), |
|
212 |
AS(SDLK_END, WKC_END), |
|
213 |
||
214 |
AS(SDLK_INSERT, WKC_INSERT), |
|
215 |
AS(SDLK_DELETE, WKC_DELETE), |
|
216 |
||
217 |
// Map letters & digits |
|
423 | 218 |
AM(SDLK_a, SDLK_z, 'A', 'Z'), |
219 |
AM(SDLK_0, SDLK_9, '0', '9'), |
|
0 | 220 |
|
221 |
AS(SDLK_ESCAPE, WKC_ESC), |
|
424
4c7808af7526
(svn r623) -Feature: [ 1066504 ] Pause key pauses the game
tron
parents:
423
diff
changeset
|
222 |
AS(SDLK_PAUSE, WKC_PAUSE), |
0 | 223 |
AS(SDLK_BACKSPACE, WKC_BACKSPACE), |
224 |
||
225 |
AS(SDLK_SPACE, WKC_SPACE), |
|
226 |
AS(SDLK_RETURN, WKC_RETURN), |
|
227 |
AS(SDLK_TAB, WKC_TAB), |
|
228 |
||
229 |
// Function keys |
|
423 | 230 |
AM(SDLK_F1, SDLK_F12, WKC_F1, WKC_F12), |
0 | 231 |
|
232 |
// Numeric part. |
|
233 |
// What is the virtual keycode for numeric enter?? |
|
423 | 234 |
AM(SDLK_KP0, SDLK_KP9, WKC_NUM_0, WKC_NUM_9), |
0 | 235 |
AS(SDLK_KP_DIVIDE, WKC_NUM_DIV), |
236 |
AS(SDLK_KP_MULTIPLY, WKC_NUM_MUL), |
|
237 |
AS(SDLK_KP_MINUS, WKC_NUM_MINUS), |
|
238 |
AS(SDLK_KP_PLUS, WKC_NUM_PLUS), |
|
239 |
AS(SDLK_KP_ENTER, WKC_NUM_ENTER), |
|
423 | 240 |
AS(SDLK_KP_PERIOD, WKC_NUM_DECIMAL) |
0 | 241 |
}; |
242 |
||
243 |
static uint32 ConvertSdlKeyIntoMy(SDL_keysym *sym) |
|
244 |
{ |
|
2026 | 245 |
const VkMapping *map; |
423 | 246 |
uint key = 0; |
247 |
for (map = _vk_mapping; map != endof(_vk_mapping); ++map) { |
|
248 |
if ((uint)(sym->sym - map->vk_from) <= map->vk_count) { |
|
249 |
key = sym->sym - map->vk_from + map->map_to; |
|
0 | 250 |
break; |
251 |
} |
|
252 |
} |
|
129
df1a60bc0d70
(svn r130) Change: hotkey for console is Backquote (the key left to '1', regardless of keyboard layout
dominik
parents:
128
diff
changeset
|
253 |
|
df1a60bc0d70
(svn r130) Change: hotkey for console is Backquote (the key left to '1', regardless of keyboard layout
dominik
parents:
128
diff
changeset
|
254 |
// check scancode for BACKQUOTE key, because we want the key left of "1", not anything else (on non-US keyboards) |
810
7c51ba5a4368
(svn r1281) -Fix: the OS/2 is now finished. Fixes:
truelight
parents:
798
diff
changeset
|
255 |
#if defined(WIN32) || defined(__OS2__) |
135
638fb31434eb
(svn r136) -Feature/Fix: Console Rev #2 and WKC_BACKQUOTE this patch adds new features to the ingame console and inserts a new keymanagement for windows pcs... (sign_de)
darkvater
parents:
129
diff
changeset
|
256 |
if (sym->scancode == 41) key |= WKC_BACKQUOTE; |
423 | 257 |
#elif defined(__APPLE__) |
258 |
if (sym->scancode == 10) key |= WKC_BACKQUOTE; |
|
259 |
#elif defined(__MORPHOS__) |
|
260 |
if (sym->scancode == 0) key |= WKC_BACKQUOTE; // yes, that key is code '0' under MorphOS :) |
|
435
62863eb5148a
(svn r637) Add keycode for the key to open the console on BeOS
tron
parents:
424
diff
changeset
|
261 |
#elif defined(__BEOS__) |
62863eb5148a
(svn r637) Add keycode for the key to open the console on BeOS
tron
parents:
424
diff
changeset
|
262 |
if (sym->scancode == 17) key |= WKC_BACKQUOTE; |
570
7506629cb749
(svn r981) SunOS: fixed the hotkey for console (Oskar)
bjarni
parents:
543
diff
changeset
|
263 |
#elif defined(__SVR4) && defined(__sun) |
7506629cb749
(svn r981) SunOS: fixed the hotkey for console (Oskar)
bjarni
parents:
543
diff
changeset
|
264 |
if (sym->scancode == 60) key |= WKC_BACKQUOTE; |
572 | 265 |
if (sym->scancode == 49) key |= WKC_BACKSPACE; |
1810
bf33a29287e5
(svn r2314) - Feature: [ 1187490 ] Patches for building on IRIX (jgilje)
Darkvater
parents:
1808
diff
changeset
|
266 |
#elif defined(__sgi__) |
bf33a29287e5
(svn r2314) - Feature: [ 1187490 ] Patches for building on IRIX (jgilje)
Darkvater
parents:
1808
diff
changeset
|
267 |
if (sym->scancode == 22) key |= WKC_BACKQUOTE; |
135
638fb31434eb
(svn r136) -Feature/Fix: Console Rev #2 and WKC_BACKQUOTE this patch adds new features to the ingame console and inserts a new keymanagement for windows pcs... (sign_de)
darkvater
parents:
129
diff
changeset
|
268 |
#else |
1428
91f318d6a490
(svn r1932) Fix: [SDL] On Linux console, the backquote scancode is 41. Let's hope nothing conflicts with it in X.
pasky
parents:
1369
diff
changeset
|
269 |
if (sym->scancode == 41) key |= WKC_BACKQUOTE; // Linux console |
423 | 270 |
if (sym->scancode == 49) key |= WKC_BACKQUOTE; |
135
638fb31434eb
(svn r136) -Feature/Fix: Console Rev #2 and WKC_BACKQUOTE this patch adds new features to the ingame console and inserts a new keymanagement for windows pcs... (sign_de)
darkvater
parents:
129
diff
changeset
|
271 |
#endif |
572 | 272 |
|
0 | 273 |
// META are the command keys on mac |
274 |
if (sym->mod & KMOD_META) key |= WKC_META; |
|
275 |
if (sym->mod & KMOD_SHIFT) key |= WKC_SHIFT; |
|
276 |
if (sym->mod & KMOD_CTRL) key |= WKC_CTRL; |
|
277 |
if (sym->mod & KMOD_ALT) key |= WKC_ALT; |
|
423 | 278 |
// these two lines really help porting hotkey combos. Uncomment to use -- Bjarni |
167 | 279 |
//printf("scancode character pressed %d\n", sym->scancode); |
280 |
//printf("unicode character pressed %d\n", sym->unicode); |
|
0 | 281 |
return (key << 16) + sym->unicode; |
282 |
} |
|
283 |
||
1881
023a134a4b12
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
Darkvater
parents:
1861
diff
changeset
|
284 |
extern void DoExitSave(void); |
643
6f04156241bd
(svn r1076) Feature: Patch setting to autosave the game on exit
dominik
parents:
572
diff
changeset
|
285 |
|
423 | 286 |
static int PollEvent(void) |
287 |
{ |
|
0 | 288 |
SDL_Event ev; |
289 |
||
290 |
if (!SDL_CALL SDL_PollEvent(&ev)) |
|
291 |
return -2; |
|
292 |
||
423 | 293 |
switch (ev.type) { |
0 | 294 |
case SDL_MOUSEMOTION: |
295 |
if (_cursor.fix_at) { |
|
296 |
int dx = ev.motion.x - _cursor.pos.x; |
|
297 |
int dy = ev.motion.y - _cursor.pos.y; |
|
298 |
if (dx != 0 || dy != 0) { |
|
299 |
_cursor.delta.x += dx; |
|
300 |
_cursor.delta.y += dy; |
|
301 |
SDL_CALL SDL_WarpMouse(_cursor.pos.x, _cursor.pos.y); |
|
302 |
} |
|
303 |
} else { |
|
304 |
_cursor.delta.x = ev.motion.x - _cursor.pos.x; |
|
305 |
_cursor.delta.y = ev.motion.y - _cursor.pos.y; |
|
306 |
_cursor.pos.x = ev.motion.x; |
|
307 |
_cursor.pos.y = ev.motion.y; |
|
308 |
_cursor.dirty = true; |
|
309 |
} |
|
310 |
break; |
|
311 |
||
312 |
case SDL_MOUSEBUTTONDOWN: |
|
313 |
if (_rightclick_emulate && (SDL_CALL SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL))) |
|
314 |
ev.button.button = SDL_BUTTON_RIGHT; |
|
315 |
||
423 | 316 |
switch (ev.button.button) { |
317 |
case SDL_BUTTON_LEFT: |
|
318 |
_left_button_down = true; |
|
319 |
break; |
|
320 |
case SDL_BUTTON_RIGHT: |
|
321 |
_right_button_down = true; |
|
322 |
_right_button_clicked = true; |
|
323 |
break; |
|
324 |
case SDL_BUTTON_WHEELUP: |
|
325 |
_cursor.wheel--; |
|
326 |
break; |
|
327 |
case SDL_BUTTON_WHEELDOWN: |
|
328 |
_cursor.wheel++; |
|
329 |
break; |
|
330 |
default: |
|
331 |
break; |
|
0 | 332 |
} |
333 |
break; |
|
334 |
||
335 |
case SDL_MOUSEBUTTONUP: |
|
336 |
if (_rightclick_emulate) { |
|
337 |
_right_button_down = false; |
|
338 |
_left_button_down = false; |
|
339 |
_left_button_clicked = false; |
|
340 |
} else if (ev.button.button == SDL_BUTTON_LEFT) { |
|
341 |
_left_button_down = false; |
|
342 |
_left_button_clicked = false; |
|
343 |
} else if (ev.button.button == SDL_BUTTON_RIGHT) { |
|
344 |
_right_button_down = false; |
|
345 |
} |
|
346 |
break; |
|
347 |
||
348 |
case SDL_QUIT: |
|
291
8339f2fe911d
(svn r297) Fix (SDL): Added a confirmation dialog when quitting the game
dominik
parents:
245
diff
changeset
|
349 |
// do not ask to quit on the main screen |
643
6f04156241bd
(svn r1076) Feature: Patch setting to autosave the game on exit
dominik
parents:
572
diff
changeset
|
350 |
if (_game_mode != GM_MENU) { |
6f04156241bd
(svn r1076) Feature: Patch setting to autosave the game on exit
dominik
parents:
572
diff
changeset
|
351 |
if(_patches.autosave_on_exit) { |
6f04156241bd
(svn r1076) Feature: Patch setting to autosave the game on exit
dominik
parents:
572
diff
changeset
|
352 |
DoExitSave(); |
2228 | 353 |
return 0; |
643
6f04156241bd
(svn r1076) Feature: Patch setting to autosave the game on exit
dominik
parents:
572
diff
changeset
|
354 |
} else |
6f04156241bd
(svn r1076) Feature: Patch setting to autosave the game on exit
dominik
parents:
572
diff
changeset
|
355 |
AskExitGame(); |
6f04156241bd
(svn r1076) Feature: Patch setting to autosave the game on exit
dominik
parents:
572
diff
changeset
|
356 |
} else |
2228 | 357 |
return 0; |
291
8339f2fe911d
(svn r297) Fix (SDL): Added a confirmation dialog when quitting the game
dominik
parents:
245
diff
changeset
|
358 |
break; |
0 | 359 |
|
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
360 |
case SDL_KEYDOWN: /* Toggle full-screen on ALT + ENTER/F */ |
423 | 361 |
if ((ev.key.keysym.mod & (KMOD_ALT | KMOD_META)) && |
362 |
(ev.key.keysym.sym == SDLK_RETURN || ev.key.keysym.sym == SDLK_f)) { |
|
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
363 |
ToggleFullScreen(!_fullscreen); |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
364 |
} else |
0 | 365 |
_pressed_key = ConvertSdlKeyIntoMy(&ev.key.keysym); |
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
366 |
|
0 | 367 |
break; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
179
diff
changeset
|
368 |
|
0 | 369 |
case SDL_VIDEORESIZE: { |
423 | 370 |
int w = clamp(ev.resize.w, 64, MAX_SCREEN_WIDTH); |
371 |
int h = clamp(ev.resize.h, 64, MAX_SCREEN_HEIGHT); |
|
372 |
ChangeResInGame(w, h); |
|
373 |
break; |
|
374 |
} |
|
0 | 375 |
} |
376 |
return -1; |
|
377 |
} |
|
378 |
||
1301
313804601383
(svn r1805) Teach the driver layer a few things about const correctness
tron
parents:
1299
diff
changeset
|
379 |
static const char *SdlVideoStart(const char * const *parm) |
0 | 380 |
{ |
423 | 381 |
char buf[30]; |
0 | 382 |
|
423 | 383 |
const char *s = SdlOpen(SDL_INIT_VIDEO); |
384 |
if (s != NULL) return s; |
|
0 | 385 |
|
386 |
SDL_CALL SDL_VideoDriverName(buf, 30); |
|
2210
58a293892a66
(svn r2728) -Fix/Feature: Change the driver probing algorithm
tron
parents:
2204
diff
changeset
|
387 |
DEBUG(driver, 1) ("sdl: using driver '%s'", buf); |
0 | 388 |
|
389 |
GetVideoModes(); |
|
390 |
CreateMainSurface(_cur_resolution[0], _cur_resolution[1]); |
|
391 |
MarkWholeScreenDirty(); |
|
392 |
||
393 |
SDL_CALL SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); |
|
394 |
SDL_CALL SDL_EnableUNICODE(1); |
|
395 |
return NULL; |
|
396 |
} |
|
397 |
||
423 | 398 |
static void SdlVideoStop(void) |
0 | 399 |
{ |
400 |
SdlClose(SDL_INIT_VIDEO); |
|
401 |
} |
|
402 |
||
2228 | 403 |
static void SdlVideoMainLoop(void) |
0 | 404 |
{ |
423 | 405 |
uint32 next_tick = SDL_CALL SDL_GetTicks() + 30; |
406 |
uint32 cur_ticks; |
|
407 |
uint32 pal_tick = 0; |
|
0 | 408 |
int i; |
409 |
uint32 mod; |
|
410 |
int numkeys; |
|
411 |
Uint8 *keys; |
|
412 |
||
423 | 413 |
for (;;) { |
0 | 414 |
InteractiveRandom(); // randomness |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
179
diff
changeset
|
415 |
|
423 | 416 |
while ((i = PollEvent()) == -1) {} |
2228 | 417 |
if (i >= 0) return; |
0 | 418 |
|
2228 | 419 |
if (_exit_game) return; |
0 | 420 |
|
18
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
421 |
mod = SDL_CALL SDL_GetModState(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
179
diff
changeset
|
422 |
keys = SDL_CALL SDL_GetKeyState(&numkeys); |
0 | 423 |
#if defined(_DEBUG) |
423 | 424 |
if (_shift_pressed) |
0 | 425 |
#else |
423 | 426 |
if (keys[SDLK_TAB]) |
0 | 427 |
#endif |
423 | 428 |
{ |
1040
71a267bebb29
(svn r1541) Fix: [ 1100767 ] fast forward in main menu
dominik
parents:
1028
diff
changeset
|
429 |
if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2; |
423 | 430 |
} else if (_fast_forward & 2) { |
0 | 431 |
_fast_forward = 0; |
432 |
} |
|
433 |
||
423 | 434 |
cur_ticks = SDL_CALL SDL_GetTicks(); |
18
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
435 |
if ((_fast_forward && !_pause) || cur_ticks > next_tick) |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
436 |
next_tick = cur_ticks; |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
437 |
|
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
438 |
if (cur_ticks == next_tick) { |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
439 |
next_tick += 30; |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
440 |
|
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
441 |
_ctrl_pressed = !!(mod & (KMOD_LCTRL | KMOD_RCTRL)); |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
442 |
_shift_pressed = !!(mod & (KMOD_LSHIFT | KMOD_RSHIFT)); |
2664
fcefd29dd9d2
(svn r3206) Wrap all instances of _dbg_screen_rect in #ifdef _DEBUG
tron
parents:
2228
diff
changeset
|
443 |
#ifdef _DEBUG |
302
d028f2803157
(svn r308) Added debug hotkey 'caps lock' for sdl builds as well
dominik
parents:
291
diff
changeset
|
444 |
_dbg_screen_rect = !!(mod & KMOD_CAPS); |
2664
fcefd29dd9d2
(svn r3206) Wrap all instances of _dbg_screen_rect in #ifdef _DEBUG
tron
parents:
2228
diff
changeset
|
445 |
#endif |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
179
diff
changeset
|
446 |
|
18
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
447 |
// determine which directional keys are down |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
179
diff
changeset
|
448 |
_dirkeys = |
423 | 449 |
(keys[SDLK_LEFT] ? 1 : 0) | |
450 |
(keys[SDLK_UP] ? 2 : 0) | |
|
451 |
(keys[SDLK_RIGHT] ? 4 : 0) | |
|
452 |
(keys[SDLK_DOWN] ? 8 : 0); |
|
18
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
453 |
GameLoop(); |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
454 |
|
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
455 |
_screen.dst_ptr = _sdl_screen->pixels; |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
456 |
UpdateWindows(); |
423 | 457 |
if (++pal_tick > 4) { |
458 |
CheckPaletteAnim(); |
|
459 |
pal_tick = 1; |
|
0 | 460 |
} |
2026 | 461 |
DrawSurfaceToScreen(); |
0 | 462 |
} else { |
18
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
463 |
SDL_CALL SDL_Delay(1); |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
464 |
_screen.dst_ptr = _sdl_screen->pixels; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
454
diff
changeset
|
465 |
DrawTextMessage(); |
18
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
466 |
DrawMouseCursor(); |
7428dd7c5732
(svn r19) SDL performance fix fo palette animation and mouse jumping (jirif)
dominik
parents:
0
diff
changeset
|
467 |
DrawSurfaceToScreen(); |
0 | 468 |
} |
469 |
} |
|
470 |
} |
|
471 |
||
472 |
static bool SdlVideoChangeRes(int w, int h) |
|
473 |
{ |
|
2169
f6d2ec3ecd5b
(svn r2683) Remove redundant function call propagate return value
tron
parents:
2163
diff
changeset
|
474 |
return CreateMainSurface(w, h); |
0 | 475 |
} |
476 |
||
1829
0b6de3b4458a
(svn r2334) - Fix (regression): moved togglefullscreen into the video-driver, now windows works, dedicated works and sdl works. Also reverted the change to the makefile.
Darkvater
parents:
1825
diff
changeset
|
477 |
static void SdlVideoFullScreen(bool full_screen) |
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
478 |
{ |
1808
859858f770c0
(svn r2312) - Fix (regression): changing to/from fullscreen got broken with SDL.
Darkvater
parents:
1807
diff
changeset
|
479 |
_fullscreen = full_screen; |
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
480 |
GetVideoModes(); // get the list of available video modes |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
481 |
if (!_video_driver->change_resolution(_cur_resolution[0], _cur_resolution[1])) |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
482 |
_fullscreen ^= true; // switching resolution failed, put back full_screen to original status |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
483 |
} |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1509
diff
changeset
|
484 |
|
0 | 485 |
const HalVideoDriver _sdl_video_driver = { |
486 |
SdlVideoStart, |
|
487 |
SdlVideoStop, |
|
488 |
SdlVideoMakeDirty, |
|
489 |
SdlVideoMainLoop, |
|
490 |
SdlVideoChangeRes, |
|
1829
0b6de3b4458a
(svn r2334) - Fix (regression): moved togglefullscreen into the video-driver, now windows works, dedicated works and sdl works. Also reverted the change to the makefile.
Darkvater
parents:
1825
diff
changeset
|
491 |
SdlVideoFullScreen, |
0 | 492 |
}; |
2189
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
493 |
|
d240b9097139
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
494 |
#endif |