Skip to content

Commit

Permalink
Remove all code and assets related to Mine, Smoke and Flames.
Browse files Browse the repository at this point in the history
  • Loading branch information
@enneract
enneract committed Jun 28, 2015
1 parent 5904b53 commit 93d2e44
Show file tree
Hide file tree
Showing 22 changed files with 4 additions and 553 deletions.
Binary file removed assets/icons/iconw_mine.tga
View file
Binary file not shown.
Binary file removed assets/models/weapons/mine/impact0.wav
View file
Binary file not shown.
Binary file removed assets/models/weapons/mine/mine.jpg
View file
Binary file not shown.
Binary file removed assets/models/weapons/mine/mine.md3
View file
Binary file not shown.
Binary file removed assets/models/weapons/mine/mine_blend.jpg
View file
Binary file not shown.
Binary file removed assets/models/weapons/mine/mine_spike.jpg
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions assets/models/weapons/mine/weapon.cfg
View file

This file was deleted.

Binary file removed assets/sound/misc/mine_bounce1.wav
View file
Binary file not shown.
40 changes: 1 addition & 39 deletions src/cgame/cg_event.c
View file
Expand Up @@ -148,7 +148,6 @@ static void CG_Obituary( entityState_t *ent )
switch( mod )
{
case MOD_FLAMER_SPLASH:
case MOD_LEVEL4_FLAMES:
if( gender == GENDER_FEMALE )
message = "^5toasted herself";
else if( gender == GENDER_NEUTER )
Expand Down Expand Up @@ -220,7 +219,7 @@ static void CG_Obituary( entityState_t *ent )
else
message = "^5spiked himself";
break;

case MOD_PRIFLE:
if( gender == GENDER_FEMALE )
message = "^5pulse rifled herself";
Expand All @@ -229,25 +228,6 @@ static void CG_Obituary( entityState_t *ent )
else
message = "^5pulse rifled himself";
break;


case MOD_MINE:
if( gender == GENDER_FEMALE )
message = "^5was betrayed by own mine";
else if( gender == GENDER_NEUTER )
message = "^5it betrayed by own mine";
else
message = "^5was betrayed by own mine";
break;

case MOD_FLAMES:
if( gender == GENDER_FEMALE )
message = "^5was terminated by own flames";
else if( gender == GENDER_NEUTER )
message = "^5it terminated by own flames";
else
message = "^5was terminated by own flames";
break;

default:
if( gender == GENDER_FEMALE )
Expand Down Expand Up @@ -346,16 +326,6 @@ static void CG_Obituary( entityState_t *ent )
message = "^5was sliced by^7";
message2 = "^5's ^5blades";
break;
case MOD_MINE:
message = "^5found^7";
message2 = "^5's ^5mine";
break;

case MOD_FLAMES:
case MOD_LEVEL4_FLAMES:
message = "^5tasted^7";
message2 = "^5's ^5flames";
break;

case MOD_ABUILDER_CLAW:
message = "^5should leave^7";
Expand Down Expand Up @@ -976,14 +946,6 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.hardBounceSound2 );
break;

case EV_MINE_BOUNCE:
if( rand( ) & 1 )
trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.mineBounceSound1 );
else
trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.mineBounceSound1 );
break;
break;

case EV_ACIDBOMB_BOUNCE:
if( rand( ) & 1 )
trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.acidBombBounceSound1 );
Expand Down
1 change: 0 additions & 1 deletion src/cgame/cg_local.h
View file
Expand Up @@ -1232,7 +1232,6 @@ typedef struct
sfxHandle_t turretSpinupSound;
sfxHandle_t hardBounceSound1;
sfxHandle_t hardBounceSound2;
sfxHandle_t mineBounceSound1;

sfxHandle_t airpounce;
sfxHandle_t acidBombBounceSound1;
Expand Down
4 changes: 1 addition & 3 deletions src/cgame/cg_main.c
View file
Expand Up @@ -752,9 +752,7 @@ static void CG_RegisterSounds( void )

cgs.media.hardBounceSound1 = trap_S_RegisterSound( "sound/misc/hard_bounce1.wav", qfalse );
cgs.media.hardBounceSound2 = trap_S_RegisterSound( "sound/misc/hard_bounce2.wav", qfalse );

cgs.media.mineBounceSound1 = trap_S_RegisterSound( "sound/misc/mine_bounce1.wav", qfalse );


cgs.media.airpounce = trap_S_RegisterSound( "models/weapons/level5/airpounce.wav", qfalse );

