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

Upstream Chihiro Non-LLE Code #2243

Merged
merged 2 commits into from Jun 21, 2021

Conversation

RadWolfie
Copy link
Member

Hopefully this will be the last pull request to move chihiro relative changes. Then any rebases on wip Chihiro will be easier management to continue the work.

With addition to the changes, I added a check if system/xbe are detected to run as Chihiro type will force failure. Chihiro support is still under major work in progress and being work on a separate branch.

I'm requesting @LukeUsher to verify any changes made here are good to go.

@RadWolfie RadWolfie requested a review from LukeUsher June 20, 2021 16:07
@github-actions github-actions bot added file-system file-system issue HLE High Level Emulation informational useful information, not a bug kernel xbox kernel related user interface GUI related labels Jun 20, 2021
Copy link
Member

@LukeUsher LukeUsher left a comment

Choose a reason for hiding this comment

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

Overall looks good:

Just a heads up that long-term/in the future: g_bIsChihiro will need to be true for any XBE that runs in Chihiro mode, false otherwise, rather than being set purely based on the Xbe type.

Perhaps we should rename it or add another variable for "IsEmulatingChihiro" or something, to allow Xbox mode to still be used for games like Virtua Cop 3.

@LukeUsher LukeUsher merged commit 494ef0b into Cxbx-Reloaded:master Jun 21, 2021
@RadWolfie RadWolfie deleted the cxbxr-chihiro-non-lle branch June 21, 2021 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
file-system file-system issue HLE High Level Emulation informational useful information, not a bug kernel xbox kernel related user interface GUI related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants