aboutsummaryrefslogtreecommitdiff
path: root/saga/scene.h
diff options
context:
space:
mode:
authorEugene Sandulenko2004-12-15 00:24:12 +0000
committerEugene Sandulenko2004-12-15 00:24:12 +0000
commit502b279d243d79f46bb8a151ae610949d30bf757 (patch)
tree7f17defd563f74aa4944c7f8c6da0bc9ffc81c1a /saga/scene.h
parent58eabb6a5fdafed605fcb0cd8f56dbcea8723d46 (diff)
downloadscummvm-rg350-502b279d243d79f46bb8a151ae610949d30bf757.tar.gz
scummvm-rg350-502b279d243d79f46bb8a151ae610949d30bf757.tar.bz2
scummvm-rg350-502b279d243d79f46bb8a151ae610949d30bf757.zip
Patch #1081904 ITE: MAC demo support
o Endianness-aware resource loading o Removed ys_dl_list in favor of our object implementation o Cleanup in actor code o Partial support for ITE Mac rereleased demo svn-id: r16051
Diffstat (limited to 'saga/scene.h')
-rw-r--r--saga/scene.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/saga/scene.h b/saga/scene.h
index b4124573a4..3f821e460f 100644
--- a/saga/scene.h
+++ b/saga/scene.h
@@ -27,6 +27,7 @@
#define SAGA_SCENE_H
#include "saga/text.h"
+#include "saga/list.h"
namespace Saga {
@@ -136,9 +137,11 @@ struct SCENE_IMAGE {
struct SCENE_ANIMINFO {
int anim_res_number;
int anim_handle;
- SCENE_ANIMINFO *next;
+ //SCENE_ANIMINFO *next;
};
+typedef SortedList<SCENE_ANIMINFO> SceneAnimInfoList;
+
enum SCENE_FADE_TYPES {
SCENE_NOFADE = 0,
SCENE_FADE = 1,
@@ -154,6 +157,8 @@ struct SCENE_QUEUE {
int fadeType;
};
+typedef Common::List<SCENE_QUEUE> SceneQueueList;
+
///// IHNM-specific stuff
#define IHNM_PALFADE_TIME 1000
#define IHNM_INTRO_FRAMETIME 80
@@ -258,7 +263,7 @@ class Scene {
int *_sceneLUT;
int _sceneCount;
int _sceneMax;
- YS_DL_LIST *_sceneQueue;
+ SceneQueueList _sceneQueue;
int _firstScene;
bool _sceneLoaded;
int _sceneMode;
@@ -270,7 +275,7 @@ class Scene {
int _resListEntries;
SCENE_RESLIST *_resList;
int _animEntries;
- YS_DL_LIST *_animList;
+ SceneAnimInfoList _animList;
SCENE_PROC *_sceneProc;
TEXTLIST *_textList;
SCENE_IMAGE _bg;