From 90301e24c0fc5fcd6bffb0399e203e5adea6aa2c Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sun, 31 Mar 2013 10:21:22 +0200 Subject: Added field "item" to class "object" in CBot --- src/script/script.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/script/script.cpp') diff --git a/src/script/script.cpp b/src/script/script.cpp index f09b53a..2bfe632 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -33,6 +33,7 @@ #include "object/object.h" #include "object/robotmain.h" #include "object/task/taskmanager.h" +#include "object/objman.h" #include "physics/physics.h" @@ -335,9 +336,7 @@ bool CScript::rGetObject(CBotVar* var, CBotVar* result, int& exception, void* us rank = var->GetValInt(); - CInstanceManager* iMan = CInstanceManager::GetInstancePointer(); - - pObj = static_cast(iMan->SearchInstance(CLASS_OBJECT, rank)); + pObj = static_cast(CObjectManager::GetInstancePointer()->SearchInstance(rank)); if ( pObj == 0 ) { result->SetPointer(0); @@ -371,9 +370,7 @@ bool CScript::rDestroy(CBotVar* var, CBotVar* result, int& exception, void* user rank = var->GetValInt(); - CInstanceManager* iMan = CInstanceManager::GetInstancePointer(); - - pObj = static_cast(iMan->SearchInstance(CLASS_OBJECT, rank)); + pObj = static_cast(CObjectManager::GetInstancePointer()->SearchInstance(rank)); if ( pObj == 0 ) { return true; -- cgit v1.2.3-1-g7c22