cgs.media.acidBombBounceSound1 = trap_S_RegisterSound( "sound/misc/abomb_bounce1.wav", qfalse );
Expand Down
2 changes: 0 additions & 2 deletions src/cgame/cg_weapons.c
View file
Expand Up @@ -63,8 +63,6 @@ void CG_RegisterUpgrade( int upgradeNum )
//la la la la la, i'm not listening!
if( upgradeNum == UP_GRENADE )
upgradeInfo->upgradeIcon = cg_weapons[ WP_GRENADE ].weaponIcon;
else if( upgradeNum == UP_MINE )
upgradeInfo->upgradeIcon = cg_weapons[ WP_MINE ].weaponIcon;
else if( ( icon = BG_Upgrade( upgradeNum )->icon ) )
upgradeInfo->upgradeIcon = trap_R_RegisterShader( icon );
}
Expand Down
52 changes: 0 additions & 52 deletions src/game/bg_misc.c
View file
Expand Up @@ -3530,31 +3530,6 @@ static const weaponAttributes_t bg_weapons[ ] =
qfalse, //qboolean longRanged;
TEAM_HUMANS //team_t team;
},
{
WP_MINE, //int weaponNum;
MINE_PRICE, //int price;
STAGE_GE_5, //int stages
SLOT_NONE, //int slots;
"mine", //char *weaponName;
"Sticky Grenade", //char *weaponHumanName;
"",
1, //int maxAmmo;
0, //int maxClips;
qfalse, //int infiniteAmmo;
qfalse, //int usesEnergy;
MINE_REPEAT, //int repeatRate1;
0, //int repeatRate2;
0, //int repeatRate3;
0, //int reloadTime;
MINE_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_HIVE, //int weaponNum;
0, //int price;
Expand Down Expand Up @@ -3871,32 +3846,6 @@ static const upgradeAttributes_t bg_upgrades[ ] =
qtrue, //qboolean usable
TEAM_HUMANS //team_t team;
},
{
UP_MINE, //int upgradeNum;
MINE_PRICE, //int price;
STAGE_GE_5, //int stages
SLOT_NONE, //int slots;
"min", //char *upgradeName;
"[yenade]Mine", //char *upgradeHumanName;
"",
0,
qtrue, //qboolean purchasable
qtrue, //qboolean usable
TEAM_HUMANS //WUTeam_t team;
},
{
UP_SMOKE, //int upgradeNum;
SMOKE_PRICE, //int price;
STAGE_GE_5, //int stages
SLOT_NONE, //int slots;
"smo", //char *upgradeName;
"[yenade]Smoke Grenade", //char *upgradeHumanName;
"",
0,
qfalse, //qboolean purchasable
qtrue, //qboolean usable
TEAM_HUMANS //WUTeam_t team;
},
{
UP_AMMO, //int upgradeNum;
0, //int price;
Expand Down Expand Up @@ -4106,7 +4055,6 @@ char *eventnames[ ] =
"EV_PLAYER_TELEPORT_IN",
"EV_PLAYER_TELEPORT_OUT",
"EV_GRENADE_BOUNCE", // eventParm will be the soundindex
"EV_MINE_BOUNCE", // eventParm will be the soundindex
"EV_GENERAL_SOUND",
"EV_GLOBAL_SOUND", // no attenuation
"EV_BULLET_HIT_FLESH",
Expand Down
3 changes: 0 additions & 3 deletions src/game/bg_mod.h
View file
Expand Up @@ -17,8 +17,6 @@ MOD( MOD_ROCKETL, CSW_ROCKETL ),
MOD( MOD_ROCKETL_SPLASH, CSW_ROCKETL ),
MOD( MOD_GRENADE, CSW_GRENADE ),
MOD( MOD_PSAWBLADE, CSW_PAINSAW_ALT ),
MOD( MOD_MINE, CSW_UNKNOWN ),
MOD( MOD_FLAMES, CSW_UNKNOWN ),
MOD( MOD_SPITEFUL_ABCESS, CSW_UNKNOWN ),
MOD( MOD_WATER, CSW_UNKNOWN ),
MOD( MOD_SLIME, CSW_UNKNOWN ),
Expand Down Expand Up @@ -47,7 +45,6 @@ MOD( MOD_LEVEL2_BOUNCEBALL, CSW_UNKNOWN ),
MOD( MOD_LEVEL4_CLAW, CSW_LEVEL4 ),
MOD( MOD_LEVEL4_TRAMPLE, CSW_UNKNOWN ),
MOD( MOD_LEVEL4_CRUSH, CSW_UNKNOWN ),
MOD( MOD_LEVEL4_FLAMES, CSW_LEVEL4_ALT ),
MOD( MOD_SLOWBLOB, CSW_UNKNOWN ),
MOD( MOD_POISON, CSW_UNKNOWN ),
MOD( MOD_SWARM, CSW_UNKNOWN ),
Expand Down
4 changes: 0 additions & 4 deletions src/game/bg_public.h
View file
Expand Up @@ -368,7 +368,6 @@ typedef enum
WP_LUCIFER_CANNON,
WP_ROCKET_LAUNCHER,
WP_GRENADE,
WP_MINE,
WP_HIVE,
WP_TESLAGEN,
WP_MGTURRET,
Expand All @@ -389,8 +388,6 @@ typedef enum
UP_JETPACK,
UP_BATTLESUIT,
UP_GRENADE,
UP_MINE,
UP_SMOKE,
UP_AMMO,
UP_NUM_UPGRADES
} upgrade_t;
Expand Down Expand Up @@ -523,7 +520,6 @@ typedef enum
EV_PLAYER_TELEPORT_IN,
EV_PLAYER_TELEPORT_OUT,
EV_GRENADE_BOUNCE, // eventParm will be the soundindex
EV_MINE_BOUNCE, // eventParm will be the soundindex
EV_GENERAL_SOUND,
EV_GLOBAL_SOUND, // no attenuation
EV_BULLET_HIT_FLESH,
Expand Down
15 changes: 0 additions & 15 deletions src/game/g_active.c
View file
Expand Up @@ -1710,21 +1710,6 @@ void ClientThink_real( gentity_t *ent )
ent->s.weapon = lastWeapon;
}

