summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2021-10-03 18:15:02 -0700
committerGitHub <noreply@github.com>2021-10-03 21:15:02 -0400
commit5a0c39cb9586343be2509bf5c75d69898c248355 (patch)
tree7c3c27238f7c83654497c083605c6f7bc05cf645
parent6d51ec4a4cd10372860f5408d2f0fc26df9b0234 (diff)
fix actor spawner menu and tunic color changer (#64)HEAD0.4.10.4.00.3.00.2.00.1.0master
* fix actor spawner menu * Update libtp_c * Update libtp_c
m---------external/libtp_c0
-rw-r--r--src/menus/actor_spawner_menu.cpp26
2 files changed, 13 insertions, 13 deletions
diff --git a/external/libtp_c b/external/libtp_c
-Subproject dda50110c7bc8402c6b20132fa0d04ae3081db5
+Subproject c917558581939a7e6d150eaa22ffb712dc21d4f
diff --git a/src/menus/actor_spawner_menu.cpp b/src/menus/actor_spawner_menu.cpp
index 5889c3c..794a624 100644
--- a/src/menus/actor_spawner_menu.cpp
+++ b/src/menus/actor_spawner_menu.cpp
@@ -10,20 +10,20 @@
#define LINES 4
#ifdef GCN_PLATFORM
-#define CONTROLLER_RIGHT Controller::Pad::DPAD_RIGHT
-#define CONTROLLER_LEFT Controller::Pad::DPAD_LEFT
-#define CONTROLLER_UP Controller::Pad::DPAD_UP
-#define CONTROLLER_DOWN Controller::Pad::DPAD_DOWN
-#define CONTROLLER_SKIP_10 Controller::Pad::X
-#define CONTROLLER_SKIP_MINUS_10 Controller::Pad::Y
+#define CONTROLLER_RIGHT Controller::DPAD_RIGHT
+#define CONTROLLER_LEFT Controller::DPAD_LEFT
+#define CONTROLLER_UP Controller::DPAD_UP
+#define CONTROLLER_DOWN Controller::DPAD_DOWN
+#define CONTROLLER_SKIP_10 Controller::X
+#define CONTROLLER_SKIP_MINUS_10 Controller::Y
#endif
#ifdef WII_PLATFORM
-#define CONTROLLER_RIGHT Controller::Mote::DPAD_RIGHT
-#define CONTROLLER_LEFT Controller::Mote::DPAD_LEFT
-#define CONTROLLER_UP Controller::Mote::DPAD_UP
-#define CONTROLLER_DOWN Controller::Mote::DPAD_DOWN
-#define CONTROLLER_SKIP_10 Controller::Mote::ONE
-#define CONTROLLER_SKIP_MINUS_10 Controller::Mote::TWO
+#define CONTROLLER_RIGHT Controller::DPAD_RIGHT
+#define CONTROLLER_LEFT Controller::DPAD_LEFT
+#define CONTROLLER_UP Controller::DPAD_UP
+#define CONTROLLER_DOWN Controller::DPAD_DOWN
+#define CONTROLLER_SKIP_10 Controller::ONE
+#define CONTROLLER_SKIP_MINUS_10 Controller::TWO
#endif
static Cursor cursor = {0, 0};
@@ -31,7 +31,7 @@ bool lock_cursor_y = false;
bool lock_cursor_x = false;
bool init_once = false;
-int16_t actor_id = 0;
+uint16_t actor_id = 0;
uint32_t actor_params = 0;
int8_t actor_type = -1;
uint8_t param_index = 0;