aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Zbróg2013-10-28 17:06:12 +0000
committerKamil Zbróg2013-10-28 17:06:12 +0000
commit39265b7a4b3e39348165b126ae53c9d89ccf32a9 (patch)
tree878266bc341739ebcd4512e54c5d862be683169f
parent84784add6811aa1b285b70e139d0bdf9738c858c (diff)
downloadscummvm-rg350-39265b7a4b3e39348165b126ae53c9d89ccf32a9.tar.gz
scummvm-rg350-39265b7a4b3e39348165b126ae53c9d89ccf32a9.tar.bz2
scummvm-rg350-39265b7a4b3e39348165b126ae53c9d89ccf32a9.zip
PRINCE: replace space with tabs in indent
-rw-r--r--engines/prince/debugger.cpp148
-rw-r--r--engines/prince/debugger.h20
-rw-r--r--engines/prince/sound.cpp26
-rw-r--r--engines/prince/sound.h28
4 files changed, 111 insertions, 111 deletions
diff --git a/engines/prince/debugger.cpp b/engines/prince/debugger.cpp
index 817e4fb2b5..1a78049f91 100644
--- a/engines/prince/debugger.cpp
+++ b/engines/prince/debugger.cpp
@@ -26,113 +26,113 @@
namespace Prince {
Debugger::Debugger(PrinceEngine *vm) : GUI::Debugger(), _vm(vm) {
- DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit));
- DCmd_Register("setflag", WRAP_METHOD(Debugger, Cmd_SetFlag));
- DCmd_Register("getflag", WRAP_METHOD(Debugger, Cmd_GetFlag));
- DCmd_Register("clearflag", WRAP_METHOD(Debugger, Cmd_ClearFlag));
- DCmd_Register("viewflc", WRAP_METHOD(Debugger, Cmd_ViewFlc));
- DCmd_Register("initroom", WRAP_METHOD(Debugger, Cmd_InitRoom));
- DCmd_Register("changecursor", WRAP_METHOD(Debugger, Cmd_ChangeCursor));
+ DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit));
+ DCmd_Register("setflag", WRAP_METHOD(Debugger, Cmd_SetFlag));
+ DCmd_Register("getflag", WRAP_METHOD(Debugger, Cmd_GetFlag));
+ DCmd_Register("clearflag", WRAP_METHOD(Debugger, Cmd_ClearFlag));
+ DCmd_Register("viewflc", WRAP_METHOD(Debugger, Cmd_ViewFlc));
+ DCmd_Register("initroom", WRAP_METHOD(Debugger, Cmd_InitRoom));
+ DCmd_Register("changecursor", WRAP_METHOD(Debugger, Cmd_ChangeCursor));
}
static int strToInt(const char *s) {
- if (!*s)
- // No string at all
- return 0;
- else if (toupper(s[strlen(s) - 1]) != 'H')
- // Standard decimal string
- return atoi(s);
-
- // Hexadecimal string
- uint tmp = 0;
- int read = sscanf(s, "%xh", &tmp);
- if (read < 1)
- error("strToInt failed on string \"%s\"", s);
- return (int)tmp;
+ if (!*s)
+ // No string at all
+ return 0;
+ else if (toupper(s[strlen(s) - 1]) != 'H')
+ // Standard decimal string
+ return atoi(s);
+
+ // Hexadecimal string
+ uint tmp = 0;
+ int read = sscanf(s, "%xh", &tmp);
+ if (read < 1)
+ error("strToInt failed on string \"%s\"", s);
+ return (int)tmp;
}
/*
* This command sets a flag
*/
bool Debugger::Cmd_SetFlag(int argc, const char **argv) {
- // Check for a flag to set
- if (argc != 2) {
- DebugPrintf("Usage: %s <flag number>\n", argv[0]);
- return true;
- }
-
- int flagNum = strToInt(argv[1]);
- //g_globals->setFlag(flagNum);
- return true;
+ // Check for a flag to set
+ if (argc != 2) {
+ DebugPrintf("Usage: %s <flag number>\n", argv[0]);
+ return true;
+ }
+
+ int flagNum = strToInt(argv[1]);
+ //g_globals->setFlag(flagNum);
+ return true;
}
/*
* This command gets the value of a flag
*/
bool Debugger::Cmd_GetFlag(int argc, const char **argv) {
- // Check for an flag to display
- if (argc != 2) {
- DebugPrintf("Usage: %s <flag number>\n", argv[0]);
- return true;
- }
-
- int flagNum = strToInt(argv[1]);
- //DebugPrintf("Value: %d\n", g_globals->getFlag(flagNum));
- return true;
+ // Check for an flag to display
+ if (argc != 2) {
+ DebugPrintf("Usage: %s <flag number>\n", argv[0]);
+ return true;
+ }
+
+ int flagNum = strToInt(argv[1]);
+ //DebugPrintf("Value: %d\n", g_globals->getFlag(flagNum));
+ return true;
}
/*
* This command clears a flag
*/
bool Debugger::Cmd_ClearFlag(int argc, const char **argv) {
- // Check for a flag to clear
- if (argc != 2) {
- DebugPrintf("Usage: %s <flag number>\n", argv[0]);
- return true;
- }
-
- int flagNum = strToInt(argv[1]);
- //g_globals->clearFlag(flagNum);
- return true;
+ // Check for a flag to clear
+ if (argc != 2) {
+ DebugPrintf("Usage: %s <flag number>\n", argv[0]);
+ return true;
+ }
+
+ int flagNum = strToInt(argv[1]);
+ //g_globals->clearFlag(flagNum);
+ return true;
}
/*
* This command starts new flc anim
*/
bool Debugger::Cmd_ViewFlc(int argc, const char **argv) {
- // Check for a flag to clear
- if (argc != 2) {
- DebugPrintf("Usage: %s <anim number>\n", argv[0]);
- return true;
- }
-
- int flagNum = strToInt(argv[1]);
- _vm->loadAnim(flagNum);
- return true;
+ // Check for a flag to clear
+ if (argc != 2) {
+ DebugPrintf("Usage: %s <anim number>\n", argv[0]);
+ return true;
+ }
+
+ int flagNum = strToInt(argv[1]);
+ _vm->loadAnim(flagNum);
+ return true;
}
bool Debugger::Cmd_InitRoom(int argc, const char **argv) {
- // Check for a flag to clear
- if (argc != 2) {
- DebugPrintf("Usage: %s <anim number>\n", argv[0]);
- return true;
- }
-
- int flagNum = strToInt(argv[1]);
- _vm->loadLocation(flagNum);
- return true;
+ // Check for a flag to clear
+ if (argc != 2) {
+ DebugPrintf("Usage: %s <anim number>\n", argv[0]);
+ return true;
+ }
+
+ int flagNum = strToInt(argv[1]);
+ _vm->loadLocation(flagNum);
+ return true;
}
bool Debugger::Cmd_ChangeCursor(int argc, const char **argv) {
- // Check for a flag to clear
- if (argc != 2) {
- DebugPrintf("Usage: %s <curId>\n", argv[0]);
- return true;
- }
-
- int flagNum = strToInt(argv[1]);
- _vm->changeCursor(flagNum);
- return true;
+ // Check for a flag to clear
+ if (argc != 2) {
+ DebugPrintf("Usage: %s <curId>\n", argv[0]);
+ return true;
+ }
+
+ int flagNum = strToInt(argv[1]);
+ _vm->changeCursor(flagNum);
+ return true;
}
}
diff --git a/engines/prince/debugger.h b/engines/prince/debugger.h
index dabcd970ea..087f29e550 100644
--- a/engines/prince/debugger.h
+++ b/engines/prince/debugger.h
@@ -32,18 +32,18 @@ class PrinceEngine;
class Debugger : public GUI::Debugger {
public:
- Debugger(PrinceEngine *vm);
- virtual ~Debugger() {} // we need this for __SYMBIAN32__ archaic gcc/UIQ
+ Debugger(PrinceEngine *vm);
+ virtual ~Debugger() {} // we need this for __SYMBIAN32__ archaic gcc/UIQ
private:
- bool Cmd_SetFlag(int argc, const char **argv);
- bool Cmd_GetFlag(int argc, const char **argv);
- bool Cmd_ClearFlag(int argc, const char **argv);
- bool Cmd_ViewFlc(int argc, const char **argv);
- bool Cmd_InitRoom(int argc, const char **argv);
- bool Cmd_ChangeCursor(int argc, const char **argv);
-
- PrinceEngine *_vm;
+ bool Cmd_SetFlag(int argc, const char **argv);
+ bool Cmd_GetFlag(int argc, const char **argv);
+ bool Cmd_ClearFlag(int argc, const char **argv);
+ bool Cmd_ViewFlc(int argc, const char **argv);
+ bool Cmd_InitRoom(int argc, const char **argv);
+ bool Cmd_ChangeCursor(int argc, const char **argv);
+
+ PrinceEngine *_vm;
};
diff --git a/engines/prince/sound.cpp b/engines/prince/sound.cpp
index 2e2e53e664..3285390aca 100644
--- a/engines/prince/sound.cpp
+++ b/engines/prince/sound.cpp
@@ -36,7 +36,7 @@
namespace Prince {
const char * MusicPlayer::_musTable[] = {
- "",
+ "",
"Battlfld.mid",
"Cave.mid",
"Cemetery.mid",
@@ -56,14 +56,14 @@ const char * MusicPlayer::_musTable[] = {
};
const uint8 MusicPlayer::_musRoomTable[] = {
- 0,
- 3,
- 9,
- 9,
- 9,
- 13,
- 9,
- 9
+ 0,
+ 3,
+ 9,
+ 9,
+ 9,
+ 13,
+ 9,
+ 9
};
@@ -81,7 +81,7 @@ MusicPlayer::MusicPlayer(PrinceEngine *vm) : _vm(vm) {
_driver->sendGMReset();
// TODO: Load cmf.ins with the instrument table. It seems that an
- // interface for such an operation is supported for AdLib. Maybe for
+ // interface for such an operation is supported for AdLib. Maybe for
// this card, setting instruments is necessary.
_driver->setTimerCallback(this, &timerCallback);
@@ -100,8 +100,8 @@ void MusicPlayer::killMidi() {
}
void MusicPlayer::loadMidi(const char * name) {
- Common::SeekableReadStream * stream = SearchMan.createReadStreamForMember(name);
- if (!stream)
+ Common::SeekableReadStream * stream = SearchMan.createReadStreamForMember(name);
+ if (!stream)
return;
// Stop any currently playing MIDI file
@@ -110,7 +110,7 @@ void MusicPlayer::loadMidi(const char * name) {
// Read in the data for the file
_dataSize = stream->size();
_data = (byte *)malloc(_dataSize);
- stream->read(_data, _dataSize);
+ stream->read(_data, _dataSize);
// Start playing the music
sndMidiStart();
diff --git a/engines/prince/sound.h b/engines/prince/sound.h
index 779fe563f9..f4ba9ba45f 100644
--- a/engines/prince/sound.h
+++ b/engines/prince/sound.h
@@ -43,25 +43,25 @@ class PrinceEngine;
class MusicPlayer: public Audio::MidiPlayer {
private:
- PrinceEngine *_vm;
- byte *_data;
- int _dataSize;
- bool _isGM;
+ PrinceEngine *_vm;
+ byte *_data;
+ int _dataSize;
+ bool _isGM;
- // Start MIDI File
- void sndMidiStart();
+ // Start MIDI File
+ void sndMidiStart();
- // Stop MIDI File
- void sndMidiStop();
+ // Stop MIDI File
+ void sndMidiStop();
public:
- MusicPlayer(PrinceEngine *vm);
- ~MusicPlayer();
+ MusicPlayer(PrinceEngine *vm);
+ ~MusicPlayer();
- void loadMidi(const char *);
- void killMidi();
+ void loadMidi(const char *);
+ void killMidi();
- virtual void send(uint32 b);
- virtual void sendToChannel(byte channel, uint32 b);
+ virtual void send(uint32 b);
+ virtual void sendToChannel(byte channel, uint32 b);
static const char * _musTable[];
static const uint8 _musRoomTable[];