World_Start(&cl.world);
// load or reload .loc file for team chat messages
- CL_Locs_Reload_f(&cmd_client);
+ CL_Locs_Reload_f(cmd_client);
// make sure we send enough keepalives
CL_KeepaliveMessage(false);
return;
// abort existing upload if in progress
- QW_CL_StopUpload_f(&cmd_client);
+ QW_CL_StopUpload_f(cmd_client);
Con_DPrintf("Starting upload of %d bytes...\n", size);
cls.qw_uploadsize = size;
cls.qw_uploadpos = 0;
- QW_CL_NextUpload_f(&cmd_client);
+ QW_CL_NextUpload_f(cmd_client);
}
#if 0
// execute cl_begindownloads next frame
// (after any commands added by svc_stufftext have been executed)
// when done with downloads the "prespawn" will be sent
- Cbuf_AddText(&cmd_client, "\ncl_begindownloads\n");
+ Cbuf_AddText(cmd_client, "\ncl_begindownloads\n");
//MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
//MSG_WriteString (&cls.netcon->message, "prespawn");
if (cls.demorecording)
{
// finish the previous level's demo file
- CL_Stop_f(&cmd_client);
+ CL_Stop_f(cmd_client);
}
// start a new demo file
void CL_ValidateState(entity_state_t *s)
{
- dp_model_t *model;
+ model_t *model;
if (!s->active)
return;
int sound_num, vol, atten;
MSG_ReadVector(&cl_message, org, cls.protocol);
- if (large || cls.protocol == PROTOCOL_NEHAHRABJP2)
+ if (large)
sound_num = (unsigned short) MSG_ReadShort(&cl_message);
else
sound_num = MSG_ReadByte(&cl_message);
CL_Effect(org, CL_GetModelByIndex(modelindex), startframe, framecount, framerate);
}
-void CL_NewBeam (int ent, vec3_t start, vec3_t end, dp_model_t *m, int lightning)
+void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning)
{
int i;
beam_t *b = NULL;
Con_DPrint("beam list overflow!\n");
}
-static void CL_ParseBeam (dp_model_t *m, int lightning)
+static void CL_ParseBeam (model_t *m, int lightning)
{
int ent;
vec3_t start, end;
break;
case qw_svc_disconnect:
- Con_Printf("Server disconnected\n");
if (cls.demonum != -1)
CL_NextDemo();
else
+ {
+ Con_Printf("Server disconnected\n");
CL_Disconnect();
+ }
return;
case qw_svc_print:
break;
case qw_svc_sellscreen:
- Cmd_ExecuteString(&cmd_client, "help", src_local, true);
+ Cmd_ExecuteString(cmd_client, "help", src_local, true);
break;
case qw_svc_smallkick:
break;
case svc_disconnect:
- Con_Printf ("Server disconnected\n");
if (cls.demonum != -1)
CL_NextDemo ();
else
+ {
+ Con_Printf ("Server disconnected\n");
CL_Disconnect ();
+ }
break;
case svc_print:
break;
case svc_sound:
- CL_ParseStartSoundPacket(false);
+ CL_ParseStartSoundPacket(cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 ? true : false);
break;
case svc_precache:
{
if (i >= 1 && i < MAX_MODELS)
{
- dp_model_t *model = Mod_ForName(s, false, false, s[0] == '*' ? cl.model_name[1] : NULL);
+ model_t *model = Mod_ForName(s, false, false, s[0] == '*' ? cl.model_name[1] : NULL);
if (!model)
Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
cl.model_precache[i] = model;
break;
case svc_spawnstaticsound:
- CL_ParseStaticSound (false);
+ CL_ParseStaticSound (cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 ? true : false);
break;
case svc_spawnstaticsound2:
break;
case svc_sellscreen:
- Cmd_ExecuteString(&cmd_client, "help", src_local, true);
+ Cmd_ExecuteString(cmd_client, "help", src_local, true);
break;
case svc_hidelmp:
if (gamemode == GAME_TENEBRAE)
void CL_Parse_ErrorCleanUp(void)
{
CL_StopDownload(0, 0);
- QW_CL_StopUpload_f(&cmd_client);
+ QW_CL_StopUpload_f(cmd_client);
}
void CL_Parse_Init(void)