Subversion Repositories plumbers

Compare Revisions

Regard whitespace Rev 9 → Rev 12

/trunk/Win32_Player/Game.pas
41,7 → 41,6
procedure PrevDecisionScene;
protected
GameData: TGameBinFile;
function FindScene(ASceneID: integer): PSceneDef;
procedure Wait(AMilliseconds: integer);
procedure PlayScene(scene: PSceneDef; goToDecision: boolean);
public
83,21 → 82,6
end;
end;
 
function TGame.FindScene(ASceneID: integer): PSceneDef;
var
i: integer;
begin
for i := 0 to GameData.numScenes - 1 do
begin
if GameData.scenes[i].szSceneFolder = Format('SC%.2d', [ASceneID]) then
begin
result := @GameData.scenes[i];
exit;
end;
end;
result := nil;
end;
 
procedure TGame.TryExit;
begin
if Assigned(ExitCallback) then ExitCallback(Self);
119,9 → 103,9
TryExit
else
begin
nextScene := FindScene(action^.nextSceneID);
nextScene := GameData.FindScene(action^.nextSceneID);
if Assigned(nextScene) then
PlayScene(nextScene, action^.sceneSegment=1)
PlayScene(nextScene, action^.sceneSegment=SEGMENT_DECISION)
(*
else
raise Exception.CreateFmt('Scene %d was not found in GAME.BIN', [action^.nextSceneID]);
/trunk/Win32_Player/Main.pas
92,7 → 92,7
Temp := '';
for I := 1 to L2 do
begin
Temp := ThousandSeparator + Copy (S, LS - 3 * I + 1, 3) + Temp;
Temp := {$IF not Declared(ThousandSeparator)}FormatSettings.{$IFEND}ThousandSeparator + Copy (S, LS - 3 * I + 1, 3) + Temp;
end;
Result := Copy (S, N, (LS - 1) mod 3 + 1) + Temp;
if N > 1 then Result := '-' + Result;
101,6 → 101,8
{ TMainForm }
 
procedure TMainForm.cbPictureShow(ASender: TGame; AFilename: string; AType: TPictureType);
resourcestring
S_YOUR_SCORE = 'Your score is: %s';
begin
if FileExists(AFilename) then
begin
146,7 → 148,7
End;
end;
 
Panel1.Caption := Format('Your score is: %s', [AddThouSeps(IntToStr(ASender.Score))]);
Panel1.Caption := Format(S_YOUR_SCORE, [AddThouSeps(IntToStr(ASender.Score))]);
Panel1.Left := 8;
Panel1.Top := Min(ClientHeight, Screen.Height) - Panel1.Height - 8;
Panel1.Visible := AType = ptDecision;