Hopefully fixing teams

This commit is contained in:
Dino 2023-09-04 20:14:05 -04:00
parent 1e84dcecb0
commit 99c737b245
3 changed files with 10 additions and 13 deletions

View file

@ -1,13 +1,9 @@
#include "g_local.h"
enum aqteam_t
{
NOTEAM,
TEAM1,
TEAM2,
TEAM3
};
#define NOTEAM 0
#define TEAM1 1
#define TEAM2 2
#define TEAM3 3
#define MAX_TEAMS 3
#define TEAM_TOP (MAX_TEAMS+1)

View file

@ -1954,7 +1954,6 @@ extern gitem_t itemlist[IT_TOTAL];
#define CROUCHING_VIEWHEIGHT 8
#define STANDING_VIEWHEIGHT 22
extern aqteam_t teams[TEAM_TOP];
int32_t gameSettings; // Round based, deathmatch, etc?
extern cvar_t *allitem;
@ -2959,8 +2958,9 @@ struct team_t
int32_t pauses_used, wantReset;
cvar_t *teamscore;
};
extern team_t teams[TEAM_TOP];
// Action ADd
// Action Add
// [Paril-KEX] seconds until we are fully invisible after
// making a racket

View file

@ -66,7 +66,7 @@ void Add_Frag(edict_t * ent, int mod)
ent->client->resp.gunstats[mod].kills++;
}
// Grenade splash, kicks and punch damage
if (mod.id > 0 && ((mod.id == MOD_HG_SPLASH) || (mod.id == MOD_KICK) || (mod.id == MOD_PUNCH))) {
if (mod > 0 && ((mod == MOD_HG_SPLASH) || (mod == MOD_KICK) || (mod == MOD_PUNCH))) {
ent->client->resp.gunstats[mod].kills++;
}
@ -614,7 +614,8 @@ void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t
{
//snprintf( death_msg, sizeof(death_msg), message);
//sprintf( death_msg, message );
death_msg = message;
strdup(death_msg, message);
PrintDeathMessage(death_msg, self );
if (!teamplay->value || team_round_going || !ff_afterround->value) {
@ -909,7 +910,7 @@ void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t
{
//sprintf(death_msg, "%s%s %s%s\n", self->client->pers.netname, message, attacker->client->pers.netname, message2);
//snprintf(death_msg, sizeof(death_msg), message);
death_msg = message;
strdup(death_msg, message);
PrintDeathMessage(death_msg, self);
AddKilledPlayer(attacker, self);