diff options
| author | Tim Angus <tim@ngus.net> | 2001-12-22 04:06:28 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2001-12-22 04:06:28 +0000 |
| commit | 37651838b6ed3731f50ce0c798b02161ca2919ab (patch) | |
| tree | 2954f8ec23fcd26b77d12aa70303b1a6ae28f6da /src/cgame | |
| parent | d90bdf12e0aaa4cef3772d0d50fc40dfb1f09802 (diff) | |
Bug fixes to droid->alien conversion :)
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_event.c | 2 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 2 | ||||
| -rw-r--r-- | src/cgame/cg_weapons.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index b8f87a84..ec521b80 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -138,7 +138,7 @@ static void CG_Obituary( entityState_t *ent ) { case MOD_HSPAWN: message = "should have run further"; break; - case MOD_DSPAWN: + case MOD_ASPAWN: message = "was melted by the acid blood"; break; default: diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 7cc25a3f..8f9a6668 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -824,7 +824,7 @@ static void CG_RegisterGraphics( void ) { cgs.media.alienNav3 = trap_R_RegisterShader( "alienNav3" ); cgs.media.alienNav2 = trap_R_RegisterShader( "alienNav2" ); cgs.media.alienNav1 = trap_R_RegisterShader( "alienNav1" ); - cgs.media.alienHealth = trap_R_RegisterShader( "gfx/2d/alienhealth.tga" ); + cgs.media.alienHealth = trap_R_RegisterShader( "gfx/2d/droidhealth.tga" ); cgs.media.armorModel = trap_R_RegisterModel( "models/powerups/armor/armor_yel.md3" ); cgs.media.armorIcon = trap_R_RegisterShaderNoMip( "icons/iconr_yellow" ); diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 7e2f78cc..b8794354 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -807,8 +807,8 @@ void CG_RegisterWeapon( int weaponNum ) { weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/melee/fstatck.wav", qfalse ); break; - case WP_DBUILD: - case WP_DBUILD2: + case WP_ABUILD: + case WP_ABUILD2: case WP_HBUILD: case WP_HBUILD2: //nowt |