-Removal of older WAV files, now useless thanks to OpenAL
-SDLh updated to better support SDL-1.3 symbols
-various update for iphone development
--- a/hedgewars/CCHandlers.inc Tue Jul 07 15:24:43 2009 +0000
+++ b/hedgewars/CCHandlers.inc Tue Jul 07 21:48:55 2009 +0000
@@ -577,9 +577,10 @@
if SDLPrimSurface <> nil then SDL_FreeSurface(SDLPrimSurface);
{$IFDEF DARWIN}
-{Fix for the Mac titlebar bug}
+//remove the topbar from Mac and iPhone
flags:= flags or SDL_NOFRAME;
{$ENDIF}
+
SDLPrimSurface:= SDL_SetVideoMode(cScreenWidth, cScreenHeight, cBits, flags);
SDLTry(SDLPrimSurface <> nil, true);
--- a/hedgewars/SDLh.pas Tue Jul 07 15:24:43 2009 +0000
+++ b/hedgewars/SDLh.pas Tue Jul 07 21:48:55 2009 +0000
@@ -62,16 +62,35 @@
{$ENDIF}
SDL_SWSURFACE = $00000000;
SDL_HWSURFACE = $00000001;
- SDL_ASYNCBLIT = $00000004;
- SDL_ANYFORMAT = $10000000;
+ SDL_SRCALPHA = $00010000;
+ SDL_INIT_VIDEO = $00000020;
+ SDL_INIT_AUDIO = $00000010;
+
+ {$IFDEF SDL13}
+ SDL_ASYNCBLIT = $08000000;
+ SDL_ANYFORMAT = $10000000;
+ SDL_HWPALETTE = $00200000;
+ SDL_DOUBLEBUF = $00400000;
+ SDL_FULLSCREEN = $00800000;
+ SDL_HWACCEL = $08000000;
+ SDL_SRCCOLORKEY = $00020000;
+ SDL_RLEACCEL = $08000000;
+ SDL_NOFRAME = $02000000;
+ SDL_OPENGL = $04000000;
+ SDL_RESIZABLE = $01000000;
+ {$ELSE}
+ SDL_ASYNCBLIT = $00000004;
+ SDL_ANYFORMAT = $00100000;
SDL_HWPALETTE = $20000000;
SDL_DOUBLEBUF = $40000000;
SDL_FULLSCREEN = $80000000;
- SDL_NOFRAME = $00000020;
SDL_HWACCEL = $00000100;
SDL_SRCCOLORKEY = $00001000;
SDL_RLEACCEL = $00004000;
- SDL_SRCALPHA = $00010000;
+ SDL_NOFRAME = $00000020;
+ SDL_OPENGL = $00000002;
+ SDL_RESIZABLE = $00000010;
+ {$ENDIF}
SDL_NOEVENT = 0;
SDL_ACTIVEEVENT = 1;
@@ -81,17 +100,11 @@
SDL_VIDEORESIZE = 16;
SDL_APPINPUTFOCUS = 2;
-
- SDL_INIT_VIDEO = $00000020;
- SDL_INIT_AUDIO = $00000010;
+ SDL_GL_DOUBLEBUFFER = 5;
- SDL_GL_DOUBLEBUFFER = 5;
- SDL_OPENGL = 2;
- SDL_RESIZABLE = $00000010;
-
- RMask = $FF;
- GMask = $FF00;
- BMask = $FF0000;
+ RMask = $000000FF;
+ GMask = $0000FF00;
+ BMask = $00FF0000;
AMask = $FF000000;
type PSDL_Rect = ^TSDL_Rect;
--- a/hedgewars/uIO.pas Tue Jul 07 15:24:43 2009 +0000
+++ b/hedgewars/uIO.pas Tue Jul 07 21:48:55 2009 +0000
@@ -169,8 +169,11 @@
buf: array[0..255] of byte;
s: shortstring absolute buf;
begin
+{$IFDEF IPHONEOS}
+filemode := 0;
+{$ENDIF}
+
assign(f, fileName);
-
reset(f, 1);
repeat
--- a/hedgewars/uLand.pas Tue Jul 07 15:24:43 2009 +0000
+++ b/hedgewars/uLand.pas Tue Jul 07 21:48:55 2009 +0000
@@ -606,7 +606,6 @@
AddProgress;
-AddProgress
end;
procedure MakeFortsMap;
--- a/hedgewars/uStore.pas Tue Jul 07 15:24:43 2009 +0000
+++ b/hedgewars/uStore.pas Tue Jul 07 21:48:55 2009 +0000
@@ -281,7 +281,11 @@
if (not cReducedQuality) or ((ii <> sprSky) and (ii <> sprHorizont) and (ii <> sprFlake)) then
begin
if AltPath = ptNone then
+{$IFDEF IPHONEOS}
+ tmpsurf:= LoadImage(Pathz[Path] + '/' + FileName, ifAlpha or ifTransparent)
+{$ELSE}
tmpsurf:= LoadImage(Pathz[Path] + '/' + FileName, ifAlpha or ifCritical or ifTransparent)
+{$ENDIF}
else begin
tmpsurf:= LoadImage(Pathz[Path] + '/' + FileName, ifAlpha or ifTransparent);
if tmpsurf = nil then
Binary file share/hedgewars/Data/Sounds/voices/Default/Illgetyou.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Default/Incoming.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Default/Stupid.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Mobster/Coward.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Mobster/Firstblood.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Mobster/Youllregretthat.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Coward.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Enemydown.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Robot/Reinforcements.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Robot/Yessir.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Russian/Coward.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Russian/Kamikaze.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Russian/Solong.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Singer/Illgetyou.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Singer/Revenge.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Illgetyou.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Yessir.wav has changed