diff options
| author | Aetias <aetias@outlook.com> | 2024-04-20 14:01:33 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-04-20 14:01:33 +0200 |
| commit | d994c9ee4b153c72757bed21e480e849448aeb5f (patch) | |
| tree | 1b1503f1cdffe9a3ca326d30a768f0d02ea8cc67 /include | |
| parent | 9a7bc06baa5dadd2632b550e3cf92a1aa13530a5 (diff) | |
| parent | e54e6a277cbdcd3830e9258be2577fe974e51b1a (diff) | |
Merge branch 'main' into item-manager
Diffstat (limited to 'include')
| -rw-r--r-- | include/Actor/ActorRupee.hpp | 2 | ||||
| -rw-r--r-- | include/System/Resource.hpp | 13 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index 93c3082c..4ec671b8 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -4,7 +4,6 @@ #include "types.h" #include "lib/math.h" -#include "System/Resource.hpp" #include "Actor/Actor.hpp" #include "Actor/ActorType.hpp" #include "Item/Item.hpp" @@ -24,7 +23,6 @@ enum RupeeId_ { class ActorRupee : public Actor { public: - static Resource gResource; static ActorType gType; /* 000 (base) */ diff --git a/include/System/Resource.hpp b/include/System/Resource.hpp deleted file mode 100644 index 757ccba0..00000000 --- a/include/System/Resource.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "global.h" -#include "types.h" - -typedef void (*ResourceCleanupFunc)(void *object); - -struct Resource { - /* 0 */ Resource *next; - /* 4 */ ResourceCleanupFunc cleanup; - /* 8 */ void *object; - /* c */ -}; |