CRYOMNI3D: Add a function to collect an Object *

This commit is contained in:
Le Philousophe 2019-03-10 17:27:15 +01:00 committed by Eugene Sandulenko
parent 6e692195c8
commit 0619120f3a
2 changed files with 4 additions and 3 deletions

View File

@ -1326,9 +1326,8 @@ void CryOmni3DEngine_Versailles::animateCursor(const Object *obj) {
g_system->showMouse(cursorWasVisible);
}
void CryOmni3DEngine_Versailles::collectObject(unsigned int nameID, const ZonFixedImage *fimg,
void CryOmni3DEngine_Versailles::collectObject(Object *obj, const ZonFixedImage *fimg,
bool showObject) {
Object *obj = _objects.findObjectByNameID(nameID);
_inventory.add(obj);
Object::ViewCallback cb = obj->viewCallback();
if (showObject && cb) {

View File

@ -306,8 +306,10 @@ private:
bool loadGame(bool visit, unsigned int saveNum);
void animateCursor(const Object *object);
void collectObject(unsigned int nameID, const ZonFixedImage *fimg = nullptr,
void collectObject(Object *object, const ZonFixedImage *fimg = nullptr,
bool showObject = true);
void collectObject(unsigned int nameID, const ZonFixedImage *fimg = nullptr,
bool showObject = true) { collectObject(_objects.findObjectByNameID(nameID), fimg, showObject); }
typedef void (CryOmni3DEngine_Versailles::*DisplayObjectHook)(Graphics::ManagedSurface &surface);
void displayObject(const Common::String &imgName, DisplayObjectHook hook = nullptr);