game: sync droptofloor

0lvin · Nov 6, 2024 · 26f8524 · 26f8524
1 parent 34c6a65
commit 26f8524
Show file tree

Hide file tree

Showing 61 changed files with 399 additions and 355 deletions.
diff --git a/src/game/character/ai.c b/src/game/character/ai.c
@@ -199,10 +199,10 @@ void c_corvus_init(edict_t *self,int classId)
 	self->yaw_speed = 20;
 	VectorClear(self->knockbackvel);
 
-	VectorCopy (c_mins, self->mins);
-	VectorCopy (c_maxs, self->maxs);
-	VectorCopy (c_mins, self->intentMins);
-	VectorCopy (c_maxs, self->intentMaxs);
+	VectorCopy(c_mins, self->mins);
+	VectorCopy(c_maxs, self->maxs);
+	VectorCopy(c_mins, self->intentMins);
+	VectorCopy(c_maxs, self->intentMaxs);
 	self->viewheight = self->maxs[2]*0.8;
 
 

diff --git a/src/game/character/dranor/dranor.c b/src/game/character/dranor/dranor.c
@@ -178,8 +178,8 @@ The elf who talks like Sean Connery
 */
 void SP_character_dranor (edict_t *self)
 {
-	VectorSet (self->mins, -16, -16, -32);
-	VectorSet (self->maxs, 16, 16, 32);
+	VectorSet(self->mins, -16, -16, -32);
+	VectorSet(self->maxs, 16, 16, 32);
 
 	c_character_init(self,CID_DRANOR);
 

diff --git a/src/game/character/elflord/elflord.c b/src/game/character/elflord/elflord.c
@@ -188,8 +188,8 @@ The Celestial Watcher who whispers when he talks
 */
 void SP_character_elflord (edict_t *self)
 {
-	VectorSet (self->mins, -24, -24, -78);
-	VectorSet (self->maxs, 24, 24, 16);
+	VectorSet(self->mins, -24, -24, -78);
+	VectorSet(self->maxs, 24, 24, 16);
 
 	c_character_init(self,CID_C_ELFLORD);
 

diff --git a/src/game/character/priestess/priestess.c b/src/game/character/priestess/priestess.c
@@ -198,8 +198,8 @@ INVISIBLE - you won't see her
 */
 void SP_character_highpriestess (edict_t *self)
 {
-	VectorSet (self->mins, -16, -16, -32);
-	VectorSet (self->maxs, 16, 16, 32);
+	VectorSet(self->mins, -16, -16, -32);
+	VectorSet(self->maxs, 16, 16, 32);
 
 	c_character_init(self,CID_C_HIGHPRIESTESS);
 }
diff --git a/src/game/character/priestess/priestess2.c b/src/game/character/priestess/priestess2.c
@@ -130,8 +130,8 @@ INVISIBLE - you won't see her
 */
 void SP_character_highpriestess2 (edict_t *self)
 {
-	VectorSet (self->mins, -16, -16, -38);
-	VectorSet (self->maxs, 16, 16, 38);
+	VectorSet(self->mins, -16, -16, -38);
+	VectorSet(self->maxs, 16, 16, 38);
 
 	c_character_init(self,CID_C_HIGHPRIESTESS2);
 }
diff --git a/src/game/character/siernan/siernan1.c b/src/game/character/siernan/siernan1.c
@@ -213,8 +213,8 @@ LEANING - leaning against a wall, idling
 */
 void SP_character_siernan1 (edict_t *self)
 {
-	VectorSet (self->mins, -10, -10, -20);
-	VectorSet (self->maxs, 10, 10, 20);
+	VectorSet(self->mins, -10, -10, -20);
+	VectorSet(self->maxs, 10, 10, 20);
 
 	self->s.scale = self->monsterinfo.scale = 1.2;
 

diff --git a/src/game/character/siernan/siernan2.c b/src/game/character/siernan/siernan2.c
@@ -100,8 +100,8 @@ The cinematic siernan laying down
 */
 void SP_character_siernan2 (edict_t *self)
 {
-	VectorSet (self->mins, -17, -25, 0);
-	VectorSet (self->maxs, 22, 12, 16);
+	VectorSet(self->mins, -17, -25, 0);
+	VectorSet(self->maxs, 22, 12, 16);
 
 	self->s.scale = self->monsterinfo.scale = 1;
 

diff --git a/src/game/character/ssithrascout/ssithrascout.c b/src/game/character/ssithrascout/ssithrascout.c
@@ -161,8 +161,8 @@ The scout
 */
 void SP_character_ssithra_scout (edict_t *self)
 {
-	VectorSet (self->mins, -26, -16, -13);
-	VectorSet (self->maxs, 26, 16, 13);
+	VectorSet(self->mins, -26, -16, -13);
+	VectorSet(self->maxs, 26, 16, 13);
 
 	c_character_init(self,CID_SSITHRA_SCOUT);
 }
diff --git a/src/game/character/tome/tome.c b/src/game/character/tome/tome.c
@@ -89,8 +89,8 @@ The talking tome of power (sounds like a hot babe)
 */
 void SP_character_tome (edict_t *self)
 {
-	VectorSet (self->mins, -4, -8, -12);
-	VectorSet (self->maxs, 4, 8, 12);
+	VectorSet(self->mins, -4, -8, -12);
+	VectorSet(self->maxs, 4, 8, 12);
 
 	c_character_init(self,CID_C_TOME);
 }
diff --git a/src/game/character/victimssithra/victimssithra.c b/src/game/character/victimssithra/victimssithra.c
@@ -119,8 +119,8 @@ The Ssithra Victim for use in the torture scene
 */
 void SP_character_ssithra_victim (edict_t *self)
 {
-	VectorSet (self->mins, -40, -16, -2);
-	VectorSet (self->maxs, 40, 16, 2);
+	VectorSet(self->mins, -40, -16, -2);
+	VectorSet(self->maxs, 40, 16, 2);
 
 	c_character_init(self,CID_SSITHRA_VICTIM);
 

diff --git a/src/game/ds.cpp b/src/game/ds.cpp
@@ -414,7 +414,7 @@ void SP_script_runner (edict_t *ent)
 	ent->use = script_use;
 
 //	gi.setmodel (ent, ent->model);
-//	gi.linkentity (ent);
+//	gi.linkentity(ent);
 }
 #ifdef __cplusplus
 } //end extern "C"
@@ -3502,7 +3502,7 @@ void CScript::HandleTrigger(bool Enable)
 		{
 			trigger_ent->solid = SOLID_TRIGGER;
 			trigger_ent->use = Use_Multi;
-			gi.linkentity (trigger_ent);
+			gi.linkentity(trigger_ent);
 		}
 		else
 		{

diff --git a/src/game/effects/client_entities.c b/src/game/effects/client_entities.c
@@ -312,7 +312,7 @@ int AddEffectsToView(client_entity_t **root, centity_t *owner)
 
 						dl = &fxi.r_dlights[(*fxi.r_numdlights)++];
 
-						VectorCopy (current->r.origin, dl->origin);
+						VectorCopy(current->r.origin, dl->origin);
 
 						dl->intensity = ce_dlight->intensity;
 

diff --git a/src/game/effects/netmsg_read.c b/src/game/effects/netmsg_read.c
@@ -185,7 +185,7 @@ void MSG_ReadDirMag(sizebuf_t *sb, vec3_t dir)
 		assert(0);
 		fxi.Com_Error (ERR_DROP, "MSF_ReadDirMag: out of range");
 	}
-	VectorCopy (bytedirs[b], dir);
+	VectorCopy(bytedirs[b], dir);
 
 	// Scale by magnitude
 	b = fxi.MSG_ReadByte(sb);

diff --git a/src/game/g_breakable.c b/src/game/g_breakable.c
@@ -260,7 +260,7 @@ void SP_breakable_brush (edict_t *ent)
 	ent->use = KillBrushUse;
 
 	gi.setmodel (ent, ent->model);
-	gi.linkentity (ent);
+	gi.linkentity(ent);
 
 	// Use size to calculate mass
 	VectorSubtract(ent->maxs, ent->mins, space);

diff --git a/src/game/g_combat.c b/src/game/g_combat.c
@@ -1232,7 +1232,7 @@ void T_Damage(edict_t *targ, edict_t *inflictor, edict_t *attacker, vec3_t pdir,
 
 		client->damage_blood += take;
 		client->damage_knockback += knockback;
-		VectorCopy (point, client->damage_from);
+		VectorCopy(point, client->damage_from);
 	}
 }
 

diff --git a/src/game/g_env.c b/src/game/g_env.c
@@ -64,7 +64,7 @@ void SP_env_dust (edict_t *self)
 	self->moveinfo.sound_middle = gi.soundindex ("world/quakeshort.wav");
 
 	gi.setmodel (self, self->model);
-	gi.linkentity (self);
+	gi.linkentity(self);
 }
 
 #define START_OFF 8
@@ -181,5 +181,5 @@ void SP_env_muck (edict_t *self)
 	self->use = env_dust_use;
 
 	gi.setmodel (self, self->model);
-	gi.linkentity (self);
+	gi.linkentity(self);
 }
