mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-27 23:02:08 +00:00
game: code style remove space before tab
This commit is contained in:
parent
c4a771f3d0
commit
cbc983155c
28 changed files with 52 additions and 52 deletions
|
@ -1318,7 +1318,7 @@ plat2_blocked(edict_t *self, edict_t *other)
|
|||
|
||||
void
|
||||
Use_Plat2(edict_t *ent, edict_t *other /* unused */,
|
||||
edict_t *activator)
|
||||
edict_t *activator)
|
||||
{
|
||||
edict_t *trigger;
|
||||
int i;
|
||||
|
@ -1358,7 +1358,7 @@ Use_Plat2(edict_t *ent, edict_t *other /* unused */,
|
|||
|
||||
void
|
||||
plat2_activate(edict_t *ent, edict_t *other /* unused */,
|
||||
edict_t *activator /* unused */)
|
||||
edict_t *activator /* unused */)
|
||||
{
|
||||
edict_t *trigger;
|
||||
|
||||
|
@ -1607,7 +1607,7 @@ rotating_blocked(edict_t *self, edict_t *other)
|
|||
|
||||
void
|
||||
rotating_touch(edict_t *self, edict_t *other, cplane_t *plane /* unused */,
|
||||
csurface_t *surf /* unused */)
|
||||
csurface_t *surf /* unused */)
|
||||
{
|
||||
if (!self || !other)
|
||||
{
|
||||
|
@ -1623,7 +1623,7 @@ rotating_touch(edict_t *self, edict_t *other, cplane_t *plane /* unused */,
|
|||
|
||||
void
|
||||
rotating_use(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator /* unused */)
|
||||
edict_t *activator /* unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
@ -1884,7 +1884,7 @@ button_use(edict_t *self, edict_t *other /* unused */, edict_t *activator)
|
|||
|
||||
void
|
||||
button_touch(edict_t *self, edict_t *other, cplane_t *plane /* unused */,
|
||||
csurface_t *surf /* unused */)
|
||||
csurface_t *surf /* unused */)
|
||||
{
|
||||
if (!self || !other)
|
||||
{
|
||||
|
@ -2375,7 +2375,7 @@ door_use(edict_t *self, edict_t *other /* unused */, edict_t *activator)
|
|||
|
||||
void
|
||||
Touch_DoorTrigger(edict_t *self, edict_t *other, cplane_t *plane /* unused */,
|
||||
csurface_t *surf /* unused */)
|
||||
csurface_t *surf /* unused */)
|
||||
{
|
||||
if (!self || !other)
|
||||
{
|
||||
|
@ -2759,7 +2759,7 @@ SP_func_door(edict_t *ent)
|
|||
|
||||
void
|
||||
Door_Activate(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator /* unused */)
|
||||
edict_t *activator /* unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
@ -3475,7 +3475,7 @@ func_train_find(edict_t *self)
|
|||
|
||||
void
|
||||
train_use(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator)
|
||||
edict_t *activator)
|
||||
{
|
||||
if (!self || !activator)
|
||||
{
|
||||
|
@ -3573,7 +3573,7 @@ SP_func_train(edict_t *self)
|
|||
*/
|
||||
void
|
||||
trigger_elevator_use(edict_t *self, edict_t *other,
|
||||
edict_t *activator /* unused */)
|
||||
edict_t *activator /* unused */)
|
||||
{
|
||||
edict_t *target;
|
||||
|
||||
|
@ -3753,7 +3753,7 @@ SP_func_timer(edict_t *self)
|
|||
*/
|
||||
void
|
||||
func_conveyor_use(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator /* unused */)
|
||||
edict_t *activator /* unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
@ -3820,7 +3820,7 @@ SP_func_conveyor(edict_t *self)
|
|||
*/
|
||||
void
|
||||
door_secret_use(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator /*unused */)
|
||||
edict_t *activator /*unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
@ -4164,7 +4164,7 @@ rotating_light_killed(edict_t *self, edict_t *inflictor /* unused */,
|
|||
|
||||
void
|
||||
rotating_light_use(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator /* unused */)
|
||||
edict_t *activator /* unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -1698,7 +1698,7 @@ Touch_Item(edict_t *ent, edict_t *other, cplane_t *plane /* unused */, csurface_
|
|||
other->client->ps.stats[STAT_PICKUP_ICON] =
|
||||
gi.imageindex(ent->item->icon);
|
||||
other->client->ps.stats[STAT_PICKUP_STRING] =
|
||||
CS_ITEMS + ITEM_INDEX(ent->item);
|
||||
CS_ITEMS + ITEM_INDEX(ent->item);
|
||||
other->client->pickup_msg_time = level.time + 3.0;
|
||||
|
||||
/* change selected item */
|
||||
|
@ -1706,7 +1706,7 @@ Touch_Item(edict_t *ent, edict_t *other, cplane_t *plane /* unused */, csurface_
|
|||
{
|
||||
other->client->pers.selected_item =
|
||||
other->client->ps.stats[STAT_SELECTED_ITEM] =
|
||||
ITEM_INDEX(ent->item);
|
||||
ITEM_INDEX(ent->item);
|
||||
}
|
||||
|
||||
if (ent->item->pickup == Pickup_Health)
|
||||
|
|
|
@ -382,7 +382,7 @@ force_wall_think(edict_t *self)
|
|||
|
||||
void
|
||||
force_wall_use(edict_t *self, edict_t *other /* activator */,
|
||||
edict_t *activator /* activator */)
|
||||
edict_t *activator /* activator */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -868,7 +868,7 @@ Nuke_Think(edict_t *ent)
|
|||
|
||||
void
|
||||
nuke_bounce(edict_t *ent, edict_t *other /* unused */, cplane_t *plane /* unused */,
|
||||
csurface_t *surf /* unused */)
|
||||
csurface_t *surf /* unused */)
|
||||
{
|
||||
if (!ent)
|
||||
{
|
||||
|
|
|
@ -781,14 +781,14 @@ SpawnEntities(const char *mapname, char *entities, const char *spawnpoint)
|
|||
|
||||
if (!Q_stricmp(level.mapname, "rhangar2") &&
|
||||
!Q_stricmp(ent->classname, "trigger_always") &&
|
||||
ent->target && !Q_stricmp(ent->target, "t265"))
|
||||
ent->target && !Q_stricmp(ent->target, "t265"))
|
||||
{
|
||||
ent->spawnflags |= SPAWNFLAG_NOT_COOP;
|
||||
}
|
||||
|
||||
if (!Q_stricmp(level.mapname, "rhangar2") &&
|
||||
!Q_stricmp(ent->classname, "func_wall") &&
|
||||
!Q_stricmp(ent->model, "*15"))
|
||||
!Q_stricmp(ent->model, "*15"))
|
||||
{
|
||||
ent->spawnflags |= SPAWNFLAG_NOT_COOP;
|
||||
}
|
||||
|
|
|
@ -145,7 +145,7 @@ Use_Multi(edict_t *ent, edict_t *other /* unused */, edict_t *activator)
|
|||
|
||||
void
|
||||
Touch_Multi(edict_t *self, edict_t *other, cplane_t *plane /* unused */,
|
||||
csurface_t *surf /* unused */)
|
||||
csurface_t *surf /* unused */)
|
||||
{
|
||||
if (!self || !other)
|
||||
{
|
||||
|
@ -207,7 +207,7 @@ Touch_Multi(edict_t *self, edict_t *other, cplane_t *plane /* unused */,
|
|||
*/
|
||||
void
|
||||
trigger_enable(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator /* unused */)
|
||||
edict_t *activator /* unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
@ -320,7 +320,7 @@ SP_trigger_once(edict_t *ent)
|
|||
*/
|
||||
void
|
||||
trigger_relay_use(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator)
|
||||
edict_t *activator)
|
||||
{
|
||||
if (!self || !activator)
|
||||
{
|
||||
|
@ -519,7 +519,7 @@ SP_trigger_key(edict_t *self)
|
|||
|
||||
void
|
||||
trigger_counter_use(edict_t *self, edict_t *other /* unused */,
|
||||
edict_t *activator)
|
||||
edict_t *activator)
|
||||
{
|
||||
if (!self || !activator)
|
||||
{
|
||||
|
@ -846,7 +846,7 @@ hurt_use(edict_t *self, edict_t *other /* unused */,
|
|||
|
||||
self->solid = SOLID_TRIGGER;
|
||||
num = gi.BoxEdicts(self->absmin, self->absmax,
|
||||
touch, MAX_EDICTS, AREA_SOLID);
|
||||
touch, MAX_EDICTS, AREA_SOLID);
|
||||
|
||||
/* Check for idle monsters in
|
||||
trigger hurt */
|
||||
|
|
|
@ -1629,7 +1629,7 @@ Trap_Think(edict_t *ent)
|
|||
if (ent->wait == 64)
|
||||
{
|
||||
gi.sound(ent, CHAN_VOICE, gi.soundindex("weapons/trapdown.wav"),
|
||||
1, ATTN_IDLE, 0);
|
||||
1, ATTN_IDLE, 0);
|
||||
}
|
||||
|
||||
ent->wait -= 2;
|
||||
|
|
|
@ -676,7 +676,7 @@ boss2_reattack_mg(edict_t *self)
|
|||
|
||||
void
|
||||
boss2_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -556,7 +556,7 @@ jorg_attack1(edict_t *self)
|
|||
|
||||
void
|
||||
jorg_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -568,7 +568,7 @@ boss5_reattack1(edict_t *self)
|
|||
|
||||
void
|
||||
boss5_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
@ -833,7 +833,7 @@ BossExplode2(edict_t *self)
|
|||
void
|
||||
boss5_die(edict_t *self, edict_t *inflictor /* unused */,
|
||||
edict_t *attacker /* unused */, int damage /* unused */,
|
||||
vec3_t point /* unused */)
|
||||
vec3_t point /* unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -805,7 +805,7 @@ brain_laserbeam(edict_t *self)
|
|||
if (random() > 0.8)
|
||||
{
|
||||
gi.sound(self, CHAN_AUTO, gi.soundindex("misc/lasfly.wav"),
|
||||
1, ATTN_STATIC, 0);
|
||||
1, ATTN_STATIC, 0);
|
||||
}
|
||||
|
||||
/* check for max distance */
|
||||
|
@ -1078,7 +1078,7 @@ brain_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker /* u
|
|||
if (self->health <= self->gib_health)
|
||||
{
|
||||
gi.sound(self, CHAN_VOICE, gi.soundindex("misc/udeath.wav"),
|
||||
1, ATTN_NORM, 0);
|
||||
1, ATTN_NORM, 0);
|
||||
|
||||
for (n = 0; n < 2; n++)
|
||||
{
|
||||
|
|
|
@ -379,7 +379,7 @@ mmove_t chick_move_pain3 =
|
|||
|
||||
void
|
||||
chick_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
float r;
|
||||
|
||||
|
|
|
@ -1174,7 +1174,7 @@ fixbot_fire_laser(edict_t *self)
|
|||
}
|
||||
|
||||
gi.sound(self, CHAN_AUTO, gi.soundindex("misc/lasfly.wav"),
|
||||
1, ATTN_STATIC, 0);
|
||||
1, ATTN_STATIC, 0);
|
||||
|
||||
VectorCopy(self->s.origin, start);
|
||||
VectorCopy(self->enemy->s.origin, end);
|
||||
|
@ -1576,7 +1576,7 @@ fixbot_attack(edict_t *self)
|
|||
|
||||
void
|
||||
fixbot_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage /* unused */)
|
||||
float kick /* unused */, int damage /* unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -768,7 +768,7 @@ floater_melee(edict_t *self)
|
|||
|
||||
void
|
||||
floater_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
int n;
|
||||
|
||||
|
|
|
@ -934,7 +934,7 @@ flyer_check_melee(edict_t *self)
|
|||
|
||||
void
|
||||
flyer_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
int n;
|
||||
|
||||
|
|
|
@ -459,7 +459,7 @@ mmove_t gladb_move_death = {
|
|||
|
||||
void
|
||||
gladb_die(edict_t *self, edict_t *inflictor /* unused */,
|
||||
edict_t *attacker /* unused */, int damage /*unused */,
|
||||
edict_t *attacker /* unused */, int damage /*unused */,
|
||||
vec3_t point)
|
||||
{
|
||||
int n;
|
||||
|
|
|
@ -486,7 +486,7 @@ mmove_t gladiator_move_death =
|
|||
|
||||
void
|
||||
gladiator_die(edict_t *self, edict_t *inflictor /* unused */,
|
||||
edict_t *attacker /* unused */, int damage /*unused */,
|
||||
edict_t *attacker /* unused */, int damage /*unused */,
|
||||
vec3_t point)
|
||||
{
|
||||
int n;
|
||||
|
|
|
@ -413,7 +413,7 @@ mmove_t gunner_move_pain1 =
|
|||
|
||||
void
|
||||
gunner_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -303,7 +303,7 @@ mmove_t infantry_move_pain2 =
|
|||
|
||||
void
|
||||
infantry_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -700,7 +700,7 @@ insane_run(edict_t *self)
|
|||
|
||||
void
|
||||
insane_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
int l, r;
|
||||
|
||||
|
|
|
@ -674,7 +674,7 @@ SV_StepDirection(edict_t *ent, float yaw, float dist)
|
|||
{
|
||||
if ((delta > 45) && (delta < 315))
|
||||
{
|
||||
/* not turned far enough, so don't take the step */
|
||||
/* not turned far enough, so don't take the step */
|
||||
VectorCopy(oldorigin, ent->s.origin);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -443,7 +443,7 @@ mmove_t parasite_move_pain1 =
|
|||
|
||||
void
|
||||
parasite_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage /* unused */)
|
||||
float kick /* unused */, int damage /* unused */)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -2526,7 +2526,7 @@ mmove_t soldierh_move_pain4 = {
|
|||
|
||||
void
|
||||
soldierh_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage /* unused */)
|
||||
float kick /* unused */, int damage /* unused */)
|
||||
{
|
||||
float r;
|
||||
int n;
|
||||
|
|
|
@ -584,7 +584,7 @@ supertank_reattack1(edict_t *self)
|
|||
|
||||
void
|
||||
supertank_pain(edict_t *self, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage)
|
||||
float kick /* unused */, int damage)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -372,7 +372,7 @@ mmove_t tank_move_pain3 =
|
|||
|
||||
void
|
||||
tank_pain(edict_t *self, edict_t *other /* other */,
|
||||
float kick /* other */, int damage)
|
||||
float kick /* other */, int damage)
|
||||
{
|
||||
if (!self)
|
||||
{
|
||||
|
|
|
@ -434,7 +434,7 @@ SP_info_player_intermission(edict_t *self)
|
|||
|
||||
void
|
||||
player_pain(edict_t *self /* unused */, edict_t *other /* unused */,
|
||||
float kick /* unused */, int damage /* unused */)
|
||||
float kick /* unused */, int damage /* unused */)
|
||||
{
|
||||
/* Player pain is handled at the end
|
||||
* of the frame in P_DamageFeedback.
|
||||
|
@ -506,7 +506,7 @@ IsNeutral(edict_t *ent)
|
|||
|
||||
void
|
||||
ClientObituary(edict_t *self, edict_t *inflictor /* unused */,
|
||||
edict_t *attacker)
|
||||
edict_t *attacker)
|
||||
{
|
||||
int mod;
|
||||
char *message;
|
||||
|
@ -1869,7 +1869,7 @@ InitBodyQue(void)
|
|||
|
||||
void
|
||||
body_die(edict_t *self, edict_t *inflictor /* unused */,
|
||||
edict_t *attacker /* unused */, int damage,
|
||||
edict_t *attacker /* unused */, int damage,
|
||||
vec3_t point /* unused */)
|
||||
{
|
||||
int n;
|
||||
|
|
|
@ -549,7 +549,7 @@ G_SetStats(edict_t *ent)
|
|||
{
|
||||
ent->client->ps.stats[STAT_TIMER_ICON] = gi.imageindex("p_quadfire");
|
||||
ent->client->ps.stats[STAT_TIMER] = (ent->client->quadfire_framenum
|
||||
- level.framenum) / 10;
|
||||
- level.framenum) / 10;
|
||||
}
|
||||
else if (ent->client->invincible_framenum > level.framenum)
|
||||
{
|
||||
|
|
|
@ -3381,7 +3381,7 @@ weapon_trap_fire(edict_t *ent, qboolean held)
|
|||
|
||||
timer = ent->client->grenade_time - level.time;
|
||||
speed = GRENADE_MINSPEED + (GRENADE_TIMER - timer) *
|
||||
((GRENADE_MAXSPEED - GRENADE_MINSPEED) / GRENADE_TIMER);
|
||||
((GRENADE_MAXSPEED - GRENADE_MINSPEED) / GRENADE_TIMER);
|
||||
fire_trap(ent, start, forward, damage, speed, timer, radius, held);
|
||||
|
||||
ent->client->pers.inventory[ent->client->ammo_index]--;
|
||||
|
@ -3427,7 +3427,7 @@ Weapon_Trap(edict_t *ent)
|
|||
if (level.time >= ent->pain_debounce_time)
|
||||
{
|
||||
gi.sound(ent, CHAN_VOICE, gi.soundindex("weapons/noammo.wav"),
|
||||
1, ATTN_NORM, 0);
|
||||
1, ATTN_NORM, 0);
|
||||
ent->pain_debounce_time = level.time + 1;
|
||||
}
|
||||
|
||||
|
@ -3461,7 +3461,7 @@ Weapon_Trap(edict_t *ent)
|
|||
if (ent->client->ps.gunframe == 5)
|
||||
{
|
||||
gi.sound(ent, CHAN_WEAPON, gi.soundindex("weapons/trapcock.wav"),
|
||||
1, ATTN_NORM, 0);
|
||||
1, ATTN_NORM, 0);
|
||||
}
|
||||
|
||||
if (ent->client->ps.gunframe == 11)
|
||||
|
|
Loading…
Reference in a new issue