sheepy-clone: comparison hedgewars/uStore.pas

equal deleted inserted replaced

-:d5d5e1698554
+:1dedcc37bfe8
 procedure RenderHealth(var Hedgehog: THedgehog);
 procedure AddProgress;
 procedure FinishProgress;
 function  LoadImage(const filename: shortstring; imageFlags: LongInt): PSDL_Surface;
-// loads an image from the game's data files
+// loads an image from the games data files
 function  LoadDataImage(const path: TPathType; const filename: shortstring; imageFlags: LongInt): PSDL_Surface;
 // like LoadDataImage but uses altPath as fallback-path if file not found/loadable in path
 function  LoadDataImageAltPath(const path, altPath: TPathType; const filename: shortstring; imageFlags: LongInt): PSDL_Surface;
 // like LoadDataImage but uses altFile as fallback-filename if file cannot be loaded
 function  LoadDataImageAltFile(const path: TPathType; const filename, altFile: shortstring; imageFlags: LongInt): PSDL_Surface;
 procedure WarpMouse(x, y: Word); inline;
 procedure SwapBuffers; {$IFDEF USE_VIDEO_RECORDING}cdecl{$ELSE}inline{$ENDIF};
 implementation
-uses uMisc, uConsole, uMobile, uVariables, uUtils, uTextures, uRender, uRenderUtils, uCommands
+uses uMisc, uConsole, uVariables, uUtils, uTextures, uRender, uRenderUtils, uCommands
 , uPhysFSLayer
 , uDebug
 {$IFDEF USE_CONTEXT_RESTORE}, uWorld{$ENDIF}
 {$IF NOT DEFINED(SDL13) AND DEFINED(USE_VIDEO_RECORDING)}, glut {$ENDIF};
 SDLwindow: PSDL_Window;
 SDLGLcontext: PSDL_GLContext;
 {$ELSE}
 SDLPrimSurface: PSDL_Surface;
 {$ENDIF}
+squaresize : LongInt;
+numsquares : LongInt;
+ProgrTex: PTexture;
+const
+cHHFileName = 'Hedgehog';
+cCHFileName = 'Crosshair';
 function WriteInRect(Surface: PSDL_Surface; X, Y: LongInt; Color: LongWord; Font: THWFont; s: ansistring): TSDL_Rect;
 var w, h: LongInt;
 tmpsurf: PSDL_Surface;
 clr: TSDL_Color;
 r, rr: TSDL_Rect;
 drY: LongInt;
 texsurf, flagsurf, iconsurf: PSDL_Surface;
 foundBot: boolean;
 begin
+if cOnlyStats then exit;
 r.x:= 0;
 r.y:= 0;
 drY:= - 4;
 for t:= 0 to Pred(TeamsCount) do
 with TeamsArray[t]^ do
 if not reload then
 AddProgress;
 IMG_Quit();
 end;
-{$IF NOT DEFINED(S3D_DISABLED) OR DEFINED(USE_VIDEO_RECORDING)}
+{$IF DEFINED(USE_S3D_RENDERING) OR DEFINED(USE_VIDEO_RECORDING)}
 procedure CreateFramebuffer(var frame, depth, tex: GLuint);
 begin
 glGenFramebuffersEXT(1, @frame);
 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, frame);
 glGenRenderbuffersEXT(1, @depth);
 end;
 {$IFDEF USE_VIDEO_RECORDING}
 if defaultFrame <> 0 then
 DeleteFramebuffer(defaultFrame, depthv, texv);
 {$ENDIF}
-{$IFNDEF S3D_DISABLED}
+{$IFDEF USE_S3D_RENDERING}
-if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) or (cStereoMode = smAFR) then
+if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then
 begin
 DeleteFramebuffer(framel, depthl, texl);
 DeleteFramebuffer(framer, depthr, texr);
 end
 {$ENDIF}
 end;
 if ((imageFlags and ifIgnoreCaps) = 0) and ((tmpsurf^.w > MaxTextureSize) or (tmpsurf^.h > MaxTextureSize)) then
 begin
 SDL_FreeSurface(tmpsurf);
-OutError(msgFailedSize, (imageFlags and ifCritical) <> 0);
+OutError(msgFailedSize, ((not cOnlyStats) and ((imageFlags and ifCritical) <> 0)));
 // dummy surface to replace non-critical textures that failed to load due to their size
 LoadImage:= SDL_CreateRGBSurface(SDL_SWSURFACE, 2, 2, 32, RMask, GMask, BMask, AMask);
 exit;
 end;
 function LoadDataImage(const path: TPathType; const filename: shortstring; imageFlags: LongInt): PSDL_Surface;
 var tmpsurf: PSDL_Surface;
 begin
 // check for file in user dir (never critical)
 tmpsurf:= LoadImage(cPathz[path] + '/' + filename, imageFlags);
