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

Moved SSN frame definitions into their own enum and removed unused definitions for the escape and F1-F10 keys

Browse Source 
svn-id: r32391
This commit is contained in:
Filippos Karapetis 2008-05-30 10:21:29 +00:00
parent d261c93049
commit d0b396f062
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/drascula/drascula.cpp
View File

@ -3240,7 +3240,7 @@ void DrasculaEngine::enterName() {
select2[v] = key;
else if (key == Common::KEYCODE_SPACE)
select2[v] = '\167';
else if (key == ESC)
else if (key == Common::KEYCODE_ESCAPE)
break;
else if (key == Common::KEYCODE_RETURN) {
select2[v] = '\0';
@ -3297,8 +3297,9 @@ int DrasculaEngine::playFrameSSN() {
memcpy(&CHUNK, mSession, 1);
mSession += 1;
}
switch (CHUNK) {
case SET_PAL:
case kFrameSetPal:
if (!UsingMem)
_Session->read(dacSSN, 768);
else {
@ -3307,10 +3308,10 @@ int DrasculaEngine::playFrameSSN() {
}
set_dacSSN(dacSSN);
break;
case EMPTY_FRAME:
case kFrameEmptyFrame:
WaitFrameSSN();
break;
case INIT_FRAME:
case kFrameInit:
if (!UsingMem) {
_Session->read(&CMP, 1);
_Session->read(&Lengt, 4);
@ -3320,7 +3321,7 @@ int DrasculaEngine::playFrameSSN() {
memcpy(&Lengt, mSession, 4);
mSession += 4;
}
if (CMP == CMP_RLE) {
if (CMP == kFrameCmpRle) {
if (!UsingMem) {
BufferSSN = (byte *)malloc(Lengt);
_Session->read(BufferSSN, Lengt);
@ -3343,7 +3344,7 @@ int DrasculaEngine::playFrameSSN() {
_system->updateScreen();
FrameSSN++;
} else {
if (CMP == CMP_OFF) {
if (CMP == kFrameCmpOff) {
if (!UsingMem) {
BufferSSN = (byte *)malloc(Lengt);
_Session->read(BufferSSN, Lengt);
@ -3368,7 +3369,7 @@ int DrasculaEngine::playFrameSSN() {
}
}
break;
case END_ANIM:
case kFrameEndAnim:
Exit = 1;
break;
default:

28
engines/drascula/drascula.h
View File

@ -80,6 +80,16 @@ enum Colors {
kColorPink = 11
};
enum SSNFrames {
kFrameInit = 0,
kFrameCmpRle = 1,
kFrameCmpOff = 2,
kFrameEndAnim = 3,
kFrameSetPal = 4,
kFrameMouseKey = 5, // unused
kFrameEmptyFrame = 6
};
#define TEXTD_START 68
struct DrasculaGameDescription;
@ -87,16 +97,6 @@ struct RoomTalkAction;
#define NUM_SAVES 10
#define NUM_FLAGS 50
#define ESC 0x01
#define F1 0x3B
#define F2 0x3C
#define F3 0x3D
#define F4 0x3E
#define F5 0x3F
#define F6 0x40
#define F8 0x42
#define F9 0x43
#define F10 0x44
#define DIF_MASK 55
#define OBJWIDTH 40
#define OBJHEIGHT 25
@ -200,14 +200,6 @@ struct RoomTalkAction;
#define X_N0_OPC 213
#define NO_DOOR 99
#define INIT_FRAME 0
#define CMP_RLE 1
#define CMP_OFF 2
#define END_ANIM 3
#define SET_PAL 4
#define MOUSE_KEY 5
#define EMPTY_FRAME 6
#define COMPLETE_PAL 256
#define HALF_PAL 128