diff options
author | Zephiles <cae222@yahoo.com> | 2022-05-23 23:05:09 -0500 |
---|---|---|
committer | Zephiles <cae222@yahoo.com> | 2022-05-23 23:05:09 -0500 |
commit | 9851bb8540b159f9cff0cce1fcd65ed54ab90ce1 (patch) | |
tree | 52838da4f8643399fcef97fc186efa7db9b6705f | |
parent | 785076c57b7a9fa04b6ecb798e14d701121d90e1 (diff) |
Update to most recent version of libtp_rel
-rw-r--r-- | GameCube/.clang-format | 2 | ||||
m--------- | GameCube/externals/libtp_rel | 0 | ||||
-rw-r--r-- | GameCube/include/events.h | 1 | ||||
-rw-r--r-- | GameCube/include/rando/randomizer.h | 2 | ||||
-rw-r--r-- | GameCube/include/rando/seedlist.h | 1 | ||||
-rw-r--r-- | GameCube/source/events.cpp | 1 | ||||
-rw-r--r-- | GameCube/source/main.cpp | 6 | ||||
-rw-r--r-- | GameCube/source/rando/seed.cpp | 3 | ||||
-rw-r--r-- | GameCube/source/user_patch/00_wallet.cpp | 1 |
9 files changed, 6 insertions, 11 deletions
diff --git a/GameCube/.clang-format b/GameCube/.clang-format index e213c8dd..775313bc 100644 --- a/GameCube/.clang-format +++ b/GameCube/.clang-format @@ -23,7 +23,7 @@ IndentWrappedFunctionNames: 'true' Language: Cpp NamespaceIndentation: All PointerAlignment: Left -SortIncludes: 'true' +SortIncludes: 'false' SortUsingDeclarations: 'true' SpaceAfterCStyleCast: 'true' SpaceAfterLogicalNot: 'false' diff --git a/GameCube/externals/libtp_rel b/GameCube/externals/libtp_rel -Subproject ca2c7efda27d8421650d4071b5197ad21a47127 +Subproject 82368e9ff2e6643d99ddb6946b300027f485156 diff --git a/GameCube/include/events.h b/GameCube/include/events.h index 828b2888..e28e4e5f 100644 --- a/GameCube/include/events.h +++ b/GameCube/include/events.h @@ -9,7 +9,6 @@ #ifndef EVENTS_H
#define EVENTS_H
-#include <cinttypes>
#include "data/items.h"
#include "rando/randomizer.h"
diff --git a/GameCube/include/rando/randomizer.h b/GameCube/include/rando/randomizer.h index 3129d12a..535fc3d8 100644 --- a/GameCube/include/rando/randomizer.h +++ b/GameCube/include/rando/randomizer.h @@ -7,8 +7,6 @@ #ifndef RANDO_RANDOMIZER_H #define RANDO_RANDOMIZER_H -#include <cinttypes> - #include "rando/data.h" #include "rando/seed.h" #include "rando/seedlist.h" diff --git a/GameCube/include/rando/seedlist.h b/GameCube/include/rando/seedlist.h index e11ec94b..ab78c2ec 100644 --- a/GameCube/include/rando/seedlist.h +++ b/GameCube/include/rando/seedlist.h @@ -6,7 +6,6 @@ */ #ifndef RANDO_SEEDLIST_H #define RANDO_SEEDLIST_H -#include <cinttypes> #include "rando/data.h" #include "rando/seed.h" diff --git a/GameCube/source/events.cpp b/GameCube/source/events.cpp index 388ec879..15760068 100644 --- a/GameCube/source/events.cpp +++ b/GameCube/source/events.cpp @@ -1,6 +1,5 @@ #include "events.h"
-#include <cinttypes>
#include <cstring>
#include "asm.h"
diff --git a/GameCube/source/main.cpp b/GameCube/source/main.cpp index 472f193c..6f83b301 100644 --- a/GameCube/source/main.cpp +++ b/GameCube/source/main.cpp @@ -1,9 +1,9 @@ #include "main.h" -#include <cinttypes> #include <cstdint> -#include <cstdio> #include <cstring> +#include <cstdio> +#include <cinttypes> #include "events.h" #include "game_patch/game_patch.h" @@ -73,6 +73,8 @@ namespace mod seedList = new rando::SeedList(); } + void exit() {} + void hookFunctions() { using namespace libtp; diff --git a/GameCube/source/rando/seed.cpp b/GameCube/source/rando/seed.cpp index fdf2662a..6f4efd5b 100644 --- a/GameCube/source/rando/seed.cpp +++ b/GameCube/source/rando/seed.cpp @@ -7,9 +7,8 @@ #include "rando/seed.h" -#include <string.h> - #include <cstdint> +#include <cstring> #include <cstdio> #include "data/stages.h" diff --git a/GameCube/source/user_patch/00_wallet.cpp b/GameCube/source/user_patch/00_wallet.cpp index f5c61354..8a4a03cc 100644 --- a/GameCube/source/user_patch/00_wallet.cpp +++ b/GameCube/source/user_patch/00_wallet.cpp @@ -4,7 +4,6 @@ * * @bug No known bugs */ -#include <cinttypes> #include "gc_wii/OSCache.h" #include "main.h" |