X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_parse.c;h=5259676bcde90e351f944bdff5f7ef486224acb2;hp=0230773107435e6f944cad655a4bc4c8422b4caf;hb=50804f7075a727286ca58efcf890861afe314ee8;hpb=3792bf2bef9f4312956afb54b47878c4580f7d01 diff --git a/cl_parse.c b/cl_parse.c index 02307731..5259676b 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "cdaudio.h" #include "cl_collision.h" +#include "csprogs.h" char *svc_strings[128] = { @@ -29,7 +30,7 @@ char *svc_strings[128] = "svc_nop", "svc_disconnect", "svc_updatestat", - "svc_version", // [long] server version + "svc_version", // [int] server version "svc_setview", // [short] entity number "svc_sound", // "svc_time", // [float] server time @@ -38,7 +39,7 @@ char *svc_strings[128] = // the string should be \n terminated "svc_setangle", // [vec3] set the view angle to this absolute value - "svc_serverinfo", // [long] version + "svc_serverinfo", // [int] version // [string] signon string // [string]..[0]model cache [string]...[0]sounds cache // [string]..[0]item cache @@ -90,14 +91,14 @@ char *svc_strings[128] = "svc_spawnbaseline2", // 55 // short modelindex instead of byte "svc_spawnstatic2", // 56 // short modelindex instead of byte "svc_entities", // 57 // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata - "svc_unusedlh3", // 58 + "svc_csqcentities", // 58 // [short] entnum [variable length] entitydata ... [short] 0x0000 "svc_spawnstaticsound2", // 59 // [coord3] [short] samp [byte] vol [byte] aten }; //============================================================================= -cvar_t demo_nehahra = {0, "demo_nehahra", "0"}; -cvar_t developer_networkentities = {0, "developer_networkentities", "0"}; +cvar_t demo_nehahra = {0, "demo_nehahra", "0", "reads all quake demos as nehahra movie protocol"}; +cvar_t developer_networkentities = {0, "developer_networkentities", "0", "prints received entities, value is 0-4 (higher for more info)"}; /* ================== @@ -168,17 +169,17 @@ so the server doesn't disconnect. ================== */ -static qbyte olddata[NET_MAXMESSAGE]; +static unsigned char olddata[NET_MAXMESSAGE]; void CL_KeepaliveMessage (void) { float time; - static float lastmsg; + static double nextmsg = -1; int oldreadcount; qboolean oldbadread; sizebuf_t old; // no need if server is local and definitely not if this is a demo - if (sv.active || cls.demoplayback) + if (sv.active || !cls.netcon) return; // read messages from server, should just be nops @@ -194,17 +195,17 @@ void CL_KeepaliveMessage (void) net_message = old; memcpy(net_message.data, olddata, net_message.cursize); - if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5) + if (cls.netcon && (time = Sys_DoubleTime()) >= nextmsg) { sizebuf_t msg; - qbyte buf[4]; - lastmsg = time; + unsigned char buf[4]; + nextmsg = time + 5; // write out a nop // LordHavoc: must use unreliable because reliable could kill the sigon message! Con_Print("--> client to server keepalive\n"); + memset(&msg, 0, sizeof(msg)); msg.data = buf; msg.maxsize = sizeof(buf); - msg.cursize = 0; MSG_WriteChar(&msg, svc_nop); NetConn_SendUnreliableMessage(cls.netcon, &msg); } @@ -213,7 +214,7 @@ void CL_KeepaliveMessage (void) void CL_ParseEntityLump(char *entdata) { const char *data; - char key[128], value[4096]; + char key[128], value[MAX_INPUTLINE]; FOG_clear(); // LordHavoc: no fog until set // LordHavoc: default to the map's sky (q3 shader parsing sets this) R_SetSkyBox(cl.worldmodel->brush.skybox); @@ -267,50 +268,57 @@ An svc_signonnum has been received, perform a client side setup */ static void CL_SignonReply (void) { - //char str[8192]; - -Con_DPrintf("CL_SignonReply: %i\n", cls.signon); + Con_DPrintf("CL_SignonReply: %i\n", cls.signon); switch (cls.signon) { case 1: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, "prespawn"); + if (cls.netcon) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, "prespawn"); + } break; case 2: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string)); + if (cls.netcon) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("name \"%s\"", cl_name.string)); - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("color %i %i\n", cl_color.integer >> 4, cl_color.integer & 15)); + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("color %i %i", cl_color.integer >> 4, cl_color.integer & 15)); - if (cl_pmodel.integer) - { - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer)); - } - if (*cl_playermodel.string) - { - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("playermodel %s\n", cl_playermodel.string)); - } - if (*cl_playerskin.string) - { - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("playerskin %s\n", cl_playerskin.string)); - } + if (cl_pmodel.integer) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("pmodel %i", cl_pmodel.integer)); + } + if (*cl_playermodel.string) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("playermodel %s", cl_playermodel.string)); + } + if (*cl_playerskin.string) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("playerskin %s", cl_playerskin.string)); + } - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer)); + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("rate %i", cl_rate.integer)); - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, "spawn"); + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, "spawn"); + } break; case 3: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, "begin"); + if (cls.netcon) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, "begin"); + } break; case 4: @@ -331,11 +339,15 @@ void CL_ParseServerInfo (void) { char *str; int i; + protocolversion_t protocol; int nummodels, numsounds; entity_t *ent; Con_DPrint("Serverinfo packet received.\n"); + // check memory integrity + Mem_CheckSentinelsGlobal(); + // // wipe the client_state_t struct // @@ -343,25 +355,26 @@ void CL_ParseServerInfo (void) // parse protocol version number i = MSG_ReadLong (); - // hack for unmarked Nehahra movie demos which had a custom protocol - if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer) - i = PROTOCOL_NEHAHRAMOVIE; - if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_DARKPLACES6 && i != PROTOCOL_NEHAHRAMOVIE) + protocol = Protocol_EnumForNumber(i); + if (protocol == PROTOCOL_UNKNOWN) { - Host_Error("CL_ParseServerInfo: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), %i (DP6), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_DARKPLACES6, PROTOCOL_NEHAHRAMOVIE); + Host_Error("CL_ParseServerInfo: Server is unrecognized protocol number (%i)", i); return; } - cl.protocol = i; - Con_DPrintf("Server protocol is %i\n", cl.protocol); + // hack for unmarked Nehahra movie demos which had a custom protocol + if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) + protocol = PROTOCOL_NEHAHRAMOVIE; + cl.protocol = protocol; + Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cl.protocol)); // parse maxclients cl.maxclients = MSG_ReadByte (); if (cl.maxclients < 1 || cl.maxclients > MAX_SCOREBOARD) { - Host_Error("Bad maxclients (%u) from server\n", cl.maxclients); + Host_Error("Bad maxclients (%u) from server", cl.maxclients); return; } - cl.scores = Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores)); + cl.scores = (scoreboard_t *)Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores)); // parse gametype cl.gametype = MSG_ReadByte (); @@ -385,6 +398,7 @@ void CL_ParseServerInfo (void) // disable until we get textures for it R_ResetSkyBox(); + memset(cl.csqc_model_precache, 0, sizeof(cl.csqc_model_precache)); //[515]: csqc memset(cl.model_precache, 0, sizeof(cl.model_precache)); memset(cl.sound_precache, 0, sizeof(cl.sound_precache)); @@ -395,7 +409,7 @@ void CL_ParseServerInfo (void) if (!str[0]) break; if (nummodels==MAX_MODELS) - Host_Error ("Server sent too many model precaches\n"); + Host_Error ("Server sent too many model precaches"); if (strlen(str) >= MAX_QPATH) Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels])); @@ -407,7 +421,7 @@ void CL_ParseServerInfo (void) if (!str[0]) break; if (numsounds==MAX_SOUNDS) - Host_Error("Server sent too many sound precaches\n"); + Host_Error("Server sent too many sound precaches"); if (strlen(str) >= MAX_QPATH) Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); strlcpy (parse_sound_precache[numsounds], str, sizeof (parse_sound_precache[numsounds])); @@ -418,24 +432,39 @@ void CL_ParseServerInfo (void) Mod_ClearUsed(); for (i = 1;i < nummodels;i++) Mod_FindName(parse_model_precache[i]); + // precache any models used by the client (this also marks them used) + cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); + cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); + cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false); + cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false); Mod_PurgeUnused(); // do the same for sounds + // FIXME: S_ServerSounds does not know about cl.sfx_ sounds S_ServerSounds (parse_sound_precache, numsounds); + // precache any sounds used by the client + cl.sfx_wizhit = S_PrecacheSound("sound/wizard/hit.wav", false, true); + cl.sfx_knighthit = S_PrecacheSound("sound/hknight/hit.wav", false, true); + cl.sfx_tink1 = S_PrecacheSound("sound/weapons/tink1.wav", false, true); + cl.sfx_ric1 = S_PrecacheSound("sound/weapons/ric1.wav", false, true); + cl.sfx_ric2 = S_PrecacheSound("sound/weapons/ric2.wav", false, true); + cl.sfx_ric3 = S_PrecacheSound("sound/weapons/ric3.wav", false, true); + cl.sfx_r_exp3 = S_PrecacheSound("sound/weapons/r_exp3.wav", false, true); + // now we try to load everything that is new // world model CL_KeepaliveMessage (); cl.model_precache[1] = Mod_ForName(parse_model_precache[1], false, false, true); - if (cl.model_precache[1] == NULL) + if (cl.model_precache[1]->Draw == NULL) Con_Printf("Map %s not found\n", parse_model_precache[1]); // normal models for (i=2 ; iDraw == NULL) Con_Printf("Model %s not found\n", parse_model_precache[i]); } @@ -455,6 +484,7 @@ void CL_ParseServerInfo (void) ent->render.model = cl.worldmodel = cl.model_precache[1]; ent->render.scale = 1; // some of the renderer still relies on scale ent->render.alpha = 1; + ent->render.colormap = -1; // no special coloring ent->render.flags = RENDER_SHADOW | RENDER_LIGHT; Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1); Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix); @@ -479,7 +509,7 @@ void CL_ValidateState(entity_state_t *s) if (!s->active) return; - if (s->modelindex >= MAX_MODELS) + if (s->modelindex >= MAX_MODELS && (65536-s->modelindex) >= MAX_MODELS) Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS); // colormap is client index + 1 @@ -490,7 +520,6 @@ void CL_ValidateState(entity_state_t *s) } model = cl.model_precache[s->modelindex]; - Mod_CheckLoaded(model); if (model && model->type && s->frame >= model->numframes) { Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes); @@ -554,7 +583,7 @@ void CL_MoveLerpEntityStates(entity_t *ent) // not a monster ent->persistent.lerpstarttime = ent->state_previous.time; // no lerp if it's singleplayer - if (cl.islocalgame) + 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); @@ -615,7 +644,7 @@ void CL_ParseClientdata (void) VectorCopy (cl.mvelocity[0], cl.mvelocity[1]); cl.mviewzoom[1] = cl.mviewzoom[0]; - if (cl.protocol != PROTOCOL_DARKPLACES6) + if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5) { cl.stats[STAT_VIEWHEIGHT] = DEFAULT_VIEWHEIGHT; cl.stats[STAT_ITEMS] = 0; @@ -649,44 +678,36 @@ void CL_ParseClientdata (void) { if (bits & (SU_PUNCH1<entity == ent) + break; + // if the entity was not found then just replace an unused beam + if (i == cl_max_beams) + for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + if (!b->model || b->endtime < cl.time) + break; + if (i < cl_max_beams) { - if (b->entity == ent) + b->entity = ent; + b->lightning = lightning; + b->model = m; + b->endtime = cl.time + 0.2; + VectorCopy (start, b->start); + VectorCopy (end, b->end); + b->relativestartvalid = 0; + if (ent && cl_entities[ent].state_current.active) { - //b->entity = ent; - b->lightning = lightning; - b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0; - b->model = m; - b->endtime = cl.time + 0.2; - VectorCopy (start, b->start); - VectorCopy (end, b->end); - return; - } - } - - // find a free beam - for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) - { - if (!b->model || b->endtime < cl.time) - { - b->entity = ent; - b->lightning = lightning; - b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0; - b->model = m; - b->endtime = cl.time + 0.2; - VectorCopy (start, b->start); - VectorCopy (end, b->end); - return; + entity_state_t *p; + matrix4x4_t matrix, imatrix; + if (ent == cl.viewentity && cl.movement) + p = &cl_entities[b->entity].state_previous; + else + p = &cl_entities[b->entity].state_current; + // not really valid yet, we need to get the orientation now + // (ParseBeam flagged this because it is received before + // entities are received, by now they have been received) + // note: because players create lightning in their think + // function (which occurs before movement), they actually + // have some lag in it's location, so compare to the + // previous player state, not the latest + Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2], -p->angles[0], p->angles[1], p->angles[2], 1); + Matrix4x4_Invert_Simple(&imatrix, &matrix); + Matrix4x4_Transform(&imatrix, b->start, b->relativestart); + Matrix4x4_Transform(&imatrix, b->end, b->relativeend); + b->relativestartvalid = 1; } } - Con_Print("beam list overflow!\n"); + else + Con_Print("beam list overflow!\n"); } void CL_ParseTempEntity(void) @@ -921,7 +925,7 @@ void CL_ParseTempEntity(void) int rnd; int colorStart, colorLength, count; float velspeed, radius; - qbyte *tempcolor; + unsigned char *tempcolor; matrix4x4_t tempmatrix; type = MSG_ReadByte(); @@ -932,9 +936,9 @@ void CL_ParseTempEntity(void) MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + //CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); CL_RunParticleEffect(pos, vec3_origin, 20, 30); - S_StartSound(-1, 0, cl_sfx_wizhit, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1); break; case TE_KNIGHTSPIKE: @@ -942,109 +946,113 @@ void CL_ParseTempEntity(void) MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + //CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); CL_RunParticleEffect(pos, vec3_origin, 226, 20); - S_StartSound(-1, 0, cl_sfx_knighthit, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1); break; case TE_SPIKE: // spike hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - if (cl_particles_bulletimpacts.integer) + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 10); + else if (cl_particles_bulletimpacts.integer) { CL_SparkShower(pos, vec3_origin, 15, 1); CL_Smoke(pos, vec3_origin, 15); - CL_BulletMark(pos); } + CL_BulletMark(pos); if (rand() % 5) - S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1); else { rnd = rand() & 3; if (rnd == 1) - S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); else - S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); } break; case TE_SPIKEQUAD: // quad spike hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to spark shower - if (cl_particles_bulletimpacts.integer) + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 10); + else if (cl_particles_bulletimpacts.integer) { CL_SparkShower(pos, vec3_origin, 15, 1); CL_Smoke(pos, vec3_origin, 15); - CL_BulletMark(pos); } + CL_BulletMark(pos); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); if (rand() % 5) - S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1); else { rnd = rand() & 3; if (rnd == 1) - S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); else - S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); } break; case TE_SUPERSPIKE: // super spike hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to dust shower - if (cl_particles_bulletimpacts.integer) + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 20); + else if (cl_particles_bulletimpacts.integer) { CL_SparkShower(pos, vec3_origin, 30, 1); CL_Smoke(pos, vec3_origin, 30); - CL_BulletMark(pos); } + CL_BulletMark(pos); if (rand() % 5) - S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1); else { rnd = rand() & 3; if (rnd == 1) - S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); else - S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); } break; case TE_SUPERSPIKEQUAD: // quad super spike hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to dust shower - if (cl_particles_bulletimpacts.integer) + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 20); + else if (cl_particles_bulletimpacts.integer) { CL_SparkShower(pos, vec3_origin, 30, 1); CL_Smoke(pos, vec3_origin, 30); - CL_BulletMark(pos); } + CL_BulletMark(pos); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); if (rand() % 5) - S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1); else { rnd = rand() & 3; if (rnd == 1) - S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); else - S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); } break; // LordHavoc: added for improved blood splatters @@ -1120,8 +1128,13 @@ void CL_ParseTempEntity(void) // bullet hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - CL_SparkShower(pos, vec3_origin, 15, 1); - CL_Smoke(pos, vec3_origin, 15); + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 20); + else + { + CL_SparkShower(pos, vec3_origin, 15, 1); + CL_Smoke(pos, vec3_origin, 15); + } CL_BulletMark(pos); break; @@ -1129,8 +1142,13 @@ void CL_ParseTempEntity(void) // quad bullet hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - CL_SparkShower(pos, vec3_origin, 15, 1); - CL_Smoke(pos, vec3_origin, 15); + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 20); + else + { + CL_SparkShower(pos, vec3_origin, 15, 1); + CL_Smoke(pos, vec3_origin, 15); + } CL_BulletMark(pos); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); @@ -1144,7 +1162,8 @@ void CL_ParseTempEntity(void) // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5 Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSIONQUAD: @@ -1154,7 +1173,8 @@ void CL_ParseTempEntity(void) CL_ParticleExplosion(pos); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSION3: @@ -1167,7 +1187,8 @@ void CL_ParseTempEntity(void) color[1] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f); color[2] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f); CL_AllocDlight(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); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSIONRGB: @@ -1180,7 +1201,8 @@ void CL_ParseTempEntity(void) color[2] = MSG_ReadByte() * (2.0f / 255.0f); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(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); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TAREXPLOSION: @@ -1189,8 +1211,8 @@ void CL_ParseTempEntity(void) CL_FindNonSolidLocation(pos, pos, 10); CL_BlobExplosion(pos); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); break; @@ -1205,7 +1227,7 @@ void CL_ParseTempEntity(void) case TE_CUSTOMFLASH: MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - radius = MSG_ReadByte() * 8; + radius = (MSG_ReadByte() + 1) * 8; velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0); color[0] = MSG_ReadByte() * (2.0f / 255.0f); color[1] = MSG_ReadByte() * (2.0f / 255.0f); @@ -1223,31 +1245,23 @@ void CL_ParseTempEntity(void) case TE_LIGHTNING1: // lightning bolts - if (!cl_model_bolt) - cl_model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); - CL_ParseBeam(cl_model_bolt, true); + CL_ParseBeam(cl.model_bolt, true); break; case TE_LIGHTNING2: // lightning bolts - if (!cl_model_bolt2) - cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); - CL_ParseBeam(cl_model_bolt2, true); + CL_ParseBeam(cl.model_bolt2, true); break; case TE_LIGHTNING3: // lightning bolts - if (!cl_model_bolt3) - cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, false, false); - CL_ParseBeam(cl_model_bolt3, false); + CL_ParseBeam(cl.model_bolt3, false); break; // PGM 01/21/97 case TE_BEAM: // grappling hook beam - if (!cl_model_beam) - cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false); - CL_ParseBeam(cl_model_beam, false); + CL_ParseBeam(cl.model_beam, false); break; // PGM 01/21/97 @@ -1275,13 +1289,14 @@ void CL_ParseTempEntity(void) colorStart = MSG_ReadByte(); colorLength = MSG_ReadByte(); CL_ParticleExplosion2(pos, colorStart, colorLength); - tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart]; + tempcolor = (unsigned char *)&palette_complete[(rand()%colorLength) + colorStart]; color[0] = tempcolor[0] * (2.0f / 255.0f); 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_AllocDlight(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); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TEI_G3: @@ -1305,7 +1320,8 @@ void CL_ParseTempEntity(void) CL_ParticleExplosion(pos); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TEI_PLASMAHIT: @@ -1325,7 +1341,15 @@ void CL_ParseTempEntity(void) #define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x); -static qbyte cgamenetbuffer[65536]; +//[515]: csqc +void CL_VM_Init (void); +qboolean CL_VM_Parse_TempEntity (void); +void CL_VM_Parse_StuffCmd (const char *msg); +void CL_VM_Parse_CenterPrint (const char *msg); +void CSQC_AddPrintText (const char *msg); +void CSQC_ReadEntities (void); +// +static unsigned char cgamenetbuffer[65536]; /* ===================== @@ -1337,7 +1361,8 @@ void CL_ParseServerMessage(void) { int cmd; int i; - qbyte cmdlog[32]; + protocolversion_t protocol; + unsigned char cmdlog[32]; char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; @@ -1428,7 +1453,7 @@ void CL_ParseServerMessage(void) } description[strlen(description)-1] = '\n'; // replace the last space with a newline Con_Print(description); - Host_Error ("CL_ParseServerMessage: Illegible server message\n"); + Host_Error ("CL_ParseServerMessage: Illegible server message"); } break; @@ -1440,6 +1465,7 @@ void CL_ParseServerMessage(void) case svc_time: cl.mtime[1] = cl.mtime[0]; cl.mtime[0] = MSG_ReadFloat (); + cl.movement_needupdate = true; break; case svc_clientdata: @@ -1448,12 +1474,13 @@ void CL_ParseServerMessage(void) case svc_version: i = MSG_ReadLong (); + protocol = Protocol_EnumForNumber(i); + if (protocol == PROTOCOL_UNKNOWN) + Host_Error("CL_ParseServerMessage: Server is unrecognized protocol number (%i)", i); // hack for unmarked Nehahra movie demos which had a custom protocol - if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer) - i = PROTOCOL_NEHAHRAMOVIE; - if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_DARKPLACES6 && i != PROTOCOL_NEHAHRAMOVIE) - Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), %i (DP6), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_DARKPLACES6, PROTOCOL_NEHAHRAMOVIE); - cl.protocol = i; + if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) + protocol = PROTOCOL_NEHAHRAMOVIE; + cl.protocol = protocol; break; case svc_disconnect: @@ -1465,15 +1492,15 @@ void CL_ParseServerMessage(void) break; case svc_print: - Con_Print(MSG_ReadString()); + CSQC_AddPrintText(MSG_ReadString()); //[515]: csqc break; case svc_centerprint: - SCR_CenterPrint(MSG_ReadString ()); + CL_VM_Parse_CenterPrint(MSG_ReadString ()); //[515]: csqc break; case svc_stufftext: - Cbuf_AddText (MSG_ReadString ()); + CL_VM_Parse_StuffCmd(MSG_ReadString ()); //[515]: csqc break; case svc_damage: @@ -1482,6 +1509,7 @@ void CL_ParseServerMessage(void) case svc_serverinfo: CL_ParseServerInfo (); + CL_VM_Init(); //[515]: init csqc break; case svc_setangle: @@ -1492,7 +1520,7 @@ void CL_ParseServerMessage(void) case svc_setview: cl.viewentity = (unsigned short)MSG_ReadShort (); if (cl.viewentity >= MAX_EDICTS) - Host_Error("svc_setview >= MAX_EDICTS\n"); + Host_Error("svc_setview >= MAX_EDICTS"); if (cl.viewentity >= cl_max_entities) CL_ExpandEntities(cl.viewentity); // LordHavoc: assume first setview recieved is the real player entity @@ -1502,11 +1530,14 @@ void CL_ParseServerMessage(void) case svc_lightstyle: i = MSG_ReadByte (); - if (i >= MAX_LIGHTSTYLES) - Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES"); + if (i >= cl_max_lightstyle) + { + Con_Printf ("svc_lightstyle >= MAX_LIGHTSTYLES"); + break; + } strlcpy (cl_lightstyle[i].map, MSG_ReadString(), sizeof (cl_lightstyle[i].map)); cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0; - cl_lightstyle[i].length = strlen(cl_lightstyle[i].map); + cl_lightstyle[i].length = (int)strlen(cl_lightstyle[i].map); break; case svc_sound: @@ -1612,7 +1643,8 @@ void CL_ParseServerMessage(void) CL_ParseStatic (true); break; case svc_temp_entity: - CL_ParseTempEntity (); + if(!CL_VM_Parse_TempEntity()) + CL_ParseTempEntity (); break; case svc_setpause: @@ -1668,9 +1700,9 @@ void CL_ParseServerMessage(void) cl.cdtrack = MSG_ReadByte (); cl.looptrack = MSG_ReadByte (); if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) ) - CDAudio_Play ((qbyte)cls.forcetrack, true); + CDAudio_Play ((unsigned char)cls.forcetrack, true); else - CDAudio_Play ((qbyte)cl.cdtrack, true); + CDAudio_Play ((unsigned char)cl.cdtrack, true); break; case svc_intermission: @@ -1748,10 +1780,11 @@ void CL_ParseServerMessage(void) EntityFrame_CL_ReadFrame(); else if (cl.protocol == PROTOCOL_DARKPLACES4) EntityFrame4_CL_ReadFrame(); - else if (cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6) - EntityFrame5_CL_ReadFrame(); else - Host_Error("CL_ParseServerMessage: svc_entities: unknown cl.protocol %i\n", cl.protocol); + EntityFrame5_CL_ReadFrame(); + break; + case svc_csqcentities: + CSQC_ReadEntities(); break; } }