Skip to content

Commit afd6faa

Browse files
committed
Properly handle the variables for the getStickAngle() function
1 parent 1e63aea commit afd6faa

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

ttyd-tools/rel/include/items.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <cstdio>
3+
#include <cstdint>
44

55
enum ITEMS : int16_t
66
{

ttyd-tools/rel/include/ttyd/system.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ void padRumbleHardOff(uint32_t padId);
2626
void padRumbleOff(uint32_t padId);
2727
void padRumbleOn(uint32_t padId);
2828

29-
int8_t keyGetSubStickY(uint32_t padId);
30-
int8_t keyGetStickY(uint32_t padId);
31-
int8_t keyGetStickX(uint32_t padId);
29+
uint8_t keyGetSubStickY(uint32_t padId);
30+
uint8_t keyGetStickY(uint32_t padId);
31+
uint8_t keyGetStickX(uint32_t padId);
3232
uint32_t keyGetButtonTrg(uint32_t padId);
3333
uint32_t keyGetDirTrg(uint32_t padId);
3434
uint32_t keyGetButtonRep(uint32_t padId);

ttyd-tools/rel/source/codes.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -754,17 +754,19 @@ void checkIfAreaFlagsShouldBeCleared()
754754

755755
double getStickAngle()
756756
{
757-
double StickX = static_cast<double>(ttyd::system::keyGetStickX(0));
758-
if (StickX > 127)
757+
int32_t tempStickX = static_cast<int32_t>(ttyd::system::keyGetStickX(0));
758+
if (tempStickX > 127)
759759
{
760-
StickX -= 256;
760+
tempStickX -= 256;
761761
}
762+
double StickX = static_cast<double>(tempStickX);
762763

763-
double StickY = static_cast<double>(ttyd::system::keyGetStickY(0));
764-
if (StickY > 127)
764+
int32_t tempStickY = static_cast<int32_t>(ttyd::system::keyGetStickY(0));
765+
if (tempStickY > 127)
765766
{
766-
StickY -= 256;
767+
tempStickY -= 256;
767768
}
769+
double StickY = static_cast<double>(tempStickY);
768770

769771
const double PI = 3.14159265358979323846;
770772
double StickAngle = (ttyd::w_atan2::atan2(StickX, StickY)) * (180 / PI);

ttyd-tools/rel/source/global.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace mod {
88

9-
const char *VersionNumber = "v3.0.18";
9+
const char *VersionNumber = "v3.0.19";
1010

1111
const char *RootLines[] =
1212
{

0 commit comments

Comments
 (0)