thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CGE: Janitorial: remove trailing spaces

Browse source
This commit is contained in:
Strangerke 2011-07-28 15:35:12 +02:00
parent df7d771feb
commit 7d5eb1ee63
8 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/cge/cge.cpp
View file

@ -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;

19
engines/cge/cge_main.cpp
View file

@ -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)

4
engines/cge/events.cpp
View file

@ -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 }

2
engines/cge/mixer.cpp
View file

@ -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";

6
engines/cge/startup.cpp
View file

@ -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;

2
engines/cge/startup.h
View file

@ -49,10 +49,10 @@ namespace CGE {
class Startup {
static bool getParms();
Startup();
public:
static int _mode;
static int _soundOk;
Startup();
};

16
engines/cge/vga13h.cpp
View file

@ -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];

2
engines/cge/vmenu.cpp
View file

@ -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) {