Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore millisecond precision for mines time
authornemo
Tue, 07 Dec 2010 22:23:40 -0500
changeset 4482 34393349f96e
parent 4481 0d73e7db3d59
child 4483 ad1524a177bd
Restore millisecond precision for mines time
QTfrontend/gamecfgwidget.cpp file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
hedgewars/uVariables.pas file | annotate | diff | comparison | revisions
hedgewars/uWorld.pas file | annotate | diff | comparison | revisions 
--- a/QTfrontend/gamecfgwidget.cpp	Tue Dec 07 19:33:34 2010 -0500
+++ b/QTfrontend/gamecfgwidget.cpp	Tue Dec 07 22:23:40 2010 -0500
@@ -179,7 +179,7 @@
     sl.append(QString("e$turntime %1").arg(schemeData(25).toInt() * 1000));
     sl.append(QString("e$sd_turns %1").arg(schemeData(27).toInt()));
     sl.append(QString("e$casefreq %1").arg(schemeData(28).toInt()));
-    sl.append(QString("e$minestime %1").arg(schemeData(29).toInt()));
+    sl.append(QString("e$minestime %1").arg(schemeData(29).toInt() * 1000));
     sl.append(QString("e$minesnum %1").arg(schemeData(30).toInt()));
     sl.append(QString("e$minedudpct %1").arg(schemeData(31).toInt()));
     sl.append(QString("e$explosives %1").arg(schemeData(32).toInt()));
--- a/hedgewars/uGears.pas	Tue Dec 07 19:33:34 2010 -0500
+++ b/hedgewars/uGears.pas	Tue Dec 07 22:23:40 2010 -0500
@@ -285,7 +285,7 @@
                 if cMinesTime < 0 then
                     gear^.Timer:= getrandom(51)*100
                 else
-                    gear^.Timer:= cMinesTime*1000;
+                    gear^.Timer:= cMinesTime;
                 end;
        gtSMine: begin
                 gear^.Health:= 10;
--- a/hedgewars/uVariables.pas	Tue Dec 07 19:33:34 2010 -0500
+++ b/hedgewars/uVariables.pas	Tue Dec 07 22:23:40 2010 -0500
@@ -2168,7 +2168,7 @@
     cMapGen             := 0;   // MAPGEN_REGULAR
     cMazeSize           := 0;
     cHedgehogTurnTime   := 45000;
-    cMinesTime          := 3;
+    cMinesTime          := 3000;
     cMaxAIThinkTime     := 9000;
     cCloudsNumber       := 9;
     cHealthCaseProb     := 35;
--- a/hedgewars/uWorld.pas	Tue Dec 07 19:33:34 2010 -0500
+++ b/hedgewars/uWorld.pas	Tue Dec 07 22:23:40 2010 -0500
@@ -141,14 +141,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
hedgewars