id/quake2-rerelease-dll
0
0
Fork 0
mirror of https://github.com/id-Software/quake2-rerelease-dll.git synced 2025-03-14 12:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added more cvars

Browse source
This commit is contained in:
Dino 2023-09-04 17:00:44 -04:00
parent 5917d5aa5f
commit 1e0656034b
4 changed files with 106 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
actionlite/g_local.h
View file

@ -1636,6 +1636,21 @@ extern cvar_t *twbanrounds;
extern cvar_t *tkbanrounds;
extern cvar_t *limchasecam;
extern cvar_t *roundlimit;
extern cvar_t *medkit_drop;
extern cvar_t *medkit_time;
extern cvar_t *medkit_instant;
extern cvar_t *medkit_max;
extern cvar_t *medkit_value;
extern cvar_t *stats_endmap; // If on (1), show the accuracy/etc stats at the end of a map
extern cvar_t *stats_afterround; // TNG Stats, collect stats between rounds
extern cvar_t *auto_join; // Automaticly join clients to teams they were on in last map.
extern cvar_t *auto_equip; // Remember weapons and items for players between maps.
extern cvar_t *auto_menu; // Automatically show the join menu
extern cvar_t *dm_choose;
extern cvar_t *dm_shield;
extern cvar_t *uvtime;
extern int snd_silencer;
extern int snd_headshot;
@ -1644,6 +1659,7 @@ extern int snd_knifethrow;
extern int snd_kick;
extern int snd_noammo;
extern mod_id_t meansOfDeath;
// zucc for hitlocation of death
extern int locOfDeath;
// stop an armor piercing round that hits a vest
@ -2035,6 +2051,7 @@ bool Entity_IsVisibleToPlayer(edict_t* ent, edict_t* player);
void Compass_Update(edict_t *ent, bool first);
// ACTION
void DeadDropSpec(edict_t * ent);
#define ITEM_INDEX(x) ((x)-itemlist)
#define INV_AMMO(ent, num) ((ent)->client->pers.inventory[num])
#define GET_ITEM(num) (&itemlist[num])
@ -2496,6 +2513,9 @@ extern byte damage_multiplier;
// ACTION
void InitTookDamage(void);
void Bandage(edict_t * ent);
void PlaceHolder(edict_t* ent);
void ThinkSpecWeap(edict_t* ent);
void temp_think_specweap(edict_t* ent);
//ACTION
//
@ -2652,6 +2672,7 @@ bool P_UseCoopInstancedItems();
// ACTION
void CL_FixUpGender(edict_t *ent, const char *userinfo);
void ClientFixLegs(edict_t *ent);
// ACTION
constexpr spawnflags_t SPAWNFLAG_LANDMARK_KEEP_Z = 1_spawnflag;

37
actionlite/g_main.cpp
View file

@ -153,23 +153,39 @@ cvar_t *ai_movement_disabled;
// Action Add
//======================================================================
// Game Modes and Settings
cvar_t *teamdm;
cvar_t *teamdm_respawn;
cvar_t *actionmaps;
cvar_t *roundtimelimit;
cvar_t *roundlimit;
cvar_t *dm_choose;
cvar_t *dm_shield;
cvar_t *uvtime;
// Kick / Bans / Silences
cvar_t *maxteamkills;
cvar_t *twbanrounds;
cvar_t *tkbanrounds;
// Gameplay Settings
cvar_t *ff_afterround;
cvar_t *respawn_effect;
cvar_t *use_warnings;
cvar_t *use_killcounts;
cvar_t *use_rewards;
// UI / Menu / Messaging Settings
cvar_t *motd_time;
cvar_t *actionmaps;
cvar_t *roundtimelimit;
cvar_t *maxteamkills;
cvar_t *twbanrounds;
cvar_t *tkbanrounds;
cvar_t *limchasecam;
cvar_t *roundlimit;
cvar_t *stats_endmap; // If on (1), show the accuracy/etc stats at the end of a map
cvar_t *stats_afterround; // TNG Stats, collect stats between rounds
cvar_t *auto_join; // Automaticly join clients to teams they were on in last map.
cvar_t *auto_equip; // Remember weapons and items for players between maps.
cvar_t *auto_menu; // Automatically show the join menu
// Weapon and Item Settings
cvar_t *allitem;
cvar_t *allweapon;
cvar_t *unique_items;
@ -180,6 +196,8 @@ cvar_t *weapon_respawn;
cvar_t *ammo_respawn;
cvar_t *hc_single;
cvar_t *use_punch;
// Radio Settings
cvar_t *radiolog;
cvar_t *radio_max;
cvar_t *radio_time;
@ -187,6 +205,13 @@ cvar_t *radio_ban;
cvar_t *radio_repeat;
cvar_t *radio_repeat_time;
// Medkit Settings
cvar_t *medkit_instant;
cvar_t *medkit_drop;
cvar_t *medkit_time;
cvar_t *medkit_max;
cvar_t *medkit_value;
//======================================================================
// Action Add End
//======================================================================

5
actionlite/p_client.cpp
View file

@ -567,7 +567,6 @@ void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t
break;
case MOD_TARGET_BLASTER:
snprintf(message, sizeof(message), "%s got blasted", self->client->pers.netname);
message = "got blasted";
break;
case MOD_BOMB:
case MOD_SPLASH:
@ -904,8 +903,8 @@ void ClientObituary(edict_t *self, edict_t *inflictor, edict_t *attacker, mod_t
if (message)
{
sprintf(death_msg, "%s%s %s%s\n", self->client->pers.netname,
message, attacker->client->pers.netname, message2);
//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);
PrintDeathMessage(death_msg, self);
AddKilledPlayer(attacker, self);

53
actionlite/p_weapon.cpp
View file

@ -3967,6 +3967,57 @@ void Weapon_Gas(edict_t* ent)
}
}
void PlaceHolder(edict_t* ent)
{
ent->nextthink = level.framenum + 1000 * HZ;
}
void ThinkSpecWeap(edict_t* ent)
{
edict_t* spot;
if ((spot = FindSpecWeapSpawn(ent)) != NULL)
{
SpawnSpecWeap(ent->item, spot);
G_FreeEdict(ent);
}
else
{
ent->nextthink = level.framenum + 1 * HZ;
ent->think = G_FreeEdict;
}
}
void temp_think_specweap(edict_t* ent)
{
ent->touch = Touch_Item;
if (allweapon->value) { // allweapon set
ent->nextthink = level.framenum + 1 * HZ;
ent->think = G_FreeEdict;
return;
}
if (gameSettings & GS_ROUNDBASED) {
ent->nextthink = level.framenum + 1000 * HZ;
ent->think = PlaceHolder;
return;
}
if (gameSettings & GS_WEAPONCHOOSE) {
ent->nextthink = level.framenum + 6 * HZ;
ent->think = ThinkSpecWeap;
}
else if (DMFLAGS(DF_WEAPON_RESPAWN)) {
ent->nextthink = level.framenum + (weapon_respawn->value * 0.6f) * HZ;
ent->think = G_FreeEdict;
}
else {
ent->nextthink = level.framenum + weapon_respawn->value * HZ;
ent->think = ThinkSpecWeap;
}
}
//======================================================================
// Action Add
// Action Add End
//======================================================================