mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-08-16 03:34:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'soniccd123/rstickquerytest-2' into 'main'

Browse Source 
Implement dual stick, new bindings, lots of other things

See merge request skmp/dca3-game!4
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2024-12-28 15:45:48 +00:00
parent 6c39b294ca 2e0dcf9c3f
commit 8023daf18a
4 changed files with 993 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/Game.cpp
View File

@@ -662,6 +662,9 @@ bool CGame::Initialise(const char* datFile)
CCollision::ms_collisionInMemory = currLevel; CCollision::ms_collisionInMemory = currLevel;
for (int i = 0; i < MAX_PADS; i++) for (int i = 0; i < MAX_PADS; i++)
CPad::GetPad(i)->Clear(true); CPad::GetPad(i)->Clear(true);
#ifdef RW_DC
//CPad::GetPad(0)->IsDualAnalog = false;
#endif
return true; return true;
} }

5
src/core/MenuScreensCustom.cpp
View File

@@ -764,11 +764,8 @@ CMenuScreenCustom aScreens[MENUPAGES] = {
// MENUPAGE_OPTIONS = 41 // MENUPAGE_OPTIONS = 41
{ "FET_OPT", MENUPAGE_NONE, MENUPAGE_NONE, nil, nil, { "FET_OPT", MENUPAGE_NONE, MENUPAGE_NONE, nil, nil,
#ifdef GTA_HANDHELD MENUACTION_CHANGEMENU, "FET_AGS", { nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS },
MENUACTION_CHANGEMENU, "FET_CTL", { nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS },
#else
MENUACTION_CHANGEMENU, "FET_CTL", { nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC }, MENUACTION_CHANGEMENU, "FET_CTL", { nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC },
#endif
MENUACTION_LOADRADIO, "FET_AUD", { nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS }, MENUACTION_LOADRADIO, "FET_AUD", { nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS },
MENUACTION_CHANGEMENU, "FET_DIS", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS }, MENUACTION_CHANGEMENU, "FET_DIS", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS },
#ifdef GRAPHICS_MENU_OPTIONS #ifdef GRAPHICS_MENU_OPTIONS

1314
src/core/Pad.cpp Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

13
src/core/Pad.h
View File

@@ -23,7 +23,7 @@ public:
int16 DPadUp, DPadDown, DPadLeft, DPadRight; int16 DPadUp, DPadDown, DPadLeft, DPadRight;
int16 Start, Select; int16 Start, Select;
int16 Square, Triangle, Cross, Circle; int16 Square, Triangle, Cross, Circle;
uint32_t A, B, C, X, Y, Z; uint32_t A, B, C, D, X, Y, Z;
int16 LeftShock, RightShock; int16 LeftShock, RightShock;
int16 NetworkTalk; int16 NetworkTalk;
float GetLeftStickX(void) { return LeftStickX/32767.0f; }; float GetLeftStickX(void) { return LeftStickX/32767.0f; };
@@ -161,6 +161,13 @@ public:
int32 LastTimeTouched; int32 LastTimeTouched;
int32 AverageWeapon; int32 AverageWeapon;
int32 AverageEntries; int32 AverageEntries;
bool IsKeyboardMouse;
bool IsDualAnalog;
bool CameraJustDown;
bool CameraJustUp;
uint32 CameraJustUpTime;
uint32 CameraLastPressed;
bool CameraIsDoublePressed;
#ifdef DETECT_PAD_INPUT_SWITCH #ifdef DETECT_PAD_INPUT_SWITCH
static bool IsAffectedByController; static bool IsAffectedByController;
@@ -212,6 +219,10 @@ public:
static CPad *GetPad(int32 pad); static CPad *GetPad(int32 pad);
#ifdef RW_DC
bool CameraSinglePress(void); //Checks if camera modifier was double clicked
bool CameraDoublePress(void);
#endif
int16 GetSteeringLeftRight(void); int16 GetSteeringLeftRight(void);
int16 GetSteeringUpDown(void); int16 GetSteeringUpDown(void);
int16 GetCarGunUpDown(void); int16 GetCarGunUpDown(void);