From e9a98966698585e54b292b9be2b08eb8f239668f Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Wed, 2 Jan 2008 19:04:41 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1541 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/menus.cfg          |  2 +-
 source/src/clientgame.cpp |  1 +
 source/src/main.cpp       | 14 ++++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/config/menus.cfg b/config/menus.cfg
index 8ba0816a..76cbba92 100755
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -81,7 +81,7 @@ menuitem "Rabid Viper Special Forces"		"team RVSF" "chmenumdl team playermodels/
 
 alias gencrosshairs [
 	loop i (listlen $arg1) [
-		alias label (at $arg1 i)
+		alias label (at $arg1 $i)
 		menuitem $label (concat loadcrosshair $label)
 	]
 ]
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 2a899a48..21eca2f5 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -530,6 +530,7 @@ void startmap(const char *name)   // called just after a map load
     s_strcpy(clientmap, name);
     if(editmode) toggleedit();
     setvar("gamespeed", 100);
+    setvar("paused", 0);
     setvar("fog", 180);
     setvar("fogcolour", 0x8099B3);
     showscores(false);
diff --git a/source/src/main.cpp b/source/src/main.cpp
index 6a774dd5..092a123c 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -209,6 +209,7 @@ void keyrepeat(bool on)
 }
 
 VARF(gamespeed, 10, 100, 1000, if(multiplayer()) gamespeed = 100);
+VARF(paused, 0, 0, 1, if(multiplayer()) paused = 0);
 
 bool firstrun = false;
 static int clockrealbase = 0, clockvirtbase = 0;
@@ -456,10 +457,15 @@ int main(int argc, char **argv)
         if(millis<totalmillis) millis = totalmillis;
         limitfps(millis, totalmillis);
         int elapsed = millis-totalmillis;
-        curtime = elapsed*gamespeed/100;
-        //if(curtime>200) curtime = 200;
-        //else if(curtime<1) curtime = 1;
-
+        if(multiplayer(false)) curtime = elapsed;
+        else
+        {
+            static int timeerr = 0;
+            int scaledtime = elapsed*gamespeed + timeerr;
+            curtime = scaledtime/100;
+            timeerr = scaledtime%100;
+            if(paused) curtime = 0;
+        }
         cleardlights();
 
         if(lastmillis) updateworld(curtime, lastmillis);