diff options
author | megamage <none@none.none> | 2011-10-07 17:56:47 -0700 |
---|---|---|
committer | megamage <none@none.none> | 2011-10-07 17:56:47 -0700 |
commit | 679802ecf40ed3f970aff74f26d8bec5b288d81a (patch) | |
tree | 28ccad306faf876cf8b6f1bfdae6b0a9f2c8733e /src/server/game/Instances/InstanceScript.cpp | |
parent | 1e44044a8f21c36847bdc544dcf89f83b02b941a (diff) | |
parent | 5b4c7783c2a28e420cb4aaf4f2967083db8f6787 (diff) |
Merge pull request #3400 from Bootz/master
REPO: Code-Style fixes... (Part duece)
Diffstat (limited to 'src/server/game/Instances/InstanceScript.cpp')
-rwxr-xr-x | src/server/game/Instances/InstanceScript.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index b2c504dfb9f..b9b9ed281fa 100755 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -253,35 +253,35 @@ void InstanceScript::DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime, if (!uiGuid) return; - GameObject* pGo = instance->GetGameObject(uiGuid); + GameObject* go = instance->GetGameObject(uiGuid); - if (pGo) + if (go) { - if (pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR || pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON) + if (go->GetGoType() == GAMEOBJECT_TYPE_DOOR || go->GetGoType() == GAMEOBJECT_TYPE_BUTTON) { - if (pGo->getLootState() == GO_READY) - pGo->UseDoorOrButton(uiWithRestoreTime, bUseAlternativeState); - else if (pGo->getLootState() == GO_ACTIVATED) - pGo->ResetDoorOrButton(); + if (go->getLootState() == GO_READY) + go->UseDoorOrButton(uiWithRestoreTime, bUseAlternativeState); + else if (go->getLootState() == GO_ACTIVATED) + go->ResetDoorOrButton(); } else - sLog->outError("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.", pGo->GetEntry(), pGo->GetGoType()); + sLog->outError("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.", go->GetEntry(), go->GetGoType()); } } void InstanceScript::DoRespawnGameObject(uint64 uiGuid, uint32 uiTimeToDespawn) { - if (GameObject* pGo = instance->GetGameObject(uiGuid)) + if (GameObject* go = instance->GetGameObject(uiGuid)) { //not expect any of these should ever be handled - if (pGo->GetGoType() == GAMEOBJECT_TYPE_FISHINGNODE || pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR || - pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON || pGo->GetGoType() == GAMEOBJECT_TYPE_TRAP) + if (go->GetGoType() == GAMEOBJECT_TYPE_FISHINGNODE || go->GetGoType() == GAMEOBJECT_TYPE_DOOR || + go->GetGoType() == GAMEOBJECT_TYPE_BUTTON || go->GetGoType() == GAMEOBJECT_TYPE_TRAP) return; - if (pGo->isSpawned()) + if (go->isSpawned()) return; - pGo->SetRespawnTime(uiTimeToDespawn); + go->SetRespawnTime(uiTimeToDespawn); } } |