From e11133ef6e84620da03447d82ed97c0ced4880d8 Mon Sep 17 00:00:00 2001 From: shibbo Date: Tue, 12 Dec 2023 09:42:43 -0500 Subject: [PATCH] more compile error fixes --- include/Game/Util/LayoutUtil.h | 1 + libs/RVL_SDK/include/private/scprivate.h | 19 ---------------- libs/RVL_SDK/include/revolution/sc.h | 28 +++++------------------- 3 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 libs/RVL_SDK/include/private/scprivate.h diff --git a/include/Game/Util/LayoutUtil.h b/include/Game/Util/LayoutUtil.h index 54fe6d24..6e852159 100644 --- a/include/Game/Util/LayoutUtil.h +++ b/include/Game/Util/LayoutUtil.h @@ -5,6 +5,7 @@ class Layout; class Nerve; +class LayoutActor; namespace MR { void setEffectRate(LayoutActor *, const char *, f32); diff --git a/libs/RVL_SDK/include/private/scprivate.h b/libs/RVL_SDK/include/private/scprivate.h deleted file mode 100644 index 463b6308..00000000 --- a/libs/RVL_SDK/include/private/scprivate.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef SCPRIVATE_H -#define SCPRIVATE_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef u8 SCType; - -#define SC_TYPE_MASK ((SCType)0xe0) -#define SC_NAME_LENGTH_MASK ((SCType)~SC_TYPE_MASK) - -#ifdef __cplusplus -} -#endif - -#endif // SCPRIVATE_H \ No newline at end of file diff --git a/libs/RVL_SDK/include/revolution/sc.h b/libs/RVL_SDK/include/revolution/sc.h index 1373d233..9e67c2ba 100644 --- a/libs/RVL_SDK/include/revolution/sc.h +++ b/libs/RVL_SDK/include/revolution/sc.h @@ -2,7 +2,6 @@ #define SC_H #include -#include #ifdef __cplusplus extern "C" { @@ -10,6 +9,11 @@ extern "C" { typedef u8 SCType; +typedef struct { + u8 mode; + u8 led; +} SCIdleModeInfo; + typedef struct { union { u8 type_u8; @@ -35,28 +39,6 @@ typedef struct { typedef void (*SCReloadConfFileCallback)(s32 result); typedef void (*SCFlushCallback)(u32 result); -typedef struct { - /*union { - u8 u8; - s8 s8; - u16 u16; - s16 s16; - u32 u32; - s32 s32; - u64 u64; - s64 s64; - u8 longPrecision64[sizeof(u64)]; - } integer;*/ - - SCType typeInteger; - SCType typeByteArray; - u32 nameLen; - u32 dataSize; - char* name; - u8* data; - u32 packedSize; -} SCItem; - typedef enum { SC_ITEM_ID_IPL_COUNTER_BIAS, SC_ITEM_ID_IPL_ASPECT_RATIO,