diff -r 45b63c2a694f -r 19cbea33e4d2 hedgewars/uMisc.pas --- a/hedgewars/uMisc.pas Wed Oct 27 14:23:47 2010 +0200 +++ b/hedgewars/uMisc.pas Mon Nov 15 12:37:39 2010 +0100 @@ -38,7 +38,7 @@ PathPrefix : shortstring = './'; cShowFPS : boolean = false; cAltDamage : boolean = true; - cReducedQuality : LongInt = rqNone; + cReducedQuality : LongWord = rqNone; //userNick is in uChat recordFileName : shortstring = ''; cReadyDelay : Longword = 0; @@ -75,6 +75,11 @@ cMinesTime : LongInt; cMaxAIThinkTime : Longword; + cHealthCaseProb : LongInt; + cHealthCaseAmount: LongInt; + cWaterRise : LongInt; + cHealthDecrease : LongInt; + cCloudsNumber : LongInt; cTagsMask : byte; @@ -107,7 +112,7 @@ cScreenSpace : LongInt; cCaseFactor : Longword; - cLandAdditions : Longword; + cLandMines : Longword; cExplosives : Longword; cSeed : shortstring; @@ -116,8 +121,7 @@ cInactDelay : Longword; bBetweenTurns : boolean; - cHealthDecrease : LongWord; - bWaterRising : Boolean; + bWaterRising : boolean; ShowCrosshair : boolean; CursorMovementX : LongInt; @@ -281,12 +285,12 @@ begin // obsolete? written in WriteLnToConsole() anyway // {$IFDEF DEBUGFILE}AddFileLog(Msg);{$ENDIF} - WriteLnToConsole(Msg); - if isFatalError then +WriteLnToConsole(Msg); +if isFatalError then begin - SendIPC('E' + GetLastConsoleLine); - SDL_Quit; - halt(1) + SendIPC('E' + GetLastConsoleLine); + SDL_Quit; + halt(1) end end; @@ -744,7 +748,6 @@ TimeTrialStopTime := 0; cWaterLine := LAND_HEIGHT; cGearScrEdgesDist := 240; - cHealthDecrease := 0; GameFlags := 0; TrainingFlags := 0; @@ -753,20 +756,24 @@ cDamagePercent := 100; cMineDudPercent := 0; cTemplateFilter := 0; - cMapGen := 0;//MAPGEN_REGULAR + cMapGen := 0; // MAPGEN_REGULAR cMazeSize := 0; cHedgehogTurnTime := 45000; - cMinesTime := 3000; + cMinesTime := 3; cMaxAIThinkTime := 9000; cCloudsNumber := 9; + cHealthCaseProb := 35; + cHealthCaseAmount := 25; + cWaterRise := 47; + cHealthDecrease := 5; cTagsMask := 0; KBnum := 0; InitStepsFlags := 0; RealTicks := 0; - AttackBar := 0; // 0 - none, 1 - just bar at the right-down corner, 2 - like in WWP + AttackBar := 0; // 0 - none, 1 - just bar at the right-down corner, 2 - from weapon cCaseFactor := 5; {0..9} - cLandAdditions := 4; + cLandMines := 4; cExplosives := 2; GameState := Low(TGameState); @@ -873,7 +880,7 @@ cReducedQuality := rqNone; //userNick is in uChat recordFileName := ''; - cReadyDelay := 5000; + cReadyDelay := 0; end; end.