From 5ac67c27f71a7b53fbce92ffdab3adb62b6baf0c Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Mon, 27 Apr 2009 18:36:10 -0500
Subject:     [7715] Provided way for scripts set alternative gameobject state
 for client show. Author: VladimirMangos

    Also use enum for gsmeobject states.

--HG--
branch : trunk
---
 src/game/World.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/game/World.cpp')

diff --git a/src/game/World.cpp b/src/game/World.cpp
index 6e8e6d8b512..71635e83559 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -2225,18 +2225,18 @@ void World::ScriptsProcess()
                 CellLock<GridReadGuard> cell_lock(cell, p);
                 cell_lock->Visit(cell_lock, object_checker, *MapManager::Instance().GetMap(caster->GetMapId(), (Unit*)source));
 
-                if ( !door )
+                if (!door)
                 {
                     sLog.outError("SCRIPT_COMMAND_OPEN_DOOR failed for gameobject(guid: %u).", step.script->datalong);
                     break;
                 }
-                if ( door->GetGoType() != GAMEOBJECT_TYPE_DOOR )
+                if (door->GetGoType() != GAMEOBJECT_TYPE_DOOR)
                 {
                     sLog.outError("SCRIPT_COMMAND_OPEN_DOOR failed for non-door(GoType: %u).", door->GetGoType());
                     break;
                 }
 
-                if( !door->GetGoState() )
+                if (door->GetGoState() != GO_STATE_READY)
                     break;                                  //door already  open
 
                 door->UseDoorOrButton(time_to_close);
@@ -2292,7 +2292,7 @@ void World::ScriptsProcess()
                     break;
                 }
 
-                if( door->GetGoState() )
+                if( door->GetGoState() == GO_STATE_READY )
                     break;                                  //door already closed
 
                 door->UseDoorOrButton(time_to_open);
-- 
cgit v1.2.3