Skip to content

Commit 0cc525b

Browse files
author
fdelapena
authored
Merge pull request #432 from Ghabry/maniac-keyinput
Change keys in SaveEventExecState from bool to int for ManiacPatch
2 parents 82892b0 + 30c1d12 commit 0cc525b

4 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎generator/csv/fields.csv‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -924,19 +924,19 @@ SaveEventExecState,wait_movement,f,Boolean,0x0D,False,0,0,Whether Wait for all m
924924
SaveEventExecState,keyinput_wait,f,Boolean,0x15,False,0,0,
925925
SaveEventExecState,keyinput_variable,f,UInt8,0x16,0,0,0,
926926
SaveEventExecState,keyinput_all_directions,f,Boolean,0x17,False,0,0,
927-
SaveEventExecState,keyinput_decision,f,Boolean,0x18,False,0,0,
928-
SaveEventExecState,keyinput_cancel,f,Boolean,0x19,False,0,0,
929-
SaveEventExecState,keyinput_2kshift_2k3numbers,f,Boolean,0x1A,False,0,0,In RM2k Value this is keyinput_shift
930-
SaveEventExecState,keyinput_2kdown_2k3operators,f,Boolean,0x1B,False,0,0,In Value keyinput_down
931-
SaveEventExecState,keyinput_2kleft_2k3shift,f,Boolean,0x1C,False,0,0,In Value keyinput_left
932-
SaveEventExecState,keyinput_2kright,f,Boolean,0x1D,False,0,0,Only in Value
933-
SaveEventExecState,keyinput_2kup,f,Boolean,0x1E,False,0,0,Only in Value
927+
SaveEventExecState,keyinput_decision,f,Int32,0x18,0,0,0,Maniac: Mouse Left (Bit 1)
928+
SaveEventExecState,keyinput_cancel,f,Int32,0x19,0,0,0,Maniac: Mouse Right (Bit 1)
929+
SaveEventExecState,keyinput_2kshift_2k3numbers,f,Int32,0x1A,0,0,0,In RM2k Value this is keyinput_shift
930+
SaveEventExecState,keyinput_2kdown_2k3operators,f,Int32,0x1B,0,0,0,In Value keyinput_down
931+
SaveEventExecState,keyinput_2kleft_2k3shift,f,Int32,0x1C,0,0,0,In Value keyinput_left; Maniac: Mouse Middle (Bit 1)
932+
SaveEventExecState,keyinput_2kright,f,Int32,0x1D,0,0,0,Only in Value
933+
SaveEventExecState,keyinput_2kup,f,Int32,0x1E,0,0,0,Only in Value
934934
SaveEventExecState,wait_time,f,Int32,0x1F,0,0,0,int
935935
SaveEventExecState,keyinput_time_variable,f,Int32,0x20,0,0,0,
936-
SaveEventExecState,keyinput_2k3down,f,Boolean,0x23,False,0,0,
937-
SaveEventExecState,keyinput_2k3left,f,Boolean,0x24,False,0,0,
938-
SaveEventExecState,keyinput_2k3right,f,Boolean,0x25,False,0,0,
939-
SaveEventExecState,keyinput_2k3up,f,Boolean,0x26,False,0,0,
936+
SaveEventExecState,keyinput_2k3down,f,Int32,0x23,0,0,0,Maniac: Mouse Scroll Down (Bit 1)
937+
SaveEventExecState,keyinput_2k3left,f,Int32,0x24,0,0,0,
938+
SaveEventExecState,keyinput_2k3right,f,Int32,0x25,0,0,0,
939+
SaveEventExecState,keyinput_2k3up,f,Int32,0x26,0,0,0,Maniac: Mouse Scroll Up (Bit 1)
940940
SaveEventExecState,keyinput_timed,f,Boolean,0x29,False,0,0,
941941
SaveEventExecState,wait_key_enter,f,Boolean,0x2a,False,0,0,Used for a wait command WaitForKeyInput rm2k3 feature to wait for decision key press.
942942
SaveMapEventBase,active,f,Boolean,0x01,True,0,0,Flag

