X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=6a0b99141fbd6165ace0c3238bbe5c9828b86e0b;hb=05fa482e8b4b3e344ffd36cbb7e98643c82816ea;hp=841c4df2d8ed135a7595efa1b730dd3b23987d08;hpb=5919f7641ef28e7e58b89da6cee142f0418cdbc5;p=xonotic%2Fdarkplaces.git

diff --git a/host_cmd.c b/host_cmd.c
index 841c4df2..6a0b9914 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -551,7 +551,7 @@ LOAD / SAVE GAME
 void Host_Savegame_to(prvm_prog_t *prog, const char *name)
 {
 	qfile_t	*f;
-	int		i, k, l, lightstyles = 64;
+	int		i, k, l, numbuffers, lightstyles = 64;
 	char	comment[SAVEGAME_COMMENT_LENGTH+1];
 	char	line[MAX_INPUTLINE];
 	qboolean isserver;
@@ -641,11 +641,13 @@ void Host_Savegame_to(prvm_prog_t *prog, const char *name)
 			FS_Printf(f,"sv.sound_precache %i %s\n", i, sv.sound_precache[i]);
 
 	// darkplaces extension - save buffers
-	for (i = 0; i < (int)Mem_ExpandableArray_IndexRange(&prog->stringbuffersarray); i++)
+	numbuffers = Mem_ExpandableArray_IndexRange(&prog->stringbuffersarray);
+	for (i = 0; i < numbuffers; i++)
 	{
 		prvm_stringbuffer_t *stringbuffer = (prvm_stringbuffer_t*) Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);
 		if(stringbuffer && (stringbuffer->flags & STRINGBUFFER_SAVED))
 		{
+			FS_Printf(f,"sv.buffer %i %i \"string\"\n", i, stringbuffer->flags & STRINGBUFFER_QCFLAGS);
 			for(k = 0; k < stringbuffer->num_strings; k++)
 			{
 				if (!stringbuffer->strings[k])
@@ -753,6 +755,11 @@ Host_Loadgame_f
 ===============
 */
 
+prvm_stringbuffer_t *BufStr_FindCreateReplace (prvm_prog_t *prog, int bufindex, int flags, char *format);
+void BufStr_Set(prvm_prog_t *prog, prvm_stringbuffer_t *stringbuffer, int strindex, const char *str);
+void BufStr_Del(prvm_prog_t *prog, prvm_stringbuffer_t *stringbuffer);
+void BufStr_Flush(prvm_prog_t *prog);
+
 static void Host_Loadgame_f (void)
 {
 	prvm_prog_t *prog = SVVM_prog;
@@ -764,12 +771,11 @@ static void Host_Loadgame_f (void)
 	const char *t;
 	char *text;
 	prvm_edict_t *ent;
-	int i, k;
+	int i, k, numbuffers;
 	int entnum;
 	int version;
 	float spawn_parms[NUM_SPAWN_PARMS];
 	prvm_stringbuffer_t *stringbuffer;
-	size_t alloclen;
 
 	if (Cmd_Argc() != 2)
 	{
@@ -988,6 +994,8 @@ static void Host_Loadgame_f (void)
 			memset(sv.lightstyles[0], 0, sizeof(sv.lightstyles));
 			memset(sv.model_precache[0], 0, sizeof(sv.model_precache));
 			memset(sv.sound_precache[0], 0, sizeof(sv.sound_precache));
+			BufStr_Flush(prog);
+
 			while (COM_ParseToken_Simple(&t, false, false, true))
 			{
 				if (!strcmp(com_token, "sv.lightstyles"))
@@ -1023,44 +1031,48 @@ static void Host_Loadgame_f (void)
 					else
 						Con_Printf("unsupported sound %i \"%s\"\n", i, com_token);
 				}
+				else if (!strcmp(com_token, "sv.buffer"))
+				{
+					if (COM_ParseToken_Simple(&t, false, false, true))
+					{
+						i = atoi(com_token);
+						if (i >= 0)
+						{
+							k = STRINGBUFFER_SAVED;
+							if (COM_ParseToken_Simple(&t, false, false, true))
+								k |= atoi(com_token);
+							if (!BufStr_FindCreateReplace(prog, i, k, "string"))
+								Con_Printf("failed to create stringbuffer %i\n", i);
+						}
+						else
+							Con_Printf("unsupported stringbuffer index %i \"%s\"\n", i, com_token);
+					}
+					else
+						Con_Printf("unexpected end of line when parsing sv.buffer (expected buffer index)\n");
+				}
 				else if (!strcmp(com_token, "sv.bufstr"))
 				{
-					COM_ParseToken_Simple(&t, false, false, true);
-					i = atoi(com_token);
-					COM_ParseToken_Simple(&t, false, false, true);
-					k = atoi(com_token);
-					COM_ParseToken_Simple(&t, false, false, true);
-					stringbuffer = (prvm_stringbuffer_t*) Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);
-					// VorteX: nasty code, cleanup required
-					// create buffer at this index
-					if(!stringbuffer) 
-						stringbuffer = (prvm_stringbuffer_t *) Mem_ExpandableArray_AllocRecordAtIndex(&prog->stringbuffersarray, i);
-					if (!stringbuffer)
-						Con_Printf("cant write string %i into buffer %i\n", k, i);
+					if (!COM_ParseToken_Simple(&t, false, false, true))
+						Con_Printf("unexpected end of line when parsing sv.bufstr\n");
 					else
 					{
-						// code copied from VM_bufstr_set
-						// expand buffer
-						if (stringbuffer->max_strings <= i)
+						i = atoi(com_token);
+						stringbuffer = BufStr_FindCreateReplace(prog, i, STRINGBUFFER_SAVED, "string");
+						if (stringbuffer)
 						{
-							char **oldstrings = stringbuffer->strings;
-							stringbuffer->max_strings = max(stringbuffer->max_strings * 2, 128);
-							while (stringbuffer->max_strings <= i)
-								stringbuffer->max_strings *= 2;
-							stringbuffer->strings = (char **) Mem_Alloc(prog->progs_mempool, stringbuffer->max_strings * sizeof(stringbuffer->strings[0]));
-							if (stringbuffer->num_strings > 0)
-								memcpy(stringbuffer->strings, oldstrings, stringbuffer->num_strings * sizeof(stringbuffer->strings[0]));
-							if (oldstrings)
-								Mem_Free(oldstrings);
+							if (COM_ParseToken_Simple(&t, false, false, true))
+							{
+								k = atoi(com_token);
+								if (COM_ParseToken_Simple(&t, false, false, true))
+									BufStr_Set(prog, stringbuffer, k, com_token);
+								else
+									Con_Printf("unexpected end of line when parsing sv.bufstr (expected string)\n");
+							}
+							else
+								Con_Printf("unexpected end of line when parsing sv.bufstr (expected strindex)\n");
 						}
-						// allocate string
-						stringbuffer->num_strings = max(stringbuffer->num_strings, k + 1);
-						if(stringbuffer->strings[k])
-							Mem_Free(stringbuffer->strings[k]);
-						stringbuffer->strings[k] = NULL;
-						alloclen = strlen(com_token) + 1;
-						stringbuffer->strings[k] = (char *)Mem_Alloc(prog->progs_mempool, alloclen);
-						memcpy(stringbuffer->strings[k], com_token, alloclen);
+						else
+							Con_Printf("failed to create stringbuffer %i \"%s\"\n", i, com_token);
 					}
 				}	
 				// skip any trailing text or unrecognized commands
@@ -1071,6 +1083,15 @@ static void Host_Loadgame_f (void)
 	}
 	Mem_Free(text);
 
+	// remove all temporary flagged string buffers (ones created with BufStr_FindCreateReplace)
+	numbuffers = Mem_ExpandableArray_IndexRange(&prog->stringbuffersarray);
+	for (i = 0; i < numbuffers; i++)
+	{
+		if ( (stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i)) )
+			if (stringbuffer->flags & STRINGBUFFER_TEMP)
+				BufStr_Del(prog, stringbuffer);
+	}
+
 	if(developer_entityparsing.integer)
 		Con_Printf("Host_Loadgame_f: finished\n");
 
@@ -1198,7 +1219,7 @@ static void Host_Name_f (void)
 	PRVM_serveredictstring(host_client->edict, netname) = PRVM_SetEngineString(prog, host_client->name);
 	if (strcmp(host_client->old_name, host_client->name))
 	{
-		if (host_client->spawned)
+		if (host_client->begun)
 			SV_BroadcastPrintf("%s ^7changed name to %s\n", host_client->old_name, host_client->name);
 		strlcpy(host_client->old_name, host_client->name, sizeof(host_client->old_name));
 		// send notification to all clients
@@ -1316,7 +1337,7 @@ static void Host_Playerskin_f (void)
 	PRVM_serveredictstring(host_client->edict, playerskin) = PRVM_SetEngineString(prog, host_client->playerskin);
 	if (strcmp(host_client->old_skin, host_client->playerskin))
 	{
-		//if (host_client->spawned)
+		//if (host_client->begun)
 		//	SV_BroadcastPrintf("%s changed skin to %s\n", host_client->name, host_client->playerskin);
 		strlcpy(host_client->old_skin, host_client->playerskin, sizeof(host_client->old_skin));
 		/*// send notification to all clients
@@ -1774,11 +1795,12 @@ Host_PreSpawn_f
 */
 static void Host_PreSpawn_f (void)
 {
-	if (host_client->spawned)
+	if (host_client->prespawned)
 	{
-		Con_Print("prespawn not valid -- already spawned\n");
+		Con_Print("prespawn not valid -- already prespawned\n");
 		return;
 	}
+	host_client->prespawned = true;
 
 	if (host_client->netconnection)
 	{
@@ -1804,11 +1826,17 @@ static void Host_Spawn_f (void)
 	client_t *client;
 	int stats[MAX_CL_STATS];
 
+	if (!host_client->prespawned)
+	{
+		Con_Print("Spawn not valid -- not yet prespawned\n");
+		return;
+	}
 	if (host_client->spawned)
 	{
 		Con_Print("Spawn not valid -- already spawned\n");
 		return;
 	}
+	host_client->spawned = true;
 
 	// reset name change timer again because they might want to change name
 	// again in the first 5 seconds after connecting
@@ -1936,7 +1964,17 @@ Host_Begin_f
 */
 static void Host_Begin_f (void)
 {
-	host_client->spawned = true;
+	if (!host_client->spawned)
+	{
+		Con_Print("Begin not valid -- not yet spawned\n");
+		return;
+	}
+	if (host_client->begun)
+	{
+		Con_Print("Begin not valid -- already begun\n");
+		return;
+	}
+	host_client->begun = true;
 
 	// LordHavoc: note: this code also exists in SV_DropClient
 	if (sv.loadgame)
@@ -2075,7 +2113,7 @@ static void Host_Give_f (void)
 	case '8':
 	case '9':
 		// MED 01/04/97 added hipnotic give stuff
-		if (gamemode == GAME_HIPNOTIC)
+		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
 		{
 			if (t[0] == '6')
 			{