game: sync code style of g_func.c

0lvin · Oct 19, 2024 · 0e9c10e · 0e9c10e
1 parent b879b9f
commit 0e9c10e
Show file tree

Hide file tree

Showing 44 changed files with 3,448 additions and 453 deletions.
diff --git a/Makefile b/Makefile
@@ -1028,6 +1028,7 @@ GAME_OBJS_ = \
 	src/game/g_hitlocation.o \
 	src/game/g_items.o \
 	src/game/g_light.o \
+	src/game/g_newai.o \
 	src/game/g_main.o \
 	src/game/g_message.o \
 	src/game/g_misc.o \

diff --git a/src/game/common/cl_strings.h b/src/game/common/cl_strings.h
@@ -181,7 +181,7 @@ typedef enum
 	GM_OBIT_HELLSTAFF2		,
 
 	GM_OBIT_P_STAFF			= 184,
-	GM_OBIT_P_STAFF1	  	,
+	GM_OBIT_P_STAFF1		,
 	GM_OBIT_P_STAFF2	   	,
 	GM_OBIT_P_FIREBALL		,
 	GM_OBIT_P_FIREBALL1		,

diff --git a/src/game/effects/fx_halo.c b/src/game/effects/fx_halo.c
@@ -113,7 +113,7 @@ static qboolean FXHaloThink(struct client_entity_s *self, centity_t *Owner)
 				}
 				else
 				{
-				  	self->flags &= ~CEF_NO_DRAW;
+					self->flags &= ~CEF_NO_DRAW;
 
 					if (self->alpha < 0.5)
 						self->alpha += 0.25;

diff --git a/src/game/effects/fx_lensflare.c b/src/game/effects/fx_lensflare.c
@@ -332,9 +332,9 @@ void FXLensFlare(centity_t *owner,int Type,int Flags,vec3_t Origin)
 
 		VectorSet(Explosion->up, 0.0f, 0.0f, 0.0f);
 
-	  	Explosion->r.color.r = tint.r;
-	  	Explosion->r.color.g = tint.g;
-	  	Explosion->r.color.b = tint.b;
+		Explosion->r.color.r = tint.r;
+		Explosion->r.color.g = tint.g;
+		Explosion->r.color.b = tint.b;
 		Explosion->alpha=alpha;
 
 		switch (I)
@@ -453,9 +453,9 @@ void FXClientLensFlare(centity_t *owner,int Type,int Flags,vec3_t Origin, int li
 
 		VectorSet(Explosion->up, 0.0f, 0.0f, 0.0f);
 
-	  	Explosion->r.color.r = tint->r;
-	  	Explosion->r.color.g = tint->g;
-	  	Explosion->r.color.b = tint->b;
+		Explosion->r.color.r = tint->r;
+		Explosion->r.color.g = tint->g;
+		Explosion->r.color.b = tint->b;
 		Explosion->alpha = (float)(tint->a)/255.0;
 
 		switch (I)

diff --git a/src/game/effects/fx_morph.c b/src/game/effects/fx_morph.c
@@ -49,7 +49,7 @@ static qboolean FXMorphMissileThink(client_entity_t *missile, centity_t *owner)
 	vec3_t				scaled_vel;
 	client_entity_t	*trail;
 	int					count;
-	paletteRGBA_t	  	color;
+	paletteRGBA_t		color;
 	vec3_t				diff, curpos;
 	int					dur;
 

diff --git a/src/game/effects/fx_shrine.c b/src/game/effects/fx_shrine.c
@@ -325,7 +325,7 @@ static qboolean FXShrineLungsThink(struct client_entity_s *self, centity_t *owne
 			VectorScale(vel, flrand(1.0,LUNG_RAD), vel);
 			vel[2] = -30.0;
 
-		  	color.c = 0xffffff40;
+			color.c = 0xffffff40;
 
 			ce = ClientParticle_new(PART_32x32_STEAM, color, 450);
 
@@ -1077,7 +1077,7 @@ static qboolean FXShrineBallThink(struct client_entity_s *self, centity_t *owner
 			part = ShrineParticle[self->SpawnInfo][irand(0,1)];
 
 		if (part == PART_32x32_STEAM)
-	  		color.c = 0xffffff40;
+			color.c = 0xffffff40;
 		else
 			color.c = 0xffffffff;
 

diff --git a/src/game/effects/fx_spellhands.c b/src/game/effects/fx_spellhands.c
@@ -46,7 +46,7 @@ static qboolean FXSpellHandsThink(struct client_entity_s *Self, centity_t *Owner
 	vec3_t			Trailend,Trailstart;
 	vec3_t			Real_Trailend,Real_Trailstart;
 	vec3_t			TrailDelta;
-	float		   	TrailLength;
+	float			TrailLength;
 
 	client_particle_t	*ce;
 	paletteRGBA_t		color;

diff --git a/src/game/effects/fx_sphereofannihlation.c b/src/game/effects/fx_sphereofannihlation.c
@@ -349,9 +349,9 @@ static qboolean FXSphereOfAnnihilationGlowballSpawnerThink(struct client_entity_
 											flrand(-10.0, 10.0)+ Self->r.origin[2]);
 		}
 
-	   	VectorCopy(Owner->current.angles,Temp);
-	   	VectorScale(Temp,180.0/M_PI,Temp);
-	   	AngleVectors(Temp,Forward2,Right2,NULL);
+		VectorCopy(Owner->current.angles,Temp);
+		VectorScale(Temp,180.0/M_PI,Temp);
+		AngleVectors(Temp,Forward2,Right2,NULL);
 
 
 		// Set my velocity and accelaration.

diff --git a/src/game/effects/generic_character_effects.c b/src/game/effects/generic_character_effects.c
@@ -805,7 +805,7 @@ static qboolean FXFeetTrailThink(struct client_entity_s *self, centity_t *owner)
 
 		for(i = 0; i < count; i++)
 		{
-	  		color.c = 0xffffff40;
+			color.c = 0xffffff40;
 
 			flame = ClientParticle_new(PART_32x32_STEAM, color, hand_flame_dur);
 			VectorSet(	flame->origin,

diff --git a/src/game/effects/main.c b/src/game/effects/main.c
@@ -694,7 +694,7 @@ AddServerEntities(frame_t *frame)
 		}
 // jmarshall end
 
-	  	VectorCopy(ent->origin, ent->oldorigin);
+		VectorCopy(ent->origin, ent->oldorigin);
 		VectorCopy(cent->origin, cent->lerp_origin);
 
 		// Set model.

diff --git a/src/game/g_combat.c b/src/game/g_combat.c
@@ -811,7 +811,7 @@ void T_Damage(edict_t *targ, edict_t *inflictor, edict_t *attacker, vec3_t pdir,
 			// be sure we still have some damage
 			if (!damage)
 			{
-	  			damage = 1;
+				damage = 1;
 				armorabsorb = 1;
 			}
 			else