diff -r 90585aba87ad -r 249adefa9c1c hedgewars/uStore.pas --- a/hedgewars/uStore.pas Sat Jan 16 17:30:37 2010 +0000 +++ b/hedgewars/uStore.pas Mon Jan 18 05:36:08 2010 +0000 @@ -20,14 +20,31 @@ unit uStore; interface -uses sysutils, uConsts, uTeams, SDLh, +uses sysutils, uConsts, uTeams, SDLh, uFloat, {$IFDEF GLES11} - gles11, + gles11; {$ELSE} - GL, GLext, + GL, GLext; {$ENDIF} -uFloat; + +var PixelFormat: PSDL_PixelFormat; + SDLPrimSurface: PSDL_Surface; + PauseTexture, + SyncTexture, + ConfirmTexture: PTexture; + cScaleFactor: GLfloat; + SupportNPOTT: Boolean; + Step: LongInt; + squaresize : LongInt; + numsquares : LongInt; +{$IFDEF SDL13notworking} + ProgrTex: TSDL_TextureID; +{$ELSE} + ProgrTex: PTexture; +{$ENDIF} + +procedure init_uStore; procedure StoreLoad; procedure StoreRelease; procedure DrawSpriteFromRect(Sprite: TSprite; r: TSDL_Rect; X, Y, Height, Position: LongInt); @@ -60,26 +77,14 @@ procedure SetScale(f: GLfloat); -var PixelFormat: PSDL_PixelFormat = nil; - SDLPrimSurface: PSDL_Surface = nil; - PauseTexture, - SyncTexture, - ConfirmTexture: PTexture; - cScaleFactor: GLfloat = 2.0; - SupportNPOTT: Boolean = false; - implementation -uses uMisc, uConsole, uLand, uLocale, uWorld - {$IFDEF IPHONEOS} - , PascalExports - {$ENDIF} - ; +uses uMisc, uConsole, uLand, uLocale, uWorld{$IFDEF IPHONEOS}, PascalExports{$ENDIF}; type TGPUVendor = (gvUnknown, gvNVIDIA, gvATI, gvIntel); -var HHTexture: PTexture; - MaxTextureSize: Integer; - {$IFNDEF IPHONEOS}cGPUVendor: TGPUVendor = gvUnknown;{$ENDIF} +var HHTexture: PTexture; + MaxTextureSize: Integer; + {$IFNDEF IPHONEOS}cGPUVendor: TGPUVendor;{$ENDIF} procedure DrawRoundRect(rect: PSDL_Rect; BorderColor, FillColor: Longword; Surface: PSDL_Surface; Clear: boolean); var r: TSDL_Rect; @@ -1165,15 +1170,6 @@ end; //////////////////////////////////////////////////////////////////////////////// -var Step: LongInt = 0; - squaresize : LongInt; - numsquares : LongInt; -{$IFDEF SDL13notworking} - ProgrTex: TSDL_TextureID = 0; -{$ELSE} - ProgrTex: PTexture = nil; -{$ENDIF} - procedure AddProgress; var r: TSDL_Rect; texsurf: PSDL_Surface; @@ -1306,4 +1302,20 @@ end; end; +procedure init_uStore; +begin + PixelFormat:= nil; + SDLPrimSurface:= nil; + {$IFNDEF IPHONEOS}cGPUVendor:= gvUnknown;{$ENDIF} + + cScaleFactor:= 2.0; + SupportNPOTT:= false; + Step:= 0; +{$IFDEF SDL13notworking} + ProgrTex:= 0; +{$ELSE} + ProgrTex:= nil; +{$ENDIF} +end; + end.