mirror of
https://github.com/Mr-Wiseguy/Zelda64Recomp.git
synced 2024-11-17 19:39:14 +01:00
Compare commits
1 Commits
0d6dd223b4
...
4c60f0b5f7
Author | SHA1 | Date | |
---|---|---|---|
|
4c60f0b5f7 |
@ -1,29 +0,0 @@
|
||||
#include "patches.h"
|
||||
|
||||
#include "overlays/actors/ovl_En_Test7/z_en_test7.h"
|
||||
|
||||
#define THIS ((EnTest7*)thisx)
|
||||
|
||||
void func_80AF118C(PlayState* play, OwlWarpFeather* feathers, EnTest7* this, s32 arg3, s32 arg4); // EnTest7_UpdateFeathers
|
||||
void func_80AF2350(EnTest7* this, PlayState* play); // EnTest7_WarpCsWarp
|
||||
|
||||
void EnTest7_Update(Actor* thisx, PlayState* play) {
|
||||
EnTest7* this = THIS;
|
||||
|
||||
this->actionFunc(this, play);
|
||||
|
||||
if (this->playerCamFunc != NULL) {
|
||||
this->playerCamFunc(this, play);
|
||||
}
|
||||
|
||||
this->timer++;
|
||||
|
||||
func_80AF118C(play, this->feathers, this, (this->flags & OWL_WARP_FLAGS_8) != 0,
|
||||
(this->flags & OWL_WARP_FLAGS_10) != 0);
|
||||
|
||||
// @recomp Allow skipping the Song of Soaring cutscene.
|
||||
Input* input = CONTROLLER1(&play->state);
|
||||
if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_B) && (OWL_WARP_CS_GET_OCARINA_MODE(&this->actor) != ENTEST7_ARRIVE)) {
|
||||
func_80AF2350(thisx, play);
|
||||
}
|
||||
}
|
@ -192,23 +192,9 @@ bool sdl_event_filter(void* userdata, SDL_Event* event) {
|
||||
SDL_ControllerAxisEvent* axis_event = &event->caxis;
|
||||
float axis_value = axis_event->value * (1/32768.0f);
|
||||
if (axis_value > axis_threshold) {
|
||||
SDL_Event set_stick_return_event;
|
||||
set_stick_return_event.type = SDL_USEREVENT;
|
||||
set_stick_return_event.user.code = axis_event->axis;
|
||||
set_stick_return_event.user.data1 = nullptr;
|
||||
set_stick_return_event.user.data2 = nullptr;
|
||||
recompui::queue_event(set_stick_return_event);
|
||||
|
||||
set_scanned_input({(uint32_t)InputType::ControllerAnalog, axis_event->axis + 1});
|
||||
}
|
||||
else if (axis_value < -axis_threshold) {
|
||||
SDL_Event set_stick_return_event;
|
||||
set_stick_return_event.type = SDL_USEREVENT;
|
||||
set_stick_return_event.user.code = axis_event->axis;
|
||||
set_stick_return_event.user.data1 = nullptr;
|
||||
set_stick_return_event.user.data2 = nullptr;
|
||||
recompui::queue_event(set_stick_return_event);
|
||||
|
||||
set_scanned_input({(uint32_t)InputType::ControllerAnalog, -axis_event->axis - 1});
|
||||
}
|
||||
} else {
|
||||
|
@ -1350,13 +1350,6 @@ void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* s
|
||||
non_mouse_interacted = true;
|
||||
kb_interacted = true;
|
||||
break;
|
||||
case SDL_EventType::SDL_USEREVENT:
|
||||
if (cur_event.user.code == SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY) {
|
||||
ui_context->rml.await_stick_return_y = true;
|
||||
} else if (cur_event.user.code == SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX) {
|
||||
ui_context->rml.await_stick_return_x = true;
|
||||
}
|
||||
break;
|
||||
case SDL_EventType::SDL_CONTROLLERAXISMOTION:
|
||||
SDL_ControllerAxisEvent* axis_event = &cur_event.caxis;
|
||||
if (axis_event->axis != SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY && axis_event->axis != SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX) {
|
||||
|
Loading…
Reference in New Issue
Block a user