Skip to content
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

Open
wants to merge 23 commits into
base: master
Choose a base branch
from

Conversation

PringlesGang
Copy link
Contributor

Connects the backend options variables to the config menu UI for C;C LCC, implementing these options in the backend as necessary.

Comment on lines 49 to 57
// 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;

Copy link
Contributor Author

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.

Copy link
Collaborator

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?

Copy link
Contributor Author

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

src/audio/audiosystem.h Outdated Show resolved Hide resolved
@PringlesGang PringlesGang marked this pull request as ready for review January 24, 2025 22:37
@@ -91,8 +92,15 @@ void DelusionTrigger::Update(float dt) {
ScrWork[6336] = 0xffff;
}
if (LastDelusionState == DelusionState) {
if (!(PADinputButtonWentDown & PAD1L2)) {
if (PADinputButtonWentDown & PAD1R2) {
int padLeft = PAD1L2;
Copy link
Collaborator

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

Copy link
Collaborator

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

Copy link
Contributor Author

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?

Copy link
Contributor Author

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

@@ -9,6 +9,8 @@ root.ScriptVars = {
SW_PLAYDATA_ALPHA=1131,
SW_MUSICMODE_ALPHA=1132,
SW_TOTALPLAYTIME=2001,
SW_CHARACTERIDMAPPING=2068,
SW_CHARACTERID=2100,
Copy link
Collaborator

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha

VERSION Outdated Show resolved Hide resolved
src/games/cclcc/optionsmenu.h Outdated Show resolved Hide resolved
Comment on lines 49 to 57
// 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;

Copy link
Collaborator

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?

@PringlesGang PringlesGang force-pushed the cclcc-config branch 7 times, most recently from eb73f43 to cf456d5 Compare January 25, 2025 22:56
@PringlesGang PringlesGang force-pushed the cclcc-config branch 2 times, most recently from f500762 to c7f4584 Compare February 8, 2025 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants