index 21501c6705baacbfc11a2711f7789163b9c9556e..4cb69f90349c26ac449f029ded27ff3e30303747 100644 (file)
procedure sys_Delay (ms: Integer);
(* --- Graphics --- *)
procedure sys_Delay (ms: Integer);
(* --- Graphics --- *)
- function sys_GetDispalyModes (bpp: Integer): SSArray;
+ function sys_GetDisplayModes (bpp: Integer): SSArray;
function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen: Boolean): Boolean;
procedure sys_EnableVSync (yes: Boolean);
procedure sys_Repaint;
function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen: Boolean): Boolean;
procedure sys_EnableVSync (yes: Boolean);
procedure sys_Repaint;
implementation
uses
implementation
uses
- SysUtils, SDL, GL, Math,
- e_log, e_graphics, e_input,
+ SysUtils, SDL, Math,
+ {$INCLUDE ../nogl/noGLuses.inc}
+ e_log, e_graphics, e_input, e_sound,
g_options, g_window, g_console, g_game, g_menu, g_gui, g_main;
const
g_options, g_window, g_console, g_game, g_menu, g_gui, g_main;
const
screen := SDL_SetVideoMode(w, h, bpp, flags);
if screen <> nil then
begin
screen := SDL_SetVideoMode(w, h, bpp, flags);
if screen <> nil then
begin
+ {$IFDEF NOGL_INIT}
+ nogl_Init;
+ {$ENDIF}
SDL_WM_SetCaption(GameTitle, nil);
UpdateSize(w, h);
result := True
SDL_WM_SetCaption(GameTitle, nil);
UpdateSize(w, h);
result := True
(* ??? *)
end;
(* ??? *)
end;
- function sys_GetDispalyModes (bpp: Integer): SSArray;
+ function sys_GetDisplayModes (bpp: Integer): SSArray;
var m: PPSDL_Rect; f: TSDL_PixelFormat; i, count: Integer;
begin
SetLength(result, 0);
var m: PPSDL_Rect; f: TSDL_PixelFormat; i, count: Integer;
begin
SetLength(result, 0);
f.BitsPerPixel := bpp;
f.BytesPerPixel := (bpp + 7) div 8;
m := SDL_ListModes(@f, SDL_OPENGL or SDL_FULLSCREEN);
f.BitsPerPixel := bpp;
f.BytesPerPixel := (bpp + 7) div 8;
m := SDL_ListModes(@f, SDL_OPENGL or SDL_FULLSCREEN);
- if (m <> NIL) and (IntPtr(m) <> -1) then
+ if (m <> NIL) and (UIntPtr(m) <> UIntPtr(-1)) then
begin
count := 0;
while m[count] <> nil do inc(count);
begin
count := 0;
while m[count] <> nil do inc(count);
SDL_JOYAXISMOTION: HandleJoyAxis(ev.jaxis);
SDL_JOYHATMOTION: HandleJoyHat(ev.jhat);
SDL_VIDEOEXPOSE: sys_Repaint;
SDL_JOYAXISMOTION: HandleJoyAxis(ev.jaxis);
SDL_JOYHATMOTION: HandleJoyHat(ev.jhat);
SDL_VIDEOEXPOSE: sys_Repaint;
+ SDL_ACTIVEEVENT: e_MuteChannels((ev.active.gain = 0) and gMuteWhenInactive);
end
end
end;
end
end
end;
(* --------- Init --------- *)
procedure sys_Init;
(* --------- Init --------- *)
procedure sys_Init;
- var flags: Uint32; ok: Boolean; i: Integer;
+ var flags: Uint32; i: Integer;
begin
e_WriteLog('Init SDL', TMsgType.Notify);
flags := SDL_INIT_VIDEO or SDL_INIT_AUDIO or
begin
e_WriteLog('Init SDL', TMsgType.Notify);
flags := SDL_INIT_VIDEO or SDL_INIT_AUDIO or
(*or SDL_INIT_NOPARACHUTE*);
if SDL_Init(flags) <> 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError);
(*or SDL_INIT_NOPARACHUTE*);
if SDL_Init(flags) <> 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError);
- ok := InitWindow(gScreenWidth, gScreenHeight, gBPP, gFullScreen);
- if not ok then
- raise Exception.Create('SDL: Failed to set videomode: ' + SDL_GetError);
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
for i := 0 to e_MaxJoys - 1 do
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
for i := 0 to e_MaxJoys - 1 do
e_WriteLog('Releasing SDL', TMsgType.Notify);
for i := 0 to e_MaxJoys - 1 do
RemoveJoystick(i);
e_WriteLog('Releasing SDL', TMsgType.Notify);
for i := 0 to e_MaxJoys - 1 do
RemoveJoystick(i);
- SDL_FreeSurface(screen);
+ if screen <> nil then
+ begin
+ {$IFDEF NOGL_INIT}
+ nogl_Quit;
+ {$ENDIF}
+ SDL_FreeSurface(screen)
+ end;
SDL_Quit
end;
SDL_Quit
end;