mirror of
https://github.com/id-Software/quake2-rerelease-dll.git
synced 2025-03-14 12:20:45 +00:00
Removed USE_AQTION preprocessors
This commit is contained in:
Dino
parent
2a3b91edeb
commit
ea468f036b
3 changed files with 4 additions and 61 deletions
|
|
@ -1013,12 +1013,6 @@ void JoinTeam (edict_t * ent, int desired_team, int skip_menuclose)
|
|||
AddToTransparentList (ent);
|
||||
}
|
||||
|
||||
#ifdef USE_AQTION
|
||||
if (in_warmup && warmup_bots->value) {
|
||||
PutClientInServer (ent);
|
||||
}
|
||||
#endif
|
||||
|
||||
//AQ2:TNG END
|
||||
if (!skip_menuclose && (gameSettings & GS_WEAPONCHOOSE) && !use_randoms->value)
|
||||
OpenWeaponMenu(ent);
|
||||
|
|
@ -1744,13 +1738,6 @@ void RunWarmup ()
|
|||
gi.LocCenter_Print(ent, "WARMUP");
|
||||
}
|
||||
}
|
||||
#ifdef USE_AQTION
|
||||
if (warmup_bots->value){
|
||||
gi.cvar_forceset("am", "1");
|
||||
gi.cvar_forceset("am_botcount", warmup_bots->string);
|
||||
attract_mode_bot_check();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void StartRound ()
|
||||
|
|
@ -2189,21 +2176,6 @@ int CheckTeamRules (void)
|
|||
if (printrules->value) {
|
||||
PrintMatchRules();
|
||||
}
|
||||
|
||||
#ifdef USE_AQTION
|
||||
// Cleanup and remove all bots, it's go time!
|
||||
if (warmup_bots->value){
|
||||
gi.cvar_forceset("am", "0");
|
||||
gi.cvar_forceset("am_botcount", "0");
|
||||
attract_mode_bot_check();
|
||||
ACESP_RemoveBot("all");
|
||||
CenterPrintAll("All bots removed, good luck and have fun!");
|
||||
|
||||
//Re-enable stats now that the bots are gone
|
||||
game.ai_ent_found = false;
|
||||
gi.cvar_forceset(stat_logs->name, "1");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if(team_round_countdown == 41 && !matchmode->value)
|
||||
|
|
@ -3144,17 +3116,7 @@ void TallyEndOfLevelTeamScores (void)
|
|||
|
||||
teams[game.clients[i].resp.team].total += game.clients[i].resp.score;
|
||||
}
|
||||
|
||||
// Stats begin
|
||||
#if USE_AQTION
|
||||
if (stat_logs->value && !matchmode->value) {
|
||||
LogMatch(); // Generates end of game stats
|
||||
LogEndMatchStats(); // Generates end of match logs
|
||||
}
|
||||
#endif
|
||||
// Stats: Reset roundNum
|
||||
game.roundNum = 0;
|
||||
// Stats end
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -51,11 +51,6 @@ void Announce_Reward(edict_t *ent, int rewardType){
|
|||
CenterPrintAll(buf);
|
||||
gi.sound(&g_edicts[0], CHAN_VOICE | CHAN_NO_PHS_ADD, gi.soundindex("tng/accuracy.wav"), 1.0, ATTN_NONE, 0.0);
|
||||
}
|
||||
|
||||
#ifdef USE_AQTION
|
||||
if (stat_logs->value)
|
||||
LogAward(ent, rewardType);
|
||||
#endif
|
||||
}
|
||||
|
||||
void Add_Frag(edict_t * ent, int mod)
|
||||
|
|
@ -467,8 +462,7 @@ void CL_FixUpGender(edict_t *ent, const char *userinfo)
|
|||
void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t mod)
|
||||
{
|
||||
int loc;
|
||||
char *message;
|
||||
char *message2;
|
||||
char message[1024];
|
||||
char death_msg[1024]; // enough in all situations? -FB
|
||||
bool friendlyFire;
|
||||
char *special_message = NULL;
|
||||
|
|
@ -484,8 +478,6 @@ void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t
|
|||
friendlyFire = meansOfDeath & MOD_FRIENDLY_FIRE;
|
||||
mod = meansOfDeath & ~MOD_FRIENDLY_FIRE;
|
||||
loc = locOfDeath; // useful for location based hits
|
||||
message = NULL;
|
||||
message2 = "";
|
||||
|
||||
// Reki: Print killfeed to spectators who ask for easily parsable stuff
|
||||
edict_t *other;
|
||||
|
|
@ -535,7 +527,8 @@ void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t
|
|||
if( self->client->push_timeout > 40 )
|
||||
snprintf(special_message, sizeof(special_message), "%s was thrown through a window by %s",
|
||||
self->client->pers.netname, attacker->client->pers.netname);
|
||||
message = "ate too much glass";
|
||||
snprintf(message, sizeof(message), "%s ate too much glass",
|
||||
self->client->pers.netname);
|
||||
break;
|
||||
case MOD_SUICIDE:
|
||||
snprintf(message, sizeof(message), "%s is done with the world", self->client->pers.netname);
|
||||
|
|
@ -597,12 +590,6 @@ void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t
|
|||
PrintDeathMessage(death_msg, self);
|
||||
AddKilledPlayer(self->client->attacker, self);
|
||||
|
||||
#if USE_AQTION
|
||||
if (stat_logs->value) { // Only create stats logs if stat_logs is 1
|
||||
LogKill(self, inflictor, self->client->attacker);
|
||||
}
|
||||
#endif
|
||||
|
||||
self->client->attacker->client->radio_num_kills++;
|
||||
|
||||
//MODIFIED FOR FF -FB
|
||||
|
|
@ -633,12 +620,6 @@ void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t
|
|||
}
|
||||
|
||||
self->enemy = NULL;
|
||||
|
||||
#if USE_AQTION
|
||||
if (stat_logs->value) { // Only create stats logs if stat_logs is 1
|
||||
LogWorldKill(self);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
namespace fmt = std;
|
||||
#define FMT_STRING(s) s
|
||||
#else
|
||||
//#include <fmt/format.h>
|
||||
#include <fmt/format.h>
|
||||
#endif
|
||||
|
||||
struct g_fmt_data_t {
|
||||
|
|
|
|||
Loading…
Reference in a new issue