diff options
| author | gvcoman <none@none> | 2008-11-21 19:16:19 -0500 |
|---|---|---|
| committer | gvcoman <none@none> | 2008-11-21 19:16:19 -0500 |
| commit | 9ceb36a5274611e576aa4c5bd4488b9b9bdf18cc (patch) | |
| tree | ece878258f15fb5af52e5829e640734dee9c1df2 /src/game/GridStates.cpp | |
| parent | 1bd37790b564be487ed16ae897484a4d8c80a2de (diff) | |
| parent | b2ba78e57a7c1895d1bacf950a3705eedd01c256 (diff) | |
Merge with 273 (aab191f73e46).
--HG--
branch : trunk
Diffstat (limited to 'src/game/GridStates.cpp')
| -rw-r--r-- | src/game/GridStates.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/GridStates.cpp b/src/game/GridStates.cpp index 1f2df5e7c59..5cf5c8b8c11 100644 --- a/src/game/GridStates.cpp +++ b/src/game/GridStates.cpp @@ -10,12 +10,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "GridStates.h" @@ -36,7 +36,7 @@ ActiveState::Update(Map &m, NGridType &grid, GridInfo & info, const uint32 &x, c info.UpdateTimeTracker(t_diff); if( info.getTimeTracker().Passed() ) { - if( grid.ActiveObjectsInGrid() == 0 && !ObjectAccessor::Instance().ActiveObjectsNearGrid(x, y, m.GetId(), m.GetInstanceId()) ) + if( grid.ActiveObjectsInGrid() == 0 && !m.ActiveObjectsNearGrid(x, y) ) { ObjectGridStoper stoper(grid); stoper.StopN(); @@ -50,7 +50,7 @@ ActiveState::Update(Map &m, NGridType &grid, GridInfo & info, const uint32 &x, c } void -IdleState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, const uint32 &y, const uint32 &) const +IdleState::Update(Map &m, NGridType &grid, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &) const { m.ResetGridExpiry(grid); grid.SetGridState(GRID_STATE_REMOVAL); |