made various things take const pointers (optimizer hint), commented out and/or remove...

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index 27c8ec9fb653c83eb54ebceaab5a68870877846b..2ed24ca1e67dedcf1a8a1989dc99c71c29840b96 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -72,7 +72,7 @@ void SV_SetIdealPitch (void)
                top[0] = sv_player->v.origin[0] + cosval*(i+3)*12;
                top[1] = sv_player->v.origin[1] + sinval*(i+3)*12;
                top[2] = sv_player->v.origin[2] + sv_player->v.view_ofs[2];
-               
+
                bottom[0] = top[0];
                bottom[1] = top[1];
                bottom[2] = top[2] - 160;
@@ -150,7 +150,7 @@ void SV_UserFriction (void)
 // apply friction      
        control = speed < sv_stopspeed.value ? sv_stopspeed.value : speed;
        newspeed = speed - sv.frametime*control*friction;
-       
+
        if (newspeed < 0)
                newspeed = 0;
        else
@@ -274,7 +274,7 @@ void SV_WaterMove (void)
        else
                wishvel[2] += cmd.upmove;
 
-       wishspeed = Length(wishvel);
+       wishspeed = VectorLength(wishvel);
        if (wishspeed > sv_maxspeed.value)
        {
                temp = sv_maxspeed.value/wishspeed;
@@ -286,7 +286,7 @@ void SV_WaterMove (void)
 //
 // water friction
 //
-       speed = Length (velocity);
+       speed = VectorLength (velocity);
        if (speed)
        {
                newspeed = speed - sv.frametime * speed * sv_friction.value;
@@ -384,7 +384,7 @@ void SV_AirMove (void)
        else
        {       // not on ground, so little effect on velocity
                SV_AirAccelerate (wishvel);
-       }               
+       }
 }
 
 /*
@@ -552,11 +552,13 @@ nextmsg:
 
                        cmd = MSG_ReadChar ();
 
+#ifndef NOROUTINGFIX
                        if (cmd != -1 && host_client->waitingforconnect)
                        {
                                host_client->waitingforconnect = false;
                                host_client->sendserverinfo = true;
                        }
+#endif
 
                        switch (cmd)
                        {