+LoadDataImage:= tmpsurf;
 end;
 function LoadDataImageAltPath(const path, altPath: TPathType; const filename: shortstring; imageFlags: LongInt): PSDL_Surface;
 var tmpsurf: PSDL_Surface;
 AddFileLog('Warning: off-screen rendering is not supported; using back buffer but it may not work.');
 end;
 end;
 {$ENDIF}
-{$IFNDEF S3D_DISABLED}
+{$IFDEF USE_S3D_RENDERING}
-if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) or (cStereoMode = smAFR) then
+if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then
 begin
 // prepare left and right frame buffers and associated textures
 if glLoadExtension('GL_EXT_framebuffer_object') then
 begin
 CreateFramebuffer(framel, depthl, texl);
 ////////////////////////////////////////////////////////////////////////////////
 procedure AddProgress;
 var r: TSDL_Rect;
 texsurf: PSDL_Surface;
 begin
+if cOnlyStats then exit;
 if Step = 0 then
 begin
 WriteToConsole(msgLoading + 'progress sprite: ');
 texsurf:= LoadDataImage(ptGraphics, 'Progress', ifCritical or ifTransparent);
 ProgrTex:= Surface2Tex(texsurf, false);
 squaresize:= texsurf^.w shr 1;
 numsquares:= texsurf^.h div squaresize;
 SDL_FreeSurface(texsurf);
+with mobileRecord do
-uMobile.GameLoading();
+if GameLoading <> nil then
+GameLoading();
 end;
 TryDo(ProgrTex <> nil, 'Error - Progress Texure is nil!', true);
 glClear(GL_COLOR_BUFFER_BIT);
 inc(Step);
 end;
 procedure FinishProgress;
 begin
-uMobile.GameLoaded();
+with mobileRecord do
+if GameLoaded <> nil then
+GameLoaded();
 WriteLnToConsole('Freeing progress surface... ');
 FreeTexture(ProgrTex);
 ProgrTex:= nil;
 Step:= 0
 end;
 var flags: Longword = 0;
 reinit: boolean = false;
 {$IFNDEF DARWIN}ico: PSDL_Surface;{$ENDIF}
 {$IFDEF SDL13}x, y: LongInt;{$ENDIF}
 begin
+if cOnlyStats then
+begin
+MaxTextureSize:= 1024;
+exit
+end;
 if Length(s) = 0 then
 cFullScreen:= (not cFullScreen)
+else cFullScreen:= s = '1';
+if cFullScreen then
+begin
+cScreenWidth:= cFullscreenWidth;
+cScreenHeight:= cFullscreenHeight;
+end
 else
-cFullScreen:= s = '1';
+begin
+cScreenWidth:= cWindowedWidth;
+cScreenHeight:= cWindowedHeight;
+end;
 AddFileLog('Preparing to change video parameters...');
 {$IFDEF SDL13}
 if SDLwindow = nil then
 {$ELSE}
 flags:= flags or SDL_WINDOW_BORDERLESS;
 {$ENDIF}
 if SDLwindow = nil then
 if cFullScreen then
-SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cOrigScreenWidth, cOrigScreenHeight, flags or SDL_WINDOW_FULLSCREEN)
+SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, flags or SDL_WINDOW_FULLSCREEN)
 else
+begin
 SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, flags);
+end;
 SDLTry(SDLwindow <> nil, true);
 {$ELSE}
 flags:= SDL_OPENGL or SDL_RESIZABLE;
 if cFullScreen then
+begin
 flags:= flags or SDL_FULLSCREEN;
+end;
 if not cOnlyStats then
 begin
 {$IFDEF WIN32}
 s:= SDL_getenv('SDL_VIDEO_CENTERED');
 SDL_putenv('SDL_VIDEO_CENTERED=1');
 {$ENDIF}
-SDLPrimSurface:= SDL_SetVideoMode(cScreenWidth, cScreenHeight, cBits, flags);
+SDLPrimSurface:= SDL_SetVideoMode(cScreenWidth, cScreenHeight, 0, flags);
 SDLTry(SDLPrimSurface <> nil, true);
 {$IFDEF WIN32}SDL_putenv(str2pchar('SDL_VIDEO_CENTERED=' + s));{$ENDIF}
 end;
 {$ENDIF}

branch	physfslayer
changeset 8520	1dedcc37bfe8
parent 8370	0c79946e96f8
child 8444	75db7bb8dce8
child 8838	aa2ffd427f6a