# HG changeset patch # User koda # Date 1303364484 -7200 # Node ID 7b515d0945b1a72843c4f55c600d99f05b0a7454 # Parent d1eb1560b4d581d685b7610f87aa5c098af805b6 Clean Augean stables 2 (pascal has classnames available) diff -r d1eb1560b4d5 -r 7b515d0945b1 hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Wed Apr 20 05:26:47 2011 +0200 +++ b/hedgewars/hwengine.pas Thu Apr 21 07:41:24 2011 +0200 @@ -283,7 +283,7 @@ else begin LoadRecordFromFile(recordFileName); - perfExt_SaveBeganSynching(); + uMobile.SaveBeganSynching(); end; ScriptOnGameInit; diff -r d1eb1560b4d5 -r 7b515d0945b1 hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Wed Apr 20 05:26:47 2011 +0200 +++ b/hedgewars/uAmmos.pas Thu Apr 21 07:41:24 2011 +0200 @@ -232,7 +232,7 @@ end end end; -perfExt_AmmoUpdate; +uMobile.AmmoUpdate; end; function HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean; diff -r d1eb1560b4d5 -r 7b515d0945b1 hedgewars/uGame.pas --- a/hedgewars/uGame.pas Wed Apr 20 05:26:47 2011 +0200 +++ b/hedgewars/uGame.pas Thu Apr 21 07:41:24 2011 +0200 @@ -76,7 +76,7 @@ GameType:= gmtLocal; AddVisualGear(0, 0, vgtTeamHealthSorter); {$IFDEF IPHONEOS}InitIPC;{$ENDIF} - perfExt_SaveFinishedSynching(); + uMobile.SaveFinishedSynching(); end; end else ProcessGears diff -r d1eb1560b4d5 -r 7b515d0945b1 hedgewars/uMobile.pas --- a/hedgewars/uMobile.pas Wed Apr 20 05:26:47 2011 +0200 +++ b/hedgewars/uMobile.pas Thu Apr 21 07:41:24 2011 +0200 @@ -35,12 +35,13 @@ {$ENDIF} function isPhone: Boolean; inline; procedure performRumble; inline; -procedure perfExt_AddProgress; inline; -procedure perfExt_FinishProgress; inline; -procedure perfExt_AmmoUpdate; // don't inline -procedure perfExt_NewTurnBeginning; inline; -procedure perfExt_SaveBeganSynching; inline; -procedure perfExt_SaveFinishedSynching; inline; + +procedure AddProgress; inline; +procedure FinishProgress; inline; +procedure AmmoUpdate; // don't inline +procedure NewTurnBeginning; inline; +procedure SaveBeganSynching; inline; +procedure SaveFinishedSynching; inline; implementation uses uVariables; @@ -62,21 +63,21 @@ {$ENDIF} end; -procedure perfExt_AddProgress; inline; +procedure AddProgress; inline; begin {$IFDEF IPHONEOS} startSpinning(); {$ENDIF} end; -procedure perfExt_FinishProgress; inline; +procedure FinishProgress; inline; begin {$IFDEF IPHONEOS} stopSpinning(); {$ENDIF} end; -procedure perfExt_AmmoUpdate; // don't inline +procedure AmmoUpdate; // don't inline begin {$IFDEF IPHONEOS} if (CurrentTeam = nil) or @@ -87,22 +88,22 @@ {$ENDIF} end; -procedure perfExt_NewTurnBeginning; inline; +procedure NewTurnBeginning; inline; begin {$IFDEF IPHONEOS} clearView(); - perfExt_AmmoUpdate(); {$ENDIF} + AmmoUpdate(); end; -procedure perfExt_SaveBeganSynching; inline; +procedure SaveBeganSynching; inline; begin {$IFDEF IPHONEOS} replayBegan(); {$ENDIF} end; -procedure perfExt_SaveFinishedSynching; inline; +procedure SaveFinishedSynching; inline; begin {$IFDEF IPHONEOS} replayFinished(); diff -r d1eb1560b4d5 -r 7b515d0945b1 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Wed Apr 20 05:26:47 2011 +0200 +++ b/hedgewars/uStore.pas Thu Apr 21 07:41:24 2011 +0200 @@ -672,7 +672,7 @@ numsquares:= texsurf^.h div squaresize; SDL_FreeSurface(texsurf); - perfExt_AddProgress(); + uMobile.AddProgress(); end; TryDo(ProgrTex <> nil, 'Error - Progress Texure is nil!', true); @@ -700,7 +700,7 @@ begin WriteLnToConsole('Freeing progress surface... '); FreeTexture(ProgrTex); - perfExt_FinishProgress(); + uMobile.FinishProgress(); end; function RenderHelpWindow(caption, subcaption, description, extra: ansistring; extracolor: LongInt; iconsurf: PSDL_Surface; iconrect: PSDL_Rect): PTexture; diff -r d1eb1560b4d5 -r 7b515d0945b1 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Wed Apr 20 05:26:47 2011 +0200 +++ b/hedgewars/uTeams.pas Thu Apr 21 07:41:24 2011 +0200 @@ -272,7 +272,7 @@ ReadyTimeLeft:= 0 end; -perfExt_NewTurnBeginning(); +uMobile.NewTurnBeginning(); ScriptCall('onNewTurn'); end;