WINTERMUTE: AStyle-formatting.

7 files changed, 48 insertions, 41 deletions

diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index fc28293ac8..fe1948d3a8 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -790,7 +790,7 @@ void AdActor::getNextStep() {
 		maxStepX--;

 	}

 

-	if (((AdGame *)_gameRef)->_scene->isBlockedAt((int)_pFX,(int) _pFY, true, this)) {

+	if (((AdGame *)_gameRef)->_scene->isBlockedAt((int)_pFX, (int) _pFY, true, this)) {

 		if (_pFCount == 0) {

 			_state = _nextState;

 			_nextState = STATE_READY;

diff --git a/engines/wintermute/ad/ad_game.h b/engines/wintermute/ad/ad_game.h
index 5136ed09d3..49c48de0bb 100644
--- a/engines/wintermute/ad/ad_game.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -151,10 +151,10 @@ private:
 	BaseArray<AdItem *, AdItem *> _items;

 

 	BaseArray<AdSentence *, AdSentence *> _sentences;

-	

+

 	BaseArray<AdSceneState *, AdSceneState *> _sceneStates;

 	BaseArray<char *, char *> _dlgPendingBranches;

-	

+

 	BaseArray<AdResponseContext *, AdResponseContext *> _responsesBranch;

 	BaseArray<AdResponseContext *, AdResponseContext *> _responsesGame;

 

diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index e9a1bb4353..cae974e152 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -375,7 +375,7 @@ bool AdItem::update() {
 		}

 	}

 	default:

-	break;

+		break;

 	}

 	_ready = (_state == STATE_READY);

 

diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp
index 6212274d03..444373ea75 100644
--- a/engines/wintermute/ad/ad_node_state.cpp
+++ b/engines/wintermute/ad/ad_node_state.cpp
@@ -44,7 +44,8 @@ IMPLEMENT_PERSISTENT(AdNodeState, false)
 AdNodeState::AdNodeState(BaseGame *inGame): BaseClass(inGame) {

 	_name = NULL;

 	_active = false;

-	for (int i = 0; i < 7; i++) _caption[i] = NULL;

+	for (int i = 0; i < 7; i++)

+		_caption[i] = NULL;

 	_alphaColor = 0;

 	_filename = NULL;

 	_cursor = NULL;

@@ -99,7 +100,8 @@ bool AdNodeState::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_filename));

 	persistMgr->transfer(TMEMBER(_cursor));

 	persistMgr->transfer(TMEMBER(_alphaColor));

-	for (int i = 0; i < 7; i++) persistMgr->transfer(TMEMBER(_caption[i]));

+	for (int i = 0; i < 7; i++)

+		persistMgr->transfer(TMEMBER(_caption[i]));

 

 	return STATUS_OK;

 }

