added support for PROTOCOL_NEHAHRAMOVIE in more places, so now nehahra works again...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4775 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_input.c b/cl_input.c
index 0e48860b1dec4195fe0d6058f3c729f9068a45d0..610bd30dda913a68a6b6eab34e383f3629a68843 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -385,7 +385,7 @@ void CL_SendMove(usercmd_t *cmd)
 
        MSG_WriteFloat (&buf, cl.mtime[0]);     // so server can get ping times
 
-       if (cl.protocol == PROTOCOL_QUAKE)
+       if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE)
        {
                for (i = 0;i < 3;i++)
                        MSG_WriteAngle8i (&buf, cl.viewangles[i]);
@@ -400,6 +400,8 @@ void CL_SendMove(usercmd_t *cmd)
                for (i = 0;i < 3;i++)
                        MSG_WriteAngle16i (&buf, cl.viewangles[i]);
        }
+       else
+               Host_Error("CL_SendMove: unknown cl.protocol %i\n", cl.protocol);
 
        MSG_WriteCoord16i (&buf, forwardmove);
        MSG_WriteCoord16i (&buf, sidemove);

diff --git a/cl_parse.c b/cl_parse.c
index 65c7cfabbae84070c6b2a7ed9aee425375f116ac..4e782b6308f50e68e60f5bbdd0aea15160e93bca 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -552,16 +552,6 @@ void CL_MoveLerpEntityStates(entity_t *ent)
        }
 }
 
-void CL_ReadEntityFrame(void)
-{
-       if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
-               EntityFrame_CL_ReadFrame();
-       else if (cl.protocol == PROTOCOL_DARKPLACES4)
-               EntityFrame4_CL_ReadFrame();
-       else if (cl.protocol == PROTOCOL_DARKPLACES5)
-               EntityFrame5_CL_ReadFrame();
-}
-
 /*
 ==================
 CL_ParseBaseline
@@ -630,10 +620,10 @@ void CL_ParseClientdata (int bits)
                {
                        if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
                                cl.punchangle[i] = MSG_ReadAngle16i();
-                       else if (cl.protocol == PROTOCOL_QUAKE)
+                       else if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE)
                                cl.punchangle[i] = MSG_ReadChar();
                        else
-                               Host_Error("CL_ParseClientData: unknown cl.protocol\n");
+                               Host_Error("CL_ParseClientData: unknown cl.protocol %i\n", cl.protocol);
                }
                else
                        cl.punchangle[i] = 0;
@@ -644,18 +634,18 @@ void CL_ParseClientdata (int bits)
                        else if (cl.protocol == PROTOCOL_DARKPLACES5)
                                cl.punchvector[i] = MSG_ReadCoord32f();
                        else
-                               Host_Error("CL_ParseClientData: unknown cl.protocol\n");
+                               Host_Error("CL_ParseClientData: unknown cl.protocol %i\n", cl.protocol);
                }
                else
                        cl.punchvector[i] = 0;
                if (bits & (SU_VELOCITY1<<i) )
                {
-                       if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+                       if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
                                cl.mvelocity[0][i] = MSG_ReadChar()*16;
                        else if (cl.protocol == PROTOCOL_DARKPLACES5)
                                cl.mvelocity[0][i] = MSG_ReadCoord32f();
                        else
-                               Host_Error("CL_ParseClientData: unknown cl.protocol\n");
+                               Host_Error("CL_ParseClientData: unknown cl.protocol %i\n", cl.protocol);
                }
                else
                        cl.mvelocity[0][i] = 0;
@@ -1687,7 +1677,14 @@ void CL_ParseServerMessage(void)
                                cls.signon = SIGNONS;
                                CL_SignonReply ();
                        }
-                       CL_ReadEntityFrame();
+                       if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+                               EntityFrame_CL_ReadFrame();
+                       else if (cl.protocol == PROTOCOL_DARKPLACES4)
+                               EntityFrame4_CL_ReadFrame();
+                       else if (cl.protocol == PROTOCOL_DARKPLACES5)
+                               EntityFrame5_CL_ReadFrame();
+                       else
+                               Host_Error("CL_ParseServerMessage: svc_entities: unknown cl.protocol %i\n", cl.protocol);
                        break;
                }
        }

diff --git a/protocol.c b/protocol.c
index f22241e706d48c9474d67c1065fefef99be850f6..b537147a06dc0ec5a8f296d195cf0289f7aaa956 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -548,6 +548,8 @@ void EntityState_ReadFields(entity_state_t *e, unsigned int bits)
                                e->origin[2] = MSG_ReadCoord32f();
                }
        }
+       else
+               Host_Error("EntityState_ReadFields: unknown cl.protocol %i\n", cl.protocol);
        if (cl.protocol == PROTOCOL_DARKPLACES5 && !(e->flags & RENDER_LOWPRECISION))
        {
                if (bits & E_ANGLE1)