Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 11:26:18 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixes

Browse source
This commit is contained in:
ManDude 2021-08-14 21:05:38 +01:00
parent af823cdb82
commit ded9d63afa
4 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
game/graphics/gfx.h
View file

@ -43,13 +43,13 @@ struct GfxSettings {
// than older versions
static constexpr u64 CURRENT_VERSION = 0x0000'0000'0002'0001;
u64 version; // the version of this settings struct
u64 version; // the version of this settings struct
const GfxRendererModule* renderer; // which rendering pipeline to use.
int vsync; // (temp) number of screen update per frame
bool debug; // graphics debugging
int vsync; // (temp) number of screen update per frame
bool debug; // graphics debugging
Pad::MappingInfo pad_mapping_info; // button mapping
Pad::MappingInfo pad_mapping_info_backup; // button mapping backup (see newpad.h)
Pad::MappingInfo pad_mapping_info; // button mapping
Pad::MappingInfo pad_mapping_info_backup; // button mapping backup (see newpad.h)
};
namespace Gfx {

4
game/kernel/kmachine.cpp
View file

@ -520,10 +520,10 @@ Ptr<CPadInfo> CPadGetData(u64 cpad_info) {
}
break;
case 78: // pressure mode request check
if (scePadGetReqState(cpad->number, 0) == 1) {
if (scePadGetReqState(cpad->number, 0) == scePadReqStateFailed) {
cpad->state = 76;
}
if (scePadGetReqState(cpad->number, 0) == 0) {
if (scePadGetReqState(cpad->number, 0) == scePadReqStateComplete) {
cpad->state = 99;
}
break;

36
game/sce/libpad.h
View file

@ -10,31 +10,31 @@
#define SCE_PAD_DMA_BUFFER_SIZE 0x100
// pad status
#define scePadStateDiscon 0
#define scePadStateFindPad 1
#define scePadStateDiscon 0
#define scePadStateFindPad 1
#define scePadStateFindCTP1 2
#define scePadStateExecCmd 5
#define scePadStateStable 6
#define scePadStateError 7
#define scePadStateClosed 99
#define scePadStateExecCmd 5
#define scePadStateStable 6
#define scePadStateError 7
#define scePadStateClosed 99
// pad mode info checks
#define InfoModeCurID 1
#define InfoModeCurExID 2
#define InfoModeCurID 1
#define InfoModeCurExID 2
#define InfoModeCurExOffs 3
#define InfoModeIdTable 4
#define InfoModeIdTable 4
// pad async request states
#define scePadReqStateComplete 0
#define scePadReqStateFaild 1 // lol
#define scePadReqStateFailed 1
#define scePadReqStateBusy 2
#define scePadReqStateComplete 0
#define scePadReqStateFaild 1 // lol
#define scePadReqStateFailed 1
#define scePadReqStateBusy 2
// pad actuator info checks
#define InfoActFunc 1
#define InfoActSub 2
#define InfoActSize 3
#define InfoActCurr 4
#define InfoActFunc 1
#define InfoActSub 2
#define InfoActSize 3
#define InfoActCurr 4
namespace ee {
@ -59,4 +59,4 @@ int scePadGetReqState(int port, int slot);
int scePadInfoAct(int port, int slot, int actno, int term);
int scePadInfoPressMode(int port, int slot);
int scePadEnterPressMode(int port, int slot);
}
} // namespace ee

8
game/system/newpad.h
View file

@ -17,7 +17,7 @@
namespace Pad {
static constexpr int CONTROLLER_COUNT = 2; // support 2 controllers.
static constexpr int CONTROLLER_COUNT = 2; // support 2 controllers.
// mirrors goal enum pad-buttons. used as indices to an array!
enum class Button {
@ -50,9 +50,9 @@ enum class Button {
};
struct MappingInfo {
bool debug = true; // debug mode
bool input_mode = false; // input mode for controller mapping
bool buffer_mode = true; // use buffered inputs
bool debug = true; // debug mode
bool input_mode = false; // input mode for controller mapping
bool buffer_mode = true; // use buffered inputs
int pad_mapping[CONTROLLER_COUNT][(int)Pad::Button::Max]; // controller button mapping
// TODO complex button mapping & key macros (e.g. shift+x for l2+r2 press etc.)
};