From f4413207a03658c719987d02fdbb87443843f43b Mon Sep 17 00:00:00 2001 From: enneract Date: Sun, 23 Nov 2014 22:29:30 +0100 Subject: Remove Smoke Grenade. --- assets/icons/iconw_smoke.tga | Bin 40044 -> 0 bytes assets/models/weapons/smoke/smoke.jpg | Bin 99790 -> 0 bytes assets/models/weapons/smoke/smoke.md3 | Bin 2652 -> 0 bytes assets/models/weapons/smoke/smoke.wav | Bin 52974 -> 0 bytes assets/models/weapons/smoke/smokegfx.tga | Bin 262188 -> 0 bytes assets/models/weapons/smoke/weapon.cfg | 11 --------- src/cgame/cg_event.c | 10 +------- src/cgame/cg_weapons.c | 2 -- src/game/bg_misc.c | 25 -------------------- src/game/bg_mod.h | 1 - src/game/bg_public.h | 1 - src/game/g_active.c | 15 ------------ src/game/g_missile.c | 38 ------------------------------- src/game/g_weapon.c | 15 ------------ 14 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 assets/icons/iconw_smoke.tga delete mode 100644 assets/models/weapons/smoke/smoke.jpg delete mode 100644 assets/models/weapons/smoke/smoke.md3 delete mode 100644 assets/models/weapons/smoke/smoke.wav delete mode 100644 assets/models/weapons/smoke/smokegfx.tga delete mode 100644 assets/models/weapons/smoke/weapon.cfg diff --git a/assets/icons/iconw_smoke.tga b/assets/icons/iconw_smoke.tga deleted file mode 100644 index 0dd72b1..0000000 Binary files a/assets/icons/iconw_smoke.tga and /dev/null differ diff --git a/assets/models/weapons/smoke/smoke.jpg b/assets/models/weapons/smoke/smoke.jpg deleted file mode 100644 index a001de3..0000000 Binary files a/assets/models/weapons/smoke/smoke.jpg and /dev/null differ diff --git a/assets/models/weapons/smoke/smoke.md3 b/assets/models/weapons/smoke/smoke.md3 deleted file mode 100644 index 53fed50..0000000 Binary files a/assets/models/weapons/smoke/smoke.md3 and /dev/null differ diff --git a/assets/models/weapons/smoke/smoke.wav b/assets/models/weapons/smoke/smoke.wav deleted file mode 100644 index 6c2d7ea..0000000 Binary files a/assets/models/weapons/smoke/smoke.wav and /dev/null differ diff --git a/assets/models/weapons/smoke/smokegfx.tga b/assets/models/weapons/smoke/smokegfx.tga deleted file mode 100644 index f028d75..0000000 Binary files a/assets/models/weapons/smoke/smokegfx.tga and /dev/null differ diff --git a/assets/models/weapons/smoke/weapon.cfg b/assets/models/weapons/smoke/weapon.cfg deleted file mode 100644 index 93fd03a..0000000 --- a/assets/models/weapons/smoke/weapon.cfg +++ /dev/null @@ -1,11 +0,0 @@ -icon icons/iconw_smoke -idleSound models/weapons/smoke/smoke.wav -primary -{ - - missileParticleSystem models/weapons/smoke/impactPS - - missileModel models/weapons/smoke/smoke.md3 - missileAnimates 0 20 20 0 - -} diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index 794b8a4..d9e2f77 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -244,10 +244,7 @@ static void CG_Obituary( entityState_t *ent ) else message = "^5was terminated by own flames"; break; - - case MOD_SMOKE: - message = "^5smoked himself up"; - break; + case MOD_ABOMB: message = "^5bombed himself up"; break; @@ -357,11 +354,6 @@ static void CG_Obituary( entityState_t *ent ) message2 = "^5's ^5flames"; break; - case MOD_SMOKE: - message = "^5tasted^7"; - message2 = "^5's ^5smoke"; - break; - case MOD_ABUILDER_CLAW: message = "^5should leave^7"; message2 = "^5's ^5buildings alone"; diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 2b41d13..04f6495 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -65,8 +65,6 @@ void CG_RegisterUpgrade( int upgradeNum ) upgradeInfo->upgradeIcon = cg_weapons[ WP_GRENADE ].weaponIcon; else if( upgradeNum == UP_MINE ) upgradeInfo->upgradeIcon = cg_weapons[ WP_MINE ].weaponIcon; - else if( upgradeNum == UP_SMOKE ) - upgradeInfo->upgradeIcon = cg_weapons[ WP_SMOKE ].weaponIcon; else if( ( icon = BG_Upgrade( upgradeNum )->icon ) ) upgradeInfo->upgradeIcon = trap_R_RegisterShader( icon ); } diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 92f3826..742363d 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -3651,31 +3651,6 @@ static const weaponAttributes_t bg_weapons[ ] = qfalse, //qboolean longRanged; TEAM_HUMANS //team_t team; }, - { - WP_SMOKE, //int weaponNum; - SMOKE_PRICE, //int price; - STAGE_GE_5, //int stages - SLOT_NONE, //int slots; - "smoke", //char *weaponName; - "Smoke", //char *weaponHumanName; - "", - 1, //int maxAmmo; - 0, //int maxClips; - qfalse, //int infiniteAmmo; - qfalse, //int usesEnergy; - SMOKE_REPEAT, //int repeatRate1; - 0, //int repeatRate2; - 0, //int repeatRate3; - 0, //int reloadTime; - SMOKE_K_SCALE, //float knockbackScale; - qfalse, //qboolean hasAltMode; - qfalse, //qboolean hasThirdMode; - qfalse, //qboolean canZoom; - 90.0f, //float zoomFov; - qfalse, //qboolean purchasable; - qfalse, //qboolean longRanged; - TEAM_HUMANS //WUTeam_t team; - }, { WP_MINE, //int weaponNum; MINE_PRICE, //int price; diff --git a/src/game/bg_mod.h b/src/game/bg_mod.h index 5e4245b..4929b32 100644 --- a/src/game/bg_mod.h +++ b/src/game/bg_mod.h @@ -18,7 +18,6 @@ MOD( MOD_GRENADE ), MOD( MOD_PSAWBLADE ), MOD( MOD_MINE ), MOD( MOD_FLAMES ), -MOD( MOD_SMOKE ), MOD( MOD_SPITEFUL_ABCESS ), MOD( MOD_WATER ), MOD( MOD_SLIME ), diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 2ca9e32..c0b6381 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -359,7 +359,6 @@ typedef enum WP_LUCIFER_CANNON, WP_ROCKET_LAUNCHER, WP_GRENADE, - WP_SMOKE, WP_MINE, WP_LOCKBLOB_LAUNCHER, WP_HIVE, diff --git a/src/game/g_active.c b/src/game/g_active.c index c7a8977..951a3a9 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1941,21 +1941,6 @@ void ClientThink_real( gentity_t *ent ) ent->s.weapon = lastWeapon; } - if( BG_InventoryContainsUpgrade( UP_SMOKE, client->ps.stats ) && - BG_UpgradeIsActive( UP_SMOKE, client->ps.stats ) ) - { - int lastWeapon = ent->s.weapon; - - //remove SMOKE - BG_DeactivateUpgrade( UP_SMOKE, client->ps.stats ); - BG_RemoveUpgradeFromInventory( UP_SMOKE, client->ps.stats ); - - //M-M-M-M-MONSTER HACK - ent->s.weapon = WP_SMOKE; - FireWeapon( ent ); - ent->s.weapon = lastWeapon; - } - // set speed if( client->ps.pm_type == PM_NOCLIP ) client->ps.speed = client->pers.flySpeed; diff --git a/src/game/g_missile.c b/src/game/g_missile.c index 830d72a..2056f79 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -1241,44 +1241,6 @@ gentity_t *launch_saw( gentity_t *self, vec3_t start, vec3_t dir ) return bolt; } - -gentity_t *launch_smoke( gentity_t *self, vec3_t start, vec3_t dir ) -{ - gentity_t *bolt; - - VectorNormalize( dir ); - bolt = G_Spawn( ); - bolt->classname = "smoke"; - bolt->nextthink = level.time + 200; - bolt->think = G_ProcessSmoke; - bolt->s.eType = ET_MISSILE; - bolt->r.svFlags = SVF_USE_CURRENT_ORIGIN; - bolt->s.weapon = WP_SMOKE; - bolt->s.eFlags = EF_BOUNCE_HALF; - bolt->s.generic1 = WPM_PRIMARY; //weaponMode - bolt->r.ownerNum = self->s.number; - bolt->parent = self; - bolt->damage = SMOKE_DAMAGE; - bolt->splashDamage = 0; - bolt->splashRadius = 0; - bolt->methodOfDeath = MOD_SMOKE; - bolt->splashMethodOfDeath = MOD_SMOKE; - bolt->clipmask = MASK_SHOT; - bolt->target_ent = NULL; - bolt->r.mins[ 0 ] = bolt->r.mins[ 1 ] = bolt->r.mins[ 2 ] = -3.0f; - bolt->r.maxs[ 0 ] = bolt->r.maxs[ 1 ] = bolt->r.maxs[ 2 ] = 3.0f; - bolt->s.time = level.time; - bolt->s.pos.trType = TR_GRAVITY; - bolt->s.pos.trTime = level.time - MISSILE_PRESTEP_TIME; // move a bit on the very first frame - VectorCopy( start, bolt->s.pos.trBase ); - VectorScale( dir, SMOKE_SPEED, bolt->s.pos.trDelta ); - SnapVector( bolt->s.pos.trDelta ); // save net bandwidth - - VectorCopy( start, bolt->r.currentOrigin ); - - return bolt; -} - /* ================ AHive_SearchAndDestroy diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 5453913..d869fb1 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -696,18 +696,6 @@ void acidBombFire2x( gentity_t *ent, int wp ) m = fire_acidBomb2( ent, muzzle, forward, wp ); } -/* -====================================================================== -SMOKE -====================================================================== -*/ - -void throwSmoke( gentity_t *ent ) -{ - gentity_t *m; - m = launch_smoke( ent, muzzle, forward ); -} - /* ====================================================================== LAS GUN @@ -1994,9 +1982,6 @@ void FireWeapon( gentity_t *ent ) case WP_MINE: throwMine( ent ); break; - case WP_SMOKE: - throwSmoke( ent ); - break; case WP_LOCKBLOB_LAUNCHER: lockBlobLauncherFire( ent ); break; -- cgit