Decouple Golems from Players and use SpawnMonster for Golem #7665
+154
−188
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
| @@ -2389,10 +2334,16 @@ size_t OnSpawnMonster(const TCmd *pCmd, const Player &player) | |||
|
|
|||
| size_t typeIndex = static_cast<size_t>(SDL_SwapLE16(message.typeIndex)); | |||
| size_t monsterId = static_cast<size_t>(SDL_SwapLE16(message.monsterId)); | |||
| uint8_t golemOwnerPlayerId = message.golemOwnerPlayerId; | |||
| int16_t golemSpellLevel = SDL_SwapLE16(message.golemSpellLevel); | |||
There was a problem hiding this comment.
Maybe we should not trust whatever spell level the remote player sends us. #7485
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.
Contributes to #543 and supports #7663
In master and vanilla golems are tied to a specific monster id. This monster id corresponds 1:1 to the player id. This is how the relation player<->golem relationship is maintained and that's also why the game reserves the first 4 monster slots for golems (max player count in multiplayer).
This PR changes that by
goalVar3to maintain the golem<->player relationship (should be 0 in singleplayer saves)SpawnMonsterlogic to spawn golems (similar to how monsters are spawned dynamically, see Support dynamically spawned monsters in multiplayer #6890)Additional notes
KillGolemcall inAddGolemfor existing golems (allows better mods).uint8_t(could be changed later).ReservedMonsterSlotsForGolemsto a lower number (I tested with 2 players and set it to 0 and 1).