marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some missmerges Guenther pointed out

floating-point
Julius Michaelis 2012-05-07 22:45:41 +02:00
parent f9410855b6
commit 2b9a1778b3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/C4Real.h
View File

@ -21,8 +21,6 @@
* See clonk_trademark_license.txt for full license.
*/
/* Fixed point math extracted from ALLEGRO by Shawn Hargreaves */
/* The Clonk engine uses fixed point math for exact object positions.
This is rather silly. Nowadays we should simply use floats. However,
I never dared changing the whole thing. */
@ -30,7 +28,7 @@
because floating point calculations are not guaranteed to be network
safe...however, it can be solved as a data type with operator
overloading, automatic type conversions, etc now - Sven2 */
/* After some time with synchronous float use, C4Real is used again to
/* After some time with synchronous float use, C4Fixed is used again to
work around the problem that different compilers produce different
floating point code, leading to desyncs between linux and windows
engines. */

3
src/script/C4Value.h
View File

@ -41,7 +41,6 @@ enum C4V_Type
C4V_Enum, // enumerated array or proplist
C4V_C4ObjectEnum, // enumerated object
C4V_C4DefEnum, // enumerated object
// for typechecks
C4V_Any,
@ -457,7 +456,7 @@ ALWAYS_INLINE void C4Value::DelDataRef(C4V_Data Data, C4V_Type Type, C4Value *pN
ALWAYS_INLINE void C4Value::Set(C4V_Data nData, C4V_Type nType)
{
// Do not add this to the same linked list twice.
if (Data == nData && Type >= C4V_PropList) return;
if (Data == nData && Type == nType) return;
C4V_Data oData = Data;
C4V_Type oType = Type;