Revert yet again for breaking stuff. No more chances on this. If there'd been a release, this would have been twice with serious breakage. P.S. - as per koda's complaint last time, only reverted the non-iphone, probably means iphone is now broken. Oh well.
--- a/QTfrontend/gamecfgwidget.cpp Mon Nov 08 22:11:46 2010 -0500
+++ b/QTfrontend/gamecfgwidget.cpp Mon Nov 08 22:26:44 2010 -0500
@@ -158,7 +158,7 @@
sl.append(QString("e$gmflags %1").arg(getGameFlags()));
sl.append(QString("e$damagepct %1").arg(schemeData(22).toInt()));
sl.append(QString("e$turntime %1").arg(schemeData(23).toInt() * 1000));
- sl.append(QString("e$minestime %1").arg(schemeData(27).toInt()));
+ sl.append(QString("e$minestime %1").arg(schemeData(27).toInt() * 1000));
sl.append(QString("e$minesnum %1").arg(schemeData(28).toInt()));
sl.append(QString("e$sd_turns %1").arg(schemeData(25).toInt()));
sl.append(QString("e$casefreq %1").arg(schemeData(26).toInt()));
--- a/hedgewars/uAI.pas Mon Nov 08 22:11:46 2010 -0500
+++ b/hedgewars/uAI.pas Mon Nov 08 22:26:44 2010 -0500
@@ -333,7 +333,7 @@
with CurrentHedgehog^ do
if (Gear <> nil)
and ((Gear^.State and gstHHDriven) <> 0)
- and (TurnTimeLeft + 50 > cHedgehogTurnTime ) then
+ and (TurnTimeLeft < cHedgehogTurnTime - 50) then
if ((Gear^.State and gstHHThinking) = 0) then
if (BestActions.Pos >= BestActions.Count)
and (TurnTimeLeft > cStopThinkTime) then
--- a/hedgewars/uGears.pas Mon Nov 08 22:11:46 2010 -0500
+++ b/hedgewars/uGears.pas Mon Nov 08 22:26:44 2010 -0500
@@ -365,9 +365,9 @@
gear^.Elasticity:= _0_55;
gear^.Friction:= _0_995;
if cMinesTime < 0 then
- gear^.Timer:= getrandom(51)*100
+ gear^.Timer:= getrandom(6)*1000
else
- gear^.Timer:= cMinesTime*1000;
+ gear^.Timer:= cMinesTime*1;
end;
gtSMine: begin
gear^.Health:= 10;
--- a/hedgewars/uMisc.pas Mon Nov 08 22:11:46 2010 -0500
+++ b/hedgewars/uMisc.pas Mon Nov 08 22:26:44 2010 -0500
@@ -758,7 +758,7 @@
cMapGen := 0; // MAPGEN_REGULAR
cMazeSize := 0;
cHedgehogTurnTime := 45000;
- cMinesTime := 3;
+ cMinesTime := 3000;
cMaxAIThinkTime := 9000;
cCloudsNumber := 9;
cHealthCaseProb := 35;
--- a/hedgewars/uWorld.pas Mon Nov 08 22:11:46 2010 -0500
+++ b/hedgewars/uWorld.pas Mon Nov 08 22:26:44 2010 -0500
@@ -149,14 +149,14 @@
ScreenFadeSpeed:= 1;
// modified mine timers?
-if cMinesTime <> 3 then
+if cMinesTime <> 3000 then
begin
if cMinesTime = 0 then
g:= AddGoal(g, gfAny, gidNoMineTimer)
else if cMinesTime < 0 then
g:= AddGoal(g, gfAny, gidRandomMineTimer)
else
- g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime);
+ g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000);
end;
// if the string has been set, show it for (default timeframe) seconds