diff --git a/src/game/g_field.c b/src/game/g_field.c
@@ -89,7 +89,7 @@ void TrigDamage_Activate(edict_t *self, G_Message_t *msg)
 {
 	self->solid = SOLID_TRIGGER;
 	self->use = DamageField_Use;
-	gi.linkentity (self);
+	gi.linkentity(self);
 }
 
 
@@ -140,7 +140,7 @@ void SP_trigger_Damage(edict_t *self)
 		self->use = DamageField_Use;
 
 	self->movetype = MOVETYPE_NONE;
-	gi.linkentity (self);
+	gi.linkentity(self);
 }
 
 void DamageField_Use(edict_t *self, edict_t *other, edict_t *activator)

diff --git a/src/game/g_flamethrow.c b/src/game/g_flamethrow.c
@@ -31,7 +31,7 @@ void FlameThrower_Activate(edict_t *self, G_Message_t *msg)
 	self->solid = SOLID_TRIGGER;
 	self->use = flamethrower_use;
 	self->touch = flamethrower_touch;
-	gi.linkentity (self);
+	gi.linkentity(self);
 }
 
 
@@ -164,5 +164,5 @@ void SP_flamethrower(edict_t *self)
 
 	self->use = flamethrower_use;
 	self->touch = flamethrower_touch;
-	gi.linkentity (self);
+	gi.linkentity(self);
 }
diff --git a/src/game/g_func.c b/src/game/g_func.c
@@ -1078,7 +1078,7 @@ SP_func_plat(edict_t *ent)
 
 	door_sounds(ent);
 
-	gi.linkentity (ent);
+	gi.linkentity(ent);
 
 	plat_spawn_inside_trigger(ent);	// the "start moving" trigger
 
@@ -3242,7 +3242,7 @@ SP_func_door_rotating(edict_t *ent)
 		st.distance = 90;
 	}
 
-	gi.linkentity (ent);
+	gi.linkentity(ent);
 
 	VectorCopy(ent->s.angles, ent->pos1);
 	VectorMA(ent->s.angles, st.distance, ent->movedir, ent->pos2);