X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=pr_edict.c;h=b7d347304a8c2c3c22245668fe001cd97129b7bc;hb=b132ccbd81d360fc065fa54fc846fe416c62e66e;hp=d7875c5dcdeb344d6326555ceeea084c1c7ff3cf;hpb=3b559840aaf1e5a218052d893881c1dd8c1b0780;p=xonotic%2Fdarkplaces.git

diff --git a/pr_edict.c b/pr_edict.c
index d7875c5d..b7d34730 100644
--- a/pr_edict.c
+++ b/pr_edict.c
@@ -122,6 +122,8 @@ int eval_viewzoom;
 
 mfunction_t *SV_PlayerPhysicsQC;
 mfunction_t *EndFrameQC;
+//KrimZon - SERVER COMMANDS IN QUAKEC
+mfunction_t *SV_ParseClientCommandQC;
 
 int FindFieldOffset(const char *field)
 {
@@ -173,6 +175,8 @@ void FindEdictFieldOffsets(void)
 	SV_PlayerPhysicsQC = ED_FindFunction ("SV_PlayerPhysics");
 	// LordHavoc: support for endframe
 	EndFrameQC = ED_FindFunction ("EndFrame");
+	//KrimZon - SERVER COMMANDS IN QUAKEC
+	SV_ParseClientCommandQC = ED_FindFunction ("SV_ParseClientCommand");
 }
 
 /*
@@ -185,7 +189,7 @@ Sets everything to NULL
 void ED_ClearEdict (edict_t *e)
 {
 	memset (e->v, 0, progs->entityfields * 4);
-	e->free = false;
+	e->e->free = false;
 }
 
 /*
@@ -210,7 +214,7 @@ edict_t *ED_Alloc (void)
 		e = EDICT_NUM(i);
 		// the first couple seconds of server time can involve a lot of
 		// freeing and allocating, so relax the replacement policy
-		if (e->free && ( e->freetime < 2 || sv.time - e->freetime > 0.5 ) )
+		if (e->e->free && ( e->e->freetime < 2 || sv.time - e->e->freetime > 0.5 ) )
 		{
 			ED_ClearEdict (e);
 			return e;
@@ -241,7 +245,7 @@ void ED_Free (edict_t *ed)
 {
 	SV_UnlinkEdict (ed);		// unlink from world bsp
 
-	ed->free = true;
+	ed->e->free = true;
 	ed->v->model = 0;
 	ed->v->takedamage = 0;
 	ed->v->modelindex = 0;
@@ -253,7 +257,7 @@ void ED_Free (edict_t *ed)
 	ed->v->nextthink = -1;
 	ed->v->solid = 0;
 
-	ed->freetime = sv.time;
+	ed->e->freetime = sv.time;
 }
 
 //===========================================================================
@@ -561,7 +565,7 @@ void ED_Print (edict_t *ed)
 	int		type;
 	char	tempstring[8192], tempstring2[260]; // temporary string buffers
 
-	if (ed->free)
+	if (ed->e->free)
 	{
 		Con_Printf ("FREE\n");
 		return;
@@ -636,7 +640,7 @@ void ED_Write (qfile_t *f, edict_t *ed)
 
 	FS_Printf (f, "{\n");
 
-	if (ed->free)
+	if (ed->e->free)
 	{
 		FS_Printf (f, "}\n");
 		return;
@@ -724,7 +728,7 @@ void ED_Count (void)
 	for (i=0 ; i<sv.num_edicts ; i++)
 	{
 		ent = EDICT_NUM(i);
-		if (ent->free)
+		if (ent->e->free)
 			continue;
 		active++;
 		if (ent->v->solid)
@@ -1021,7 +1025,7 @@ const char *ED_ParseEdict (const char *data, edict_t *ent)
 	}
 
 	if (!init)
-		ent->free = true;
+		ent->e->free = true;
 
 	return data;
 }
@@ -1118,7 +1122,7 @@ void ED_LoadFromFile (const char *data)
 		pr_global_struct->self = EDICT_TO_PROG(ent);
 		PR_ExecuteProgram (func - pr_functions, "");
 		spawned++;
-		if (ent->free)
+		if (ent->e->free)
 			died++;
 	}
 
@@ -1413,7 +1417,7 @@ void PR_Fields_f (void)
 	for (ednum = 0;ednum < MAX_EDICTS;ednum++)
 	{
 		ed = EDICT_NUM(ednum);
-		if (ed->free)
+		if (ed->e->free)
 			continue;
 		for (i = 1;i < progs->numfielddefs;i++)
 		{
@@ -1596,7 +1600,7 @@ int NUM_FOR_EDICT(edict_t *e)
 //}
 
 //#define	EDICT_TO_PROG(e) ((qbyte *)(((edict_t *)e)->v) - (qbyte *)(sv.edictsfields))
-//#define PROG_TO_EDICT(e) (sv.edictstable[(e) / (progs->entityfields * 4)])
+//#define PROG_TO_EDICT(e) (sv.edicts + ((e) / (progs->entityfields * 4)))
 int EDICT_TO_PROG(edict_t *e)
 {
 	int n;
@@ -1610,8 +1614,8 @@ edict_t *PROG_TO_EDICT(int n)
 {
 	if ((unsigned int)n >= (unsigned int)sv.max_edicts)
 		Host_Error("PROG_TO_EDICT: invalid edict number %i\n", n);
-	return sv.edictstable[n]; // EXPERIMENTAL
-	//return sv.edictstable[(n) / (progs->entityfields * 4)];
+	return sv.edicts + n; // EXPERIMENTAL
+	//return sv.edicts + ((n) / (progs->entityfields * 4));
 }
 */