remove client_t.gentity and SV_GentityNum

We need to use the gentityMapper instead, to properly handle QVM.

Author: mrwonko

codemp/icarus/GameInterface.cpp

@@ -307,16 +307,17 @@ bool ICARUS_ValidEnt( sharedEntityMapper_t *ent )
 			//and while this allows us to read it on our "fake" entity here, we can't modify pointers like this. We can however do
 			//something completely hackish such as the following.
 			assert(ent->s->number >= 0 && ent->s->number < MAX_GENTITIES);
-			sharedEntity_t *trueEntity = SV_GentityNum(ent->s->number);
 
 			//This works because we're modifying the actual shared game vm data and turning one pointer into another.
 			//While these pointers both look like garbage to us in here, they are not.
 			if ( VM_IsCurrentQVM() )
 			{
-				sharedEntity_qvm_t *trueEntityQVM = (sharedEntity_qvm_t*)trueEntity;
-				trueEntityQVM->script_targetname = trueEntityQVM->targetname;
+				*ent->script_targetname.qvm = *ent->targetname.qvm;
+			}
+			else
+			{
+				*ent->script_targetname.native = *ent->targetname.native;
 			}
-			else trueEntity->script_targetname = trueEntity->targetname;
 			return true;
 		}
 	}

codemp/server/server.h

@@ -153,8 +153,7 @@ typedef struct client_s {
 	int				lastMessageNum;		// for delta compression
 	int				lastClientCommand;	// reliable client message sequence
 	char			lastClientCommandString[MAX_STRING_CHARS];
-	sharedEntity_t	*gentity;			// SV_GentityNum(clientnum)
-	sharedEntityMapper_t *gentityMapper;
+	sharedEntityMapper_t *gentityMapper;	// SV_GentityMapperNum(clientnum)
 	char			name[MAX_NAME_LENGTH];			// extracted from userinfo, high bits masked
 
 	// downloading
@@ -381,12 +380,10 @@ void SV_SendClientSnapshot( client_t *client );
 //
 int	SV_NumForGentity( const sharedEntity_t *ent );
 int	SV_NumForGentityMapper( const sharedEntityMapper_t *ent );
-sharedEntity_t *SV_GentityNum( int num );
 sharedEntityMapper_t *SV_GentityMapperNum( int num );
 playerState_t *SV_GameClientNum( int num );
 svEntity_t	*SV_SvEntityForGentity( sharedEntity_t *gEnt );
 svEntity_t	*SV_SvEntityForGentityMapper( sharedEntityMapper_t *gEnt );
-sharedEntity_t *SV_GEntityForSvEntity( svEntity_t *svEnt );
 sharedEntityMapper_t *SV_GEntityMapperForSvEntity( svEntity_t *svEnt );
 sharedEntityMapper_t *SV_GEntityMapperForGentity( const sharedEntity_t *gEnt );
 void		SV_InitGameProgs ( void );

codemp/server/sv_bot.cpp

@@ -201,7 +201,6 @@ int SV_BotAllocateClient(void) {
 		return -1;
 	}
 
-	cl->gentity = SV_GentityNum( i );
 	cl->gentityMapper = SV_GentityMapperNum( i );
 	cl->gentityMapper->s->number = i;
 	cl->state = CS_ACTIVE;
@@ -264,8 +263,8 @@ void BotDrawDebugPolygons(void (*drawPoly)(int color, int numPoints, float *poin
 		if (bot_reachability->integer) parm0 |= 2;
 		if (bot_groundonly->integer) parm0 |= 4;
 		botlib_export->BotLibVarSet("bot_highlightarea", bot_highlightarea->string);
-		botlib_export->Test(parm0, NULL, svs.clients[0].gentity->r.currentOrigin,
-			svs.clients[0].gentity->r.currentAngles);
+		botlib_export->Test(parm0, NULL, svs.clients[0].gentityMapper->r->currentOrigin,
+			svs.clients[0].gentityMapper->r->currentAngles);
 	} //end if
 	//draw all debug polys
 	for (i = 0; i < bot_maxdebugpolys; i++) {

codemp/server/sv_client.cpp

@@ -302,7 +302,6 @@ void SV_DirectConnect( netadr_t from ) {
 	// this is the only place a client_t is ever initialized
 	*newcl = temp;
 	clientNum = newcl - svs.clients;
-	newcl->gentity = SV_GentityNum( clientNum );
 	newcl->gentityMapper = SV_GentityMapperNum( clientNum );
 
 	// save the challenge
@@ -560,7 +559,6 @@ void SV_ClientEnterWorld( client_t *client, usercmd_t *cmd ) {
 
 	// set up the entity for the client
 	clientNum = client - svs.clients;
-	client->gentity = SV_GentityNum( clientNum );
 	client->gentityMapper = SV_GentityMapperNum( clientNum );
 	client->gentityMapper->s->number = clientNum;
 

codemp/server/sv_game.cpp

@@ -47,14 +47,6 @@ int	SV_NumForGentityMapper( const sharedEntityMapper_t *ent ) {
 	return ent - sv.gentitiesMapper;
 }
 
-sharedEntity_t *SV_GentityNum( int num ) {
-	sharedEntity_t *ent;
-
-	ent = (sharedEntity_t *)((byte *)sv.gentities + sv.gentitySize*(num));
-
-	return ent;
-}
-
 sharedEntityMapper_t *SV_GentityMapperNum( int num ) {
 	if ( num < 0 || num >= (int)ARRAY_LEN(sv.gentitiesMapper) ) return NULL;
 	return &sv.gentitiesMapper[num];
@@ -82,13 +74,6 @@ svEntity_t	*SV_SvEntityForGentityMapper( sharedEntityMapper_t *gEnt ) {
 	return &sv.svEntities[ gEnt->s->number ];
 }
 
-sharedEntity_t *SV_GEntityForSvEntity( svEntity_t *svEnt ) {
-	int		num;
-
-	num = svEnt - sv.svEntities;
-	return SV_GentityNum( num );
-}
-
 sharedEntityMapper_t *SV_GEntityMapperForSvEntity( svEntity_t *svEnt ) {
 	int		num;
 

codemp/server/sv_gameapi.cpp

@@ -3017,7 +3017,6 @@ void SV_InitGame( qboolean restart ) {
 	// clear level pointers
 	sv.entityParsePoint = CM_EntityString();
 	for ( i=0, cl=svs.clients; i<sv_maxclients->integer; i++, cl++ ) {
-		cl->gentity = NULL;
 		cl->gentityMapper = NULL;
 	}
 

codemp/server/sv_init.cpp

@@ -673,7 +673,6 @@ Ghoul2 Insert End
 					client->state = CS_ACTIVE;
 					client->gentityMapper = SV_GentityMapperNum( i );
 					client->gentityMapper->s->number = i;
-					client->gentity = SV_GentityNum( i );
 
 					client->deltaMessage = -1;
 					client->nextSnapshotTime = svs.time;	// generate a snapshot immediately