summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-02-07 03:42:19 +0100
committerTreeki <treeki@gmail.com>2013-02-07 03:42:19 +0100
commit6f4c1441bea125b95cc03e6497ffa0130daa4926 (patch)
tree15d9bc7bf84a8bd0aef43e8801c8993d44bac57c /src
parentb31b8205be154805c3f5caf2fc9444ed21634304 (diff)
downloadkamek-6f4c1441bea125b95cc03e6497ffa0130daa4926.tar.gz
kamek-6f4c1441bea125b95cc03e6497ffa0130daa4926.zip
cutsceney things
Diffstat (limited to '')
-rw-r--r--src/cutScene.cpp8
-rw-r--r--src/cutScene.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/cutScene.cpp b/src/cutScene.cpp
index cac1f10..c872dd7 100644
--- a/src/cutScene.cpp
+++ b/src/cutScene.cpp
@@ -96,6 +96,7 @@ int dScCutScene_c::onExecute() {
int nsmbwMovieType = settings & 3;
switch (nsmbwMovieType) {
case 0:
+ SaveGame(0, false);
DoSceneChange(WORLD_MAP, 0x80000000, 0);
break;
case 1:
@@ -116,6 +117,12 @@ int dScCutScene_c::onExecute() {
return true;
}
+ frameOffset++;
+
+ if (nowPressed & WPAD_ONE) {
+ OSReport("Currently: Scene %d; Frame %d\n", currentScene, frameOffset);
+ }
+
layout->execAnimations();
layout->update();
}
@@ -168,6 +175,7 @@ int dScCutScene_c::onExecute() {
OSReport("Loaded scene %d\n", currentScene);
nextScene = -1;
+ frameOffset = 0;
}
}
diff --git a/src/cutScene.h b/src/cutScene.h
index c377347..07c665e 100644
--- a/src/cutScene.h
+++ b/src/cutScene.h
@@ -22,6 +22,7 @@ class dScCutScene_c : public dScene_c {
int currentScene;
int nextScene;
+ int frameOffset;
dMovieData_s *data;