Skip to content

Compile objects.cpp and items.cpp as C #536

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 9 commits into from
Jan 6, 2019
Merged

Compile objects.cpp and items.cpp as C #536

merged 9 commits into from
Jan 6, 2019

Conversation

AJenbo
Copy link
Member

@AJenbo AJenbo commented Dec 31, 2018 •
edited
Loading

This clean up all functions that made use of __OFSUB__ in objects.cpp & items.cpp, and the adds them to the list of files to compile as C

@AJenbo AJenbo changed the title Objects.cpp Compile objects.cpp and items.cpp as C Dec 31, 2018
@AJenbo AJenbo mentioned this pull request Jan 1, 2019
Merged
mewmew
mewmew approved these changes Jan 6, 2019
View reviewed changes
Copy link
Contributor

@mewmew mewmew left a comment

Choose a reason for hiding this comment

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

Nice! Looks good to me. Obj_Trap is much cleaner with the switch statement!

@mewmew
Copy link
Contributor

mewmew commented Jan 6, 2019

Feel free to merge once the conflict on MakefileVC is resolved.

@AJenbo AJenbo merged commit eb0b404 into diasurgical:nightly Jan 6, 2019
@AJenbo AJenbo deleted the objects.cpp branch January 6, 2019 00:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@mewmew mewmew mewmew approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Binary exact
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AJenbo @mewmew