From 835ed26370940e5824fc9e5c62fdcbb07d6025e7 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 19 Dec 2008 03:57:24 +0000 Subject: [PATCH] - Decal changes as per Xaser's suggestions: Smaller decal for PhoenixFX2, CrossbowFX2 and MaceFX4 were missing decals, and HornRodFX2 gets a whole new decal. - Fixed: bfgscrc2.png had some holes in the middle that did not look so good. (From previously being handled through WinTex, maybe?) SVN r1325 (trunk) --- docs/rh-log.txt | 7 +++++++ src/s_sound.cpp | 13 +++++------- wadsrc/static/decaldef.txt | 30 ++++++++++++++++++++++++++-- wadsrc/static/graphics/bfgscrc2.png | Bin 2681 -> 2602 bytes wadsrc/static/graphics/twirl.png | Bin 0 -> 2660 bytes 5 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 wadsrc/static/graphics/twirl.png diff --git a/docs/rh-log.txt b/docs/rh-log.txt index cad6765ee..ca11c5ba1 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,10 @@ +December 18, 2008 +- Decal changes as per Xaser's suggestions: Smaller decal for PhoenixFX2, + CrossbowFX2 and MaceFX4 were missing decals, and HornRodFX2 gets a whole + new decal. +- Fixed: bfgscrc2.png had some holes in the middle that did not look so good. + (From previously being handled through WinTex, maybe?) + December 17, 2008 - Fixed: Thing_ProjectileIntercept broke slightly when converted to the new vector math routines (almost two years ago!) because the original code diff --git a/src/s_sound.cpp b/src/s_sound.cpp index 120ed3d3d..6943d2ab9 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -664,7 +664,7 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector, break; case SOURCE_Actor: - assert(actor != NULL); +// assert(actor != NULL); if (actor != NULL) { x = actor->x; @@ -715,14 +715,11 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector, if (vel != NULL) { // Only actors maintain velocity information. - if (type == SOURCE_Actor) + if (type == SOURCE_Actor && actor != NULL) { - if (actor != NULL) - { - vel->X = FIXED2FLOAT(actor->momx) * TICRATE; - vel->Y = FIXED2FLOAT(actor->momz) * TICRATE; - vel->Z = FIXED2FLOAT(actor->momy) * TICRATE; - } + vel->X = FIXED2FLOAT(actor->momx) * TICRATE; + vel->Y = FIXED2FLOAT(actor->momz) * TICRATE; + vel->Z = FIXED2FLOAT(actor->momy) * TICRATE; } else { diff --git a/wadsrc/static/decaldef.txt b/wadsrc/static/decaldef.txt index 46d031e02..2bacce720 100644 --- a/wadsrc/static/decaldef.txt +++ b/wadsrc/static/decaldef.txt @@ -772,6 +772,30 @@ decal CrossbowScorch2 randomflipy } +/***** Phoenix Rod, flamethrower mode **************************************/ + +decal PhoenixThrowerScorch +{ + pic CBALSCR1 + shade "00 00 00" + x-scale 0.4 + y-scale 0.4 + randomflipx + randomflipy +} + +/***** "Horn Rod", rain maker projectile ***********************************/ + +decal HornyRainMaker +{ + pic TWIRL + shade "00 00 00" + x-scale 0.7 + y-scale 0.7 + randomflipx + randomflipy +} + /***** Centaur Scorches ****************************************************/ decal CentaurScorch @@ -990,15 +1014,17 @@ generator GoldWand RailScorchLower generator GoldWandPowered RailScorchLower generator GoldWandFX1 HImpScorch generator CrossbowFX1 CrossbowScorch +generator CrossbowFX2 CrossbowScorch generator CrossbowFX3 CrossbowScorch2 generator MaceFX1 BaronScorch +generator MaceFX4 BFGScorch generator Blaster RailScorchLower generator BlasterFX1 HImpScorch generator Ripper HImpScorch generator HornRodFX1 PlasmaScorchLower -generator HornRodFX2 PlasmaScorchLower +generator HornRodFX2 HornyRainMaker generator PhoenixFX1 Scorch -generator PhoenixFX2 Scorch +generator PhoenixFX2 PhoenixThrowerScorch generator CStaffMissile DoomImpScorch generator HammerMissile Scorch diff --git a/wadsrc/static/graphics/bfgscrc2.png b/wadsrc/static/graphics/bfgscrc2.png index 1f8dcf9cdcddaa83e18cc99d847d0a6c91dbbcdf..fab62b873747c682876564482a4a3f212de9d8c7 100644 GIT binary patch delta 2561 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 AmjD0& delta 2641 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 literal 0 HcmV?d00001