libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move SCENE_* to class.

Browse Source 
svn-id: r14463
This commit is contained in:
Eugene Sandulenko 2004-08-04 20:28:57 +00:00
parent 11078570dc
commit 51b5acfc9c
14 changed files with 515 additions and 515 deletions

14
saga/events.cpp

@ -31,7 +31,7 @@
#include "saga/animation.h"
#include "saga/console_mod.h"
#include "saga/scene_mod.h"
#include "saga/scene.h"
#include "saga/interface_mod.h"
#include "saga/text.h"
#include "saga/palanim_mod.h"
@ -174,7 +174,7 @@ int HandleContinuous(R_EVENT *event) {
switch (event->op) {
case EVENT_DISSOLVE:
_vm->_render->getBufferInfo(&buf_info);
SCENE_GetBGInfo(&bg_info);
_vm->_scene->getBGInfo(&bg_info);
TRANSITION_Dissolve(buf_info.r_bg_buf, buf_info.r_bg_buf_w, buf_info.r_bg_buf_h,
buf_info.r_bg_buf_w, bg_info.bg_buf, bg_info.bg_p, 0, event_pc);
break;
@ -226,7 +226,7 @@ static int HandleOneShot(R_EVENT *event) {
case EVENT_REMOVE:
{
R_SCENE_INFO scene_info;
SCENE_GetInfo(&scene_info);
_vm->_scene->getInfo(&scene_info);
_vm->textDeleteEntry(scene_info.text_list, (R_TEXTLIST_ENTRY *)event->data);
}
break;
@ -246,12 +246,12 @@ static int HandleOneShot(R_EVENT *event) {
R_BUFFER_INFO rbuf_info;
R_POINT bg_pt;
if (SCENE_GetMode() == R_SCENE_MODE_NORMAL) {
if (_vm->_scene->getMode() == R_SCENE_MODE_NORMAL) {
back_buf = _vm->_gfx->getBackBuffer();
_vm->_render->getBufferInfo(&rbuf_info);
SCENE_GetBGInfo(&bginfo);
_vm->_scene->getBGInfo(&bginfo);
bg_pt.x = bginfo.bg_x;
bg_pt.y = bginfo.bg_y;
@ -260,7 +260,7 @@ static int HandleOneShot(R_EVENT *event) {
bginfo.bg_buf, bginfo.bg_w, bginfo.bg_h, NULL, &bg_pt);
if (event->param == SET_PALETTE) {
PALENTRY *pal_p;
SCENE_GetBGPal(&pal_p);
_vm->_scene->getBGPal(&pal_p);
_vm->_gfx->setPalette(back_buf, pal_p);
}
}
@ -278,7 +278,7 @@ static int HandleOneShot(R_EVENT *event) {
case R_SCENE_EVENT:
switch (event->op) {
case EVENT_END:
SCENE_Next();
_vm->_scene->nextScene();
return R_EVENT_BREAK;
break;
default:

12
saga/ihnm_introproc.cpp

@ -31,7 +31,6 @@
#include "saga/cvar_mod.h"
#include "saga/events_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/scene_mod.h"
#include "saga/palanim_mod.h"
#include "saga/scene.h"
@ -39,6 +38,11 @@
namespace Saga {
int IHNM_IntroMovieProc1(int param, R_SCENE_INFO *scene_info);
int IHNM_IntroMovieProc2(int param, R_SCENE_INFO *scene_info);
int IHNM_IntroMovieProc3(int param, R_SCENE_INFO *scene_info);
int IHNM_HateProc(int param, R_SCENE_INFO *scene_info);
R_SCENE_RESLIST IHNM_IntroMovie1RL[] = {
{30, SAGA_BG_IMAGE, 0, 0} ,
{31, SAGA_ANIM_1, 0, 0}
@ -97,7 +101,7 @@ int IHNM_StartProc() {
n_introscenes = ARRAYSIZE(IHNM_IntroList);
for (i = 0; i < n_introscenes; i++) {
SCENE_Queue(&IHNM_IntroList[i]);
_vm->_scene->queueScene(&IHNM_IntroList[i]);
}
return R_SUCCESS;
@ -159,7 +163,7 @@ int IHNM_IntroMovieProc2(int param, R_SCENE_INFO *scene_info) {
q_event = EVENT_Chain(q_event, &event);
// Fade in from black to the scene background palette
SCENE_GetBGPal(&pal);
_vm->_scene->getBGPal(&pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;
@ -219,7 +223,7 @@ int IHNM_IntroMovieProc3(int param, R_SCENE_INFO *scene_info) {
q_event = EVENT_Chain(q_event, &event);
// Fade in from black to the scene background palette
SCENE_GetBGPal(&pal);
_vm->_scene->getBGPal(&pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;

6
saga/ihnm_introproc.h

@ -23,8 +23,8 @@
// Intro sequence scene procedures header file
#ifndef SAGA_ITE_INTRO_H_
#define SAGA_ITE_INTRO_H_
#ifndef SAGA_IHNM_INTRO_H_
#define SAGA_IHNM_INTRO_H_
namespace Saga {
@ -33,6 +33,8 @@ namespace Saga {
#define R_IHNM_DGLOGO_TIME 8000
#define R_IHNM_TITLE_TIME 16000
int IHNM_StartProc();
} // End of namespace Saga
#endif

4
saga/input.cpp

@ -27,7 +27,7 @@
#include "saga/console_mod.h"
#include "saga/interface_mod.h"
#include "saga/render.h"
#include "saga/scene_mod.h"
#include "saga/scene.h"
#include "saga/script_mod.h"
namespace Saga {
@ -106,7 +106,7 @@ int SYSINPUT_ProcessInput() {
break;
case 27: // Esc
// Skip to next scene skip target
SCENE_Skip();
_vm->_scene->skipScene();
break;
default:
break;

95
saga/ite_introproc.cpp

@ -34,7 +34,6 @@
#include "saga/font.h"
#include "saga/game_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/scene_mod.h"
#include "saga/sndres.h"
#include "saga/text.h"
#include "saga/palanim_mod.h"
@ -45,6 +44,17 @@
namespace Saga {
int ITE_IntroAnimProc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroCave1Proc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroCave2Proc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroCave3Proc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroCave4Proc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroValleyProc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroTreeHouseProc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroFairePathProc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroFaireTentProc(int param, R_SCENE_INFO *scene_info);
int initialScene(int param, R_SCENE_INFO *scene_info);
static R_INTRO_DIALOGUE IntroDiag[] = {
{
CAVE_VOICE_0, "intro1a",
@ -135,7 +145,7 @@ int ITE_StartProc() {
n_introscenes = ARRAYSIZE(ITE_IntroList);
for (i = 0; i < n_introscenes; i++) {
SCENE_Queue(&ITE_IntroList[i]);
_vm->_scene->queueScene(&ITE_IntroList[i]);
}
GAME_GetSceneInfo(&gs_desc);
@ -145,7 +155,7 @@ int ITE_StartProc() {
first_scene.scene_skiptarget = 1;
first_scene.scene_proc = initialScene;
SCENE_Queue(&first_scene);
_vm->_scene->queueScene(&first_scene);
return R_SUCCESS;
}
@ -258,7 +268,7 @@ int ITE_IntroCave1Proc(int param, R_SCENE_INFO *scene_info) {
q_event = EVENT_Chain(q_event, &event);
// Fade in from black to the scene background palette
SCENE_GetBGPal(&pal);
_vm->_scene->getBGPal(&pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;
event.op = EVENT_BLACKTOPAL;
@ -987,4 +997,81 @@ int ITE_IntroFaireTentProc(int param, R_SCENE_INFO *scene_info) {
return 0;
}
int initialScene(int param, R_SCENE_INFO *scene_info) {
R_EVENT event;
R_EVENT *q_event;
int delay_time = 0;
static PALENTRY current_pal[R_PAL_ENTRIES];
PALENTRY *pal;
switch (param) {
case SCENE_BEGIN:
_vm->_music->stop();
_vm->_sound->stopVoice();
// Fade palette to black from intro scene
_vm->_gfx->getCurrentPal(current_pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;
event.op = EVENT_PALTOBLACK;
event.time = 0;
event.duration = PALETTE_FADE_DURATION;
event.data = current_pal;
delay_time += PALETTE_FADE_DURATION;
q_event = EVENT_Queue(&event);
// Activate user interface
event.type = R_ONESHOT_EVENT;
event.code = R_INTERFACE_EVENT;
event.op = EVENT_ACTIVATE;
event.time = 0;
q_event = EVENT_Chain(q_event, &event);
// Set first scene background w/o changing palette
event.type = R_ONESHOT_EVENT;
event.code = R_BG_EVENT;
event.op = EVENT_DISPLAY;
event.param = NO_SET_PALETTE;
event.time = 0;
q_event = EVENT_Chain(q_event, &event);
// Fade in to first scene background palette
_vm->_scene->getBGPal(&pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;
event.op = EVENT_BLACKTOPAL;
event.time = delay_time;
event.duration = PALETTE_FADE_DURATION;
event.data = pal;
q_event = EVENT_Chain(q_event, &event);
event.code = R_PALANIM_EVENT;
event.op = EVENT_CYCLESTART;
event.time = 0;
q_event = EVENT_Chain(q_event, &event);
_vm->_anim->setFlag(0, ANIM_LOOP);
_vm->_anim->play(0, delay_time);
debug(0, "Scene started");
break;
case SCENE_END:
break;
default:
warning("Scene::initialScene(): Illegal scene procedure parameter");
break;
}
return 0;
}
} // End of namespace Saga

2
saga/ite_introproc.h

@ -75,6 +75,8 @@ struct INTRO_CREDIT {
int font_id;
};
int ITE_StartProc();
} // End of namespace Saga
#endif /* SAGA_ITE_INTRO_H_ */

8
saga/render.cpp

@ -31,7 +31,7 @@
#include "saga/font.h"
#include "saga/game_mod.h"
#include "saga/interface_mod.h"
#include "saga/scene_mod.h"
#include "saga/scene.h"
#include "saga/text.h"
#include "saga/actionmap.h"
@ -126,13 +126,13 @@ int Render::drawScene() {
// Get mouse coordinates
mouse_pt = SYSINPUT_GetMousePos();
SCENE_GetBGInfo(&bg_info);
_vm->_scene->getBGInfo(&bg_info);
GAME_GetDisplayInfo(&disp_info);
bg_pt.x = 0;
bg_pt.y = 0;
// Display scene background
SCENE_Draw(backbuf_surface);
_vm->_scene->draw(backbuf_surface);
// Display scene maps, if applicable
if (getFlags() & RF_OBJECTMAP_TEST) {
@ -144,7 +144,7 @@ int Render::drawScene() {
_vm->_actor->drawList();
// Draw queued text strings
SCENE_GetInfo(&scene_info);
_vm->_scene->getInfo(&scene_info);
_vm->textDrawList(scene_info.text_list, backbuf_surface);

11
saga/saga.cpp

@ -48,7 +48,7 @@
#include "saga/isomap.h"
#include "saga/script.h"
#include "saga/script_mod.h"
#include "saga/scene_mod.h"
#include "saga/scene.h"
#include "saga/sdata.h"
#include "saga/sndres.h"
#include "saga/sprite.h"
@ -109,7 +109,6 @@ void SagaEngine::go() {
CON_Register(); // Register console cvars first
GAME_Register();
SCENE_Register();
_soundEnabled = 1;
_musicEnabled = 1;
@ -148,8 +147,9 @@ void SagaEngine::go() {
_sdata = new SData();
INTERFACE_Init(); // requires script module
_actor = new Actor(this);
_scene = new Scene(this);
if (SCENE_Init() != R_SUCCESS) {
if (!_scene->initialized()) {
warning("Couldn't initialize scene module");
return;
}
@ -194,6 +194,7 @@ void SagaEngine::go() {
debug(0, "Sound disabled.");
}
_scene->reg();
_actor->reg();
_script->reg();
_render->reg();
@ -205,7 +206,7 @@ void SagaEngine::go() {
// Begin Main Engine Loop
SCENE_Start();
_scene->startScene();
uint32 currentTicks;
for (;;) {
@ -235,7 +236,7 @@ void SagaEngine::go() {
}
void SagaEngine::shutdown() {
SCENE_Shutdown();
delete _scene;
delete _actor;
delete _script;
delete _sprite;

2
saga/saga.h

@ -54,6 +54,7 @@ class Script;
class Actor;
class Font;
class Sprite;
class Scene;
using Common::MemoryReadStream;
@ -110,6 +111,7 @@ public:
Actor *_actor;
Font *_font;
Sprite *_sprite;
Scene *_scene;
private:
int decodeBGImageRLE(const byte *inbuf, size_t inbuf_len, byte *outbuf, size_t outbuf_len);

636
saga/scene.cpp

File diff suppressed because it is too large Load Diff

147
saga/scene.h

@ -26,8 +26,40 @@
#ifndef SAGA_SCENE_H
#define SAGA_SCENE_H
#include "saga/text.h"
namespace Saga {
enum R_SCENE_MODES {
R_SCENE_MODE_INVALID,
R_SCENE_MODE_NORMAL,
R_SCENE_MODE_ISO
};
struct SCENE_ZINFO {
int begin_slope;
int end_slope;
};
struct SCENE_BGINFO {
int bg_x;
int bg_y;
int bg_w;
int bg_h;
int bg_p;
byte *bg_buf;
size_t bg_buflen;
};
struct R_SCENE_INFO {
SCENE_ZINFO z_info;
SCENE_BGINFO bg_info;
R_TEXTLIST *text_list;
};
typedef int (R_SCENE_PROC) (int, R_SCENE_INFO *);
#define PALETTE_FADE_DURATION 1000
enum SCENE_LOAD_FLAGS {
@ -111,64 +143,67 @@ struct R_SCENE_QUEUE {
int scene_skiptarget;
};
struct R_SCENE_MODULE {
int init;
R_RSCFILE_CONTEXT *scene_ctxt;
int *scene_lut;
int scene_count;
int scene_max;
YS_DL_LIST *scene_queue;
int first_scene;
int scene_loaded;
int scene_mode;
int scene_number;
int scene_rn;
int in_game;
int load_desc;
R_SCENE_DESC desc;
int reslist_loaded;
int reslist_entries;
R_SCENE_RESLIST *reslist;
int anim_entries;
YS_DL_LIST *anim_list;
R_SCENE_PROC *scene_proc;
R_TEXTLIST *text_list;
SCENE_IMAGE bg;
SCENE_IMAGE bg_mask;
class Scene {
public:
Scene(SagaEngine *vm);
~Scene();
int reg();
int startScene();
int nextScene();
int skipScene();
int endScene();
int queueScene(R_SCENE_QUEUE *scene_queue);
int draw(R_SURFACE *);
int getMode();
int getBGMaskInfo(int *w, int *h, byte **buf, size_t *buf_len);
int isBGMaskPresent(void);
int getBGInfo(SCENE_BGINFO *bginfo);
int getZInfo(SCENE_ZINFO *zinfo);
int getBGPal(PALENTRY **pal);
int getInfo(R_SCENE_INFO *si);
int clearSceneQueue(void);
int changeScene(int scene_num);
bool initialized() { return _initialized; }
void sceneInfoCmd(int argc, char *argv[]);
void sceneChangeCmd(int argc, char *argv[]);
private:
int loadScene(int scene, int load_flag, R_SCENE_PROC scene_proc, R_SCENE_DESC *);
int loadSceneDescriptor(uint32 res_number);
int loadSceneResourceList(uint32 res_number);
int processSceneResources();
private:
SagaEngine *_vm;
bool _initialized;
R_RSCFILE_CONTEXT *_sceneContext;
int *_sceneLUT;
int _sceneCount;
int _sceneMax;
YS_DL_LIST *_sceneQueue;
int _firstScene;
bool _sceneLoaded;
int _sceneMode;
int _sceneNumber;
int _sceneResNum;
bool _inGame;
bool _loadDesc;
R_SCENE_DESC _desc;
int _resListEntries;
R_SCENE_RESLIST *_resList;
int _animEntries;
YS_DL_LIST *_animList;
R_SCENE_PROC *_sceneProc;
R_TEXTLIST *_textList;
SCENE_IMAGE _bg;
SCENE_IMAGE _bgMask;
};
int SCENE_Queue(R_SCENE_QUEUE * scene_queue);
int SCENE_ClearQueue(void);
int SCENE_Load(int scene, int load_flag, R_SCENE_PROC scene_proc, R_SCENE_DESC *);
int LoadSceneDescriptor(uint32 res_number);
int LoadSceneResourceList(uint32 res_number);
int ProcessSceneResources();
void CF_scenechange(int argc, char *argv[], void *refCon);
void CF_sceneinfo(int argc, char *argv[], void *refCon);
int IHNM_StartProc();
int initialScene(int param, R_SCENE_INFO *scene_info);
int defaultScene(int param, R_SCENE_INFO *scene_info);
int ITE_StartProc();
int ITE_IntroAnimProc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroCave1Proc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroCave2Proc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroCave3Proc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroCave4Proc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroValleyProc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroTreeHouseProc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroFairePathProc(int param, R_SCENE_INFO *scene_info);
int ITE_IntroFaireTentProc(int param, R_SCENE_INFO *scene_info);
int IHNM_StartProc();
int IHNM_IntroMovieProc1(int param, R_SCENE_INFO *scene_info);
int IHNM_IntroMovieProc2(int param, R_SCENE_INFO *scene_info);
int IHNM_IntroMovieProc3(int param, R_SCENE_INFO *scene_info);
int IHNM_HateProc(int param, R_SCENE_INFO *scene_info);
} // End of namespace Saga
#endif

81
saga/scene_mod.h

@ -1,81 +0,0 @@
/* ScummVM - Scumm Interpreter
* Copyright (C) 2004 The ScummVM project
*
* The ReInherit Engine is (C)2000-2003 by Daniel Balsom.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
*/
// Scene management module public header file
#ifndef SAGA_SCENE_MOD_H__
#define SAGA_SCENE_MOD_H__
#include "saga/text.h"
namespace Saga {
enum R_SCENE_MODES {
R_SCENE_MODE_INVALID,
R_SCENE_MODE_NORMAL,
R_SCENE_MODE_ISO
};
struct SCENE_ZINFO {
int begin_slope;
int end_slope;
};
struct SCENE_BGINFO {
int bg_x;
int bg_y;
int bg_w;
int bg_h;
int bg_p;
byte *bg_buf;
size_t bg_buflen;
};
struct R_SCENE_INFO {
SCENE_ZINFO z_info;
SCENE_BGINFO bg_info;
R_TEXTLIST *text_list;
};
typedef int (R_SCENE_PROC) (int, R_SCENE_INFO *);
int SCENE_Register();
int SCENE_Init();
int SCENE_Shutdown();
int SCENE_Start();
int SCENE_Next();
int SCENE_Skip();
int SCENE_End();
int SCENE_Draw(R_SURFACE *);
int SCENE_GetMode();
int SCENE_GetBGMaskInfo(int *w, int *h, byte **buf, size_t *buf_len);
int SCENE_IsBGMaskPresent(void);
int SCENE_GetBGInfo(SCENE_BGINFO *bginfo);
int SCENE_GetZInfo(SCENE_ZINFO *zinfo);
int SCENE_GetBGPal(PALENTRY **pal);
int SCENE_GetInfo(R_SCENE_INFO *si);
} // End of namespace Saga
#endif

4
saga/sdebug.cpp

@ -27,7 +27,7 @@
#include "saga/gfx.h"
#include "saga/console_mod.h"
#include "saga/text.h"
#include "saga/scene_mod.h"
#include "saga/scene.h"
#include "saga/font.h"
#include "saga/script.h"
@ -48,7 +48,7 @@ int SDEBUG_PrintInstr(R_SCRIPT_THREAD *thread) {
int i;
R_SCENE_INFO si;
SCENE_GetInfo(&si);
_vm->_scene->getInfo(&si);
disp_buf[0] = 0;

8
saga/sprite.cpp

@ -26,7 +26,7 @@
#include "saga/game_mod.h"
#include "saga/gfx.h"
#include "saga/scene_mod.h"
#include "saga/scene.h"
#include "saga/rscfile_mod.h"
#include "saga/text.h"
@ -288,7 +288,7 @@ int Sprite::drawOccluded(R_SURFACE *ds, R_SPRITELIST *sprite_list, int sprite_nu
return R_FAILURE;
}
if (!SCENE_IsBGMaskPresent()) {
if (!_vm->_scene->isBGMaskPresent()) {
return draw(ds, sprite_list, sprite_num, spr_x, spr_y);
}
@ -317,7 +317,7 @@ int Sprite::drawOccluded(R_SURFACE *ds, R_SPRITELIST *sprite_list, int sprite_nu
sprite_data_p = sprite_p + readS.pos();
// Create actor Z occlusion LUT
SCENE_GetZInfo(&zinfo);
_vm->_scene->getZInfo(&zinfo);
e_slope = zinfo.end_slope;
@ -327,7 +327,7 @@ int Sprite::drawOccluded(R_SURFACE *ds, R_SPRITELIST *sprite_list, int sprite_nu
actor_z = spr_y;
SCENE_GetBGMaskInfo(&mask_w, &mask_h, &mask_buf, &mask_buf_len);
_vm->_scene->getBGMaskInfo(&mask_w, &mask_h, &mask_buf, &mask_buf_len);
spr_src_rect.left = 0;
spr_src_rect.top = 0;