if( BG_InventoryContainsUpgrade( UP_MINE, client->ps.stats ) &&
BG_UpgradeIsActive( UP_MINE, client->ps.stats ) )
{
int lastWeapon = ent->s.weapon;

//remove MINE
BG_DeactivateUpgrade( UP_MINE, client->ps.stats );
BG_RemoveUpgradeFromInventory( UP_MINE, client->ps.stats );

//M-M-M-M-MONSTER HACK
ent->s.weapon = WP_MINE;
FireWeapon( ent );
ent->s.weapon = lastWeapon;
}

// set speed
if( client->ps.pm_type == PM_NOCLIP )
client->ps.speed = client->pers.flySpeed;
Expand Down
1 change: 0 additions & 1 deletion src/game/g_csw.h
View file
Expand Up @@ -24,7 +24,6 @@ CSW( CSW_LEVEL2_ALT, MOD_LEVEL2_ZAP, "Marauder Zap", LEVEL2_AREAZAP
CSW( CSW_LEVEL3, MOD_LEVEL3_CLAW, "Dragoon", LEVEL3_CLAW_DMG ),
CSW( CSW_LEVEL3_ALT, MOD_LEVEL3_BOUNCEBALL, "Dragoon Barb", LEVEL3_BOUNCEBALL_DMG ),
CSW( CSW_LEVEL4, MOD_LEVEL4_CLAW, "Tyrant", LEVEL4_CLAW_DMG ),
CSW( CSW_LEVEL4_ALT, MOD_LEVEL4_FLAMES, "Tyrant Flames", 50 ),
CSW( CSW_LEVEL5, MOD_LEVEL5_CLAW, "Hummel", LEVEL5_CLAW_DMG ),
CSW( CSW_LEVEL5_ALT, MOD_LEVEL5_BOUNCEBALL, "Hummel Prickles", LEVEL5_PRICKLES_DMG )

Expand Down
8 changes: 0 additions & 8 deletions src/game/g_local.h
View file
Expand Up @@ -1001,12 +1001,7 @@ void G_LogCombatStats( gentity_t *ent );
//
void G_RunMissile( gentity_t *ent );

gentity_t *launch_grenade2( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *fire_prifle_stasis( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *flamerchageimpact( gentity_t *self, vec3_t start, vec3_t dir, int damage, int radius, int speed );
gentity_t *launch_nadeflames( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *flamerfire3( gentity_t *self, vec3_t start, vec3_t dir, int damage, int radius, int speed );
gentity_t *flamerfire( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *fire_flamer( gentity_t *self, vec3_t start, vec3_t aimdir );
gentity_t *fire_blaster( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *fire_pulseRifle( gentity_t *self, vec3_t start, vec3_t dir );
Expand All @@ -1021,9 +1016,6 @@ gentity_t *launch_grenade_flames( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *launch_shield( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *launch_saw( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *fire_md2( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *launch_mine( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *launch_flames( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *launch_smoke( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *fire_rocket( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *fire_fern( vec3_t origin, vec3_t angles, int lifespan );

Expand Down

0 comments on commit 93d2e44

Please sign in to comment.