Commit: 3dc3179a77a509741a8c85ed52cc0b01982c6ff1 - zatspg-release (hg)

This is a fork of Zandronum for TSPG.

Commit MetaInfo

• Revisão: 3dc3179a77a509741a8c85ed52cc0b01982c6ff1 (tree)
• Hora: 2017-03-26 00:21:33
• Autor: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Mensagem de Log

Fixed: Angle arguments in DECORATE didn't work properly on ARM devices like the Raspberry Pi (adapted from the corresponding ZDoom fix, fixes 2773).

Mudança Sumário

• modified: docs/zandronum-history.txt
• modified: src/m_fixed.h
• modified: src/thingdef/thingdef.h

Diff

diff -r 16ef985b4dad -r 3dc3179a77a5 docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Sun Mar 19 21:58:53 2017 +0100
+++ b/docs/zandronum-history.txt	Sat Mar 25 16:21:33 2017 +0100
@@ -117,6 +117,7 @@
 -	- Fixed a potential client crash related to the firing sound of a railgun. [Torr Samaho]
 -	- Fixed: Blood splatter caused unnecessary network traffic. [Torr Samaho]
 -	- Fixed: A_FiredSpawnRock and A_FiredSplotch caused unnecessary network traffic. [Torr Samaho]
+-	- Fixed: Angle arguments in DECORATE didn't work properly on ARM devices like the Raspberry Pi (adapted from the corresponding ZDoom fix). [Torr Samaho]
 !	- Changed: Spectators can now interact with gravity and use the fly/land commands. [Leonard]
 !	- Save games now contain information about the renderer used to create the save. This allows to print a proper error message when an incompatible save is tried to be loaded. [Torr Samaho]
 !	- Clients don't error out anymore when encountering a division by zero in a DECORATE expression. Instead, a one time warning is printed on the first occasion and the result is assumed to be zero. This is necessary since clients can encounter this in valid DECORATE code due to Zandronum's jump handling. [Torr Samaho]

diff -r 16ef985b4dad -r 3dc3179a77a5 src/m_fixed.h
--- a/src/m_fixed.h	Sun Mar 19 21:58:53 2017 +0100
+++ b/src/m_fixed.h	Sat Mar 25 16:21:33 2017 +0100
@@ -141,4 +141,12 @@
 #define FIXED2FLOAT(f)		((f) / float(65536))
 #define FIXED2DBL(f)		((f) / double(65536))
 
+#define ANGLE2DBL(f)		((f) * (90./ANGLE_90))
+#define ANGLE2FLOAT(f)		(float((f) * (90./ANGLE_90)))
+#define FLOAT2ANGLE(f)		((angle_t)xs_CRoundToInt((f) * (ANGLE_90/90.)))
+
+#define ANGLE2RAD(f)		((f) * (M_PI/ANGLE_180))
+#define ANGLE2RADF(f)		((f) * float(M_PI/ANGLE_180))
+#define RAD2ANGLE(f)		((angle_t)xs_CRoundToInt((f) * (ANGLE_180/M_PI)))
+
 #endif

diff -r 16ef985b4dad -r 3dc3179a77a5 src/thingdef/thingdef.h
--- a/src/thingdef/thingdef.h	Sun Mar 19 21:58:53 2017 +0100
+++ b/src/thingdef/thingdef.h	Sat Mar 25 16:21:33 2017 +0100
@@ -430,7 +430,7 @@
 #define ACTION_PARAM_NAME(var,i) \
 	FName var = EvalExpressionName(ParameterIndex+i, self);
 #define ACTION_PARAM_ANGLE(var,i) \
-	angle_t var = angle_t(EvalExpressionF(ParameterIndex+i, self)*ANGLE_90/90.f);
+	angle_t var = FLOAT2ANGLE(EvalExpressionF(ParameterIndex+i, self));
 
 #define ACTION_SET_RESULT(v) if (statecall != NULL) statecall->Result = v;