summaryrefslogtreecommitdiff
path: root/src/heretic/doomdef.h
diff options
context:
space:
mode:
authorSimon Howard2008-09-17 20:07:18 +0000
committerSimon Howard2008-09-17 20:07:18 +0000
commit90056c594d74eb1b938e34d02833435bd23e0bf7 (patch)
tree8d8b0ebee70c0ee650ca2751984139ede61c2c0a /src/heretic/doomdef.h
parent967d3910e3957417630085237a95cdac546b1bd4 (diff)
downloadchocolate-doom-90056c594d74eb1b938e34d02833435bd23e0bf7.tar.gz
chocolate-doom-90056c594d74eb1b938e34d02833435bd23e0bf7.tar.bz2
chocolate-doom-90056c594d74eb1b938e34d02833435bd23e0bf7.zip
Remove heretic definitions for fixed math arithmetic and endianness
conversion macros; use the ones from the common code. Subversion-branch: /branches/raven-branch Subversion-revision: 1242
Diffstat (limited to 'src/heretic/doomdef.h')
-rw-r--r--src/heretic/doomdef.h35
1 files changed, 1 insertions, 34 deletions
diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h
index bdf78a19..654c1bd8 100644
--- a/src/heretic/doomdef.h
+++ b/src/heretic/doomdef.h
@@ -62,6 +62,7 @@
// events
#include "d_event.h"
+// gamemode/mission
#include "d_mode.h"
extern byte *destview, *destscreen; // PC direct to screen pointers
@@ -666,40 +667,6 @@ extern boolean autostart;
===============================================================================
*/
-
-fixed_t FixedMul(fixed_t a, fixed_t b);
-fixed_t FixedDiv(fixed_t a, fixed_t b);
-fixed_t FixedDiv2(fixed_t a, fixed_t b);
-
-#ifdef __WATCOMC__
-#pragma aux FixedMul = \
- "imul ebx", \
- "shrd eax,edx,16" \
- parm [eax] [ebx] \
- value [eax] \
- modify exact [eax edx]
-
-#pragma aux FixedDiv2 = \
- "cdq", \
- "shld edx,eax,16", \
- "sal eax,16", \
- "idiv ebx" \
- parm [eax] [ebx] \
- value [eax] \
- modify exact [eax edx]
-#endif
-
-#ifdef __BIG_ENDIAN__
-short ShortSwap(short);
-long LongSwap(long);
-#define SHORT(x) ShortSwap(x)
-#define LONG(x) LongSwap(x)
-#else
-#define SHORT(x) (x)
-#define LONG(x) (x)
-#endif
-
-
#include "z_zone.h"
//----------