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 zcmV+c3jX!^6si=ELw^a;NklS|H835p!+2x+xT`re5MN+aZTe0j!sgv}s z(FR3|7C}GthxAMTM}J4Z6h-?bK@zudPG6EOOO`}kqGuZ+VM&$)F@J#H696D0MnRfThJIfF zrd$Cfe1Ok9dM$wAU_U7(WAE5Hote;6s`VNG#exEPMr5cklMy^9rSvK@j{g^cMdYL- zV1|oa!KnT0gN2fcvT4zAS&9LK{{?`O%&-hT`8KCC93jisTMt03IP>F9!g1C$S*2lEqDFJ_(G2))A{UWq*G2n_4-VmcHF+M%ju1#=dz@ zE@WnMow|Hw-fEhTcGN57vQy3Wo*AT+DBz-AM_GQ`-5=0b0yxODn?a?#T4y}>{;o-< z)rxx5_5qWqlrm{U+YKed>p1k~0Hfx9`-kh}nlOmrWhH{8bbY7F6~*fcFl-aKVJUgv&Ss-8 zKAEWLOgcXDF0e+m!z_UP-4g)8Qvg8kA=0b5SvQMQ zQ-6X;c&VMDdk^EViFN}3pq`gc07wBmrpi_BchgD$thVKeMLjYyv6fVq<|!6+xHKIu zmvQglU|ZuKigH+|QB34;8;L}l^)*Qt z+WW26{*hnd+n}F~U?Pg}<29hsaikHOrhh?U23r$J6mg*(%bK7W_D0O)XFSJi*$&?r zA`~!G%S}Qjo3_Wn(?x^~3yOzUz$u(0U8*Ues)ms^sWNVq4^UAgO3?6_rPxM>k*!5; zW!U!f!-o-l3aD3?(z#v_UKS?9VA8RRCCNykG@&jZCZ-Gmi1(q*O!h$>rt(!^$bVSa z+BuqFa10=h0SOWMuC>t5)>hchIu6MPA(Wt$kd>4u5Q^25EOniP01LebOl!5UfRoU1 zBw(LJz#t5zU>ql|Tu-8s8_=j&g-d16;)@)GtS9cqG1zLWFL-v80ThKyMnM}E z)q{@5Q10DmwbzzBCJ&Gc@! z%|5E&3o6HtNg^r4_Nc+&+`2v)4OZ`VdQmNVqlbWh7@h$DCWx_rJQwCJZr<<~WHByf zRcc1HK_cxC*AF7=QtCnwBjopw#^ZSn&X6tpEC7q@uurFoM*p)1{=mcbVd~Bv7((7k z)Yz6qg?!pBbk`kTj(^OE;Vw;FusM1Pu!2PMC|2k8+^g#64^7{dtGPkvt}bwLmRRXX z0(|Cg;ri#DM^G=LsLT^Je)ORKBmyQS^4aOAW0I7}X15!C+nAf11w8=L6~ZSGbT%TK z8Xg2b+iR+&S(r*o8D#?LWJFH@s502@HO(0Ky@d}1zlqDgzkitKoLxG<*hZqx^|R)E zD0i%*eN!wbl{chd3QIoX3G4?a0190nKRJ#{LMu@qno807W}5^>&I;op*tt^E%OIfR z9k7y38i^5W9)=6i25(xYz<)|xIv$4l)%4Io*!`EX5Pveq0C?8o@zQU&Jc=e4ue3AMy*Nc^M~uvg>9qZB)0~Xh>SZ)gLnkt>TFmeaN(#?a-`ms@dn;5L=&It~vUY3o6g5=sNl zf4DY;nDrmEhO~CVjGEBPZDBg zdgjvm>{MsdZOd1;KDl+T+m9tCsMFFAAjCu?T86a?>El@ zjDbCWI0+eH>uykW>a5HY+r(D0b*-|0%Y>c@?b}~|RF45+R7FclB>E1(C#{ei_mbXq z95m8?^&`XY9oDq)-q2mUEBr8PCF$q)_B{#!g?|bYjeLmD0x%f`CozePA7gnczmU1} zReMnQwXCe;x^QR>Ey@-03B1W382Sa)I4xsaf|&o X)7m@QSagLn00000NkvXXu0mjf1?l0J delta 2641 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 S$IFud0000