diff options
28 files changed, 59 insertions, 60 deletions
diff --git a/devtools/create_cryo/eden_rooms.h b/devtools/create_cryo/eden_rooms.h index e28bc468f4..08384e7be9 100644 --- a/devtools/create_cryo/eden_rooms.h +++ b/devtools/create_cryo/eden_rooms.h @@ -26,7 +26,7 @@ // Note: the following data can be found in the original game's executable const int kNumRooms = 424; const room_t gameRooms[kNumRooms] = { - // Mo + // Mo { 1, {255, 0, 0, 0}, 0, 66, 0xFFFF,29, 93, 1, 4}, { 7, { 4, 0, 6, 0}, 4, 72, 0xFFFF, 8,143, 2, 2}, { 3, { 24, 0, 5, 0}, 6, 99, 1, 6, 6, 3, 0}, diff --git a/devtools/create_xeen/file.h b/devtools/create_xeen/file.h index 3d10825711..2d87ff3da9 100644 --- a/devtools/create_xeen/file.h +++ b/devtools/create_xeen/file.h @@ -197,7 +197,7 @@ public: case SEEK_CUR: _offset += whence; break; case SEEK_END: _offset = _size + whence; break; } - + return _offset; } virtual long read(void *buffer, size_t len) { diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 533b04fa30..d2f7ac6bd5 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -486,7 +486,7 @@ void AGOSEngine::printScreenText(uint vgaSpriteId, uint color, const char *strin if (_variableArray[141] == 0) _variableArray[141] = 9; _variableArray[85] = _variableArray[141] * talkDelay; - + if (_language == Common::HE_ISR) _variableArray[85] += talkDelay * 2; } else { diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp index 18583f0d75..00aee0b4ad 100644 --- a/engines/bladerunner/script/scene/nr04.cpp +++ b/engines/bladerunner/script/scene/nr04.cpp @@ -187,7 +187,7 @@ void SceneScriptNR04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo Delay(2500); Actor_Says(kActorEarlyQ, 290, 3); sub_401DB0(); - //return true; + //return true; break; case 213: Actor_Clue_Acquire(kActorMcCoy, kClueDektorasDressingRoom, 0, kActorEarlyQ); diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp index 1b3b59e1ef..e42444dc00 100644 --- a/engines/director/frame.cpp +++ b/engines/director/frame.cpp @@ -241,7 +241,7 @@ void Frame::readChannels(Common::ReadStreamEndian *stream) { sprite._width = stream->readUint16(); stream->readUint16(); stream->readUint16(); - + } if (sprite._castId) { diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 822e32d9c4..208b1f4aef 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -1188,7 +1188,7 @@ void ScummEngine_v2::o2_startScript() { } } - // WORKAROUND bug #4556: Purple Tentacle can appear in the lab, after being + // WORKAROUND bug #4556: Purple Tentacle can appear in the lab, after being // chased out and end up stuck in the room. This bug is triggered if the player // enters the lab within 45 minutes of first entering the mansion and has chased Purple Tentacle // out. Eventually the cutscene with Purple Tentacle chasing Sandy in the lab @@ -1211,10 +1211,9 @@ void ScummEngine_v2::o2_startScript() { } void ScummEngine_v2::stopScriptCommon(int script) { - // WORKAROUND bug #4112: If you enter the lab while Dr. Fred has the powered turned off // to repair the Zom-B-Matic, the script will be stopped and the power will never turn - // back on. This fix forces the power on, when the player enters the lab, + // back on. This fix forces the power on, when the player enters the lab, // if the script which turned it off is running if (_game.id == GID_MANIAC && _roomResource == 4 && isScriptRunning(MM_SCRIPT(138))) { @@ -1320,7 +1319,7 @@ void ScummEngine_v2::o2_putActorInRoom() { // Var[245] is set to have the Disguise on in most situations // // We don't touch the variable in the following situations - // If the Caponian is being put into the space ship room, or the current room is the + // If the Caponian is being put into the space ship room, or the current room is the // space ship and the Caponian is being put into the backroom of the telephone company (you didnt show your fan club card) if (_game.id == GID_ZAK && _game.version <= 2 && act == 7) { // Is script-96 cutscene done diff --git a/engines/titanic/continue_save_dialog.cpp b/engines/titanic/continue_save_dialog.cpp index 6de267e9fe..0aee87328b 100644 --- a/engines/titanic/continue_save_dialog.cpp +++ b/engines/titanic/continue_save_dialog.cpp @@ -185,7 +185,7 @@ void CContinueSaveDialog::mouseMove(const Point &mousePos) { void CContinueSaveDialog::leftButtonDown(const Point &mousePos) { Rect eye1(188, 190, 192, 195), eye2(209, 192, 213, 197); - if (g_vm->_events->isSpecialPressed(MK_SHIFT) && + if (g_vm->_events->isSpecialPressed(MK_SHIFT) && (eye1.contains(mousePos) || eye2.contains(mousePos))) { // Show the Easter Egg "Evil Twin" _evilTwinShown = true; diff --git a/engines/titanic/debugger.cpp b/engines/titanic/debugger.cpp index 7438a0053b..01948dd4d3 100644 --- a/engines/titanic/debugger.cpp +++ b/engines/titanic/debugger.cpp @@ -357,7 +357,7 @@ bool Debugger::cmdFrame(int argc, const char **argv) { if (argc == 3) { CGameObject *obj = dynamic_cast<CGameObject *>( g_vm->_window->_project->findByName(argv[1])); - + if (obj) { obj->loadFrame(strToInt(argv[2])); return false; diff --git a/engines/titanic/game/bomb.cpp b/engines/titanic/game/bomb.cpp index d9eb737c34..40651c0a88 100644 --- a/engines/titanic/game/bomb.cpp +++ b/engines/titanic/game/bomb.cpp @@ -374,7 +374,7 @@ bool CBomb::TimerMsg(CTimerMsg *msg) { addTimer(0, 100, 0); return true; } - + if (msg->_actionVal == 0) { addTimer(1, 1000, 0); } else { @@ -459,7 +459,7 @@ bool CBomb::TimerMsg(CTimerMsg *msg) { --_countdown; addTimer(0, 1000, 0); } - + return true; } diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp index ee639c908f..c23fefce91 100644 --- a/engines/titanic/npcs/deskbot.cpp +++ b/engines/titanic/npcs/deskbot.cpp @@ -301,7 +301,7 @@ bool CDeskbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) CTurnOff turnOff; CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(msg); - + if (g_language == Common::DE_DEU) { switch (msg->_dialogueId) { case 41701: diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp index 2265e46bb2..364023ea3a 100644 --- a/engines/titanic/sound/music_room_handler.cpp +++ b/engines/titanic/sound/music_room_handler.cpp @@ -230,7 +230,7 @@ void CMusicRoomHandler::updateAudio() { } } } - + _audioBuffer->push(audioData, size); delete[] audioData; } diff --git a/engines/titanic/sound/music_song.cpp b/engines/titanic/sound/music_song.cpp index ea5f29a536..1645004c0a 100644 --- a/engines/titanic/sound/music_song.cpp +++ b/engines/titanic/sound/music_song.cpp @@ -127,7 +127,7 @@ bool CSongParser::parse(CValuePair &r) { } else if (_currentChar == '^') { if (_flag) break; - + _flag = true; r._data = 0x7FFFFFFF; r._length = _field10; @@ -176,7 +176,7 @@ bool CSongParser::parse(CValuePair &r) { FETCH_CHAR; } } - + if (!_flag) return false; diff --git a/engines/titanic/star_control/camera_auto_mover.h b/engines/titanic/star_control/camera_auto_mover.h index db57627e33..d9b2888fc8 100644 --- a/engines/titanic/star_control/camera_auto_mover.h +++ b/engines/titanic/star_control/camera_auto_mover.h @@ -62,17 +62,17 @@ public: /** * Clear src and dest orientation and set some default values for other fields - */ + */ void clear(); /** * Setup a transition to from one position to another - */ + */ void setPath(const FVector &srcV, const FVector &destV); /** * Applys speeds to the mover. More than one application is usually done for several transitions - */ + */ virtual MoverState move(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) { return DONE_MOVING; } /** * Given a distance to cover, determines a bunch of speeds for a gradual transition diff --git a/engines/titanic/star_control/marked_auto_mover.h b/engines/titanic/star_control/marked_auto_mover.h index ca7fbf3b7f..d5f714b3ae 100644 --- a/engines/titanic/star_control/marked_auto_mover.h +++ b/engines/titanic/star_control/marked_auto_mover.h @@ -46,7 +46,7 @@ public: /** * Applys speeds to the mover. More than one application is usually done for several transitions - */ + */ virtual MoverState move(CErrorCode &errorCode, FVector &pos, FMatrix &orientation); }; diff --git a/engines/titanic/star_control/star_closeup.cpp b/engines/titanic/star_control/star_closeup.cpp index 6ec94bbf38..3bc3623d58 100644 --- a/engines/titanic/star_control/star_closeup.cpp +++ b/engines/titanic/star_control/star_closeup.cpp @@ -69,9 +69,9 @@ bool CStarCloseup::setup2(int val1, int val2) { const int VALUES1[] = { 0x800, 0xC00, 0x1000, 0x1400, 0x1800 }; const int VALUES2[] = { 0xF95BCD, 0xA505A0, 0xFFAD43, 0x98F4EB, 0xF3EFA5, 0, - 0xFFFFFF, 0x81EEF5, 0x5FFD3, 0x4EE4FA, 0x11C3FF, 0x28F3F4, - 0x36FCF2, 0x29F1FD, 0x29BCFD, 0x98E3F4, 0xBBF3D9, 0x8198F5, - 0x5BE4F9, 0x0D6E2, 0x74EEF6, 0x68DEF8 + 0xFFFFFF, 0x81EEF5, 0x5FFD3, 0x4EE4FA, 0x11C3FF, 0x28F3F4, + 0x36FCF2, 0x29F1FD, 0x29BCFD, 0x98E3F4, 0xBBF3D9, 0x8198F5, + 0x5BE4F9, 0x0D6E2, 0x74EEF6, 0x68DEF8 }; Entry *e = &_entries[0]; @@ -174,7 +174,7 @@ bool CStarCloseup::setup2(int val1, int val2) { e->_pixel2 = (val >> 8) & 0xff; e->_pixel3 = (val >> 16) & 0xff; e->_field8 = g_vm->getRandomNumber(3) + 3; - + e->_fieldC = g_vm->getRandomNumber(255); e->_field10 = FACTOR * (float)g_vm->getRandomNumber(15); e->_field14 = ((float)g_vm->getRandomNumber(0xfffffffe) @@ -293,7 +293,7 @@ void CStarCloseup::draw(const FPose &pose, const FVector &vector, const FVector } switch (starColor) { - case WHITE: + case WHITE: surfaceArea->setMode(SA_SOLID); surfaceArea->_pixel = MKTAG_BE(entryP->_pixel1, entryP->_pixel2, entryP->_pixel3, 0); @@ -424,7 +424,7 @@ void CStarCloseup::draw(const FPose &pose, const FVector &vector, const FVector surfaceArea->drawLine(FRect(grid1._position._x, grid1._position._y, grid2._position._x, grid2._position._y)); } - } + } break; case PINK: surfaceArea->setMode(SA_SOLID); diff --git a/engines/titanic/star_control/viewport.h b/engines/titanic/star_control/viewport.h index 082d063233..ae42e84ea4 100644 --- a/engines/titanic/star_control/viewport.h +++ b/engines/titanic/star_control/viewport.h @@ -35,7 +35,7 @@ namespace Titanic { * For starview it should be white * For skyview it should be pink */ -enum StarColor { WHITE = 0, PINK = 2 }; +enum StarColor { WHITE = 0, PINK = 2 }; /** * Implements the viewport functionality for viewing the star field in @@ -111,14 +111,14 @@ public: * The view has changed between starview and skyview * Change the enum that tracks the color of the stars * Also change the X coordinate pixel offset used for star drawing - */ + */ void changeStarColorPixel(StarMode mode, double pixelOffSet); void reposition(double factor); /** * Applys a rotation matrix to the current * orientation - */ + */ void changeOrientation(const FMatrix &matrix); FPose getPose(); @@ -148,15 +148,15 @@ public: /** * Sets the center vector y angle * The actual center y value doesn't - * change untill reset is called - */ + * change untill reset is called + */ void setCenterYAngle(double angleDegrees); /** * Sets the center vector z angle * The actual center z value doesn't - * change untill reset is called - */ + * change untill reset is called + */ void setCenterZAngle(double angleDegrees); }; diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp index 75fd01e506..2caeef45dd 100644 --- a/engines/titanic/true_talk/tt_parser.cpp +++ b/engines/titanic/true_talk/tt_parser.cpp @@ -1760,7 +1760,7 @@ void TTparser::preprocessGerman(TTstring &line) { continue; const char *wordEndP = p + _replacements4[idx].size(); - + for (int sIdx = 0; sIdx < 12; ++sIdx) { const char *suffixP = SUFFIXES[sIdx]; if (!strncmp(wordEndP, suffixP, strlen(suffixP))) { diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp index 736d0db8a7..afc013ba89 100644 --- a/engines/xeen/character.cpp +++ b/engines/xeen/character.cpp @@ -196,7 +196,7 @@ void Character::synchronize(Common::Serializer &s) { // upper nibble of the first 64 bytes. Except for award 9, which was a full // byte counter counting the number of times the warzone was awarded for (int idx = 0; idx < 64; ++idx) { - byte b = (idx == WARZONE_AWARD) ? _awards[idx] : + byte b = (idx == WARZONE_AWARD) ? _awards[idx] : (_awards[idx] ? 0x1 : 0) | (_awards[idx + 64] ? 0x10 : 0); s.syncAsByte(b); if (s.isLoading()) { diff --git a/engines/xeen/debugger.cpp b/engines/xeen/debugger.cpp index 322833eed6..7d8f170129 100644 --- a/engines/xeen/debugger.cpp +++ b/engines/xeen/debugger.cpp @@ -170,7 +170,7 @@ bool Debugger::cmdMap(int argc, const char **argv) { int mapId = strToInt(argv[1]); int x = argc < 3 ? 8 : strToInt(argv[2]); int y = argc < 4 ? 8 : strToInt(argv[3]); - + if (argc == 5) map._loadCcNum = strToInt(argv[4]); map.load(mapId); diff --git a/engines/xeen/dialogs/dialogs_create_char.cpp b/engines/xeen/dialogs/dialogs_create_char.cpp index 3115fbd10a..9f3e2a51f1 100644 --- a/engines/xeen/dialogs/dialogs_create_char.cpp +++ b/engines/xeen/dialogs/dialogs_create_char.cpp @@ -554,7 +554,7 @@ int CreateCharacterDialog::exchangeAttribute(int srcAttr) { break; int destAttr = getAttribFromKeycode(_buttonValue); - + if (destAttr != -1 && srcAttr != destAttr) { result = destAttr; break; diff --git a/engines/xeen/interface_minimap.cpp b/engines/xeen/interface_minimap.cpp index 583156cf5a..5805047d9e 100644 --- a/engines/xeen/interface_minimap.cpp +++ b/engines/xeen/interface_minimap.cpp @@ -161,7 +161,7 @@ void InterfaceMinimap::drawIndoorsMinimap() { (map._currentSteppedOn || party._wizardEyeActive)) { map._tileSprites.draw(1, map.mazeData()._surfaceTypes[map._currentSurfaceId] + 36, - Common::Point(MINIMAP_XSTART - (TILE_WIDTH / 2), + Common::Point(MINIMAP_XSTART - (TILE_WIDTH / 2), MINIMAP_YSTART - (TILE_HEIGHT / 2) + 1)); } @@ -192,7 +192,7 @@ void InterfaceMinimap::drawIndoorsMinimap() { } // Handle drawing partially clip top row and left column - for (int xp = MINIMAP_XSTART, yp = MINIMAP_YSTART + (MINIMAP_SIZE - 1) * TILE_HEIGHT, + for (int xp = MINIMAP_XSTART, yp = MINIMAP_YSTART + (MINIMAP_SIZE - 1) * TILE_HEIGHT, mazeX = pt.x - MINIMAP_DIFF, mazeY = pt.y + MINIMAP_DIFF; mazeX <= (pt.x - MINIMAP_DIFF); xp += TILE_WIDTH, yp -= TILE_HEIGHT, ++mazeX, --mazeY) { diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp index 6c4b6ac8c4..63478bab5f 100644 --- a/engines/xeen/locations.cpp +++ b/engines/xeen/locations.cpp @@ -1146,7 +1146,7 @@ int ArenaLocation::show() { int count = party._activeParty[0]._awards[WARZONE_AWARD]; int suffixNum = (count < 10) ? count : 0; Common::String msg = Common::String::format(format.c_str(), count, SUFFIXES[suffixNum]); - + LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER, msg, 1); map.load(28); @@ -1383,7 +1383,7 @@ int ReaperCutscene::show() { events.updateGameCounter(); screen.blitFrom(savedBg); sprites1.draw(0, 0, Common::Point(REAPER_X1[_ccNum][idx], REAPER_Y1[_ccNum][idx]), 0, idx); - + if (_ccNum) { sprites1.draw(0, 1, Common::Point(REAPER_X2[idx], REAPER_Y1[1][idx]), 0, idx); sprites1.draw(0, party._isNight ? 3 : 2, Common::Point(REAPER_X3[idx], REAPER_Y1[1][idx]), 0, idx); @@ -1592,7 +1592,7 @@ int GolemCutscene::show() { if (!_ccNum) sprites2[0].draw(0, 2, Common::Point(idx + g_vm->getRandomNumber(9) - 5, g_vm->getRandomNumber(9) - 5), SPRFLAG_800); - + if (!_ccNum && !sound.isSoundPlaying()) sound.playSound("ogre.voc"); @@ -2101,7 +2101,7 @@ int SphinxCutscene::show() { // Save background Graphics::ManagedSurface bgSurface; bgSurface.copyFrom(screen); - + for (int idx = 8; idx >= 0; --idx) { events.updateGameCounter(); screen.blitFrom(bgSurface); diff --git a/engines/xeen/patcher.cpp b/engines/xeen/patcher.cpp index f9d9ee77ff..10c8664776 100644 --- a/engines/xeen/patcher.cpp +++ b/engines/xeen/patcher.cpp @@ -57,7 +57,7 @@ void Patcher::patchScripts() { FileManager &files = *g_vm->_files; Map &map = *g_vm->_map; Party &party = *g_vm->_party; - + uint gameId = g_vm->getGameID(); if (gameId == GType_WorldOfXeen) gameId = files._ccNum ? GType_DarkSide : GType_Clouds; @@ -66,7 +66,7 @@ void Patcher::patchScripts() { const ScriptEntry &se = SCRIPT_PATCHES[patchIdx]; if (se._gameId != gameId || se._mapId != party._mazeId) continue; - + MazeEvent evt; Common::MemoryReadStream memStream(se._data, se._data[0] + 1); Common::Serializer s(&memStream, nullptr); diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp index 43164a1ce9..dd87f5807a 100644 --- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp +++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp @@ -278,7 +278,7 @@ bool CloudsCutscenes::showCloudsIntroInner() { sound.playVoice(_INTRO_VOCS[lineCtr]); } - for (int frameCtr = 0, lookup = 0; sound.isSoundPlaying() || + for (int frameCtr = 0, lookup = 0; sound.isSoundPlaying() || (_subtitles.active() && (lineCtr == 0 || lineCtr == 4 || lineCtr == 10 || lineCtr == 13)); ) { groupo.draw(0, 0); groupo.draw(0, 1, Common::Point(160, 0)); @@ -332,7 +332,7 @@ bool CloudsCutscenes::showCloudsIntroInner() { windows[0].writeString(Res.CLOUDS_INTRO1); ctr5 = (ctr5 + 1) % 19; - + WAIT(1); continue; } @@ -985,7 +985,7 @@ bool CloudsCutscenes::showCloudsEnding5() { king.draw(0, 1, Common::Point(160, 0)); screen.fadeIn(); _subtitles.setLine(13); - + sound.playVoice("king4.voc"); do { king.draw(0, 0, Common::Point(0, 0)); diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp index ef5c1df157..db9254f067 100644 --- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp +++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp @@ -104,7 +104,7 @@ bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) { // Render the next frame screen.vertMerge(0); nwc[nwcIndex].draw(0, nwcFrame); - + switch (idx) { case 17: sound.playSound(voc[0]); @@ -128,7 +128,7 @@ bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) { for (int idx = 0; idx < 42 && !g_vm->shouldExit(); ++idx) { screen.vertMerge(SCREEN_HEIGHT); nwc[3].draw(0, idx); - + switch (idx) { case 3: sound.playFX(40); @@ -808,7 +808,7 @@ bool DarkSideCutscenes::showWorldOfXeenLogo() { for (int idx = 0; idx < 21; ++idx) { screen.restoreBackground(); wfire[6].draw(0, idx, Common::Point(0, 45)); - + switch (idx) { case 0: case 11: diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp index 5beff45337..6d80e62806 100644 --- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp +++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp @@ -57,7 +57,7 @@ void MainMenuContainer::show() { MainMenuContainer::MainMenuContainer(const char *spritesName1, const char *spritesName2, const char *spritesName3) : _animateCtr(0), _dialog(nullptr) { g_vm->_files->setGameCc(g_vm->getGameID() == GType_Clouds ? 0 : 1); - + _backgroundSprites.resize(1 + (spritesName2 ? 1 : 0) + (spritesName3 ? 1 : 0)); _backgroundSprites[0].load(spritesName1); if (spritesName2) @@ -120,7 +120,7 @@ void MainMenuContainer::execute() { // Check for events events.updateGameCounter(); - + if (events.wait(4, true)) { if (_dialog) { // There's a dialog active, so let it handle the event @@ -337,7 +337,7 @@ void CloudsMenuDialog::loadButtons() { void CloudsMenuDialog::draw() { Windows &windows = *g_vm->_windows; Window &w = windows[GAME_WINDOW]; - + w.frame(); w.writeString(Common::String::format(Res.OPTIONS_MENU, Res.GAME_NAMES[0], g_vm->_gameWon[0] ? 117 : 92, 1992)); drawButtons(&w); @@ -584,7 +584,7 @@ void OtherOptionsDialog::draw() { w.frame(); w.writeString(Common::String::format(Res.OPTIONS_MENU, - Res.GAME_NAMES[g_vm->getGameID() == GType_WorldOfXeen ? 2 : 1], + Res.GAME_NAMES[g_vm->getGameID() == GType_WorldOfXeen ? 2 : 1], w.getBounds().height() - 33, 1993)); drawButtons(&w); } diff --git a/gui/debugger.cpp b/gui/debugger.cpp index fb03b57892..9b559d8bb9 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -404,17 +404,17 @@ void Debugger::splitCommand(char *input, int &argc, const char **argv) { byte c; enum states { DULL, IN_WORD, IN_STRING } state = DULL; const char *paramStart = nullptr; - + argc = 0; for (char *p = input; *p; ++p) { c = (byte)*p; switch (state) { - case DULL: + case DULL: // not in a word, not in a double quoted string if (isspace(c)) break; - + // not a space -- if it's a double quote we go to IN_STRING, else to IN_WORD if (c == '"') { state = IN_STRING; diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp index 696289ef68..977aaaf021 100644 --- a/gui/widgets/tab.cpp +++ b/gui/widgets/tab.cpp @@ -167,7 +167,7 @@ void TabWidget::setActiveTab(int tabID) { } _activeTab = tabID; _firstWidget = _tabs[tabID].firstWidget; - + // Also ensure the tab is visible in the tab bar if (_firstVisibleTab > tabID) setFirstVisible(tabID, true); |