aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/cge/cge.cpp4
-rw-r--r--engines/cge/cge_main.cpp19
-rw-r--r--engines/cge/events.cpp4
-rw-r--r--engines/cge/mixer.cpp2
-rw-r--r--engines/cge/startup.cpp6
-rw-r--r--engines/cge/startup.h2
-rw-r--r--engines/cge/vga13h.cpp16
-rw-r--r--engines/cge/vmenu.cpp2
8 files changed, 22 insertions, 33 deletions
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 6542518a7e..3c3f14884d 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -152,10 +152,10 @@ CGEEngine::~CGEEngine() {
delete _console;
- // Delete engine objects
+ // Delete engine objects
delete _vga;
delete _sys;
- //delete _sprite; Sprite is destroyed by the queue it's added to
+ //delete _sprite; Sprite is destroyed by the queue it's added to
delete _miniCave;
delete _shadow;
delete _horzLine;
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index d6dd82dbe0..8681a6314a 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -200,7 +200,7 @@ bool CGEEngine::loadGame(int slotNumber, SavegameHeader *header, bool tiny) {
if (slotNumber == 0)
strncpy(_usrFnam, saveHeader.saveName.c_str(), 8);
}
-
+
// Get in the savegame
syncGame(readStream, NULL, tiny);
@@ -502,7 +502,7 @@ void CGEEngine::resetQSwitch() {
void CGEEngine::quit() {
debugC(1, kCGEDebugEngine, "CGEEngine::quit()");
- static Choice QuitMenu[] = {
+ static Choice QuitMenu[] = {
{ NULL, &CGEEngine::startCountDown },
{ NULL, &CGEEngine::resetQSwitch },
{ NULL, &CGEEngine::dummy }
@@ -737,7 +737,7 @@ void System::touch(uint16 mask, int x, int y) {
case Del:
if (_keyboard->_key[ALT] && _keyboard->_key[CTRL])
_vm->AltCtrlDel();
- else
+ else
_vm->killSprite();
break;
case 'F':
@@ -1465,7 +1465,7 @@ void CGEEngine::tick() {
void CGEEngine::loadUser() {
// set scene
- if (Startup::_mode == 0) {
+ if (Startup::_mode == 0) {
// user .SVG file found - load it from slot 0
loadGame(0, NULL);
} else {
@@ -1740,21 +1740,10 @@ bool CGEEngine::showTitle(const char *name) {
return (Startup::_mode == 2 || usr_ok);
}
-
-/*
-void StkDump () {
- CFILE f("!STACK.DMP", BFW);
- f.Write((uint8 *) (intStackPtr-STACK_SIZ/2), STACK_SIZ*2);
-}
-*/
-
-
void CGEEngine::cge_main() {
uint16 intStack[STACK_SIZ / 2];
_intStackPtr = intStack;
- //Debug( memset((void *) (-K(2)), 0, K(1)); )
- //Debug( memset((void *) (-K(4)), 0, K(1)); )
memset(_barriers, 0xFF, sizeof(_barriers));
if (!_mouse->_exist)
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index aa71782f77..dc6e65722d 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -147,14 +147,14 @@ void Keyboard::newKeyboard(Common::Event &event) {
Mouse::Mouse(CGEEngine *vm) : Sprite(vm, NULL), _busy(NULL), _hold(NULL), _hx(0), _vm(vm) {
_hold = NULL;
- _hx = 0;
+ _hx = 0;
_hy = 0;
_exist = true;
_buttons = 0;
_busy = NULL;
_active = false;
_flags._kill = false;
-
+
const Seq ms[] = {
{ 0, 0, 0, 0, 1 },
{ 1, 1, 0, 0, 1 }
diff --git a/engines/cge/mixer.cpp b/engines/cge/mixer.cpp
index 36f7a8e2f7..decc516ae3 100644
--- a/engines/cge/mixer.cpp
+++ b/engines/cge/mixer.cpp
@@ -54,7 +54,7 @@ Mixer::Mixer(CGEEngine *vm, int x, int y) : Sprite(vm, NULL), _fall(kMixFall), _
// slaves
uint i;
- Seq ls[kMixMax];
+ Seq ls[kMixMax];
for (i = 0; i < kMixMax; i++) {
static char fn[] = "V00";
diff --git a/engines/cge/startup.cpp b/engines/cge/startup.cpp
index 9a9d9ccfee..5e1c8b8d64 100644
--- a/engines/cge/startup.cpp
+++ b/engines/cge/startup.cpp
@@ -56,7 +56,7 @@ bool Startup::getParms() {
int n = takeEnum(PrmTab, strtok(_argv[--i], " =:("));
uint16 p = xtow(strtok(NULL, " h,)"));
switch (n) {
- case 0 :
+ case 0 :
if (Mode != 2)
Mode = 1;
break;
@@ -95,7 +95,7 @@ bool Startup::getParms() {
if (n >= 2)
SoundOk = 2;
}
-
+
if (SNDDrvInfo.MDEV != DEV_GM)
SNDDrvInfo.MDEV = SNDDrvInfo.DDEV;
return true;
@@ -109,7 +109,7 @@ Startup::Startup() {
/*
uint32 m = farcoreleft() >> 10;
if (m < 0x7FFF)
- Core = (int) m;
+ Core = (int) m;
else
Core = 0x7FFF;
diff --git a/engines/cge/startup.h b/engines/cge/startup.h
index a9de89a5e2..8a8305040c 100644
--- a/engines/cge/startup.h
+++ b/engines/cge/startup.h
@@ -49,10 +49,10 @@ namespace CGE {
class Startup {
static bool getParms();
+ Startup();
public:
static int _mode;
static int _soundOk;
- Startup();
};
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index d08f9bc8e8..7e1d8f9962 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -228,7 +228,7 @@ extern "C" void TimerProc() {
if (_heart->_xTimer) {
if (*_heart->_xTimer)
*_heart->_xTimer--;
- else
+ else
_heart->_xTimer = NULL;
}
@@ -324,9 +324,9 @@ void Engine_::newTimer(...) {
}
for (spr = VGA::ShowQ.First(); spr; spr = spr->Next) {
- if (spr->Time) {
+ if (spr->Time) {
if (!spr->_flags.Hide) {
- if (--spr->Time == 0)
+ if (--spr->Time == 0)
spr->tick();
}
}
@@ -949,7 +949,7 @@ void Vga::deinit() {
}
Vga::Vga(int mode)
- : _frmCnt(0), _oldMode(0), _oldScreen(NULL), _statAdr(VGAST1_),
+ : _frmCnt(0), _oldMode(0), _oldScreen(NULL), _statAdr(VGAST1_),
_msg(NULL), _nam(NULL), _setPal(false), _mono(0) {
_oldColors = NULL;
_newColors = NULL;
@@ -1026,7 +1026,7 @@ void Vga::setStatAdr() {
#pragma argsused
void Vga::waitVR(bool on) {
- // Since some of the game parts rely on using vertical sync as a delay mechanism,
+ // Since some of the game parts rely on using vertical sync as a delay mechanism,
// we're introducing a short delay to simulate it
g_system->delayMillis(10);
}
@@ -1244,7 +1244,7 @@ void Bitmap::xShow(int16 x, int16 y) {
}
// Move to next dest position
- destP += 4;
+ destP += 4;
}
}
}
@@ -1294,7 +1294,7 @@ void Bitmap::show(int16 x, int16 y) {
}
// Move to next dest position
- destP += 4;
+ destP += 4;
}
if (cmd == 2)
@@ -1302,7 +1302,7 @@ void Bitmap::show(int16 x, int16 y) {
}
}
/*
- DEBUG code to display image immediately
+ DEBUG code to display image immediately
// Temporary
g_system->copyRectToScreen((const byte *)VGA::Page[1]->getBasePtr(0, 0), SCR_WID, 0, 0, SCR_WID, SCR_HIG);
byte palData[PAL_SIZ];
diff --git a/engines/cge/vmenu.cpp b/engines/cge/vmenu.cpp
index f846b3d061..934bd6299d 100644
--- a/engines/cge/vmenu.cpp
+++ b/engines/cge/vmenu.cpp
@@ -115,7 +115,7 @@ Vmenu::~Vmenu() {
_addr = NULL;
}
-#define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
+#define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
void Vmenu::touch(uint16 mask, int x, int y) {
if (_items) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-09 09:02:46 +0000