From 207cdad9f9b20397e0826dfe8a0a6b89c7f9989a Mon Sep 17 00:00:00 2001
From: Rafael Barreto <baarreth@hotmail.com>
Date: Wed, 7 Jul 2010 17:24:52 +0000
Subject: [PATCH] mouseaccel rescale, afk fix (again!)

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5300 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp | 2 +-
 source/src/physics.cpp    | 2 +-
 source/src/server.cpp     | 4 ++--
 source/src/serverchecks.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 547159de..af4788a9 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -636,7 +636,7 @@ void dodamage(int damage, playerent *pl, playerent *actor, bool gib, bool local)
     pl->respawnoffset = pl->lastpain = lastmillis;
 
 //    playerent *h = local ? player1 : updatefollowplayer(0);
-    if(/*actor==h && pl!=actor*/ actor == player1) // FIXME
+    if(/*actor==h && pl!=actor*/ actor == player1 && pl!=actor ) // FIXME
     {
         if(hitsound && lasthit != lastmillis) audiomgr.playsound(S_HITSOUND, SP_HIGH);
         lasthit = lastmillis;
diff --git a/source/src/physics.cpp b/source/src/physics.cpp
index e8dd1448..975a36c0 100644
--- a/source/src/physics.cpp
+++ b/source/src/physics.cpp
@@ -777,7 +777,7 @@ void mousemove(int odx, int ody)
 
     float cursens = sensitivity;
 
-    if(mouseaccel && curtime && (dx || dy)) cursens += mouseaccel * sqrtf(dx*dx + dy*dy)/curtime;
+    if(mouseaccel && curtime && (dx || dy)) cursens += 0.02 * mouseaccel * sqrtf(dx*dx + dy*dy)/curtime;
     cursens /= 33.0f*sensitivityscale;
 
     if( zooming(player1) )
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 3b86e61b..7dfef080 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1604,7 +1604,7 @@ bool balanceteams(int ftr)  // pro vs noobs never more
 
     int h = 0, l = 1;
     if ( tscore[1] > tscore[0] ) { h = 1; l = 0; }
-    if ( 2 * tscore[h] < 3 * tscore[l] ) return true;
+    if ( 2 * tscore[h] < 3 * tscore[l] || tscore[l] + tscore[l] < totalclients * 100 ) return true;
     if ( tscore[h] > 3 * tscore[l] && tscore[h] > 50 * totalclients )
     {
 //        sendf(-1, 1, "ri2", SV_SERVERMODE, sendservermode(false) | AT_SHUFFLE);
@@ -3516,7 +3516,7 @@ void serverslice(uint timeout)   // main server update, called from cube main lo
         if(m_arena) arenacheck();
 //        if(m_lms) lmscheck();
         sendextras();
-        if ( next_afk_check > servmillis && mastermode == MM_OPEN && gamemillis > 20 * 1000 ) check_afk();
+        if ( mastermode == MM_OPEN && next_afk_check < servmillis && gamemillis > 20 * 1000 ) check_afk();
     }
 
     if(curvote)
diff --git a/source/src/serverchecks.h b/source/src/serverchecks.h
index 25aaf510..05b2feee 100644
--- a/source/src/serverchecks.h
+++ b/source/src/serverchecks.h
@@ -446,7 +446,7 @@ void check_afk()
     {
         client &c = *clients[i];
         if ( c.type != ST_TCPIP || c.connectmillis + 60 * 1000 > servmillis ||
-             c.inputmillis + 45 * 1000 > servmillis || clienthasflag(c.clientnum) ) continue;
+             c.inputmillis + 45 * 1000 > servmillis || clienthasflag(c.clientnum) != -1 ) continue;
         if ( ( c.state.state == CS_DEAD && !m_arena && c.state.lastdeath + 45 * 1000 < gamemillis) ||
              ( c.state.state == CS_ALIVE && c.upspawnp ) ||
              ( c.state.state == CS_SPECTATE ) ) {