libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 14:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CGE: remove jbw.h, some clean up

Browse Source
This commit is contained in:
Strangerke 2011-08-27 18:01:06 +02:00
parent fedd310871
commit bc0e65baac
9 changed files with 38 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/cge/bitmap.cpp
View File

@ -26,7 +26,6 @@
*/ */
#include "cge/bitmap.h" #include "cge/bitmap.h"
#include "cge/jbw.h"
#include "cge/vga13h.h" #include "cge/vga13h.h"
#include "cge/cge_main.h" #include "cge/cge_main.h"
#include "common/system.h" #include "common/system.h"

10
engines/cge/cge_main.cpp
View File

@ -310,9 +310,7 @@ void CGEEngine::syncGame(Common::SeekableReadStream *readStream, Common::WriteSt
_pocref[i] = (pocSpr) ? pocSpr->_ref : -1; _pocref[i] = (pocSpr) ? pocSpr->_ref : -1;
} }
warning("STUB: CGEEngine::syncGame Digital and Midi volume"); // Skip Digital and Midi volumes, useless under ScummVM
// _volume[0] = _sndDrvInfo.Vol2._d;
// _volume[1] = _sndDrvInfo.Vol2._m;
_volume[0] = 0; _volume[0] = 0;
_volume[1] = 0; _volume[1] = 0;
} }
@ -329,9 +327,7 @@ void CGEEngine::syncGame(Common::SeekableReadStream *readStream, Common::WriteSt
} else { } else {
// Loading game // Loading game
if (_soundOk == 1 && _mode == 0) { if (_soundOk == 1 && _mode == 0) {
// _sndDrvInfo.Vol2._d = _volume[0]; // Skip Digital and Midi volumes, useless under ScummVM
// _sndDrvInfo.Vol2._m = _volume[1];
warning("STUB: CGEEngine::syncGame Digital and Midi volume");
sndSetVolume(); sndSetVolume();
} }
@ -652,7 +648,7 @@ void CGEEngine::qGame() {
saveSound(); saveSound();
// Write out the user's progress // Write out the user's progress
saveGame(0, ""); saveGame(0, Common::String("Automatic Savegame"));
_vga->sunset(); _vga->sunset();
_finis = true; _finis = true;

30
engines/cge/events.h
View File

@ -31,7 +31,6 @@
#include "common/events.h" #include "common/events.h"
#include "cge/game.h" #include "cge/game.h"
#include "cge/talk.h" #include "cge/talk.h"
#include "cge/jbw.h"
#include "cge/vga13h.h" #include "cge/vga13h.h"
namespace CGE { namespace CGE {
@ -52,6 +51,35 @@ enum EventMask {
kEventKeyb = 1 << 7 kEventKeyb = 1 << 7
}; };
enum Keys {
NoKey = 0, CtrlA, CtrlB, CtrlC, CtrlD, CtrlE, CtrlF, CtrlG, CtrlH,
CtrlI, CtrlJ, CtrlK, CtrlL, CtrlM, CtrlN, CtrlO, CtrlP,
CtrlQ, CtrlR, CtrlS, CtrlT, CtrlU, CtrlV, CtrlW, CtrlX,
CtrlY, CtrlZ,
BSp = 8, Tab,
Enter = 13,
Eof = 26, Esc,
AltQ = 256 + 16, AltW, AltE, AltR, AltT, AltY, AltU, AltI, AltO, AltP,
AltA = 256 + 30, AltS, AltD, AltF, AltG, AltH, AltJ, AltK, AltL,
AltZ = 256 + 44, AltX, AltC, AltV, AltB, AltN, AltM,
F11 = 256 + 87, F12,
F1 = 256 + 59, F2, F3, F4, F5, F6, F7, F8, F9, F10,
ShiftTab = 256 + 15,
ShiftF1 = 256 + 84, ShiftF2, ShiftF3, ShiftF4, ShiftF5,
ShiftF6, ShiftF7, ShiftF8, ShiftF9, ShiftF10,
CtrlF1 = 256 + 94, CtrlF2, CtrlF3, CtrlF4, CtrlF5,
CtrlF6, CtrlF7, CtrlF8, CtrlF9, CtrlF10,
AltF1 = 256 + 104, AltF2, AltF3, AltF4, AltF5,
AltF6, AltF7, AltF8, AltF9, AltF10,
Home = 256 + 71, Up, PgUp,
Left = 256 + 75, Ctr, Right,
End = 256 + 79, Down, PgDn, Ins, Del,
CtrlLeft = 256 + 115, CtrlRight, CtrlEnd, CtrlPgDn, CtrlHome,
CtrlPgUp = 256 + 132,
MouseLeft = 512 + 1, MouseRight,
TwiceLeft = 512 + 256 + 1, TwiceRight
};
class Keyboard { class Keyboard {
private: private:
bool getKey(Common::Event &event, int &cgeCode); bool getKey(Common::Event &event, int &cgeCode);

2
engines/cge/general.cpp
View File

@ -171,7 +171,7 @@ char *dwtom(uint32 val, char *str, int radix, int len) {
} }
void sndSetVolume() { void sndSetVolume() {
warning("STUB: SNDSetVolume"); // USeless for ScummVM
} }
DataCk *loadWave(XFile *file) { DataCk *loadWave(XFile *file) {

5
engines/cge/general.h
View File

@ -33,11 +33,14 @@
#include "common/random.h" #include "common/random.h"
#include "common/textconsole.h" #include "common/textconsole.h"
#include "common/str.h" #include "common/str.h"
#include "cge/jbw.h"
namespace CGE { namespace CGE {
#define kCryptSeed 0xA5 #define kCryptSeed 0xA5
#define kMaxFile 128
#define IsDigit(c) ((c) >= '0' && (c) <= '9')
#define IsHxDig(c) (IsDigit(c) || ((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
#define ArrayCount(a) (sizeof(a) / sizeof((a)[0]))
struct Dac { struct Dac {
uint8 _r; uint8 _r;

89
engines/cge/jbw.h
View File

@ -1,89 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
/*
* This code is based on original Soltys source code
* Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
*/
#ifndef __CGE_JBW__
#define __CGE_JBW__
#include "common/scummsys.h"
namespace CGE {
#define kMaxFile 128
#define IsDigit(c) ((c) >= '0' && (c) <= '9')
#define IsHxDig(c) (IsDigit(c) || ((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
#define ArrayCount(a) (sizeof(a) / sizeof((a)[0]))
enum Keys {
NoKey = 0, CtrlA, CtrlB, CtrlC, CtrlD, CtrlE, CtrlF, CtrlG, CtrlH,
CtrlI, CtrlJ, CtrlK, CtrlL, CtrlM, CtrlN, CtrlO, CtrlP,
CtrlQ, CtrlR, CtrlS, CtrlT, CtrlU, CtrlV, CtrlW, CtrlX,
CtrlY, CtrlZ,
BSp = 8,
Tab = 9,
Enter = 13,
Eof = 26,
Esc = 27,
AltQ = 256 + 16, AltW, AltE, AltR, AltT, AltY, AltU, AltI, AltO, AltP,
AltA = 256 + 30, AltS, AltD, AltF, AltG, AltH, AltJ, AltK, AltL,
AltZ = 256 + 44, AltX, AltC, AltV, AltB, AltN, AltM,
F11 = 256 + 87, F12,
F1 = 256 + 59, F2, F3, F4, F5, F6, F7, F8, F9, F10,
ShiftTab = 256 + 15,
ShiftF1 = 256 + 84, ShiftF2, ShiftF3, ShiftF4, ShiftF5,
ShiftF6, ShiftF7, ShiftF8, ShiftF9, ShiftF10,
CtrlF1 = 256 + 94, CtrlF2, CtrlF3, CtrlF4, CtrlF5,
CtrlF6, CtrlF7, CtrlF8, CtrlF9, CtrlF10,
AltF1 = 256 + 104, AltF2, AltF3, AltF4, AltF5,
AltF6, AltF7, AltF8, AltF9, AltF10,
Home = 256 + 71,
Up,
PgUp,
Left = 256 + 75,
Ctr,
Right,
End = 256 + 79,
Down,
PgDn,
Ins,
Del,
CtrlLeft = 256 + 115,
CtrlRight,
CtrlEnd,
CtrlPgDn,
CtrlHome,
CtrlPgUp = 256 + 132,
MouseLeft = 512 + 1,
MouseRight,
TwiceLeft = 512 + 256 + 1,
TwiceRight
};
} // End of namespace CGE
#endif

1
engines/cge/snail.h
View File

@ -28,7 +28,6 @@
#ifndef __CGE_SNAIL__ #ifndef __CGE_SNAIL__
#define __CGE_SNAIL__ #define __CGE_SNAIL__
#include "cge/jbw.h"
#include "cge/cge.h" #include "cge/cge.h"
namespace CGE { namespace CGE {

1
engines/cge/talk.h
View File

@ -29,7 +29,6 @@
#define __CGE_TALK__ #define __CGE_TALK__
#include "cge/general.h" #include "cge/general.h"
#include "cge/jbw.h"
#include "cge/vga13h.h" #include "cge/vga13h.h"
namespace CGE { namespace CGE {

5
engines/cge/text.h
View File

@ -29,14 +29,11 @@
#define __CGE_TEXT__ #define __CGE_TEXT__
#include "cge/talk.h" #include "cge/talk.h"
#include "cge/jbw.h"
namespace CGE { namespace CGE {
#define kSysTextMax 1000
#define kSayExt ".SAY" #define kSayExt ".SAY"
#define kSysTextMax 1000
#define kTextNoMouse 95 #define kTextNoMouse 95
#define kInfName 101 #define kInfName 101
#define kSayName 102 #define kSayName 102