1 files changed, 29 insertions, 29 deletions

diff --git a/engines/wintermute/Ad/AdScene.h b/engines/wintermute/Ad/AdScene.h
index d47d727884..72c69e668a 100644
--- a/engines/wintermute/Ad/AdScene.h
+++ b/engines/wintermute/Ad/AdScene.h
@@ -49,17 +49,17 @@ public:
 

 	CBObject *getNextAccessObject(CBObject *CurrObject);

 	CBObject *getPrevAccessObject(CBObject *CurrObject);

-	ERRORCODE getSceneObjects(CBArray<CAdObject *, CAdObject *> &Objects, bool InteractiveOnly);

-	ERRORCODE getRegionObjects(CAdRegion *Region, CBArray<CAdObject *, CAdObject *> &Objects, bool InteractiveOnly);

+	bool getSceneObjects(CBArray<CAdObject *, CAdObject *> &Objects, bool InteractiveOnly);

+	bool getRegionObjects(CAdRegion *Region, CBArray<CAdObject *, CAdObject *> &Objects, bool InteractiveOnly);

 

-	ERRORCODE afterLoad();

+	bool afterLoad();

 

-	ERRORCODE getRegionsAt(int X, int Y, CAdRegion **RegionList, int NumRegions);

-	ERRORCODE handleItemAssociations(const char *ItemName, bool Show);

+	bool getRegionsAt(int X, int Y, CAdRegion **RegionList, int NumRegions);

+	bool handleItemAssociations(const char *ItemName, bool Show);

 	CUIWindow *_shieldWindow;

 	float getRotationAt(int X, int Y);

-	ERRORCODE loadState();

-	ERRORCODE saveState();

+	bool loadState();

+	bool saveState();

 	bool _persistentState;

 	bool _persistentStateSprites;

 	CBObject *getNodeByName(const char *name);

@@ -67,27 +67,27 @@ public:
 	bool pointInViewport(int X, int Y);

 	int getOffsetTop();

 	int getOffsetLeft();

-	ERRORCODE getViewportSize(int *Width = NULL, int *Height = NULL);

-	ERRORCODE getViewportOffset(int *OffsetX = NULL, int *OffsetY = NULL);

+	bool getViewportSize(int *Width = NULL, int *Height = NULL);

+	bool getViewportOffset(int *OffsetX = NULL, int *OffsetY = NULL);

 	CBViewport *_viewport;

 	CBFader *_fader;

 	int _pfPointsNum;

 	void pfPointsAdd(int X, int Y, int Distance);

 	void pfPointsStart();

 	bool _initialized;

-	ERRORCODE correctTargetPoint(int StartX, int StartY, int *X, int *Y, bool CheckFreeObjects = false, CBObject *Requester = NULL);

-	ERRORCODE correctTargetPoint2(int StartX, int StartY, int *TargetX, int *TargetY, bool CheckFreeObjects, CBObject *Requester);

+	bool correctTargetPoint(int StartX, int StartY, int *X, int *Y, bool CheckFreeObjects = false, CBObject *Requester = NULL);

+	bool correctTargetPoint2(int StartX, int StartY, int *TargetX, int *TargetY, bool CheckFreeObjects, CBObject *Requester);

 	DECLARE_PERSISTENT(CAdScene, CBObject)

-	ERRORCODE displayRegionContent(CAdRegion *Region = NULL, bool Display3DOnly = false);

-	ERRORCODE displayRegionContentOld(CAdRegion *Region = NULL);

+	bool displayRegionContent(CAdRegion *Region = NULL, bool Display3DOnly = false);

+	bool displayRegionContentOld(CAdRegion *Region = NULL);

 	static int compareObjs(const void *Obj1, const void *Obj2);

 

-	ERRORCODE updateFreeObjects();

-	ERRORCODE traverseNodes(bool Update = false);

+	bool updateFreeObjects();

+	bool traverseNodes(bool Update = false);

 	float getScaleAt(int Y);

-	ERRORCODE sortScaleLevels();

-	ERRORCODE sortRotLevels();

-	virtual ERRORCODE saveAsText(CBDynBuffer *buffer, int indent);

+	bool sortScaleLevels();

+	bool sortRotLevels();

+	virtual bool saveAsText(CBDynBuffer *buffer, int indent);

 	uint32 getAlphaAt(int X, int Y, bool ColorCheck = false);

 	bool _paralaxScrolling;

 	void skipTo(int OffsetX, int OffsetY);

@@ -96,7 +96,7 @@ public:
 	void skipToObject(CBObject *Object);

 	void scrollToObject(CBObject *Object);

 	void scrollTo(int OffsetX, int OffsetY);

-	virtual ERRORCODE update();

+	virtual bool update();

 	bool _autoScroll;

 	int _targetOffsetTop;

 	int _targetOffsetLeft;

@@ -109,9 +109,9 @@ public:
 	uint32 _scrollTimeH;

 	uint32 _lastTimeH;

 

-	virtual ERRORCODE display();

+	virtual bool display();

 	uint32 _pfMaxTime;

-	ERRORCODE initLoop();

+	bool initLoop();

 	void pathFinderStep();

 	bool isBlockedAt(int X, int Y, bool CheckFreeObjects = false, CBObject *Requester = NULL);

 	bool isWalkableAt(int X, int Y, bool CheckFreeObjects = false, CBObject *Requester = NULL);

@@ -123,12 +123,12 @@ public:
 	CBArray<CAdLayer *, CAdLayer *> _layers;

 	CBArray<CAdObject *, CAdObject *> _objects;

 	CBArray<CAdWaypointGroup *, CAdWaypointGroup *> _waypointGroups;

-	ERRORCODE loadFile(const char *filename);

-	ERRORCODE loadBuffer(byte *buffer, bool complete = true);

+	bool loadFile(const char *filename);

+	bool loadBuffer(byte *buffer, bool complete = true);

 	int _width;

 	int _height;

-	ERRORCODE addObject(CAdObject *Object);

-	ERRORCODE removeObject(CAdObject *Object);

+	bool addObject(CAdObject *Object);

+	bool removeObject(CAdObject *Object);

 	int _editorMarginH;

 	int _editorMarginV;

 	uint32 _editorColFrame;

@@ -152,18 +152,18 @@ public:
 	CBArray<CAdScaleLevel *, CAdScaleLevel *> _scaleLevels;

 	CBArray<CAdRotLevel *, CAdRotLevel *> _rotLevels;

 

-	virtual ERRORCODE restoreDeviceObjects();

+	virtual bool restoreDeviceObjects();

 	int getPointsDist(CBPoint p1, CBPoint p2, CBObject *requester = NULL);

 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

-	virtual ERRORCODE scSetProperty(const char *name, CScValue *value);

-	virtual ERRORCODE scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

+	virtual bool scSetProperty(const char *name, CScValue *value);

+	virtual bool scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

 	virtual const char *scToString();

 

 

 private:

-	ERRORCODE persistState(bool Saving = true);

+	bool persistState(bool Saving = true);

 	void pfAddWaypointGroup(CAdWaypointGroup *Wpt, CBObject *Requester = NULL);

 	bool _pfReady;

 	CBPoint *_pfTarget;