diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_main.c | 2 | ||||
| -rw-r--r-- | src/cgame/cg_weapons.c | 11 | ||||
| -rw-r--r-- | src/game/tremulous.h | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 6d37e724..ab50ac9b 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -241,7 +241,7 @@ static cvarTable_t cvarTable[ ] = { &cg_brassTime, "cg_brassTime", "2500", CVAR_ARCHIVE }, { &cg_simpleItems, "cg_simpleItems", "0", CVAR_ARCHIVE }, { &cg_addMarks, "cg_marks", "1", CVAR_ARCHIVE }, - { &cg_lagometer, "cg_lagometer", "1", CVAR_ARCHIVE }, + { &cg_lagometer, "cg_lagometer", "0", CVAR_ARCHIVE }, { &cg_teslaTrailTime, "cg_teslaTrailTime", "600", CVAR_ARCHIVE }, { &cg_alienZapTime, "cg_alienZapTime", "500", CVAR_ARCHIVE }, { &cg_railTrailTime, "cg_railTrailTime", "400", CVAR_ARCHIVE }, diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 2703dc00..d4b458ec 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -267,8 +267,6 @@ void CG_RegisterWeapon( int weaponNum ) switch( weaponNum ) { case WP_TESLAGEN: - case WP_AREA_ZAP: - case WP_DIRECT_ZAP: MAKERGB( weaponInfo->flashDlightColor, 0.6f, 0.6f, 1.0f ); weaponInfo->readySound = trap_S_RegisterSound( "sound/weapons/melee/fsthum.wav", qfalse ); weaponInfo->firingSound = trap_S_RegisterSound( "sound/weapons/lightning/lg_hum.wav", qfalse ); @@ -279,6 +277,15 @@ void CG_RegisterWeapon( int weaponNum ) cgs.media.sfx_lghit = trap_S_RegisterSound( "sound/weapons/lightning/lg_fire.wav", qfalse ); break; + case WP_AREA_ZAP: + case WP_DIRECT_ZAP: + MAKERGB( weaponInfo->flashDlightColor, 0.0f, 0.0f, 0.0f ); + + weaponInfo->flashSound[ 0 ] = trap_S_RegisterSound( "sound/weapons/lightning/lg_fire.wav", qfalse ); + cgs.media.lightningShader = trap_R_RegisterShader( "models/ammo/tesla/tesla_bolt"); + cgs.media.sfx_lghit = trap_S_RegisterSound( "sound/weapons/lightning/lg_fire.wav", qfalse ); + break; + case WP_MACHINEGUN: MAKERGB( weaponInfo->flashDlightColor, 1, 1, 0 ); weaponInfo->flashSound[ 0 ] = trap_S_RegisterSound( "sound/weapons/machinegun/machgf1b.wav", qfalse ); diff --git a/src/game/tremulous.h b/src/game/tremulous.h index a079a66a..e4dece74 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -276,7 +276,7 @@ #define RIFLE_MAXCLIPS 3 #define RIFLE_REPEAT 100 #define RIFLE_RELOAD 2000 -#define RIFLE_PRICE 100 +#define RIFLE_PRICE 0 #define RIFLE_SPREAD 200 #define RIFLE_DMG HDM(7) @@ -333,7 +333,7 @@ #define PAINSAW_DAMAGE HDM(5) #define PAINSAW_RANGE 32 -#define HBUILD_PRICE 100 +#define HBUILD_PRICE 0 #define HBUILD_REPEAT 1000 #define HBUILD_DELAY 9000 |