aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
authorMax Horn2009-09-30 16:16:53 +0000
committerMax Horn2009-09-30 16:16:53 +0000
commit8ba75fc522f16844524dd4d6f88c3851e2402969 (patch)
treedf25c20389e3e706d508f37914dedc73c6479f00 /engines/agi
parent25dde91c7c6c7da52636e3daa34bd9eee5d9dcb9 (diff)
downloadscummvm-rg350-8ba75fc522f16844524dd4d6f88c3851e2402969.tar.gz
scummvm-rg350-8ba75fc522f16844524dd4d6f88c3851e2402969.tar.bz2
scummvm-rg350-8ba75fc522f16844524dd4d6f88c3851e2402969.zip
Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things)
svn-id: r44495
Diffstat (limited to 'engines/agi')
-rw-r--r--engines/agi/preagi_common.cpp2
-rw-r--r--engines/agi/preagi_mickey.cpp18
-rw-r--r--engines/agi/preagi_troll.cpp8
-rw-r--r--engines/agi/preagi_winnie.cpp20
4 files changed, 24 insertions, 24 deletions
diff --git a/engines/agi/preagi_common.cpp b/engines/agi/preagi_common.cpp
index 74dcd75edb..e84bf0d1ba 100644
--- a/engines/agi/preagi_common.cpp
+++ b/engines/agi/preagi_common.cpp
@@ -124,7 +124,7 @@ int PreAgiEngine::getSelection(SelectionTypes type) {
while (!shouldQuit()) {
while (_eventMan->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return 0;
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index c06cd94bec..e61637194c 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -295,7 +295,7 @@ void Mickey::getMouseMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow, i
int iWord;
int *sel = 0;
- switch(iRow) {
+ switch (iRow) {
case 0:
if (y != IDI_MSA_ROW_MENU_0) return;
sel = sel0;
@@ -323,7 +323,7 @@ bool Mickey::getMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow) {
int x, y;
int goIndex = -1, northIndex = -1, southIndex = -1, eastIndex = -1, westIndex = -1;
- switch(iRow) {
+ switch (iRow) {
case 0:
sel = sel0;
break;
@@ -361,7 +361,7 @@ bool Mickey::getMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow) {
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return 0;
@@ -679,7 +679,7 @@ void Mickey::playSound(ENUM_MSA_SOUND iSound) {
uint8 *buffer = new uint8[1024];
int pBuf = 1;
- switch(iSound) {
+ switch (iSound) {
case IDI_MSA_SND_XL30:
for (int iNote = 0; iNote < 6; iNote++) {
note.counter = _vm->rnd(59600) + 59;
@@ -701,7 +701,7 @@ void Mickey::playSound(ENUM_MSA_SOUND iSound) {
if (iSound == IDI_MSA_SND_THEME) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
case Common::EVENT_LBUTTONUP:
@@ -769,7 +769,7 @@ void Mickey::drawRoomAnimation() {
0xF0, 1, 0xF9, 2, 43, 45, 0xFF
};
- switch(_game.iRoom) {
+ switch (_game.iRoom) {
case IDI_MSA_PIC_EARTH_SHIP:
case IDI_MSA_PIC_VENUS_SHIP:
case IDI_MSA_PIC_NEPTUNE_SHIP:
@@ -835,7 +835,7 @@ void Mickey::drawRoomAnimation() {
// draw crystal
if (_game.iRoom == IDI_MSA_XTAL_ROOM_XY[_game.iPlanet][0]) {
if (!_game.fHasXtal) {
- switch(_game.iPlanet) {
+ switch (_game.iPlanet) {
case IDI_MSA_PLANET_VENUS:
if (_game.iRmMenu[_game.iRoom] != 2)
break;
@@ -1488,7 +1488,7 @@ void Mickey::getXtal(int iStr) {
}
bool Mickey::parse(int cmd, int arg) {
- switch(cmd) {
+ switch (cmd) {
// BASIC
@@ -2211,7 +2211,7 @@ void Mickey::waitAnyKey(bool anim) {
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
case Common::EVENT_KEYDOWN:
diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp
index e34949c8fe..04c0d25b11 100644
--- a/engines/agi/preagi_troll.cpp
+++ b/engines/agi/preagi_troll.cpp
@@ -60,7 +60,7 @@ bool Troll::getMenuSel(const char *szMenu, int *iSel, int nSel) {
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return 0;
@@ -207,7 +207,7 @@ void Troll::waitAnyKeyIntro() {
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
case Common::EVENT_LBUTTONUP:
@@ -285,7 +285,7 @@ void Troll::tutorial() {
while (!done && !_vm->shouldQuit()) {
getMenuSel(IDS_TRO_TUTORIAL_1, &iSel, IDI_TRO_MAX_OPTION);
- switch(iSel) {
+ switch (iSel) {
case IDI_TRO_SEL_OPTION_1:
_vm->clearScreen(0x22, false);
_vm->_gfx->doUpdate();
@@ -579,7 +579,7 @@ void Troll::gameLoop() {
roomParam = _roomDescs[_roomPicture - 1].roomDescIndex[currentOption];
- switch(_roomDescs[_roomPicture - 1].optionTypes[currentOption]) {
+ switch (_roomDescs[_roomPicture - 1].optionTypes[currentOption]) {
case OT_FLASHLIGHT:
if (!haveFlashlight) {
printUserMessage(13);
diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index ac0d3625b2..85cf2d29ef 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -266,7 +266,7 @@ int Winnie::parser(int pc, int index, uint8 *buffer) {
// extract text from block
opcode = *(buffer + pc);
- switch(opcode) {
+ switch (opcode) {
case 0:
case IDO_WTP_OPTION_0:
case IDO_WTP_OPTION_1:
@@ -331,9 +331,9 @@ int Winnie::parser(int pc, int index, uint8 *buffer) {
}
// process selection
- switch(iSel) {
+ switch (iSel) {
case IDI_WTP_SEL_HOME:
- switch(_room) {
+ switch (_room) {
case IDI_WTP_ROOM_HOME:
case IDI_WTP_ROOM_MIST:
case IDI_WTP_ROOM_TIGGER:
@@ -384,7 +384,7 @@ int Winnie::parser(int pc, int index, uint8 *buffer) {
// process script
do {
opcode = *(buffer + pc++);
- switch(opcode) {
+ switch (opcode) {
case IDO_WTP_GOTO_ROOM:
opcode = *(buffer + pc++);
iNewRoom = opcode;
@@ -726,7 +726,7 @@ void Winnie::drawMenu(char *szMenu, int iSel, int fCanSel[]) {
if (fCanSel[IDI_WTP_SEL_DROP])
_vm->drawStr(IDI_WTP_ROW_OPTION_4, IDI_WTP_COL_DROP, IDA_DEFAULT, IDS_WTP_DROP);
- switch(iSel) {
+ switch (iSel) {
case IDI_WTP_SEL_OPT_1:
case IDI_WTP_SEL_OPT_2:
case IDI_WTP_SEL_OPT_3:
@@ -778,7 +778,7 @@ void Winnie::decMenuSel(int *iSel, int fCanSel[]) {
}
void Winnie::getMenuMouseSel(int *iSel, int fCanSel[], int x, int y) {
- switch(y) {
+ switch (y) {
case IDI_WTP_ROW_OPTION_1:
case IDI_WTP_ROW_OPTION_2:
case IDI_WTP_ROW_OPTION_3:
@@ -816,7 +816,7 @@ void Winnie::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return;
@@ -865,7 +865,7 @@ void Winnie::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
_vm->_gfx->setCursorPalette(false);
}
- switch(*iSel) {
+ switch (*iSel) {
case IDI_WTP_SEL_OPT_1:
case IDI_WTP_SEL_OPT_2:
case IDI_WTP_SEL_OPT_3:
@@ -970,7 +970,7 @@ void Winnie::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
makeSel();
break;
case Common::KEYCODE_RETURN:
- switch(*iSel) {
+ switch (*iSel) {
case IDI_WTP_SEL_OPT_1:
case IDI_WTP_SEL_OPT_2:
case IDI_WTP_SEL_OPT_3:
@@ -1036,7 +1036,7 @@ phase2:
while (!_vm->shouldQuit()) {
for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) {
- switch(parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata)) {
+ switch (parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata)) {
case IDI_WTP_PAR_GOTO:
goto phase0;
break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-02 05:28:44 +0000