sound_num = MSG_ReadByte(&cl_message);
}
- channel = CHAN_NET2ENGINE(channel);
-
MSG_ReadVector(&cl_message, pos, cls.protocol);
if (sound_num < 0 || sound_num >= MAX_SOUNDS)
R_SetSkyBox("unit1_");
}
+extern cvar_t con_chatsound_team_file;
static const vec3_t defaultmins = {-4096, -4096, -4096};
static const vec3_t defaultmaxs = {4096, 4096, 4096};
static void CL_SetupWorldModel(void)
CL_KeepaliveMessage(false);
// load the team chat beep if possible
- cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
+ cl.foundteamchatsound = FS_FileExists(con_chatsound_team_file.string);
// check memory integrity
Mem_CheckSentinelsGlobal();
// if we got here...
// curl is done, so let's start with the business
if(!cl.loadbegun)
- SCR_PushLoadingScreen(false, "Loading precaches", 1);
+ SCR_PushLoadingScreen("Loading precaches", 1);
cl.loadbegun = true;
// if already downloading something from the previous level, don't stop it
{
Con_Printf("Downloading new CSQC code to dlcache/%s.%i.%i\n", csqc_progname.string, csqc_progsize.integer, csqc_progcrc.integer);
if(cl_serverextension_download.integer == 2 && FS_HasZlib())
- Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "download %s deflate", csqc_progname.string));
+ CL_ForwardToServer(va(vabuf, sizeof(vabuf), "download %s deflate", csqc_progname.string));
else
- Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "download %s", csqc_progname.string));
+ CL_ForwardToServer(va(vabuf, sizeof(vabuf), "download %s", csqc_progname.string));
return;
}
}
if(cl.loadmodel_current == 1)
{
// worldmodel counts as 16 models (15 + world model setup), for better progress bar
- SCR_PushLoadingScreen(false, "Loading precached models",
+ SCR_PushLoadingScreen("Loading precached models",
(
(cl.loadmodel_total - 1) * LOADPROGRESSWEIGHT_MODEL
+ LOADPROGRESSWEIGHT_WORLDMODEL
+ cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND
)
);
- SCR_BeginLoadingPlaque(false);
}
for (;cl.loadmodel_current < cl.loadmodel_total;cl.loadmodel_current++)
{
- SCR_PushLoadingScreen(false, cl.model_name[cl.loadmodel_current],
+ SCR_PushLoadingScreen(cl.model_name[cl.loadmodel_current],
(
(cl.loadmodel_current == 1) ? LOADPROGRESSWEIGHT_WORLDMODEL : LOADPROGRESSWEIGHT_MODEL
) / (
SCR_PopLoadingScreen(false);
if(cl.loadmodel_current == 1)
{
- SCR_PushLoadingScreen(false, cl.model_name[cl.loadmodel_current], 1.0 / cl.loadmodel_total);
+ SCR_PushLoadingScreen(cl.model_name[cl.loadmodel_current], 1.0 / cl.loadmodel_total);
SCR_PopLoadingScreen(false);
}
continue;
if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw && cl.loadmodel_current == 1)
{
// we now have the worldmodel so we can set up the game world
- SCR_PushLoadingScreen(true, "world model setup",
+ SCR_PushLoadingScreen("world model setup",
(
LOADPROGRESSWEIGHT_WORLDMODEL_INIT
) / (
cl.loadfinished = true;
// now issue the spawn to move on to signon 2 like normal
if (cls.netcon)
- Cmd_ForwardStringToServer("prespawn");
+ CL_ForwardToServer("prespawn");
}
}
}
{
// loading sounds
if(cl.loadsound_current == 1)
- SCR_PushLoadingScreen(false, "Loading precached sounds",
+ SCR_PushLoadingScreen("Loading precached sounds",
(
cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND
) / (
);
for (;cl.loadsound_current < cl.loadsound_total;cl.loadsound_current++)
{
- SCR_PushLoadingScreen(false, cl.sound_name[cl.loadsound_current], 1.0 / cl.loadsound_total);
+ SCR_PushLoadingScreen(cl.sound_name[cl.loadsound_current], 1.0 / cl.loadsound_total);
if (cl.sound_precache[cl.loadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.loadsound_current]))
{
SCR_PopLoadingScreen(false);
cl.loadfinished = true;
// now issue the spawn to move on to signon 2 like normal
if (cls.netcon)
- Cmd_ForwardStringToServer("prespawn");
+ CL_ForwardToServer("prespawn");
}
}
aborteddownload = false;
CL_KeepaliveMessage(true);
if (cl.model_name[cl.downloadmodel_current][0] != '*' && strcmp(cl.model_name[cl.downloadmodel_current], "null") && !FS_FileExists(cl.model_name[cl.downloadmodel_current]))
{
- if (cl.downloadmodel_current == 1) {
- // No way any game is playable without the map.
+ if (cl.downloadmodel_current == 1)
Con_Printf("Map %s not found\n", cl.model_name[cl.downloadmodel_current]);
- CL_Disconnect();
- return;
- }
else
Con_Printf("Model %s not found\n", cl.model_name[cl.downloadmodel_current]);
// regarding the * check: don't try to download submodels
if (cl_serverextension_download.integer && cls.netcon && cl.model_name[cl.downloadmodel_current][0] != '*' && !sv.active)
{
- Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "download %s", cl.model_name[cl.downloadmodel_current]));
+ CL_ForwardToServer(va(vabuf, sizeof(vabuf), "download %s", cl.model_name[cl.downloadmodel_current]));
// we'll try loading again when the download finishes
return;
}
if (cl.downloadmodel_current == 1)
{
// we now have the worldmodel so we can set up the game world
+ // or maybe we do not have it (cl_serverextension_download 0)
+ // then we need to continue loading ANYWAY!
CL_SetupWorldModel();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
{
cl.loadfinished = true;
// now issue the spawn to move on to signon 2 like normal
if (cls.netcon)
- Cmd_ForwardStringToServer("prespawn");
+ CL_ForwardToServer("prespawn");
}
}
}
Con_Printf("Sound %s not found\n", soundname);
if (cl_serverextension_download.integer && cls.netcon && !sv.active)
{
- Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "download %s", soundname));
+ CL_ForwardToServer(va(vabuf, sizeof(vabuf), "download %s", soundname));
// we'll try loading again when the download finishes
return;
}
// now issue the spawn to move on to signon 2 like normal
if (cls.netcon)
- Cmd_ForwardStringToServer("prespawn");
+ CL_ForwardToServer("prespawn");
}
}
// check further encodings here
}
- Cmd_ForwardStringToServer("sv_startdownload");
+ CL_ForwardToServer("sv_startdownload");
}
static void CL_StopDownload_f(cmd_state_t *cmd)
CL_BeginDownloads(false);
}
+extern cvar_t cl_topcolor;
+extern cvar_t cl_bottomcolor;
static void CL_SendPlayerInfo(void)
{
char vabuf[1024];
MSG_WriteString (&cls.netcon->message, va(vabuf, sizeof(vabuf), "name \"%s\"", cl_name.string));
MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
- MSG_WriteString (&cls.netcon->message, va(vabuf, sizeof(vabuf), "color %i %i", cl_color.integer >> 4, cl_color.integer & 15));
+ MSG_WriteString (&cls.netcon->message, va(vabuf, sizeof(vabuf), "color %i %i", cl_topcolor.integer, cl_bottomcolor.integer));
MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
MSG_WriteString (&cls.netcon->message, va(vabuf, sizeof(vabuf), "rate %i", cl_rate.integer));
cls.demo_lastcsprogscrc = -1;
}
else
- Con_Print ("ERROR: couldn't open.\n");
+ Con_Print(CON_ERROR "ERROR: couldn't open.\n");
}
}
cl.islocalgame = NetConn_IsLocalGame();
{
// not a monster
ent->persistent.lerpstarttime = ent->state_previous.time;
- // no lerp if it's singleplayer
- if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer)
- ent->persistent.lerpdeltatime = 0;
- else
- ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1);
+ ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1);
VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
framecount = MSG_ReadByte(&cl_message);
framerate = MSG_ReadByte(&cl_message);
- CL_Effect(org, modelindex, startframe, framecount, framerate);
+ CL_Effect(org, CL_GetModelByIndex(modelindex), startframe, framecount, framerate);
}
static void CL_ParseEffect2 (void)
framecount = MSG_ReadByte(&cl_message);
framerate = MSG_ReadByte(&cl_message);
- CL_Effect(org, modelindex, startframe, framecount, framerate);
+ 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)
VectorCopy (end, b->end);
}
else
- Con_Print("beam list overflow!\n");
+ Con_DPrint("beam list overflow!\n");
}
static void CL_ParseBeam (dp_model_t *m, int lightning)
CL_FindNonSolidLocation(pos, pos, 10);
CL_ParticleEffect(EFFECT_TE_EXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
- CL_Effect(pos, cl.qw_modelindex_s_explod, 0, 6, 10);
+ CL_Effect(pos, CL_GetModelByIndex(cl.qw_modelindex_s_explod), 0, 6, 10);
break;
case QW_TE_TAREXPLOSION:
color[2] = MSG_ReadCoord(&cl_message, cls.protocol) * (2.0f / 1.0f);
CL_ParticleExplosion(pos);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, NULL, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
color[1] = MSG_ReadByte(&cl_message) * (2.0f / 255.0f);
color[2] = MSG_ReadByte(&cl_message) * (2.0f / 255.0f);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, NULL, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
color[1] = MSG_ReadByte(&cl_message) * (2.0f / 255.0f);
color[2] = MSG_ReadByte(&cl_message) * (2.0f / 255.0f);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocLightFlash(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, -1, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_AllocLightFlash(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, NULL, -1, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
break;
case TE_FLAMEJET:
color[1] = tempcolor[1] * (2.0f / 255.0f);
color[2] = tempcolor[2] * (2.0f / 255.0f);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, NULL, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
return true;
}
-extern cvar_t slowmo;
+extern cvar_t host_timescale;
extern cvar_t cl_lerpexcess;
static void CL_NetworkTimeReceived(double newtime)
{
double timehigh;
cl.mtime[1] = cl.mtime[0];
cl.mtime[0] = newtime;
- if (cl_nolerp.integer || cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
+ if (cl_nolerp.integer || cls.timedemo || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
cl.time = cl.mtime[1] = newtime;
else if (cls.demoplayback)
{
//if (cls.demorecording)
// CL_WriteDemoMessage (&cl_message);
- cl.last_received_message = realtime;
+ cl.last_received_message = host.realtime;
CL_KeepaliveMessage(false);
// if recording demos, copy the message out
//
if (cl_shownet.integer == 1)
- Con_Printf("%f %i\n", realtime, cl_message.cursize);
+ Con_Printf("%f %i\n", host.realtime, cl_message.cursize);
else if (cl_shownet.integer == 2)
Con_Print("------------------\n");
if (cls.protocol == PROTOCOL_QUAKEWORLD)
{
- CL_NetworkTimeReceived(realtime); // qw has no clock
+ CL_NetworkTimeReceived(host.realtime); // qw has no clock
// kill all qw nails
cl.qw_num_nails = 0;
Cvar_RegisterVariable(&cl_iplog_name);
Cvar_RegisterVariable(&cl_readpicture_force);
- Cmd_AddCommand(&cmd_client, "nextul", QW_CL_NextUpload_f, "sends next fragment of current upload buffer (screenshot for example)");
- Cmd_AddCommand(&cmd_client, "stopul", QW_CL_StopUpload_f, "aborts current upload (screenshot for example)");
- Cmd_AddCommand(&cmd_client, "skins", QW_CL_Skins_f, "downloads missing qw skins from server");
- Cmd_AddCommand(&cmd_client, "changing", QW_CL_Changing_f, "sent by qw servers to tell client to wait for level change");
- Cmd_AddCommand(&cmd_client, "cl_begindownloads", CL_BeginDownloads_f, "used internally by darkplaces client while connecting (causes loading of models and sounds or triggers downloads for missing ones)");
- Cmd_AddCommand(&cmd_client, "cl_downloadbegin", CL_DownloadBegin_f, "(networking) informs client of download file information, client replies with sv_startsoundload to begin the transfer");
- Cmd_AddCommand(&cmd_client, "stopdownload", CL_StopDownload_f, "terminates a download");
- Cmd_AddCommand(&cmd_client, "cl_downloadfinished", CL_DownloadFinished_f, "signals that a download has finished and provides the client with file size and crc to check its integrity");
- Cmd_AddCommand(&cmd_client, "iplog_list", CL_IPLog_List_f, "lists names of players whose IP address begins with the supplied text (example: iplog_list 123.456.789)");
+ Cmd_AddCommand(CMD_CLIENT, "nextul", QW_CL_NextUpload_f, "sends next fragment of current upload buffer (screenshot for example)");
+ Cmd_AddCommand(CMD_CLIENT, "stopul", QW_CL_StopUpload_f, "aborts current upload (screenshot for example)");
+ Cmd_AddCommand(CMD_CLIENT | CMD_CLIENT_FROM_SERVER, "skins", QW_CL_Skins_f, "downloads missing qw skins from server");
+ Cmd_AddCommand(CMD_CLIENT, "changing", QW_CL_Changing_f, "sent by qw servers to tell client to wait for level change");
+ Cmd_AddCommand(CMD_CLIENT, "cl_begindownloads", CL_BeginDownloads_f, "used internally by darkplaces client while connecting (causes loading of models and sounds or triggers downloads for missing ones)");
+ Cmd_AddCommand(CMD_CLIENT | CMD_CLIENT_FROM_SERVER, "cl_downloadbegin", CL_DownloadBegin_f, "(networking) informs client of download file information, client replies with sv_startsoundload to begin the transfer");
+ Cmd_AddCommand(CMD_CLIENT | CMD_CLIENT_FROM_SERVER, "stopdownload", CL_StopDownload_f, "terminates a download");
+ Cmd_AddCommand(CMD_CLIENT | CMD_CLIENT_FROM_SERVER, "cl_downloadfinished", CL_DownloadFinished_f, "signals that a download has finished and provides the client with file size and crc to check its integrity");
+ Cmd_AddCommand(CMD_CLIENT, "iplog_list", CL_IPLog_List_f, "lists names of players whose IP address begins with the supplied text (example: iplog_list 123.456.789)");
}
void CL_Parse_Shutdown(void)
projects / xonotic / darkplaces.git / blobdiff