@@ -107,23 +109,27 @@ bool AdNodeState::persist(BasePersistenceManager *persistMgr) {
 

 //////////////////////////////////////////////////////////////////////////

 void AdNodeState::setCaption(const char *caption, int caseVal) {

-	if (caseVal== 0) caseVal= 1;

-	if (caseVal< 1 || caseVal> 7) return;

-

-	delete[] _caption[caseVal- 1];

-	_caption[caseVal- 1] = new char[strlen(caption) + 1];

-	if (_caption[caseVal- 1]) {

-		strcpy(_caption[caseVal- 1], caption);

-		_gameRef->_stringTable->expand(&_caption[caseVal- 1]);

+	if (caseVal == 0)

+		caseVal = 1;

+	if (caseVal < 1 || caseVal > 7)

+		return;

+

+	delete[] _caption[caseVal - 1];

+	_caption[caseVal - 1] = new char[strlen(caption) + 1];

+	if (_caption[caseVal - 1]) {

+		strcpy(_caption[caseVal - 1], caption);

+		_gameRef->_stringTable->expand(&_caption[caseVal - 1]);

 	}

 }

 

 

 //////////////////////////////////////////////////////////////////////////

 char *AdNodeState::getCaption(int caseVal) {

-	if (caseVal== 0) caseVal= 1;

-	if (caseVal< 1 || caseVal> 7 || _caption[caseVal- 1] == NULL) return "";

-	else return _caption[caseVal- 1];

+	if (caseVal == 0) caseVal = 1;

+	if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == NULL)

+		return "";

+	else

+		return _caption[caseVal - 1];

 }

 

 

@@ -132,7 +138,8 @@ bool AdNodeState::transferEntity(AdEntity *entity, bool includingSprites, bool s
 	if (!entity) return STATUS_FAILED;

 

 	// HACK!

-	if (this->_gameRef != entity->_gameRef) this->_gameRef = entity->_gameRef;

+	if (this->_gameRef != entity->_gameRef)

+		this->_gameRef = entity->_gameRef;

 

 	if (saving) {

 		for (int i = 0; i < 7; i++) {

diff --git a/engines/wintermute/ad/ad_response_box.h b/engines/wintermute/ad/ad_response_box.h
index f77ff3360c..5dc22cbebe 100644
--- a/engines/wintermute/ad/ad_response_box.h
+++ b/engines/wintermute/ad/ad_response_box.h
@@ -52,9 +52,9 @@ public:
 	ScScript *_waitingScript;

 	virtual bool listen(BaseScriptHolder *param1, uint32 param2);

 	typedef enum {

-	    EVENT_PREV, 

-		EVENT_NEXT, 

-		EVENT_RESPONSE

+	    EVENT_PREV,

+	    EVENT_NEXT,

+	    EVENT_RESPONSE

 	} TResponseEvent;

 

 	bool weedResponses();

diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
index 359215ee8f..d47cbb446e 100644
--- a/engines/wintermute/ad/ad_talk_holder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -222,7 +222,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS
 		} else {

 			for (int i = 0; i < _talkSprites.getSize(); i++) {

 				if (scumm_stricmp(_talkSprites[i]->getFilename(), filename) == 0) {

-					if (_currentSprite == _talkSprites[i]) 

+					if (_currentSprite == _talkSprites[i])

 						setCurrent = true;

 					if (_tempSprite2 == _talkSprites[i])

 						setTemp2 = true;

@@ -282,7 +282,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS
 			// set new

 			if (ex)

 				_talkSpritesEx.add(spr);

-			else 

+			else

 				_talkSprites.add(spr);

 			stack->pushBool(true);

 

diff --git a/engines/wintermute/ad/ad_types.h b/engines/wintermute/ad/ad_types.h
index b88d6fe259..18892919c6 100644
--- a/engines/wintermute/ad/ad_types.h
+++ b/engines/wintermute/ad/ad_types.h
@@ -33,19 +33,19 @@ namespace WinterMute {
 

 typedef enum {

     GAME_NORMAL,

-	GAME_WAITING_RESPONSE

+    GAME_WAITING_RESPONSE

 } TGameStateEx;

 

 typedef enum {

     OBJECT_ENTITY,

-	OBJECT_REGION,

-	OBJECT_ACTOR,

-	OBJECT_NONE

+    OBJECT_REGION,

+    OBJECT_ACTOR,

+    OBJECT_NONE

 } TObjectType;

 

 typedef enum {

     ENTITY_NORMAL,

-	ENTITY_SOUND

+    ENTITY_SOUND

 } TEntityType;

 

 typedef enum {

@@ -66,40 +66,40 @@ typedef enum {
 

 typedef enum {

     DIRECT_WALK_NONE,

-	DIRECT_WALK_FW,

-	DIRECT_WALK_BK

+    DIRECT_WALK_FW,

+    DIRECT_WALK_BK

 } TDirectWalkMode;

 

 typedef enum {

     DIRECT_TURN_NONE,

-	DIRECT_TURN_CW,

-	DIRECT_TURN_CCW

+    DIRECT_TURN_CW,

+    DIRECT_TURN_CCW

 } TDirectTurnMode;

 

 typedef enum {

     RESPONSE_TEXT,

-	RESPONSE_ICON

+    RESPONSE_ICON

 } TResponseStyle;

 

 typedef enum {

     RESPONSE_ALWAYS,

-	RESPONSE_ONCE,

-	RESPONSE_ONCE_GAME

+    RESPONSE_ONCE,

+    RESPONSE_ONCE_GAME

 } TResponseType;

 

 

 typedef enum {

     TALK_SKIP_LEFT = 0,

-	TALK_SKIP_RIGHT = 1,

-	TALK_SKIP_BOTH = 2,

-	TALK_SKIP_NONE = 3

+    TALK_SKIP_RIGHT = 1,

+    TALK_SKIP_BOTH = 2,

+    TALK_SKIP_NONE = 3

 } TTalkSkipButton;

 

 typedef enum {

     GEOM_WAYPOINT,

-	GEOM_WALKPLANE,

-	GEOM_BLOCKED,

-	GEOM_GENERIC

+    GEOM_WALKPLANE,

+    GEOM_BLOCKED,

+    GEOM_GENERIC

 } TGeomNodeType;

 

 } // end of namespace WinterMute