‎src/generated/lcf/lsd/chunks.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -692,15 +692,15 @@ namespace LSD_Reader {
692692
keyinput_variable = 0x16,
693693
/** */
694694
keyinput_all_directions = 0x17,
695-
/** */
695+
/** Maniac: Mouse Left (Bit 1) */
696696
keyinput_decision = 0x18,
697-
/** */
697+
/** Maniac: Mouse Right (Bit 1) */
698698
keyinput_cancel = 0x19,
699699
/** In RM2k Value this is keyinput_shift */
700700
keyinput_2kshift_2k3numbers = 0x1A,
701701
/** In Value keyinput_down */
702702
keyinput_2kdown_2k3operators = 0x1B,
703-
/** In Value keyinput_left */
703+
/** In Value keyinput_left; Maniac: Mouse Middle (Bit 1) */
704704
keyinput_2kleft_2k3shift = 0x1C,
705705
/** Only in Value */
706706
keyinput_2kright = 0x1D,
@@ -710,13 +710,13 @@ namespace LSD_Reader {
710710
wait_time = 0x1F,
711711
/** */
712712
keyinput_time_variable = 0x20,
713-
/** */
713+
/** Maniac: Mouse Scroll Down (Bit 1) */
714714
keyinput_2k3down = 0x23,
715715
/** */
716716
keyinput_2k3left = 0x24,
717717
/** */
718718
keyinput_2k3right = 0x25,
719-
/** */
719+
/** Maniac: Mouse Scroll Up (Bit 1) */
720720
keyinput_2k3up = 0x26,
721721
/** */
722722
keyinput_timed = 0x29,

‎src/generated/lcf/rpg/saveeventexecstate.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ namespace rpg {
3434
bool keyinput_wait = false;
3535
uint8_t keyinput_variable = 0;
3636
bool keyinput_all_directions = false;
37-
bool keyinput_decision = false;
38-
bool keyinput_cancel = false;
39-
bool keyinput_2kshift_2k3numbers = false;
40-
bool keyinput_2kdown_2k3operators = false;
41-
bool keyinput_2kleft_2k3shift = false;
42-
bool keyinput_2kright = false;
43-
bool keyinput_2kup = false;
37+
int32_t keyinput_decision = 0;
38+
int32_t keyinput_cancel = 0;
39+
int32_t keyinput_2kshift_2k3numbers = 0;
40+
int32_t keyinput_2kdown_2k3operators = 0;
41+
int32_t keyinput_2kleft_2k3shift = 0;
42+
int32_t keyinput_2kright = 0;
43+
int32_t keyinput_2kup = 0;
4444
int32_t wait_time = 0;
4545
int32_t keyinput_time_variable = 0;
46-
bool keyinput_2k3down = false;
47-
bool keyinput_2k3left = false;
48-
bool keyinput_2k3right = false;
49-
bool keyinput_2k3up = false;
46+
int32_t keyinput_2k3down = 0;
47+
int32_t keyinput_2k3left = 0;
48+
int32_t keyinput_2k3right = 0;
49+
int32_t keyinput_2k3up = 0;
5050
bool keyinput_timed = false;
5151
bool wait_key_enter = false;
5252
};

‎src/generated/lsd_saveeventexecstate.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,49 +69,49 @@ static TypedField<rpg::SaveEventExecState, bool> static_keyinput_all_directions(
6969
0,
7070
0
7171
);
72-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_decision(
72+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_decision(
7373
&rpg::SaveEventExecState::keyinput_decision,
7474
LSD_Reader::ChunkSaveEventExecState::keyinput_decision,
7575
"keyinput_decision",
7676
0,
7777
0
7878
);
79-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_cancel(
79+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_cancel(
8080
&rpg::SaveEventExecState::keyinput_cancel,
8181
LSD_Reader::ChunkSaveEventExecState::keyinput_cancel,
8282
"keyinput_cancel",
8383
0,
8484
0
8585
);
86-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2kshift_2k3numbers(
86+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2kshift_2k3numbers(
8787
&rpg::SaveEventExecState::keyinput_2kshift_2k3numbers,
8888
LSD_Reader::ChunkSaveEventExecState::keyinput_2kshift_2k3numbers,
8989
"keyinput_2kshift_2k3numbers",
9090
0,
9191
0
9292
);
93-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2kdown_2k3operators(
93+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2kdown_2k3operators(
9494
&rpg::SaveEventExecState::keyinput_2kdown_2k3operators,
9595
LSD_Reader::ChunkSaveEventExecState::keyinput_2kdown_2k3operators,
9696
"keyinput_2kdown_2k3operators",
9797
0,
9898
0
9999
);
100-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2kleft_2k3shift(
100+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2kleft_2k3shift(
101101
&rpg::SaveEventExecState::keyinput_2kleft_2k3shift,
102102
LSD_Reader::ChunkSaveEventExecState::keyinput_2kleft_2k3shift,
103103
"keyinput_2kleft_2k3shift",
104104
0,
105105
0
106106
);
107-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2kright(
107+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2kright(
108108
&rpg::SaveEventExecState::keyinput_2kright,
109109
LSD_Reader::ChunkSaveEventExecState::keyinput_2kright,
110110
"keyinput_2kright",
111111
0,
112112
0
113113
);
114-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2kup(
114+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2kup(
115115
&rpg::SaveEventExecState::keyinput_2kup,
116116
LSD_Reader::ChunkSaveEventExecState::keyinput_2kup,
117117
"keyinput_2kup",
@@ -132,28 +132,28 @@ static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_time_variabl
132132
0,
133133
0
134134
);
135-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2k3down(
135+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2k3down(
136136
&rpg::SaveEventExecState::keyinput_2k3down,
137137
LSD_Reader::ChunkSaveEventExecState::keyinput_2k3down,
138138
"keyinput_2k3down",
139139
0,
140140
0
141141
);
142-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2k3left(
142+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2k3left(
143143
&rpg::SaveEventExecState::keyinput_2k3left,
144144
LSD_Reader::ChunkSaveEventExecState::keyinput_2k3left,
145145
"keyinput_2k3left",
146146
0,
147147
0
148148
);
149-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2k3right(
149+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2k3right(
150150
&rpg::SaveEventExecState::keyinput_2k3right,
151151
LSD_Reader::ChunkSaveEventExecState::keyinput_2k3right,
152152
"keyinput_2k3right",
153153
0,
154154
0
155155
);
156-
static TypedField<rpg::SaveEventExecState, bool> static_keyinput_2k3up(
156+
static TypedField<rpg::SaveEventExecState, int32_t> static_keyinput_2k3up(
157157
&rpg::SaveEventExecState::keyinput_2k3up,
158158
LSD_Reader::ChunkSaveEventExecState::keyinput_2k3up,
159159
"keyinput_2k3up",

0 commit comments

Comments
 (0)