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

Merging yellow doors will now combine them to remove duplicate connec… #256

Merged
merged 1 commit into from
Nov 1, 2020

Conversation

EvidentlyCube
Copy link
Collaborator

…tions and resolve conflicts by converting them to toggle

Relevant thread

Copy link
Member

@mrimer mrimer left a comment

Choose a reason for hiding this comment

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

Excellent work, as always!

Made a couple minor suggestions. After these, I think it's ready to merge.


#include "OrbUtil.h"

void GetOrbConnections(CDbRoom& room, CCoordSet doorCoords, vector<COrbData*>& outOrbData) {
Copy link
Member

Choose a reason for hiding this comment

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

Performance optimization: Make doorCoords a const reference, i.e., const CCoordSet& doorCoords. This avoids making a copy in calling the function, rather referencing the source object.

Same in next function.

Copy link
Member

Choose a reason for hiding this comment

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

Still should make it a reference.
I.e., add '&' to avoid making a copy

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sorry, I thought I did but I must've missed it

DRODLib/OrbUtil.cpp Outdated Show resolved Hide resolved
@EvidentlyCube
Copy link
Collaborator Author

Try now!

…tions and resolve conflicts by converting them to toggle
@EvidentlyCube
Copy link
Collaborator Author

Let's try again.

@mrimer mrimer merged commit 07daafe into CaravelGames:master Nov 1, 2020
mrimer added a commit to mrimer/drod that referenced this pull request Nov 10, 2020
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