-
Notifications
You must be signed in to change notification settings - Fork 18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
C;C LCC config menu implementation #104
base: master
Are you sure you want to change the base?
Conversation
src/inputsystem.h
Outdated
// Controller settings | ||
|
||
// Advance text on L/R stick, arrow keys, etc. | ||
inline bool AdvanceTextOnDirectionalInput = false; | ||
|
||
// Interact with trigger using left and right input in addition | ||
// to their regular counterparts | ||
inline bool DirectionalInputForTrigger = false; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not entirely happy with the location of these variables. Lmk if you have a better place to put them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it would be better to have all the user configurable options in one place like ConfigSystem or OptionsSystem class?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh yeah that's a great idea! Move 'em all (minus the group volumes) into an Impacto::ConfigSystem
namespace in src/configsystem.h
796c559
to
c0364c0
Compare
src/games/cclcc/delusiontrigger.cpp
Outdated
@@ -91,8 +92,15 @@ void DelusionTrigger::Update(float dt) { | |||
ScrWork[6336] = 0xffff; | |||
} | |||
if (LastDelusionState == DelusionState) { | |||
if (!(PADinputButtonWentDown & PAD1L2)) { | |||
if (PADinputButtonWentDown & PAD1R2) { | |||
int padLeft = PAD1L2; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be better to use the GetControlState function here and add something to delusion triggers for it. Also there's a padcustom element for right trigger + directional key, so we should use that instead
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm reworking the input system a little bit, so maybe hold off on this one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh yeah good idea. The MousohTrigger
codes are 40 and 41, but in GetControlState
40 is already taken up by CT_ResetOptions
for MO8, so maybe abstract some game-dependent stuff away in your reworking?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, rebased and it's now in GetControlState
using the right PadCustom
indices
profiles/common/scriptvars.lua
Outdated
@@ -9,6 +9,8 @@ root.ScriptVars = { | |||
SW_PLAYDATA_ALPHA=1131, | |||
SW_MUSICMODE_ALPHA=1132, | |||
SW_TOTALPLAYTIME=2001, | |||
SW_CHARACTERIDMAPPING=2068, | |||
SW_CHARACTERID=2100, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2100 should be SW_ANIME0CHANO, 2101 is SW_ANIME1CHANO, 2102 is SW_ANIME2CHANO
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gotcha
src/inputsystem.h
Outdated
// Controller settings | ||
|
||
// Advance text on L/R stick, arrow keys, etc. | ||
inline bool AdvanceTextOnDirectionalInput = false; | ||
|
||
// Interact with trigger using left and right input in addition | ||
// to their regular counterparts | ||
inline bool DirectionalInputForTrigger = false; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it would be better to have all the user configurable options in one place like ConfigSystem or OptionsSystem class?
eb73f43
to
cf456d5
Compare
9b69baa
to
87a51d9
Compare
f500762
to
c7f4584
Compare
c7f4584
to
f9ae4ee
Compare
Connects the backend options variables to the config menu UI for C;C LCC, implementing these options in the backend as necessary.