diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-07-04 03:07:03 +0300 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-07-04 03:07:03 +0300 |
| commit | 592e6fe7e6d03cb1aca0da7e0c9627972362ed50 (patch) | |
| tree | f5abb123a165ca9f590b6a642ffcc46c8234daa1 | |
| parent | 9636124acf9af15c776d6f1df320790d14551bc6 (diff) | |
Smoke grenade is now disabled.
Medikit is no longer purchasable from armoury (uses gpp behaviour).
| -rw-r--r-- | src/game/bg_misc.c | 4 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 3 | ||||
| -rw-r--r-- | src/game/tremulous.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 0b9ff85..a11451b 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -3957,7 +3957,7 @@ static const upgradeAttributes_t bg_upgrades[ ] = "[yemed]Medkit", //char *humanName; "Basic health kit. ", "icons/iconu_atoxin", - qtrue, //qboolean purchasable + (SPAWN_WITH_MEDKIT ? qfalse : qtrue), //qboolean purchasable qtrue, //qboolean usable TEAM_HUMANS //team_t team; }, @@ -4072,7 +4072,7 @@ static const upgradeAttributes_t bg_upgrades[ ] = "[yenade]Smoke Grenade", //char *upgradeHumanName; "", 0, - qtrue, //qboolean purchasable + qfalse, //qboolean purchasable qtrue, //qboolean usable TEAM_HUMANS //WUTeam_t team; }, diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index bcd5eb1..7fb6fba 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -2846,7 +2846,8 @@ void HMedistat_Think( gentity_t *self ) //if they're completely healed, give them a medkit if( self->enemy->health >= self->enemy->client->ps.stats[ STAT_MAX_HEALTH ] ) { - self->enemy->health = self->enemy->client->ps.stats[ STAT_MAX_HEALTH ]; + self->enemy->health = self->enemy->client->ps.stats[ STAT_MAX_HEALTH ]; + if (SPAWN_WITH_MEDKIT) BG_AddUpgradeToInventory( UP_MEDKIT, self->enemy->client->ps.stats ); } } } diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 3e3ccd8..879b290 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -544,7 +544,7 @@ TREMULOUS EDGE MOD SRC FILE #define HELMET_INFECTION_PROTECTION 1 #define HELMET_PCLOUD_PROTECTION 1000 -#define SPAWN_WITH_MEDKIT 0 +#define SPAWN_WITH_MEDKIT 1 #define MEDKIT_PRICE 50 #define BATTPACK_PRICE 75 |