aboutsummaryrefslogtreecommitdiff
path: root/kyra/kyra.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2005-07-30 21:11:48 +0000
committerEugene Sandulenko2005-07-30 21:11:48 +0000
commit6b4484472b79dc7ea7d1ce545a28fba7d3b7696f (patch)
treec44c4e61f18ddd537f7082cb48869cf33d422fbd /kyra/kyra.cpp
parent86ab70b149e5cd00cf54f2e41896e2c4e16795e4 (diff)
downloadscummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.tar.gz
scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.tar.bz2
scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.zip
Remove trailing whitespaces.
svn-id: r18604
Diffstat (limited to 'kyra/kyra.cpp')
-rw-r--r--kyra/kyra.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp
index e9d1bf8574..b73d102b93 100644
--- a/kyra/kyra.cpp
+++ b/kyra/kyra.cpp
@@ -165,7 +165,7 @@ int KyraEngine::init(GameDetector &detector) {
// loads the Font
_font = _resMgr->loadFont("8FAT.FNT");
-
+
_npcScript = _resMgr->loadScript("_NPC.EMC");
// loads the scripts (only Kyrandia 1)
@@ -174,10 +174,10 @@ int KyraEngine::init(GameDetector &detector) {
} else {
error("game start files not known");
}
-
+
assert(_npcScript);
assert(_currentScript);
-
+
return 0;
}
@@ -209,7 +209,7 @@ int KyraEngine::go() {
warning("init script returned: %d", _currentScript->state());
}
}*/
-
+
Movie* movie = _resMgr->loadMovie("MAL-KAL.WSA");
assert(movie);
CPSImage* image = _resMgr->loadImage("GEMCUT.CPS");
@@ -234,12 +234,12 @@ int KyraEngine::go() {
_midiDriver->playMusic("KYRA2A.XMI");
_midiDriver->playTrack(3);
}
-
+
while (true) {
OSystem::Event event;
//if (_debugger->isAttached())
// _debugger->onFrame();
-
+
memcpy(_screen, _buffer, 320 * 200);
if (lastFrameChange + movie->frameChange() < _system->getMillis()) {
lastFrameChange = _system->getMillis();
@@ -249,7 +249,7 @@ int KyraEngine::go() {
currentFrame = 0;
}
}
-
+
movie->renderFrame(_screen, 320, 200, currentFrame);
_font->drawStringToPlane("This is only a test!", _screen, 320, 200, 75, 179, 136);
_font->drawStringToPlane("Nothing scripted!", _screen, 320, 200, 85, 189, 136);
@@ -265,11 +265,11 @@ int KyraEngine::go() {
}
_system->delayMillis(10);
}
-
+
delete movie;
delete image;
delete [] _buffer;
-
+
return 0;
}