From 66c2e4b5409567fe860762c9dc766f203b11b096 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 29 Dec 2009 22:53:45 +0000 Subject: [PATCH] - Added ACS stubs for GZDoom's new SetGlobalFogParameter action special. SVN r2058 (trunk) --- src/actionspecials.h | 1 + src/g_hexen/a_flechette.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/actionspecials.h b/src/actionspecials.h index 417c823b1..552b65e49 100644 --- a/src/actionspecials.h +++ b/src/actionspecials.h @@ -139,6 +139,7 @@ DEFINE_SPECIAL(Teleport_NoStop, 154, 2, 3, 3) // Although ZDoom doesn't support them it's better to have them defined so that // WADs using them somewhere can at least be started without aborting due // to an error message. +DEFINE_SPECIAL(SetGlobalFogParameter, 157, 2, 2, 2) DEFINE_SPECIAL(FS_Execute, 158, 1, 4, 4) DEFINE_SPECIAL(Sector_SetPlaneReflection, 159, 3, 3, 3) DEFINE_SPECIAL(Sector_Set3DFloor, 160, -1, -1, 5) diff --git a/src/g_hexen/a_flechette.cpp b/src/g_hexen/a_flechette.cpp index ea72cb208..dd951d451 100644 --- a/src/g_hexen/a_flechette.cpp +++ b/src/g_hexen/a_flechette.cpp @@ -125,7 +125,7 @@ bool AArtiPoisonBag3::Use (bool pickup) angle_t orgpitch = angle_t(-Owner->pitch) >> ANGLETOFINESHIFT; angle_t modpitch = angle_t(0xDC00000 - Owner->pitch) >> ANGLETOFINESHIFT; angle_t angle = mo->angle >> ANGLETOFINESHIFT; - fixed_t speed = fixed_t(sqrt((double)mo->Speed*mo->Speed + (4.0*65536*4*65536))); + fixed_t speed = FLOAT2FIXED(sqrt((double)mo->Speed*mo->Speed + (4.0*65536*4*65536))); fixed_t xyscale = FixedMul(speed, finecosine[modpitch]); mo->velz = FixedMul(speed, finesine[modpitch]);