TEU uses teu.rc, not quake.rc

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index a0be10803d6a8cb505328caa6519b65e34c5030c..9a06211c62c232c46ba41f00b56b68f728ac2959 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -66,7 +66,7 @@ void SV_SetIdealPitch (void)
 
                tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, sv_player);
                // if looking at a wall, leave ideal the way is was
-               if (tr.allsolid)
+               if (tr.startsolid)
                        return;
 
                // near a dropoff
@@ -623,7 +623,7 @@ void SV_ReadClientMove (usercmd_t *move)
                val->_float = host_client->ping * 1000.0;
 
        // read current angles
-       // DPPROTOCOL_VERSION4
+       // PROTOCOL_DARKPLACES4
        for (i = 0;i < 3;i++)
                angle[i] = MSG_ReadPreciseAngle();
 
@@ -727,6 +727,7 @@ void SV_ReadClientMessage(void)
                         || strncasecmp(s, "ping", 4) == 0
                         || strncasecmp(s, "ban", 3) == 0
                         || strncasecmp(s, "pmodel", 6) == 0
+                        || strncasecmp(s, "rate", 4) == 0
                         || (gamemode == GAME_NEHAHRA && (strncasecmp(s, "max", 3) == 0 || strncasecmp(s, "monster", 7) == 0 || strncasecmp(s, "scrag", 5) == 0 || strncasecmp(s, "gimme", 5) == 0 || strncasecmp(s, "wraith", 6) == 0))
                         || (gamemode != GAME_NEHAHRA && (strncasecmp(s, "god", 3) == 0 || strncasecmp(s, "notarget", 8) == 0 || strncasecmp(s, "fly", 3) == 0 || strncasecmp(s, "give", 4) == 0 || strncasecmp(s, "noclip", 6) == 0)))
                                Cmd_ExecuteString (s, src_client);
@@ -743,10 +744,10 @@ void SV_ReadClientMessage(void)
                        break;
 
                case clc_ackentities:
-                       //if (dpprotocol == DPPROTOCOL_VERSION1 || dpprotocol == DPPROTOCOL_VERSION2 || dpprotocol == DPPROTOCOL_VERSION3)
-                       //      EntityFrame_AckFrame(&host_client->entitydatabase, MSG_ReadLong());
-                       //else
-                               EntityFrame4_AckFrame(host_client->entitydatabase4, MSG_ReadLong());
+                       host_client->entitydatabase4->ackframenum = MSG_ReadLong();
+                       if (developer_networkentities.integer >= 1)
+                               Con_Printf("recv clc_ackentities %i\n", host_client->entitydatabase4->ackframenum);
+                       EntityFrame4_AckFrame(host_client->entitydatabase4, host_client->entitydatabase4->ackframenum);
                        break;
                }
        }