diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/KeysDialog.cpp | 14 | ||||
| -rw-r--r-- | gui/eval.cpp | 4 | ||||
| -rw-r--r-- | gui/launcher.cpp | 2 | ||||
| -rw-r--r-- | gui/newgui.cpp | 12 |
4 files changed, 16 insertions, 16 deletions
diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp index c8abe1087b..d196eab1be 100644 --- a/gui/KeysDialog.cpp +++ b/gui/KeysDialog.cpp @@ -78,7 +78,7 @@ KeysDialog::KeysDialog(const Common::String &title) } void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { - switch(cmd) { + switch (cmd) { case kListSelectionChangedCmd: if (_actionsList->getSelected() >= 0) { @@ -86,14 +86,14 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { #ifdef __SYMBIAN32__ uint16 key = Actions::Instance()->getMapping(_actionsList->getSelected()); - if(key != 0) { + if (key != 0) { // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl - if(key >= 315 && key <= 323) { + if (key >= 315 && key <= 323) { key = key - 315 + SDLK_F1; } } - if(key != 0) + if (key != 0) sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key)); else sprintf(selection, "Associated key : none"); @@ -114,9 +114,9 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { _actionSelected = _actionsList->getSelected(); #ifdef __SYMBIAN32__ uint16 key = Actions::Instance()->getMapping(_actionSelected); - if(key != 0) { + if (key != 0) { // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl - if(key >= 315 && key <= 323) { + if (key >= 315 && key <= 323) { key = key - 315 + SDLK_F1; } @@ -163,7 +163,7 @@ void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) { Actions::Instance()->setMapping((ActionType)_actionSelected, ascii); #ifdef __SYMBIAN32__ - if(ascii != 0) + if (ascii != 0) sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey) keycode)); else sprintf(selection, "Associated key : none"); diff --git a/gui/eval.cpp b/gui/eval.cpp index ac0d2d984f..89dd827f76 100644 --- a/gui/eval.cpp +++ b/gui/eval.cpp @@ -192,10 +192,10 @@ void Eval::getToken() { if (_input[_pos] == '"') { _pos++; - while(_input[_pos] != '"' && _input[_pos] != '\n') + while (_input[_pos] != '"' && _input[_pos] != '\n') *temp++ = _input[_pos++]; - if(_input[_pos] == '\n') + if (_input[_pos] == '\n') exprError(eMissingQuote); _pos++; diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 249752e984..8e4d67ba26 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -373,7 +373,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat case kCmdGlobalAudioOverride: setAudioSettingsState(data != 0); setSubtitleSettingsState(data != 0); - if(_globalVolumeOverride == NULL) + if (_globalVolumeOverride == NULL) setVolumeSettingsState(data != 0); draw(); break; diff --git a/gui/newgui.cpp b/gui/newgui.cpp index c8fd560691..819b6728f7 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -68,17 +68,17 @@ void GuiObject::handleScreenChanged() { _w = g_gui.evaluator()->getVar(_name + ".w"); _h = g_gui.evaluator()->getVar(_name + ".h"); - if(_x < 0) + if (_x < 0) error("Widget <%s> has x < 0", _name.c_str()); - if(_x >= g_system->getOverlayWidth()) + if (_x >= g_system->getOverlayWidth()) error("Widget <%s> has x > %d", _name.c_str(), g_system->getOverlayWidth()); - if(_x + _w > g_system->getOverlayWidth()) + if (_x + _w > g_system->getOverlayWidth()) error("Widget <%s> has x + w > %d (%d)", _name.c_str(), g_system->getOverlayWidth(), _x + _w); - if(_y < 0) + if (_y < 0) error("Widget <%s> has y < 0", _name.c_str()); - if(_y >= g_system->getOverlayWidth()) + if (_y >= g_system->getOverlayWidth()) error("Widget <%s> has y > %d", _name.c_str(), g_system->getOverlayHeight()); - if(_y + _h > g_system->getOverlayWidth()) + if (_y + _h > g_system->getOverlayWidth()) error("Widget <%s> has y + h > %d (%d)", _name.c_str(), g_system->getOverlayHeight(), _y + _h); } } |