summaryrefslogtreecommitdiff
path: root/src/bonusRoom.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-06-30 18:55:36 -0500
committerColin Noga <Tempus@chronometry.ca>2012-06-30 18:55:36 -0500
commit7c68d1c005f29531fc2dfeb64dd20ebd70315e3e (patch)
tree2d1d896063df25cd6d284dce3e69826a060b7612 /src/bonusRoom.cpp
parentcaf65b91a27b583dc439c4e71561b818878d83d3 (diff)
downloadkamek-7c68d1c005f29531fc2dfeb64dd20ebd70315e3e.tar.gz
kamek-7c68d1c005f29531fc2dfeb64dd20ebd70315e3e.zip
Minor summer sun updates
Diffstat (limited to '')
-rw-r--r--src/bonusRoom.cpp29
1 files changed, 19 insertions, 10 deletions
diff --git a/src/bonusRoom.cpp b/src/bonusRoom.cpp
index 1188528..3b7e9fe 100644
--- a/src/bonusRoom.cpp
+++ b/src/bonusRoom.cpp
@@ -12,11 +12,13 @@ extern "C" void *StartBGMMusic();
int Songs[2][4][15][2] = {
+ // First number is the block, Second is the note/sfx, Third is timing: 30 is one quarter note at 120 bpm, 0,0 ends the sequence
+
{ // Song 1 -
- {{3,0},{3,15},{3,45},{1,75},{3,90},{5,120},{0,0}}, // First number is the note, Second is timing: 30 is one quarter note at 120 bpm, 0,0 ends the sequence
- {{1,0},{5,22},{3,45},{6,67},{7,82},{6,97},{6,105},{0,0}},
- {{1,0},{1,7},{1,22},{1,37},{2,45},{3,60},{1,67},{7,82},{6,90},{0,0}},
- {{1,0},{1,7},{1,22},{1,37},{2,45},{3,52},{0,0}}
+ {{3,3,0},{3,3,15},{3,3,45},{1,1,75},{3,3,90},{5,5,120},{0,0,0}},
+ {{1,1,0},{5,5,22},{3,3,45},{6,6,67},{7,7,82},{6,6,97},{6,6,105},{0,0,0}},
+ {{1,1,0},{1,1,7},{1,1,22},{1,1,37},{2,2,45},{3,3,60},{1,1,67},{7,7,82},{6,6,90},{0,0,0}},
+ {{1,1,0},{1,1,7},{1,1,22},{1,1,37},{2,2,45},{3,3,52},{0,0,0}}
},
{ // Song 2 -
@@ -157,7 +159,10 @@ int dSongPrize::onCreate() {
return true;
}
-int dSongPrize::onDelete() { return true; }
+int dSongPrize::onDelete() {
+ OSReport("Song Prize Delete");
+ return true;
+}
int dSongPrize::onExecute() {
acState.execute();
@@ -340,7 +345,9 @@ int dSingAlong::onExecute() {
int dSingAlong::onDraw() { return true; }
int dSingAlong::onDelete() {
+ OSReport("Sing Along Instance Remove");
instance = 0;
+ OSReport("Sing Along Delete");
return 1;
}
@@ -354,7 +361,7 @@ void dSingAlong::RegisterNote(int note) {
OSReport("State was checked");
if (note == Songs[song][chorus][currentNote][0]) {
- PlaySoundAsync(this, Notes[Songs[song][chorus][currentNote][0]-1]);
+ PlaySoundAsync(this, Notes[Songs[song][chorus][currentNote][1]-1]);
OSReport("Note was correct");
currentNote += 1;
}
@@ -433,10 +440,10 @@ void dSingAlong::executeState_Call() {
// OSReport("%d: Waiting for timer %d", timer, *currentNote[1]);
- if (timer == Songs[song][chorus][currentNote][1]) {
+ if (timer == Songs[song][chorus][currentNote][2]) {
OSReport("Playing Note %d", Songs[song][chorus][currentNote][0]);
- PlaySoundAsync(this, Notes[Songs[song][chorus][currentNote][0]-1]);
+ PlaySoundAsync(this, Notes[Songs[song][chorus][currentNote][1]-1]);
currentNote += 1;
OSReport("Next Note %d", Songs[song][chorus][currentNote][0]);
@@ -554,8 +561,8 @@ public:
nw4r::g3d::ResFile resFile;
m3d::mdl_c bodyModel;
- StageActorLight light;
- mHeapAllocator_c allocatorB;
+ // StageActorLight light;
+ // mHeapAllocator_c allocatorB;
int note;
@@ -622,7 +629,9 @@ int dSongBlock::onCreate() {
}
int dSongBlock::onDelete() {
+ OSReport("Song Block Physics Remove");
physics.removeFromList();
+ OSReport("Song Block Delete");
return true;
}