aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Ad
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-06-22 14:10:08 +0200
committerEinar Johan Trøan Sømåen2012-06-22 14:10:08 +0200
commit4e33b8ea75719cbeaf9b62c527fd49e94abd6e3e (patch)
tree80108256f0cd627c6d17913fbce7aa8420fab987 /engines/wintermute/Ad
parentb06f4ac72c2ea3d4b05ece81a60f699b0bf70086 (diff)
downloadscummvm-rg350-4e33b8ea75719cbeaf9b62c527fd49e94abd6e3e.tar.gz
scummvm-rg350-4e33b8ea75719cbeaf9b62c527fd49e94abd6e3e.tar.bz2
scummvm-rg350-4e33b8ea75719cbeaf9b62c527fd49e94abd6e3e.zip
WINTERMUTE: Run astyle on the source-files.
Diffstat (limited to 'engines/wintermute/Ad')
-rw-r--r--engines/wintermute/Ad/AdActor.cpp2
-rw-r--r--engines/wintermute/Ad/AdEntity.cpp12
-rw-r--r--engines/wintermute/Ad/AdEntity.h2
-rw-r--r--engines/wintermute/Ad/AdGame.cpp2
-rw-r--r--engines/wintermute/Ad/AdObject.cpp2
-rw-r--r--engines/wintermute/Ad/AdResponseBox.cpp2
-rw-r--r--engines/wintermute/Ad/AdScene.cpp4
7 files changed, 13 insertions, 13 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 3d4e77565a..68d173102e 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -1255,7 +1255,7 @@ int CAdActor::GetHeight() {
//////////////////////////////////////////////////////////////////////////
CAdSpriteSet *CAdActor::GetAnimByName(const Common::String &animName) {
for (int i = 0; i < _anims.GetSize(); i++) {
- if (animName.compareToIgnoreCase(_anims[i]->_name) == 0)
+ if (animName.compareToIgnoreCase(_anims[i]->_name) == 0)
return _anims[i];
}
return NULL;
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index f54f26d466..62b3156842 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -66,7 +66,7 @@ CAdEntity::CAdEntity(CBGame *inGame): CAdTalkHolder(inGame) {
_walkToX = _walkToY = 0;
_walkToDir = DI_NONE;
-
+
_theora = NULL;
}
@@ -606,7 +606,7 @@ HRESULT CAdEntity::Update() {
Game->GetOffset(&OffsetX, &OffsetY);
_theora->_posX = _posX - OffsetX;
_theora->_posY = _posY - OffsetY;
-
+
_theora->update();
if (_theora->isFinished()) {
_theora->stop();
@@ -642,15 +642,15 @@ HRESULT CAdEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "PlayTheora") == 0) {
Stack->CorrectParams(4);
- const char* Filename = Stack->Pop()->GetString();
+ const char *Filename = Stack->Pop()->GetString();
bool Looping = Stack->Pop()->GetBool(false);
- CScValue* ValAlpha = Stack->Pop();
+ CScValue *ValAlpha = Stack->Pop();
int StartTime = Stack->Pop()->GetInt();
-
+
delete _theora;
_theora = new CVidTheoraPlayer(Game);
if (_theora && SUCCEEDED(_theora->initialize(Filename))) {
- if (!ValAlpha->IsNULL()) _theora->setAlphaImage(ValAlpha->GetString());
+ if (!ValAlpha->IsNULL()) _theora->setAlphaImage(ValAlpha->GetString());
_theora->play(VID_PLAY_POS, 0, 0, false, false, Looping, StartTime, _scale >= 0.0f ? _scale : -1.0f, _sFXVolume);
//if(m_Scale>=0) m_Theora->m_PlayZoom = m_Scale;
Stack->PushBool(true);
diff --git a/engines/wintermute/Ad/AdEntity.h b/engines/wintermute/Ad/AdEntity.h
index e8a55a16aa..6590007021 100644
--- a/engines/wintermute/Ad/AdEntity.h
+++ b/engines/wintermute/Ad/AdEntity.h
@@ -35,7 +35,7 @@ namespace WinterMute {
class CVidTheoraPlayer;
class CAdEntity : public CAdTalkHolder {
public:
- CVidTheoraPlayer* _theora;
+ CVidTheoraPlayer *_theora;
HRESULT SetSprite(const char *Filename);
int _walkToX;
int _walkToY;
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 938ad66b12..c20bf721de 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -1690,7 +1690,7 @@ HRESULT CAdGame::DisplayContent(bool Update, bool DisplayAll) {
// fill black
_renderer->Fill(0, 0, 0);
if (!_editorMode) _renderer->SetScreenViewport();
-
+
// playing exclusive video?
if (_videoPlayer->isPlaying()) {
if (Update) _videoPlayer->update();
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 5cafa399e7..4f93a30a8e 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -834,7 +834,7 @@ void CAdObject::Talk(const char *Text, const char *Sound, uint32 Duration, const
_forcedTalkAnimUsed = false;
}
- delete (_sentence->_sound);
+ delete(_sentence->_sound);
_sentence->_sound = NULL;
_sentence->SetText(Text);
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index afceaf8a31..26590af65f 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -502,7 +502,7 @@ HRESULT CAdResponseBox::Listen(CBScriptHolder *param1, uint32 param2) {
ClearResponses();
} else return CBObject::Listen(param1, param2);
break;
- default:
+ default:
error("AdResponseBox::Listen - Unhandled enum");
}
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index 31d30356bd..cc51ddef22 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -2555,8 +2555,8 @@ float CAdScene::GetRotationAt(int X, int Y) {
CAdRotLevel *next = NULL;
for (int i = 0; i < _rotLevels.GetSize(); i++) {
- /* CAdRotLevel *xxx = _rotLevels[i];
- int j = _rotLevels.GetSize();*/
+ /* CAdRotLevel *xxx = _rotLevels[i];
+ int j = _rotLevels.GetSize();*/
if (_rotLevels[i]->_posX < X) prev = _rotLevels[i];
else {
next = _rotLevels[i];