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

More descriptive names for CS_BEGIN_CUTSCENE and CS_END #2311

Merged
merged 7 commits into from
Dec 2, 2024

Conversation

mracsys
Copy link
Contributor

@mracsys mracsys commented Nov 30, 2024

Per discussion with Fig and cadmic, change CS_BEGIN_CUTSCENE and CS_END macros to CS_HEADER and CS_END_SCRIPT, respectively. Previous names could be misinterpreted as controlling cutscene behavior when they are only used internally by the cutscene script parser.

Also changes the check in Cutscene_ProcessScript for CS_CMD_END_OF_SCRIPT to reference the correct name.

include/z64cutscene.h Outdated Show resolved Hide resolved
include/z64cutscene_commands.h Outdated Show resolved Hide resolved
include/z64cutscene_commands.h Outdated Show resolved Hide resolved
Copy link
Collaborator

@fig02 fig02 left a comment

Choose a reason for hiding this comment

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

Conversation about the exact name of CS_END_OF_SCRIPT still seems to be ongoing on discord. This is fine as-is for me though.

include/z64cutscene.h Outdated Show resolved Hide resolved
Co-authored-by: mzxrules <[email protected]>
mracsys and others added 2 commits December 1, 2024 14:21
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c04562d30"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c04562d30"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "cce3d93"
@fig02
Copy link
Collaborator

fig02 commented Dec 1, 2024

Opened a PR to your branch that updates ZAPD using git subrepo: mracsys#1

git subrepo pull --force tools/ZAPD
@fig02 fig02 merged commit bdc7740 into zeldaret:main Dec 2, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants