From 7be81f78e80c1f790b99a0094a03f0394c0d32cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Wed, 13 Feb 2013 18:06:31 +0100 Subject: [PATCH] C4GameObjects::ObjectPointer does not need to be virtual --- src/object/C4GameObjects.h | 2 +- src/script/C4ScriptStandalone.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/object/C4GameObjects.h b/src/object/C4GameObjects.h index 951a06265..e78d63290 100644 --- a/src/object/C4GameObjects.h +++ b/src/object/C4GameObjects.h @@ -55,7 +55,7 @@ public: void Synchronize(); // network synchronization void UpdateSolidMasks(); - virtual C4Object *ObjectPointer(int32_t iNumber); // object pointer by number + C4Object *ObjectPointer(int32_t iNumber); // object pointer by number C4Object* SafeObjectPointer(int32_t iNumber); int PostLoad(bool fKeepInactive, C4ValueNumbers *); diff --git a/src/script/C4ScriptStandalone.cpp b/src/script/C4ScriptStandalone.cpp index ae6f054e7..82ee04535 100644 --- a/src/script/C4ScriptStandalone.cpp +++ b/src/script/C4ScriptStandalone.cpp @@ -75,7 +75,6 @@ bool C4GameObjects::Remove(C4Object*) {return 0;} bool C4GameObjects::AssignInfo() {return 0;} bool C4GameObjects::ValidateOwners() {return 0;} C4Value C4GameObjects::GRBroadcast(char const*, C4AulParSet*, bool, bool) {return C4Value();} -C4Object * C4GameObjects::ObjectPointer(int) {return 0;} C4ObjectList::C4ObjectList() {} C4ObjectList::~C4ObjectList() {}