Add goto vob and goto camera marvin commands
#634
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Try
approved these changes
May 24, 2024
|
Hi, @thokkat , and thanks for PR! Code looks good. Approving for now, will merge after finishing my work with sky |
Sure no hurry. Just some pr/issue spam incoming from my side. Want to wrap up stuff lying around :) |
Try
requested changes
May 26, 2024
game/world/worldobjects.cpp
Outdated
| if(i->handle().symbol_index()==instance) | ||
| return i.get(); | ||
| Npc *WorldObjects::findNpcByInstance(size_t instance, uint32_t n) { | ||
| if(n==0) |
There was a problem hiding this comment.
Normally in C++ indexing is normally zero-based.
I'm suggesting to have this function as zero-based, and in that case -1 passed from caller will be casted to UINT_MAX and result into null result.
game/world/world.h
Outdated
| @@ -104,7 +104,8 @@ class World final { | |||
|
|
|||
| auto takeHero() -> std::unique_ptr<Npc>; | |||
| Npc* player() const { return npcPlayer; } | |||
| Npc* findNpcByInstance(size_t instance); | |||
| Npc* findNpcByInstance(size_t instance, uint32_t n = 1); | |||
| Item* findItemByInstance(size_t instance, uint32_t n = 1); | |||
There was a problem hiding this comment.
In project indices are nominated in size_t, not uint
|
Merged, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
goto vobteleports the player to a vob that matches the given name. A index number can be added to teleport to the n_th vob in case there exist multiple, often the case for items. Only npcs and items are tested for now but in vanilla it works for all kind of vobs.goto camerateleports the player to the camera position. I found this came in handy when I wanted to observe a npc without percs being triggered but then move quickly to the scene to look what would happen.