diff --git a/code/fgame/actor.h b/code/fgame/actor.h index d1c6061f..6417fd15 100644 --- a/code/fgame/actor.h +++ b/code/fgame/actor.h @@ -1178,7 +1178,7 @@ public: bool ShortenPathToAttack( float fMinDist ); void StrafeToAttack( float fDist, vec3_t vDir ); virtual Vector GunTarget( bool bNoCollision ) override; - virtual qboolean setModel( void ); + virtual qboolean setModel( void ) override; void EventSetHeadModel( Event *ev ); void EventGetHeadModel( Event *ev ); void EventSetHeadSkin( Event *ev ); diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp index 65c1c917..ac6b152e 100644 --- a/code/fgame/dm_manager.cpp +++ b/code/fgame/dm_manager.cpp @@ -1628,7 +1628,7 @@ int DM_Manager::GetTeamSpawnTimeLeft() const { int timeLeft; - if (sv_team_spawn_interval <= 0) { + if (sv_team_spawn_interval->integer <= 0) { return -1; } diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp index a639e035..e19eef52 100644 --- a/code/fgame/entity.cpp +++ b/code/fgame/entity.cpp @@ -2018,7 +2018,7 @@ void Entity::setModel(const str& mdl) model = CanonicalTikiName(mdl); if (!setModel()) { - Com_Printf("^~^~^ Bad model name '%s'\n", mdl); + Com_Printf("^~^~^ Bad model name '%s'\n", mdl.c_str()); return; } diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp index e6249264..39d8082c 100644 --- a/code/fgame/player.cpp +++ b/code/fgame/player.cpp @@ -4422,7 +4422,7 @@ void Player::GiveNewWeaponsCheat(Event *ev) return; } - if (gi.FS_ReadFile("global/givenewweapons.scr", &(void *)buffer, qtrue) != -1) { + if (gi.FS_ReadFile("global/givenewweapons.scr", (void**)&buffer, qtrue) != -1) { return; } diff --git a/code/fgame/player.h b/code/fgame/player.h index fad62361..7113e90e 100644 --- a/code/fgame/player.h +++ b/code/fgame/player.h @@ -888,7 +888,7 @@ public: void UserSelectWeapon(bool bWait); void PickWeaponEvent(Event *ev); bool AllowTeamRespawn() const; - void EventUseWeaponClass(Event *ev); + void EventUseWeaponClass(Event *ev) override; void EventAddKills(Event *ev); bool CanKnockback(float minHealth) const; //====