Skip to content

Commit

Permalink
fix some compile issues for game target
Browse files Browse the repository at this point in the history
  • Loading branch information
@jopadan
jopadan committed Mar 4, 2025
1 parent 1890679 commit 8c7e6e2
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 17 deletions.
8 changes: 4 additions & 4 deletions src/game/dm/tag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ Tag_Score(edict_t *attacker, edict_t *victim, int scoreChange)
if (tag_count == 5)
{
quad = FindItem("Quad Damage");
attacker->client->pers.inventory[ITEM_INDEX(quad)]++;
quad->use(attacker, quad);
attacker->client->pers.inventory.Items[ITEM_INDEX(quad)]++;
Use_Quad(attacker, quad);
tag_count = 0;
}
}
Expand Down Expand Up @@ -163,7 +163,7 @@ Tag_PickupToken(edict_t *ent, edict_t *other)
tag_token = ent;
}

other->client->pers.inventory[ITEM_INDEX(ent->item)]++;
other->client->pers.inventory.Items[ITEM_INDEX(ent->item)]++;

tag_owner = other;
tag_count = 0;
Expand Down Expand Up @@ -263,7 +263,7 @@ Tag_DropToken(edict_t *ent, gitem_t *item)

gi.linkentity(tag_token);

ent->client->pers.inventory[ITEM_INDEX(item)]--;
ent->client->pers.inventory.Items[ITEM_INDEX(item)]--;
ValidateSelectedItem(ent);
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/g_light.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void SpawnFlame(edict_t *self,vec3_t origin)

#define START_OFF 1

static void light_use (edict_t *self, edict_t *other, edict_t *activator)
void light_use (edict_t *self, edict_t *other, edict_t *activator)
{
if (self->spawnflags & START_OFF)
{
Expand Down
4 changes: 2 additions & 2 deletions src/game/g_newdm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,12 +392,12 @@ body_think(edict_t *self)
}

self->s.frame++;

#if 0
if (self->s.frame > FRAME_stand40)
{
self->s.frame = FRAME_stand01;
}

#endif
self->nextthink = level.time + 0.1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/g_newtarg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ target_anger_use(edict_t *self, edict_t *other /* unused */, edict_t *activator

t->enemy = target;
t->monsterinfo.aiflags |= AI_TARGET_ANGER;
FoundTarget(t);
FoundTarget(t, true);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/g_phys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ Returns the clipflags if the velocity was modified (hit something solid)
============
*/
#define MAX_CLIP_PLANES 5
static int SV_FlyMove (edict_t *ent, float time, int mask)
int SV_FlyMove (edict_t *ent, float time, int mask)
{
edict_t *hit;
int bumpcount, numbumps;
Expand Down
2 changes: 0 additions & 2 deletions src/game/header/local.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2414,10 +2414,8 @@ qboolean Pickup_Sphere(edict_t * ent, edict_t * other);
* implementation. (-Wmissing-prototypes )
*
*/
#if 0
#include "../savegame/savegame.h"
#include "../savegame/tables/gamefunc_decs.h"
#endif

/* Heretic 2 */
#define AI_EATING 0x00002000
Expand Down
12 changes: 6 additions & 6 deletions src/game/savegame/tables/gamefunc_decs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ extern qboolean SV_StepDirection ( edict_t * ent , float yaw , float dist ) ;
extern qboolean Tag_PickupToken ( edict_t * ent , edict_t * other ) ;
extern qboolean Widow2_CheckAttack ( edict_t * self ) ;
extern qboolean Widow_CheckAttack ( edict_t * self ) ;
extern qboolean ai_checkattack ( edict_t * self ) ;
extern qboolean ai_checkattack ( edict_t * self, float dist ) ;
extern qboolean below ( edict_t * self , edict_t * other ) ;
extern qboolean berserk_blocked ( edict_t * self , float dist ) ;
extern qboolean blocked_checkjump ( edict_t * self , float dist , float maxDown , float maxUp ) ;
Expand Down Expand Up @@ -197,7 +197,7 @@ extern void InfantryMachineGun ( edict_t * self ) ;
extern void InventoryMessage ( edict_t * ent ) ;
extern void Item_TriggeredSpawn ( edict_t * self , edict_t * other , edict_t * activator ) ;
extern void KillChildren ( edict_t * self ) ;
extern void Killed ( edict_t * targ , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void Killed ( edict_t * targ , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point, int mod ) ;
extern void LookAtKiller ( edict_t * self , edict_t * inflictor , edict_t * attacker ) ;
extern void M_CatagorizePosition ( edict_t * ent ) ;
extern void M_CheckGround ( edict_t * ent ) ;
Expand All @@ -207,7 +207,7 @@ extern void M_FlyCheck ( edict_t * self ) ;
extern void M_MonsterDodge ( edict_t * self , edict_t * attacker , float eta, trace_t *tr ) ;
extern void M_MoveFrame ( edict_t * self ) ;
extern void M_MoveToGoal ( edict_t * ent , float dist ) ;
extern void M_ReactToDamage ( edict_t * targ , edict_t * attacker , edict_t * inflictor ) ;
extern void M_ReactToDamage ( edict_t * targ , edict_t * attacker ) ;
extern void M_SetEffects ( edict_t * ent ) ;
extern void M_WorldEffects ( edict_t * ent ) ;
extern void M_droptofloor ( edict_t * ent ) ;
Expand Down Expand Up @@ -515,7 +515,7 @@ extern void button_done ( edict_t * self ) ;
extern void button_fire ( edict_t * self ) ;
extern void button_killed ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void button_return ( edict_t * self ) ;
extern void button_touch ( edict_t * self , edict_t * other , cplane_t * plane , csurface_t * surf ) ;
extern void button_touch ( edict_t * self , trace_t * trace ) ;
extern void button_use ( edict_t * self , edict_t * other , edict_t * activator ) ;
extern void button_wait ( edict_t * self ) ;
extern void carrier_attack ( edict_t * self ) ;
Expand Down Expand Up @@ -608,7 +608,7 @@ extern void door_secret_move4 ( edict_t * self ) ;
extern void door_secret_move5 ( edict_t * self ) ;
extern void door_secret_move6 ( edict_t * self ) ;
extern void door_secret_use ( edict_t * self , edict_t * other , edict_t * activator ) ;
extern void door_touch ( edict_t * self , edict_t * other , cplane_t * plane , csurface_t * surf ) ;
extern void door_touch ( edict_t * self , trace_t * trace ) ;
extern void door_use ( edict_t * self , edict_t * other , edict_t * activator ) ;
extern void door_use_areaportals ( edict_t * self , qboolean open ) ;
extern void doppleganger_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
Expand Down Expand Up @@ -970,7 +970,7 @@ extern void knight_sight ( edict_t * self , edict_t *other ) ;
extern void knight_stand ( edict_t * self ) ;
extern void land_to_water ( edict_t * self ) ;
extern void landing_goal ( edict_t * self ) ;
extern void light_use ( edict_t * self , edict_t * other , edict_t * activator ) ;
extern void light_use ( edict_t * self , edict_t * other, edict_t * activator ) ;
extern void loogie ( edict_t * self ) ;
extern void loogie_touch ( edict_t * self , edict_t * other , cplane_t * plane , csurface_t * surf ) ;
extern void magic_touch ( edict_t * self, edict_t * other , cplane_t *plane, csurface_t *surf) ;
Expand Down

0 comments on commit 8c7e6e2

Please sign in to comment.