X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_main.c;h=d85aba281e10a340d4b0f0126e572a35834aebae;hp=c79ee24d2be0429fd1337d2aa41b28f5dcc8498c;hb=8bd9d978b4c3c249c7adf0b7f645e61b0f4ec513;hpb=45483d9d4f318baa8b1edc04d26231c655fddfd7 diff --git a/sv_main.c b/sv_main.c index c79ee24d..d85aba28 100644 --- a/sv_main.c +++ b/sv_main.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" // select which protocol to host, by name -// this is named the same as PROTOCOL_DARKPLACES5 for example, minus the PROTOCOL_ prefix -cvar_t sv_protocolname = {0, "sv_protocolname", "DARKPLACES5"}; +// this is named the same as PROTOCOL_DARKPLACES6 for example, minus the PROTOCOL_ prefix +cvar_t sv_protocolname = {0, "sv_protocolname", "DARKPLACES6"}; cvar_t sv_ratelimitlocalplayer = {0, "sv_ratelimitlocalplayer", "0"}; cvar_t sv_maxrate = {CVAR_SAVE | CVAR_NOTIFY, "sv_maxrate", "10000"}; @@ -32,17 +32,20 @@ static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "0"}; // tend static cvar_t sv_cullentities_stats = {0, "sv_cullentities_stats", "0"}; static cvar_t sv_entpatch = {0, "sv_entpatch", "1"}; +extern cvar_t sys_ticrate; + cvar_t sv_gameplayfix_grenadebouncedownslopes = {0, "sv_gameplayfix_grenadebouncedownslopes", "1"}; cvar_t sv_gameplayfix_noairborncorpse = {0, "sv_gameplayfix_noairborncorpse", "1"}; cvar_t sv_gameplayfix_stepdown = {0, "sv_gameplayfix_stepdown", "1"}; cvar_t sv_gameplayfix_stepwhilejumping = {0, "sv_gameplayfix_stepwhilejumping", "1"}; cvar_t sv_gameplayfix_swiminbmodels = {0, "sv_gameplayfix_swiminbmodels", "1"}; +cvar_t sv_gameplayfix_setmodelrealbox = {0, "sv_gameplayfix_setmodelrealbox", "1"}; + +cvar_t sv_progs = {0, "sv_progs", "progs.dat" }; server_t sv; server_static_t svs; -static char localmodels[MAX_MODELS][5]; // inline model names for precache - mempool_t *sv_edicts_mempool = NULL; //============================================================================ @@ -58,8 +61,6 @@ SV_Init */ void SV_Init (void) { - int i; - Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f); Cvar_RegisterVariable (&sv_maxvelocity); Cvar_RegisterVariable (&sv_gravity); @@ -81,16 +82,15 @@ void SV_Init (void) Cvar_RegisterVariable (&sv_gameplayfix_stepdown); Cvar_RegisterVariable (&sv_gameplayfix_stepwhilejumping); Cvar_RegisterVariable (&sv_gameplayfix_swiminbmodels); + Cvar_RegisterVariable (&sv_gameplayfix_setmodelrealbox); Cvar_RegisterVariable (&sv_protocolname); Cvar_RegisterVariable (&sv_ratelimitlocalplayer); Cvar_RegisterVariable (&sv_maxrate); + Cvar_RegisterVariable (&sv_progs); SV_Phys_Init(); SV_World_Init(); - for (i = 0;i < MAX_MODELS;i++) - sprintf (localmodels[i], "*%i", i); - sv_edicts_mempool = Mem_AllocPool("server edicts", 0, NULL); } @@ -106,6 +106,7 @@ static void SV_SaveEntFile_f(void) FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, strlen(sv.worldmodel->brush.entities)); } + /* ============================================================================= @@ -213,15 +214,9 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, floa return; // find precache number for sound - for (sound_num=1 ; sound_numedict = EDICT_NUM(client->number + 1); + client->edict = EDICT_NUM((client - svs.clients) + 1); + // if client is a botclient coming from a level change, we need to set up + // client info that normally requires networking + if (!client->netconnection) + { + // set up the edict + ED_ClearEdict(client->edict); + + // copy spawn parms out of the client_t + for (i=0 ; i< NUM_SPAWN_PARMS ; i++) + (&pr_global_struct->parm1)[i] = host_client->spawn_parms[i]; + + // call the spawn function + pr_global_struct->time = sv.time; + pr_global_struct->self = EDICT_TO_PROG(client->edict); + PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing"); + PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing"); + host_client->spawned = true; + return; + } // LordHavoc: clear entityframe tracking + client->latestframenum = 0; if (client->entitydatabase) EntityFrame_FreeDatabase(client->entitydatabase); @@ -295,11 +310,11 @@ void SV_SendServerinfo (client_t *client) client->entitydatabase = EntityFrame_AllocDatabase(sv_clients_mempool); if (sv.protocol == PROTOCOL_DARKPLACES4) client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool); - if (sv.protocol == PROTOCOL_DARKPLACES5) + if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6) client->entitydatabase5 = EntityFrame5_AllocDatabase(sv_clients_mempool); MSG_WriteByte (&client->message, svc_print); - snprintf (message, sizeof (message), "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, pr_crc); + dpsnprintf (message, sizeof (message), "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, pr_crc); MSG_WriteString (&client->message,message); MSG_WriteByte (&client->message, svc_serverinfo); @@ -313,12 +328,12 @@ void SV_SendServerinfo (client_t *client) MSG_WriteString (&client->message,PR_GetString(sv.edicts->v->message)); - for (s = sv.model_precache+1 ; *s ; s++) - MSG_WriteString (&client->message, *s); + for (i = 1;i < MAX_MODELS && sv.model_precache[i][0];i++) + MSG_WriteString (&client->message, sv.model_precache[i]); MSG_WriteByte (&client->message, 0); - for (s = sv.sound_precache+1 ; *s ; s++) - MSG_WriteString (&client->message, *s); + for (i = 1;i < MAX_SOUNDS && sv.sound_precache[i][0];i++) + MSG_WriteString (&client->message, sv.sound_precache[i]); MSG_WriteByte (&client->message, 0); // send music @@ -360,16 +375,21 @@ void SV_ConnectClient (int clientnum, netconn_t *netconnection) client->active = true; client->netconnection = netconnection; - Con_DPrintf("Client %s connected\n", client->netconnection->address); + Con_DPrintf("Client %s connected\n", client->netconnection ? client->netconnection->address : "botclient"); strcpy(client->name, "unconnected"); strcpy(client->old_name, "unconnected"); - client->number = clientnum; client->spawned = false; client->edict = EDICT_NUM(clientnum+1); client->message.data = client->msgbuf; client->message.maxsize = sizeof(client->msgbuf); client->message.allowoverflow = true; // we can catch it + // updated by receiving "rate" command from client + client->rate = NET_MINRATE; + // no limits for local player + if (client->netconnection && LHNETADDRESS_GetAddressType(&client->netconnection->peeraddress) == LHNETADDRESSTYPE_LOOP) + client->rate = 1000000000; + client->connecttime = realtime; if (sv.loadgame) memcpy (client->spawn_parms, spawn_parms, sizeof(spawn_parms)); @@ -381,7 +401,12 @@ void SV_ConnectClient (int clientnum, netconn_t *netconnection) client->spawn_parms[i] = (&pr_global_struct->parm1)[i]; } - SV_SendServerinfo (client); + // don't call SendServerinfo for a fresh botclient because its fields have + // not been set up by the qc yet + if (client->netconnection) + SV_SendServerinfo (client); + else + client->spawned = true; } @@ -427,6 +452,7 @@ void SV_PrepareEntitiesForSending(void) int e, i; float f; edict_t *ent; + eval_t *val; entity_state_t cs; // send all entities that touch the pvs numsendentities = 0; @@ -458,6 +484,16 @@ void SV_PrepareEntitiesForSending(void) if (GETEDICTFIELDVALUE(ent, eval_glow_trail)->_float) cs.flags |= RENDER_GLOWTRAIL; + // don't need to init cs.colormod because the defaultstate did that for us + //cs.colormod[0] = cs.colormod[1] = cs.colormod[2] = 32; + val = GETEDICTFIELDVALUE(ent, eval_colormod); + if (val->vector[0] || val->vector[1] || val->vector[2]) + { + i = val->vector[0] * 32.0f;cs.colormod[0] = bound(0, i, 255); + i = val->vector[1] * 32.0f;cs.colormod[1] = bound(0, i, 255); + i = val->vector[2] * 32.0f;cs.colormod[2] = bound(0, i, 255); + } + cs.modelindex = 0; i = (int)ent->v->modelindex; if (i >= 1 && i < MAX_MODELS && *PR_GetString(ent->v->model)) @@ -622,9 +658,12 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s) if (sententities[s->tagentity] != sententitiesmark) return; } + // skip invalid modelindexes to avoid crashes + else if (s->modelindex >= MAX_MODELS) + return; // always send world submodels, they don't generate much traffic // except in PROTOCOL_QUAKE where they hog bandwidth like crazy - else if (!(isbmodel = (model = sv.models[s->modelindex]) != NULL && model->name[0] == '*') || sv.protocol == PROTOCOL_QUAKE) + else if (!(s->effects & EF_NODEPTHTEST) && (!(isbmodel = (model = sv.models[s->modelindex]) != NULL && model->name[0] == '*') || sv.protocol == PROTOCOL_QUAKE)) { Mod_CheckLoaded(model); // entity has survived every check so far, check if visible @@ -719,7 +758,7 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s) entity_state_t sendstates[MAX_EDICTS]; -void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg) +void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg, int *stats) { int i, numsendstates; entity_state_t *s; @@ -767,7 +806,7 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg) Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, sv_writeentitiestoclient_totalentities, sv_writeentitiestoclient_visibleentities, sv_writeentitiestoclient_culled_pvs + sv_writeentitiestoclient_culled_trace, sv_writeentitiestoclient_culled_pvs, sv_writeentitiestoclient_culled_trace); if (client->entitydatabase5) - EntityFrame5_WriteFrame(msg, client->entitydatabase5, numsendstates, sendstates, client - svs.clients + 1); + EntityFrame5_WriteFrame(msg, client->entitydatabase5, numsendstates, sendstates, client - svs.clients + 1, stats); else if (client->entitydatabase4) EntityFrame4_WriteFrame(msg, client->entitydatabase4, numsendstates, sendstates); else if (client->entitydatabase) @@ -798,7 +837,7 @@ SV_WriteClientdataToMessage ================== */ -void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) +void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg, int *stats) { int bits; int i; @@ -807,6 +846,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) eval_t *val; vec3_t punchvector; qbyte viewzoom; + int weaponmodelindex; // // send a damage message @@ -838,78 +878,86 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) ent->v->fixangle = 0; } - bits = 0; - - if (ent->v->view_ofs[2] != DEFAULT_VIEWHEIGHT) - bits |= SU_VIEWHEIGHT; - - if (ent->v->idealpitch) - bits |= SU_IDEALPITCH; - -// stuff the sigil bits into the high bits of items for sbar, or else -// mix in items2 + // stuff the sigil bits into the high bits of items for sbar, or else + // mix in items2 val = GETEDICTFIELDVALUE(ent, eval_items2); - if (val) items = (int)ent->v->items | ((int)val->_float << 23); else items = (int)ent->v->items | ((int)pr_global_struct->serverflags << 28); - bits |= SU_ITEMS; - - if ( (int)ent->v->flags & FL_ONGROUND) - bits |= SU_ONGROUND; - - if ( ent->v->waterlevel >= 2) - bits |= SU_INWATER; - - // PROTOCOL_DARKPLACES VectorClear(punchvector); if ((val = GETEDICTFIELDVALUE(ent, eval_punchvector))) VectorCopy(val->vector, punchvector); - i = 255; + weaponmodelindex = SV_ModelIndex(PR_GetString(ent->v->weaponmodel), 1); + + viewzoom = 255; if ((val = GETEDICTFIELDVALUE(ent, eval_viewzoom))) - { - i = val->_float * 255.0f; - if (i == 0) - i = 255; - else - i = bound(0, i, 65535); - } - viewzoom = i; + viewzoom = val->_float * 255.0f; + if (viewzoom == 0) + viewzoom = 255; + + bits = 0; - // FIXME: which protocols support this? does PROTOCOL_DARKPLACES3 support viewzoom? - if (sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5) - if (viewzoom != 255) - bits |= SU_VIEWZOOM; + if ((int)ent->v->flags & FL_ONGROUND) + bits |= SU_ONGROUND; + if (ent->v->waterlevel >= 2) + bits |= SU_INWATER; + if (ent->v->idealpitch) + bits |= SU_IDEALPITCH; for (i=0 ; i<3 ; i++) { if (ent->v->punchangle[i]) bits |= (SU_PUNCH1<v->velocity[i]) bits |= (SU_VELOCITY1<v->weaponframe) - bits |= SU_WEAPONFRAME; - - if (ent->v->armorvalue) - bits |= SU_ARMOR; - - bits |= SU_WEAPON; + memset(stats, 0, sizeof(int[MAX_CL_STATS])); + stats[STAT_VIEWHEIGHT] = ent->v->view_ofs[2]; + stats[STAT_ITEMS] = items; + stats[STAT_WEAPONFRAME] = ent->v->weaponframe; + stats[STAT_ARMOR] = ent->v->armorvalue; + stats[STAT_WEAPON] = weaponmodelindex; + stats[STAT_HEALTH] = ent->v->health; + stats[STAT_AMMO] = ent->v->currentammo; + stats[STAT_SHELLS] = ent->v->ammo_shells; + stats[STAT_NAILS] = ent->v->ammo_nails; + stats[STAT_ROCKETS] = ent->v->ammo_rockets; + stats[STAT_CELLS] = ent->v->ammo_cells; + stats[STAT_ACTIVEWEAPON] = ent->v->weapon; + stats[STAT_VIEWZOOM] = viewzoom; + // the QC bumps these itself by sending svc_'s, so we have to keep them + // zero or they'll be corrected by the engine + //stats[STAT_TOTALSECRETS] = pr_global_struct->total_secrets; + //stats[STAT_TOTALMONSTERS] = pr_global_struct->total_monsters; + //stats[STAT_SECRETS] = pr_global_struct->found_secrets; + //stats[STAT_MONSTERS] = pr_global_struct->killed_monsters; + + if (sv.protocol != PROTOCOL_DARKPLACES6) + { + if (stats[STAT_VIEWHEIGHT] != DEFAULT_VIEWHEIGHT) bits |= SU_VIEWHEIGHT; + bits |= SU_ITEMS; + if (stats[STAT_WEAPONFRAME]) bits |= SU_WEAPONFRAME; + if (stats[STAT_ARMOR]) bits |= SU_ARMOR; + bits |= SU_WEAPON; + // FIXME: which protocols support this? does PROTOCOL_DARKPLACES3 support viewzoom? + if (sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5) + if (viewzoom != 255) + bits |= SU_VIEWZOOM; + } if (bits >= 65536) bits |= SU_EXTEND1; if (bits >= 16777216) bits |= SU_EXTEND2; -// send the data - + // send the data MSG_WriteByte (msg, svc_clientdata); MSG_WriteShort (msg, bits); if (bits & SU_EXTEND1) @@ -918,7 +966,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) MSG_WriteByte(msg, bits >> 24); if (bits & SU_VIEWHEIGHT) - MSG_WriteChar (msg, ent->v->view_ofs[2]); + MSG_WriteChar (msg, stats[STAT_VIEWHEIGHT]); if (bits & SU_IDEALPITCH) MSG_WriteChar (msg, ent->v->idealpitch); @@ -929,16 +977,16 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) { if (sv.protocol == PROTOCOL_QUAKE) MSG_WriteChar(msg, ent->v->punchangle[i]); - else if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5) + else if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6) MSG_WriteAngle16i(msg, ent->v->punchangle[i]); } - if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5) + if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6) { if (bits & (SU_PUNCHVEC1<v->velocity[i] * (1.0f / 16.0f)); - else if (sv.protocol == PROTOCOL_DARKPLACES5) + else if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6) MSG_WriteCoord32f(msg, ent->v->velocity[i]); } } -// [always sent] if (bits & SU_ITEMS) - MSG_WriteLong (msg, items); + if (bits & SU_ITEMS) + MSG_WriteLong (msg, stats[STAT_ITEMS]); if (sv.protocol == PROTOCOL_DARKPLACES5) { if (bits & SU_WEAPONFRAME) - MSG_WriteShort (msg, ent->v->weaponframe); + MSG_WriteShort (msg, stats[STAT_WEAPONFRAME]); if (bits & SU_ARMOR) - MSG_WriteShort (msg, ent->v->armorvalue); + MSG_WriteShort (msg, stats[STAT_ARMOR]); if (bits & SU_WEAPON) - { - i = SV_ModelIndex(PR_GetString(ent->v->weaponmodel)); - if (i < 0) - { - Con_DPrintf("weaponmodel \"%s\" not precached\n", PR_GetString(ent->v->weaponmodel)); - i = 0; - } - MSG_WriteShort (msg, i); - } - - MSG_WriteShort (msg, ent->v->health); - MSG_WriteShort (msg, ent->v->currentammo); - MSG_WriteShort (msg, ent->v->ammo_shells); - MSG_WriteShort (msg, ent->v->ammo_nails); - MSG_WriteShort (msg, ent->v->ammo_rockets); - MSG_WriteShort (msg, ent->v->ammo_cells); - - MSG_WriteShort (msg, ent->v->weapon); - + MSG_WriteShort (msg, stats[STAT_WEAPON]); + MSG_WriteShort (msg, stats[STAT_HEALTH]); + MSG_WriteShort (msg, stats[STAT_AMMO]); + MSG_WriteShort (msg, stats[STAT_SHELLS]); + MSG_WriteShort (msg, stats[STAT_NAILS]); + MSG_WriteShort (msg, stats[STAT_ROCKETS]); + MSG_WriteShort (msg, stats[STAT_CELLS]); + MSG_WriteShort (msg, stats[STAT_ACTIVEWEAPON]); if (bits & SU_VIEWZOOM) - MSG_WriteShort (msg, viewzoom); + MSG_WriteShort (msg, min(stats[STAT_VIEWZOOM], 65535)); } - else + else if (sv.protocol != PROTOCOL_DARKPLACES6) { if (bits & SU_WEAPONFRAME) - MSG_WriteByte (msg, ent->v->weaponframe); + MSG_WriteByte (msg, stats[STAT_WEAPONFRAME]); if (bits & SU_ARMOR) - MSG_WriteByte (msg, ent->v->armorvalue); + MSG_WriteByte (msg, stats[STAT_ARMOR]); if (bits & SU_WEAPON) - { - i = SV_ModelIndex(PR_GetString(ent->v->weaponmodel)); - if (i < 0) - { - Con_DPrintf("weaponmodel \"%s\" not precached\n", PR_GetString(ent->v->weaponmodel)); - i = 0; - } - MSG_WriteByte (msg, i); - } - - MSG_WriteShort (msg, ent->v->health); - MSG_WriteByte (msg, ent->v->currentammo); - MSG_WriteByte (msg, ent->v->ammo_shells); - MSG_WriteByte (msg, ent->v->ammo_nails); - MSG_WriteByte (msg, ent->v->ammo_rockets); - MSG_WriteByte (msg, ent->v->ammo_cells); - + MSG_WriteByte (msg, stats[STAT_WEAPON]); + MSG_WriteShort (msg, stats[STAT_HEALTH]); + MSG_WriteByte (msg, stats[STAT_AMMO]); + MSG_WriteByte (msg, stats[STAT_SHELLS]); + MSG_WriteByte (msg, stats[STAT_NAILS]); + MSG_WriteByte (msg, stats[STAT_ROCKETS]); + MSG_WriteByte (msg, stats[STAT_CELLS]); if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ) { - for(i=0;i<32;i++) - { - if ( ((int)ent->v->weapon) & (1<v->weapon); - } - + MSG_WriteByte (msg, stats[STAT_WEAPON]); if (bits & SU_VIEWZOOM) { if (sv.protocol == PROTOCOL_DARKPLACES4) - { - viewzoom = min(viewzoom, 255); - MSG_WriteByte (msg, viewzoom); - } - else if (sv.protocol == PROTOCOL_DARKPLACES5) - MSG_WriteShort (msg, viewzoom); + MSG_WriteByte (msg, min(stats[STAT_VIEWZOOM], 255)); + else if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6) + MSG_WriteShort (msg, min(stats[STAT_VIEWZOOM], 65535)); } } } @@ -1046,6 +1063,7 @@ qboolean SV_SendClientDatagram (client_t *client) { int rate, maxrate, maxsize, maxsize2; sizebuf_t msg; + int stats[MAX_CL_STATS]; if (LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) == LHNETADDRESSTYPE_LOOP && !sv_ratelimitlocalplayer.integer) { @@ -1053,15 +1071,15 @@ qboolean SV_SendClientDatagram (client_t *client) maxsize = sizeof(sv_sendclientdatagram_buf); maxsize2 = sizeof(sv_sendclientdatagram_buf); } - else if (sv.protocol == PROTOCOL_DARKPLACES5) + else if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6) { // PROTOCOL_DARKPLACES5 supports packet size limiting of updates maxrate = bound(NET_MINRATE, sv_maxrate.integer, NET_MAXRATE); if (sv_maxrate.integer != maxrate) Cvar_SetValueQuick(&sv_maxrate, maxrate); - rate = bound(NET_MINRATE, client->netconnection->rate, maxrate); - rate = (int)(client->netconnection->rate * sys_ticrate.value); + rate = bound(NET_MINRATE, client->rate, maxrate); + rate = (int)(client->rate * sys_ticrate.value); maxsize = bound(100, rate, 1400); maxsize2 = 1400; } @@ -1082,9 +1100,8 @@ qboolean SV_SendClientDatagram (client_t *client) MSG_WriteFloat (&msg, sv.time); // add the client specific data to the datagram - SV_WriteClientdataToMessage (client->edict, &msg); - - SV_WriteEntitiesToClient (client, client->edict, &msg); + SV_WriteClientdataToMessage (client, client->edict, &msg, stats); + SV_WriteEntitiesToClient (client, client->edict, &msg, stats); // expand packet size to allow effects to go over the rate limit // (dropping them is FAR too ugly) @@ -1115,65 +1132,76 @@ void SV_UpdateToReliableMessages (void) int i, j; client_t *client; eval_t *val; - char *s; + char *name; + char *model; + char *skin; // check for changes to be sent over the reliable streams for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { // update the host_client fields we care about according to the entity fields - sv_player = EDICT_NUM(i+1); - s = PR_GetString(sv_player->v->netname); - if (s != host_client->name) - { - if (s == NULL) - s = ""; - // point the string back at host_client->name to keep it safe - strlcpy (host_client->name, s, sizeof (host_client->name)); - sv_player->v->netname = PR_SetString(host_client->name); - } - if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)) && host_client->colors != val->_float) - host_client->colors = val->_float; - host_client->frags = sv_player->v->frags; - if (gamemode == GAME_NEHAHRA) - if ((val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)) && host_client->pmodel != val->_float) - host_client->pmodel = val->_float; - - // if the fields changed, send messages about the changes + host_client->edict = EDICT_NUM(i+1); + + // DP_SV_CLIENTNAME + name = PR_GetString(host_client->edict->v->netname); + if (name == NULL) + name = ""; + // always point the string back at host_client->name to keep it safe + strlcpy (host_client->name, name, sizeof (host_client->name)); + host_client->edict->v->netname = PR_SetString(host_client->name); if (strcmp(host_client->old_name, host_client->name)) { + if (host_client->spawned) + SV_BroadcastPrintf("%s changed name to %s\n", host_client->old_name, host_client->name); strcpy(host_client->old_name, host_client->name); - for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) - { - if (!client->spawned || !client->netconnection) - continue; - MSG_WriteByte (&client->message, svc_updatename); - MSG_WriteByte (&client->message, i); - MSG_WriteString (&client->message, host_client->name); - } + // send notification to all clients + MSG_WriteByte (&sv.reliable_datagram, svc_updatename); + MSG_WriteByte (&sv.reliable_datagram, i); + MSG_WriteString (&sv.reliable_datagram, host_client->name); } + + // DP_SV_CLIENTCOLORS + // this is always found (since it's added by the progs loader) + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors))) + host_client->colors = (int)val->_float; if (host_client->old_colors != host_client->colors) { host_client->old_colors = host_client->colors; - for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) - { - if (!client->spawned || !client->netconnection) - continue; - MSG_WriteByte (&client->message, svc_updatecolors); - MSG_WriteByte (&client->message, i); - MSG_WriteByte (&client->message, host_client->colors); - } + // send notification to all clients + MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); + MSG_WriteByte (&sv.reliable_datagram, i); + MSG_WriteByte (&sv.reliable_datagram, host_client->colors); + } + + // NEXUIZ_PLAYERMODEL + if( eval_playermodel ) { + model = PR_GetString(GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string); + if (model == NULL) + model = ""; + // always point the string back at host_client->name to keep it safe + strlcpy (host_client->playermodel, model, sizeof (host_client->playermodel)); + GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PR_SetString(host_client->playermodel); } + + // NEXUIZ_PLAYERSKIN + if( eval_playerskin ) { + skin = PR_GetString(GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string); + if (skin == NULL) + skin = ""; + // always point the string back at host_client->name to keep it safe + strlcpy (host_client->playerskin, skin, sizeof (host_client->playerskin)); + GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PR_SetString(host_client->playerskin); + } + + // frags + host_client->frags = (int)host_client->edict->v->frags; if (host_client->old_frags != host_client->frags) { host_client->old_frags = host_client->frags; - for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) - { - if (!client->spawned || !client->netconnection) - continue; - MSG_WriteByte (&client->message, svc_updatefrags); - MSG_WriteByte (&client->message, i); - MSG_WriteShort (&client->message, host_client->frags); - } + // send notification to all clients + MSG_WriteByte (&sv.reliable_datagram, svc_updatefrags); + MSG_WriteByte (&sv.reliable_datagram, i); + MSG_WriteShort (&sv.reliable_datagram, host_client->frags); } } @@ -1301,22 +1329,95 @@ SV_ModelIndex ================ */ -int SV_ModelIndex (const char *name) +int SV_ModelIndex(char *s, int precachemode) { - int i; - - if (!name || !name[0]) + int i, limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_MODELS); + char filename[MAX_QPATH]; + if (!s || !*s) return 0; - - for (i=0 ; i 0 && entnum <= svs.maxclients) { svent->e->baseline.colormap = entnum; - i = SV_ModelIndex("progs/player.mdl"); - if (i < 0) - i = 0; - svent->e->baseline.modelindex = i; + svent->e->baseline.modelindex = SV_ModelIndex("progs/player.mdl", 1); } else { @@ -1509,7 +1607,10 @@ void SV_SpawnServer (const char *server) Con_DPrintf("SpawnServer: %s\n", server); - snprintf (modelname, sizeof(modelname), "maps/%s.bsp", server); + if (cls.state != ca_dedicated) + SCR_BeginLoadingPlaque(); + + dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", server); worldmodel = Mod_ForName(modelname, false, true, true); if (!worldmodel || !worldmodel->TraceBox) { @@ -1541,9 +1642,10 @@ void SV_SpawnServer (const char *server) // if (coop.integer) Cvar_SetValue ("deathmatch", 0); - current_skill = bound(0, (int)(skill.value + 0.5), 3); - - Cvar_SetValue ("skill", (float)current_skill); + // LordHavoc: it can be useful to have skills outside the range 0-3... + //current_skill = bound(0, (int)(skill.value + 0.5), 3); + //Cvar_SetValue ("skill", (float)current_skill); + current_skill = (int)(skill.value + 0.5); // // set up the new server @@ -1554,51 +1656,34 @@ void SV_SpawnServer (const char *server) strlcpy (sv.name, server, sizeof (sv.name)); - // FIXME: cvar + sv.netquakecompatible = false; if (!strcasecmp(sv_protocolname.string, "QUAKE")) { sv.protocol = PROTOCOL_QUAKE; sv.netquakecompatible = true; } else if (!strcasecmp(sv_protocolname.string, "QUAKEDP")) - { sv.protocol = PROTOCOL_QUAKE; - sv.netquakecompatible = false; - } else if (!strcasecmp(sv_protocolname.string, "DARKPLACES1")) - { sv.protocol = PROTOCOL_DARKPLACES1; - sv.netquakecompatible = false; - } else if (!strcasecmp(sv_protocolname.string, "DARKPLACES2")) - { sv.protocol = PROTOCOL_DARKPLACES2; - sv.netquakecompatible = false; - } else if (!strcasecmp(sv_protocolname.string, "DARKPLACES3")) - { sv.protocol = PROTOCOL_DARKPLACES3; - sv.netquakecompatible = false; - } else if (!strcasecmp(sv_protocolname.string, "DARKPLACES4")) - { sv.protocol = PROTOCOL_DARKPLACES4; - sv.netquakecompatible = false; - } else if (!strcasecmp(sv_protocolname.string, "DARKPLACES5")) - { sv.protocol = PROTOCOL_DARKPLACES5; - sv.netquakecompatible = false; - } + else if (!strcasecmp(sv_protocolname.string, "DARKPLACES6")) + sv.protocol = PROTOCOL_DARKPLACES6; else { - sv.protocol = PROTOCOL_DARKPLACES5; - sv.netquakecompatible = false; - Con_Printf("Unknown sv_protocolname \"%s\", valid values are QUAKE, QUAKEDP, DARKPLACES1, DARKPLACES2, DARKPLACES3, DARKPLACES4, DARKPLACES5, falling back to DARKPLACES5 protocol\n", sv_protocolname.string); + sv.protocol = PROTOCOL_DARKPLACES6; + Con_Printf("Unknown sv_protocolname \"%s\", valid values are QUAKE, QUAKEDP, DARKPLACES1, DARKPLACES2, DARKPLACES3, DARKPLACES4, DARKPLACES5, DARKPLACES6, falling back to DARKPLACES6 protocol\n", sv_protocolname.string); } // load progs to get entity field count - PR_LoadProgs (); + PR_LoadProgs ( sv_progs.string ); // allocate server memory // start out with just enough room for clients and a reasonable estimate of entities @@ -1622,6 +1707,10 @@ void SV_SpawnServer (const char *server) ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size); } + // fix up client->edict pointers for returning clients right away... + for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) + host_client->edict = EDICT_NUM(i + 1); + sv.datagram.maxsize = sizeof(sv.datagram_buf); sv.datagram.cursize = 0; sv.datagram.data = sv.datagram_buf; @@ -1655,14 +1744,14 @@ void SV_SpawnServer (const char *server) // SV_ClearWorld (); - sv.sound_precache[0] = ""; + strlcpy(sv.sound_precache[0], "", sizeof(sv.sound_precache[0])); - sv.model_precache[0] = ""; - sv.model_precache[1] = sv.modelname; + strlcpy(sv.model_precache[0], "", sizeof(sv.model_precache[0])); + strlcpy(sv.model_precache[1], sv.modelname, sizeof(sv.model_precache[1])); for (i = 1;i < sv.worldmodel->brush.numsubmodels;i++) { - sv.model_precache[i+1] = localmodels[i]; - sv.models[i+1] = Mod_ForName (localmodels[i], false, false, false); + dpsnprintf(sv.model_precache[i+1], sizeof(sv.model_precache[i+1]), "*%i", i); + sv.models[i+1] = Mod_ForName (sv.model_precache[i+1], false, false, false); } // @@ -1722,8 +1811,9 @@ void SV_SpawnServer (const char *server) SV_CreateBaseline (); // send serverinfo to all connected clients + // (note this also handles botclients coming back from a level change) for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) - if (host_client->netconnection) + if (host_client->active) SV_SendServerinfo(host_client); Con_DPrint("Server spawned.\n");