diff options
| author | NoName <322016+Faq@users.noreply.github.com> | 2020-01-19 18:51:30 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-20 23:13:47 +0100 |
| commit | 5e267dda7179daad3810ccea5a0e0acee8d97557 (patch) | |
| tree | d5131be515b5cc36bb0a9b5d48aba2b2829b9c4a /src/server/game | |
| parent | 868784636bf5ec8e17975dcc0068056eb79545a7 (diff) | |
Core/Gameobject: Rename GO_STATE_ACTIVE_ALTERNATIVE to GO_STATE_DESTROYED (#24062)
* Step 1: Rename GO_STATE_ACTIVE_ALTERNATIVE to GO_STATE_DESTROYED
* Update src/server/shared/SharedDefines.h
Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com>
Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com>
(cherry picked from commit 50d9d9196da90f7696cf83f07115df3d4880c879)
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index fec95d85617..131f1eb1783 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1615,7 +1615,7 @@ void GameObject::SwitchDoorOrButton(bool activate, bool alternative /* = false * RemoveFlag(GO_FLAG_IN_USE); if (GetGoState() == GO_STATE_READY) //if closed -> open - SetGoState(alternative ? GO_STATE_ACTIVE_ALTERNATIVE : GO_STATE_ACTIVE); + SetGoState(alternative ? GO_STATE_DESTROYED : GO_STATE_ACTIVE); else //if open -> close SetGoState(GO_STATE_READY); } diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 008aad2f47a..3da7ec97af4 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -2809,7 +2809,7 @@ enum GOState : uint8 { GO_STATE_ACTIVE = 0, // show in world as used and not reset (closed door open) GO_STATE_READY = 1, // show in world as ready (closed door close) - GO_STATE_ACTIVE_ALTERNATIVE = 2, // show in world as used in alt way and not reset (closed door open by cannon fire) + GO_STATE_DESTROYED = 2, // show the object in-game as already used and not yet reset (e.g. door opened by a cannon blast) GO_STATE_TRANSPORT_ACTIVE = 24, GO_STATE_TRANSPORT_STOPPED = 25 }; |