diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2026-05-09 12:36:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-09 12:36:22 +0200 |
| commit | e9ffe114a97fd3bf563a8c346f2ef2dc5e88f9fd (patch) | |
| tree | 71b1e9895021bcf152c965a87baf1a9d7c7dd699 /include/global.h | |
| parent | b44496319d3027a625fcf876cf22e467720355df (diff) | |
Delink character actor base classes and shop keeper actors (#152)
* Delink .text for ActorItemSeller, ActorBeedle, ActorTetra
* Delink .text for ActorCharacterBase, ActorCharacter, ActorGenericCharacter
* Define classes ActorCharacterBase, ActorCharacter, ActorGenericCharacter
* Don't define `override` macro during intellisense/clangd
* Define symbols for ActorCharacter, ActorCharacterBase, ActorGenericCharacter
* Define classes and symbols for ActorItemSeller, ActorBeedle, ActorTetra
* Fix duplicate symbol
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h index 91df45f0..ec252705 100644 --- a/include/global.h +++ b/include/global.h @@ -5,15 +5,15 @@ #define ARRAY_LEN(arr) (s32)(sizeof(arr) / sizeof(*arr)) // Prevent the IDE from reporting errors that the compiler/linker won't report -#ifdef __INTELLISENSE__ +#if defined(__INTELLISENSE__) || (__clang__) +#else + // `override` was added in C++11 before the DS, so we only use the keyword to indicate overriden functions + #define override #endif #define ARM _Pragma("thumb off") #define THUMB _Pragma("thumb on") -// `override` was added in C++11 before the DS, so we only use the keyword to indicate overriden functions -#define override - // Puts variables in the DTCM module by using #pragma section dtcm begin|end #pragma define_section dtcm ".dtcm" \ ".dtcm" |