diff options
| author | Mikko Tiusanen <ams@daug.net> | 2015-04-03 18:58:13 +0300 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2015-04-03 18:58:13 +0300 |
| commit | aa6fb499dbd92884037b4e20ec3dfaa9447468bf (patch) | |
| tree | 88ef19194bfa8c618404bb6f66a109a779843cc8 | |
| parent | 216fc980dd8221198e491745a0eaa029c37f74d3 (diff) | |
Removed rant flame and changed mines to sticky bombs.
| -rw-r--r-- | src/game/g_main.c | 1 | ||||
| -rw-r--r-- | src/game/g_missile.c | 6 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 14 | ||||
| -rw-r--r-- | src/game/tremulous.h | 2 |
4 files changed, 9 insertions, 14 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index d8003cc..4a966b3 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -209,7 +209,6 @@ vmCvar_t g_MinHumanExtraBuildPoints; vmCvar_t g_MaxHumanExtraBuildPoints; vmCvar_t g_BuildingCreditsFactor; - // copy cvars that can be set in worldspawn so they can be restored later static char cv_gravity[ MAX_CVAR_VALUE_STRING ]; static char cv_humanMaxStage[ MAX_CVAR_VALUE_STRING ]; diff --git a/src/game/g_missile.c b/src/game/g_missile.c index e627f14..a7781a7 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -1618,8 +1618,10 @@ gentity_t *launch_mine( gentity_t *self, vec3_t start, vec3_t dir ) VectorNormalize( dir ); bolt = G_Spawn( ); bolt->classname = "mine"; - bolt->nextthink = level.time + MINE_INIT_TIME; - bolt->think = G_ProcessMine; + /* bolt->nextthink = level.time + MINE_INIT_TIME; + bolt->think = G_ProcessMine; */ + bolt->nextthink = level.time + 5000; + bolt->think = G_ExplodeMissile; bolt->s.eType = ET_MISSILE; bolt->r.svFlags = SVF_USE_CURRENT_ORIGIN; bolt->s.weapon = WP_MINE; diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 3a8c8ac..0b5599a 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -1897,7 +1897,7 @@ void FireWeapon3( gentity_t *ent ) break; case WP_ALEVEL4: - FireBreath_tyrant( ent ); + // FireBreath_tyrant( ent ); break; case WP_MASS_DRIVER: @@ -1908,16 +1908,10 @@ void FireWeapon3( gentity_t *ent ) break; case WP_ALEVEL1: + acidBombFire2x( ent, WP_ALEVEL1 ); + break; case WP_ALEVEL1_UPG: - - if( ent->s.weapon == WP_ALEVEL1 ) - { - acidBombFire2x( ent, WP_ALEVEL1 ); - } - else - { - acidBombFire( ent, WP_ALEVEL1_UPG ); - } + acidBombFire( ent, WP_ALEVEL1_UPG ); break; default: diff --git a/src/game/tremulous.h b/src/game/tremulous.h index addf274..8a92452 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -407,7 +407,7 @@ TREMULOUS EDGE MOD SRC FILE #define GRENADE_RANGE 192.0f #define GRENADE_SPEED 700.0f -#define MINE_PRICE 1000 +#define MINE_PRICE 600 #define MINE_REPEAT 0 #define MINE_K_SCALE 1.0f #define MINE_DAMAGE HDM(250) |