From 6a70389f1d804f6111ef768ed2f644afe1ea93dc Mon Sep 17 00:00:00 2001 From: NY00123 Date: Sun, 17 May 2020 21:47:27 +0300 Subject: [PATCH] Let's just use __fastcall instead of LUNATIC_FASTCALL # Conflicts: # source/build/include/build.h --- source/build/include/build.h | 7 +++---- source/build/src/engine.cpp | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/build/include/build.h b/source/build/include/build.h index 86ff038dc..cb5423b70 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -70,7 +70,6 @@ enum rendmode_t { # define M32_FIXME_SECTORS 2 # define LUNATIC_EXTERN static -# define LUNATIC_FASTCALL __fastcall #define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3)) @@ -933,10 +932,10 @@ int32_t krand(void); #endif int32_t ksqrt(uint32_t num); -int32_t LUNATIC_FASTCALL getangle(int32_t xvect, int32_t yvect); -fix16_t LUNATIC_FASTCALL gethiq16angle(int32_t xvect, int32_t yvect); +int32_t __fastcall getangle(int32_t xvect, int32_t yvect); +fix16_t __fastcall gethiq16angle(int32_t xvect, int32_t yvect); -static FORCE_INLINE fix16_t LUNATIC_FASTCALL getq16angle(int32_t xvect, int32_t yvect) +static FORCE_INLINE fix16_t __fastcall getq16angle(int32_t xvect, int32_t yvect) { return fix16_from_int(getangle(xvect, yvect)); } diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index ad100f1d0..eec8bc462 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -4261,7 +4261,7 @@ int32_t inside(int32_t x, int32_t y, int16_t sectnum) return -1; } -int32_t LUNATIC_FASTCALL getangle(int32_t xvect, int32_t yvect) +int32_t __fastcall getangle(int32_t xvect, int32_t yvect) { int32_t rv; @@ -4282,7 +4282,7 @@ int32_t LUNATIC_FASTCALL getangle(int32_t xvect, int32_t yvect) return rv; } -fix16_t LUNATIC_FASTCALL gethiq16angle(int32_t xvect, int32_t yvect) +fix16_t __fastcall gethiq16angle(int32_t xvect, int32_t yvect) { fix16_t rv;