hedgewars: comparison hedgewars/uStore.pas

equal deleted inserted replaced

-:d24257910f8d
+:aaefa587e277
 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 SetColorPointer(p: Pointer;n: Integer);
 procedure BeginWater;
 procedure EndWater;
 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;
 {$IFDEF GL2}
 shaderMain: GLuint;
 shaderWater: GLuint;
 {$ENDIF}
 {$IFDEF WEBGL}
 OpenGLSetupedBefore : boolean;
 {$ENDIF}
+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;
 if (Gear <> nil) and (BotLevel > 0) then
 begin
 foundBot:= true;
 // initially was going to do the highest botlevel of the team, but for now, just apply if entire team has same bot level
 if maxLevel = -1 then maxLevel:= BotLevel
 else if (maxLevel > 0) and (maxLevel <> BotLevel) then maxLevel:= 0;
 //if (maxLevel > 0) and (BotLevel < maxLevel) then maxLevel:= BotLevel
 end
 else if Gear <> nil then  maxLevel:= 0;
 if foundBot then
 begin
 // disabled the plain flag - I think it looks ok even w/ full bars obscuring CPU
 //if (maxLevel > 0) and (maxLevel < 3) then Flag:= 'cpu_plain' else
 Flag:= 'cpu'
 end
 else if (Flag = 'cpu') or (Flag = 'cpu_plain') then
 Flag:= 'hedgewars';
 flagsurf:= LoadDataImageAltFile(ptFlags, Flag, 'hedgewars', ifNone);
 TryDo(flagsurf <> nil, 'Failed to load flag "' + Flag + '" as well as the default flag', true);
 case maxLevel of
 1: copyToXY(SpritesData[sprBotlevels].Surface, flagsurf, 0, 0);
 2: copyToXYFromRect(SpritesData[sprBotlevels].Surface, flagsurf, 5, 2, 17, 13, 5, 2);
 3: copyToXYFromRect(SpritesData[sprBotlevels].Surface, flagsurf, 9, 5, 13, 10, 9, 5);
 4: copyToXYFromRect(SpritesData[sprBotlevels].Surface, flagsurf, 13, 9, 9, 6, 13, 9);
 5: copyToXYFromRect(SpritesData[sprBotlevels].Surface, flagsurf, 17, 11, 5, 4, 17, 11)
 end;
 copyToXY(flagsurf, texsurf, 2, 2);
 SDL_FreeSurface(flagsurf);
 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, priority);
 // This should maybe be flagged. It wastes quite a bit of memory.
 if not reload then
 begin
 {$IFDEF USE_CONTEXT_RESTORE}
 Surface:= tmpsurf
 {$ELSE}
 if saveSurf then
 Surface:= tmpsurf
 else
 SDL_FreeSurface(tmpsurf)
 IMG_Quit();
 WriteLnToConsole('Leaving StoreLoad');
 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
 begin
 DeleteFramebuffer(framel, depthl, texl);
 DeleteFramebuffer(framer, depthr, texr);
 end
 while not eof(f) do
 begin
 ReadLn(f, line);
 source:= source + line + #10;
 end;
 Close(f);
 WriteLnToConsole('Compiling shader: ' + Pathz[ptShaders] + '/' + shaderFile);
 sourceA:=PChar(source);
 MaxTextureSize:= 1024;
 AddFileLog('OpenGL Warning - driver didn''t provide any valid max texture size; assuming 1024');
 end
 else if (MaxTextureSize < 1024) and (MaxTextureSize >= 512) then
 begin
 cReducedQuality := cReducedQuality or rqNoBackground;
 AddFileLog('Texture size too small for backgrounds, disabling.');
 end;
 (*
 // find out which gpu we are using (for extension compatibility maybe?)
 Tint(255, 255, 255, 255);
 UpdateModelviewProjection;
 {$ENDIF}
-{$IFNDEF S3D_DISABLED}
+{$IFNDEF USE_S3D_RENDERING}
 if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) or (cStereoMode = smAFR) then
 begin
 // prepare left and right frame buffers and associated textures
 if glLoadExtension('GL_EXT_framebuffer_object') then
 begin
 hglLoadIdentity();
 hglScalef(2.0 / cScreenWidth, -2.0 / cScreenHeight, 1.0);
 hglTranslatef(0, -cScreenHeight / 2, 0);
 EnableTexture(True);
 glEnableVertexAttribArray(aVertex);
 glEnableVertexAttribArray(aTexCoord);
 glGenBuffers(1, @vBuffer);
 glGenBuffers(1, @tBuffer);
 glGenBuffers(1, @cBuffer);
 UpdateModelviewProjection;
 {$ELSE}
 glMatrixMode(GL_PROJECTION);
 glLoadMatrixf(@mProjection[0, 0]);
 glMatrixMode(GL_MODELVIEW);
 {$ENDIF}
 end;
 *)
 procedure SetScale(f: GLfloat);
 begin
 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;
 ResetLand;
 ResetWorldTex;
 //uTextures.freeModule; //DEBUG ONLY
 {$ENDIF}
 AddFileLog('Freeing old primary surface...');
 {$IFNDEF SDL13}
 {$IFNDEF WEBGL}
 SDL_FreeSurface(SDLPrimSurface);
 SDLPrimSurface:= nil;
 {$ENDIF}
 {$ENDIF}
 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}
 begin
 // clean the window from any previous content
 glClear(GL_COLOR_BUFFER_BIT);
 if SuddenDeathDmg then
 glClearColor(SDSkyColor.r * (SDTint/255) / 255, SDSkyColor.g * (SDTint/255) / 255, SDSkyColor.b * (SDTint/255) / 255, 0.99)
 else if ((cReducedQuality and rqNoBackground) = 0) then
 glClearColor(SkyColor.r / 255, SkyColor.g / 255, SkyColor.b / 255, 0.99)
 else
 glClearColor(RQSkyColor.r / 255, RQSkyColor.g / 255, RQSkyColor.b / 255, 0.99);
 // reload everything we had before

branch	webgl
changeset 8330	aaefa587e277
parent 8096	453917e94e55
parent 8309	edcfb5e43245
child 8336	4877d7333818