aboutsummaryrefslogtreecommitdiff
path: root/saga
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-11-25 12:54:03 +0000
committerTorbjörn Andersson2004-11-25 12:54:03 +0000
commite79e0dec7498088ca6519d3f0ddb4219c4a58bcd (patch)
treed1e3e5a62592c86ae0299a6ba8a48360bb56bf53 /saga
parent85e362707537ab04eef7aa4a52b876982b77438c (diff)
downloadscummvm-rg350-e79e0dec7498088ca6519d3f0ddb4219c4a58bcd.tar.gz
scummvm-rg350-e79e0dec7498088ca6519d3f0ddb4219c4a58bcd.tar.bz2
scummvm-rg350-e79e0dec7498088ca6519d3f0ddb4219c4a58bcd.zip
Reverted some more of yesterday's changes.
svn-id: r15884
Diffstat (limited to 'saga')
-rw-r--r--saga/ihnm_introproc.cpp2
-rw-r--r--saga/scene.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/saga/ihnm_introproc.cpp b/saga/ihnm_introproc.cpp
index 6f9eea6f68..0ceba8545c 100644
--- a/saga/ihnm_introproc.cpp
+++ b/saga/ihnm_introproc.cpp
@@ -30,10 +30,8 @@
#include "saga/animation.h"
#include "saga/cvar_mod.h"
#include "saga/events.h"
-#include "saga/font.h"
#include "saga/rscfile_mod.h"
#include "saga/sndres.h"
-#include "saga/text.h"
#include "saga/music.h"
#include "saga/scene.h"
diff --git a/saga/scene.h b/saga/scene.h
index 1a5a32a608..f300339b58 100644
--- a/saga/scene.h
+++ b/saga/scene.h
@@ -154,8 +154,6 @@ struct SCENE_QUEUE {
int fadeType;
};
-#define INTRO_STRMAX 512
-
///// IHNM-specific stuff
#define IHNM_PALFADE_TIME 1000
#define IHNM_INTRO_FRAMETIME 80
@@ -164,6 +162,7 @@ struct SCENE_QUEUE {
#define IHNM_TITLE_TIME_FM 19500
///// ITE-specific stuff
+#define INTRO_STRMAX 256
#define ITE_INTRO_FRAMETIME 90
#define INTRO_CAPTION_Y 170