From b14d7c87531ae8d19120033d67f1c1917143fb37 Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Mon, 25 Feb 2013 22:00:45 +0100
Subject: don't start map music until path unlocking, etc is done
---
src/koopatlas/core.cpp | 2 --
src/koopatlas/pathmanager.cpp | 15 +++------------
2 files changed, 3 insertions(+), 14 deletions(-)
(limited to 'src/koopatlas')
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index 32576d2..1772724 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -179,8 +179,6 @@ bool WMInit_LoadResources2(void *ptr) {
}
if (wm->mapData.load(wm->mapPath)) {
- if (!wm->isFirstPlay)
- wm->startMusic();
return true;
} else
return false;
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index 0f0ff6a..0855bd4 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -109,12 +109,12 @@ void dWMPathManager_c::setup() {
mustComplainToMapCreator = true;
}
- waitAtStart = -1;
+ waitAtStart = 1;
} else {
if (!countdownToFadeIn)
waitAtStart = 50;
else
- waitAtStart = -1;
+ waitAtStart = 1;
if (wm->isFirstPlay)
waitAtStart = 280;
@@ -470,8 +470,7 @@ void dWMPathManager_c::execute() {
PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_VOC_MA_CS_COURSE_MISS, 1);
}
- if (dScKoopatlas_c::instance->isFirstPlay)
- dScKoopatlas_c::instance->startMusic();
+ dScKoopatlas_c::instance->startMusic();
}
return;
}
@@ -525,29 +524,21 @@ void dWMPathManager_c::startMovementTo(dKPPath_s *path) {
calledEnteredNode = false;
- SpammyReport("a\n");
isMoving = true;
reverseThroughPath = (path->end == currentNode);
- SpammyReport("b\n");
currentPath = path;
- SpammyReport("c\n");
// calculate direction of the path
short deltaX = path->end->x - path->start->x;
short deltaY = path->end->y - path->start->y;
- SpammyReport("d\n");
u16 direction = (u16)(atan2(deltaX, deltaY) / ((M_PI * 2) / 65536.0));
- SpammyReport("e\n");
if (reverseThroughPath) {
- SpammyReport("e2\n");
direction += 0x8000;
}
- SpammyReport("f\n");
daWMPlayer_c *player = daWMPlayer_c::instance;
- SpammyReport("g %p\n", player);
// Consider adding these as options
--
cgit v1.2.3