X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_main.c;h=f6cc5e3936609f5b31ffff948e3928acf5600275;hb=08512a8aed6a1d87a47987ffc2800c7080f9d439;hp=99096341c397974dfad8a572a6173266ea5e9060;hpb=c2026725b55e3025eb7f6f76a3a4fa1687a15988;p=xonotic%2Fdarkplaces.git

diff --git a/sv_main.c b/sv_main.c
index 99096341..f6cc5e39 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -150,7 +150,7 @@ cvar_t nehx19 = {0, "nehx19", "0", "nehahra data storage cvar (used in singlepla
 cvar_t cutscene = {0, "cutscene", "1", "enables cutscenes in nehahra, can be used by other mods"};
 
 cvar_t sv_autodemo_perclient = {CVAR_SAVE, "sv_autodemo_perclient", "0", "set to 1 to enable autorecorded per-client demos (they'll start to record at the beginning of a match); set it to 2 to also record client->server packets (for debugging)"};
-cvar_t sv_autodemo_perclient_nameformat = {CVAR_SAVE, "sv_autodemo_perclient_nameformat", "sv_autodemos/%Y-%m-%d_%H-%M", "The format of the sv_autodemo_perclient filename, followed by the map name, the IP address + port number, and the client number, separated by underscores" };
+cvar_t sv_autodemo_perclient_nameformat = {CVAR_SAVE, "sv_autodemo_perclient_nameformat", "sv_autodemos/%Y-%m-%d_%H-%M", "The format of the sv_autodemo_perclient filename, followed by the map name, the client number and the IP address + port number, separated by underscores" };
 
 
 server_t sv;
@@ -262,6 +262,7 @@ prvm_required_field_t reqfields[] =
 	{ev_function, "SendEntity"},
 	{ev_function, "contentstransition"}, // DRESK - Support for Entity Contents Transition Event
 	{ev_function, "customizeentityforclient"},
+	{ev_function, "movetypesteplandevent"}, // DRESK - Support for MOVETYPE_STEP Entity Land Event
 	{ev_string, "netaddress"},
 	{ev_string, "playermodel"},
 	{ev_string, "playerskin"},
@@ -832,7 +833,7 @@ void SV_SendServerinfo (client_t *client)
 		for(i = 0; ipaddress[i]; ++i)
 			if(!isalnum(ipaddress[i]))
 				ipaddress[i] = '-';
-		dpsnprintf (demofile, sizeof(demofile), "%s_%s_%s_%d.dem", Sys_TimeString (sv_autodemo_perclient_nameformat.string), levelname, ipaddress, PRVM_NUM_FOR_EDICT(client->edict));
+		dpsnprintf (demofile, sizeof(demofile), "%s_%s_%d_%s.dem", Sys_TimeString (sv_autodemo_perclient_nameformat.string), levelname, PRVM_NUM_FOR_EDICT(client->edict), ipaddress);
 
 		SV_StartDemoRecording(client, demofile, -1);
 	}
@@ -929,7 +930,7 @@ static qboolean SV_PrepareEntityForSending (prvm_edict_t *ent, entity_state_t *c
 	unsigned int customizeentityforclient;
 	float f;
 	vec3_t cullmins, cullmaxs;
-	model_t *model;
+	dp_model_t *model;
 	prvm_eval_t *val;
 
 	// this 2 billion unit check is actually to detect NAN origins
@@ -1187,7 +1188,7 @@ void SV_PrepareEntitiesForSending(void)
 void SV_MarkWriteEntityStateToClient(entity_state_t *s)
 {
 	int isbmodel;
-	model_t *model;
+	dp_model_t *model;
 	prvm_edict_t *ed;
 	if (sv.sententitiesconsideration[s->number] == sv.sententitiesmark)
 		return;
@@ -2479,7 +2480,7 @@ void SV_SpawnServer (const char *server)
 	prvm_edict_t *ent;
 	int i;
 	char *entities;
-	model_t *worldmodel;
+	dp_model_t *worldmodel;
 	char modelname[sizeof(sv.modelname)];
 
 	Con_DPrintf("SpawnServer: %s\n", server);