aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_mr.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-19 01:39:18 +0000
committerJohannes Schickel2009-05-19 01:39:18 +0000
commit783fb058b02a638a40cf5a6d1a50cedf0f26cc14 (patch)
tree79600e45b08a90e4d77a7a40e8c082f91d69695e /engines/kyra/kyra_mr.cpp
parent36ace75983e62f423fb6842647d9190fc0ea69bc (diff)
downloadscummvm-rg350-783fb058b02a638a40cf5a6d1a50cedf0f26cc14.tar.gz
scummvm-rg350-783fb058b02a638a40cf5a6d1a50cedf0f26cc14.tar.bz2
scummvm-rg350-783fb058b02a638a40cf5a6d1a50cedf0f26cc14.zip
Formatting.
svn-id: r40717
Diffstat (limited to 'engines/kyra/kyra_mr.cpp')
-rw-r--r--engines/kyra/kyra_mr.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 5a60f01aa3..c7a4d57e90 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -365,7 +365,6 @@ void KyraEngine_MR::uninitMainMenu() {
}
void KyraEngine_MR::playVQA(const char *name) {
-
VQAMovie vqa(this, _system);
char filename[20];
@@ -412,7 +411,6 @@ void KyraEngine_MR::playMenuAudioFile() {
}
void KyraEngine_MR::snd_playWanderScoreViaMap(int track, int force) {
-
if (_musicSoundChannel != -1 && !_soundDigital->isPlaying(_musicSoundChannel))
force = 1;
else if (_musicSoundChannel == -1)
@@ -435,7 +433,6 @@ void KyraEngine_MR::snd_playWanderScoreViaMap(int track, int force) {
}
void KyraEngine_MR::stopMusicTrack() {
-
if (_musicSoundChannel != -1 && _soundDigital->isPlaying(_musicSoundChannel))
_soundDigital->stopSound(_musicSoundChannel);
@@ -444,7 +441,6 @@ void KyraEngine_MR::stopMusicTrack() {
}
int KyraEngine_MR::musicUpdate(int forceRestart) {
-
static uint32 mTimer = 0;
static uint16 lock = 0;
@@ -529,7 +525,6 @@ void KyraEngine_MR::playStudioSFX(const char *str) {
#pragma mark -
void KyraEngine_MR::preinit() {
-
_itemBuffer1 = new int8[72];
_itemBuffer2 = new int8[144];
initMouseShapes();
@@ -547,7 +542,6 @@ void KyraEngine_MR::initMouseShapes() {
}
void KyraEngine_MR::startup() {
-
_album.wsa = new WSAMovie_v2(this, _screen);
assert(_album.wsa);
_album.leftPage.wsa = new WSAMovie_v2(this, _screen);
@@ -719,7 +713,6 @@ void KyraEngine_MR::loadInterface() {
}
void KyraEngine_MR::initItems() {
-
_screen->loadBitmap("ITEMS.CSH", 3, 3, 0);
for (int i = 248; i <= 319; ++i)
@@ -950,7 +943,6 @@ void KyraEngine_MR::updateCharPal(int unk1) {
}
bool KyraEngine_MR::checkCharCollision(int x, int y) {
-
int scale = getScale(_mainCharacter.x1, _mainCharacter.y1);
int width = (scale * 37) >> 8;
int height = (scale * 76) >> 8;
@@ -968,7 +960,6 @@ bool KyraEngine_MR::checkCharCollision(int x, int y) {
#pragma mark -
void KyraEngine_MR::runLoop() {
-
_eventList.clear();
_runFlag = true;
@@ -1339,7 +1330,6 @@ char *KyraEngine_MR::appendLanguage(char *buf, int lang, int bufSize) {
}
int KyraEngine_MR::loadLanguageFile(const char *file, uint8 *&buffer) {
-
delete[] buffer;
buffer = 0;
@@ -1384,7 +1374,6 @@ void KyraEngine_MR::getTableEntry(Common::SeekableReadStream *stream, int id, ch
#pragma mark -
bool KyraEngine_MR::talkObjectsInCurScene() {
-
for (int i = 0; i < 88; ++i) {
if (_talkObjectList[i].sceneId == _mainCharacter.sceneId)
return true;
@@ -1396,7 +1385,6 @@ bool KyraEngine_MR::talkObjectsInCurScene() {
#pragma mark -
bool KyraEngine_MR::updateScore(int scoreId, int strId) {
-
int scoreIndex = (scoreId >> 3);
int scoreBit = scoreId & 7;
if ((_scoreFlagTable[scoreIndex] & (1 << scoreBit)) != 0)