[Scummvm-git-logs] scummvm master -> ba37c52047b9fe5b4a4c1ba0387ab043014964a5
eriktorbjorn
eriktorbjorn at telia.com
Tue Nov 17 06:23:40 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ba37c52047 JANITORIAL: Remove some unnecessary semicolons
Commit: ba37c52047b9fe5b4a4c1ba0387ab043014964a5
https://github.com/scummvm/scummvm/commit/ba37c52047b9fe5b4a4c1ba0387ab043014964a5
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2020-11-17T07:22:49+01:00
Commit Message:
JANITORIAL: Remove some unnecessary semicolons
Changed paths:
engines/bladerunner/slice_animations.cpp
engines/cryo/eden_graphics.cpp
engines/cryomni3d/dialogs_manager.cpp
engines/director/frame.cpp
engines/director/score.cpp
engines/glk/quest/geas_runner.cpp
engines/hdb/metaengine.cpp
engines/hdb/window.cpp
engines/kyra/graphics/screen_eob_amiga.cpp
engines/kyra/sequence/sequences_eob.cpp
engines/lilliput/script.cpp
engines/ultima/nuvie/core/magic.cpp
engines/ultima/nuvie/gui/gui_button.cpp
engines/ultima/nuvie/menus/video_dialog.cpp
engines/ultima/nuvie/usecode/u6_usecode.cpp
engines/ultima/ultima8/games/game_data.cpp
engines/ultima/ultima8/graphics/anim_dat.cpp
engines/ultima/ultima8/ultima8.cpp
math/vector2d.cpp
diff --git a/engines/bladerunner/slice_animations.cpp b/engines/bladerunner/slice_animations.cpp
index d9f44b990f..b501c63205 100644
--- a/engines/bladerunner/slice_animations.cpp
+++ b/engines/bladerunner/slice_animations.cpp
@@ -59,7 +59,7 @@ bool SliceAnimations::open(const Common::String &name) {
_palettes[i].color[j].b = color_b;
const int bladeToScummVmConstant = 256 / 32; // 5 bits to 8 bits
- _palettes[i].value[j] = screenFormat.RGBToColor(color_r * bladeToScummVmConstant, color_g * bladeToScummVmConstant, color_b * bladeToScummVmConstant);;
+ _palettes[i].value[j] = screenFormat.RGBToColor(color_r * bladeToScummVmConstant, color_g * bladeToScummVmConstant, color_b * bladeToScummVmConstant);
}
}
diff --git a/engines/cryo/eden_graphics.cpp b/engines/cryo/eden_graphics.cpp
index b4a8817a0b..3896a9fdbb 100644
--- a/engines/cryo/eden_graphics.cpp
+++ b/engines/cryo/eden_graphics.cpp
@@ -262,7 +262,7 @@ void EdenGraphics::sundcurs(int16 x, int16 y) {
*keep++ = *scr++;
scr += 640 - 48;
}
- _game->setCursorSaved(true);;
+ _game->setCursorSaved(true);
}
void EdenGraphics::rundcurs() {
@@ -1260,7 +1260,7 @@ void EdenGraphics::playHNM(int16 num) {
showMovie(1);
_cursKeepPos = Common::Point(-1, -1);
if (_game->getSpecialTextMode()) {
- _game->setMusicFade(3);;
+ _game->setMusicFade(3);
_game->musicspy();
_game->_globals->_characterPtr = perso;
_game->_globals->_dialogType = oldDialogType;
diff --git a/engines/cryomni3d/dialogs_manager.cpp b/engines/cryomni3d/dialogs_manager.cpp
index 145fe0b074..680f27f928 100644
--- a/engines/cryomni3d/dialogs_manager.cpp
+++ b/engines/cryomni3d/dialogs_manager.cpp
@@ -289,7 +289,7 @@ bool DialogsManager::play(const Common::String &sequence, bool &slowStop) {
}
gotoList = executeAfterPlayAndBuildGotoList(actions);
Common::StringArray questions;
- bool endOfConversationFound = false;;
+ bool endOfConversationFound = false;
if (_ignoreNoEndOfConversation) {
// Don't check if there is an end, so, there is one
endOfConversationFound = true;
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index cb65819590..c152132f27 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -33,7 +33,7 @@ namespace Director {
Frame::Frame(Score *score, int numChannels) {
_score = score;
- _vm = score->getMovie()->getVM();;
+ _vm = score->getMovie()->getVM();
_transDuration = 0;
_transType = kTransNone;
_transArea = 0;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 7c860adffc..6d0727e9d5 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -471,7 +471,7 @@ bool Score::renderTransition(uint16 frameId) {
if (tp) {
_window->playTransition(tp->duration, tp->area, tp->chunkSize, tp->type, frameId);
- delete _window->_puppetTransition;;
+ delete _window->_puppetTransition;
_window->_puppetTransition = nullptr;
return true;
} else if (currentFrame->_transType) {
diff --git a/engines/glk/quest/geas_runner.cpp b/engines/glk/quest/geas_runner.cpp
index 37e1a54c77..b9b25be7e5 100644
--- a/engines/glk/quest/geas_runner.cpp
+++ b/engines/glk/quest/geas_runner.cpp
@@ -2439,7 +2439,7 @@ void geas_implementation::run_script(String s, String &rv) {
else if (tok == "pause") {
tok = next_token(s, c1, c2);
if (!is_param(tok)) {
- gi->debug_print("Expected parameter after pause in " + s);;
+ gi->debug_print("Expected parameter after pause in " + s);
return;
}
int i = eval_int(param_contents(tok));
diff --git a/engines/hdb/metaengine.cpp b/engines/hdb/metaengine.cpp
index 3ca7d83dde..cc04dfae5e 100644
--- a/engines/hdb/metaengine.cpp
+++ b/engines/hdb/metaengine.cpp
@@ -127,7 +127,7 @@ SaveStateList HDBMetaEngine::listSaves(const char *target) const {
}
desc.setThumbnail(thumbnail);
- uint32 timeSeconds = in->readUint32LE();;
+ uint32 timeSeconds = in->readUint32LE();
in->read(mapName, 32);
debug(1, "mapName: %s playtime: %d", mapName, timeSeconds);
diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp
index 049993b23b..2b87b682ac 100644
--- a/engines/hdb/window.cpp
+++ b/engines/hdb/window.cpp
@@ -1740,7 +1740,7 @@ void Window::drawTryAgain() {
_tryAgainInfo.y1 = _tryY1;
_tryAgainInfo.y2 = _tryY2;
- _tryAgainInfo.x1 = g_hdb->_screenDrawWidth / 2 - _gfxTry->_width / 2;;
+ _tryAgainInfo.x1 = g_hdb->_screenDrawWidth / 2 - _gfxTry->_width / 2;
_tryAgainInfo.x2 = g_hdb->_screenDrawWidth / 2 - _gfxAgain->_width / 2;
}
diff --git a/engines/kyra/graphics/screen_eob_amiga.cpp b/engines/kyra/graphics/screen_eob_amiga.cpp
index ddc40732ac..1b4c7c2a36 100644
--- a/engines/kyra/graphics/screen_eob_amiga.cpp
+++ b/engines/kyra/graphics/screen_eob_amiga.cpp
@@ -181,7 +181,7 @@ bool AmigaDOSFont::load(Common::SeekableReadStream &file) {
for (int i = 0; i < _numElements; ++i) {
file.read(cfile, _maxPathLen);
- _content[i].height = file.readUint16BE();;
+ _content[i].height = file.readUint16BE();
_content[i].style = file.readByte();
_content[i].flags = file.readByte();
_content[i].contentFile = cfile;
diff --git a/engines/kyra/sequence/sequences_eob.cpp b/engines/kyra/sequence/sequences_eob.cpp
index 52c44bd333..4185f0c2e8 100644
--- a/engines/kyra/sequence/sequences_eob.cpp
+++ b/engines/kyra/sequence/sequences_eob.cpp
@@ -1765,7 +1765,7 @@ EoBAmigaFinalePlayer::EoBAmigaFinalePlayer(EoBEngine *vm, Screen_EoB *screen) :
_councilAnimData4 = _vm->staticres()->loadRawData(kEoB1FinaleCouncilAnim4, size);
_eyesAnimData = _vm->staticres()->loadRawData(kEoB1FinaleEyesAnim, size);
_handsAnimData = (const int16*)_vm->staticres()->loadRawDataBe16(kEoB1FinaleHandsAnim, size);
- _textFrameDuration = _vm->staticres()->loadRawData(kEoB1FinaleTextDuration, size);;
+ _textFrameDuration = _vm->staticres()->loadRawData(kEoB1FinaleTextDuration, size);
}
EoBAmigaFinalePlayer::~EoBAmigaFinalePlayer() {
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index 505db2e352..4d156b2e0a 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -3045,7 +3045,7 @@ void LilliputScript::OC_waitForEvent() {
while (true) {
if (_vm->_keyboard_checkKeyboard()) {
_vm->_keyboard_getch();
- break;;
+ break;
}
if (_vm->_mouseButton == 1)
break;
diff --git a/engines/ultima/nuvie/core/magic.cpp b/engines/ultima/nuvie/core/magic.cpp
index 410f531be9..3a21c72dfd 100644
--- a/engines/ultima/nuvie/core/magic.cpp
+++ b/engines/ultima/nuvie/core/magic.cpp
@@ -169,7 +169,7 @@ bool Magic::cast() {
if (cast_buffer_len != 0) {
event->scroll->display_string("\n(");
event->scroll->display_string(spell[index]->name);
- event->scroll->display_string(")\n");;
+ event->scroll->display_string(")\n");
} else {
event->scroll->display_string(spell[index]->name);
event->scroll->display_string("\n\"");
diff --git a/engines/ultima/nuvie/gui/gui_button.cpp b/engines/ultima/nuvie/gui/gui_button.cpp
index 3c486300cc..a264f1363b 100644
--- a/engines/ultima/nuvie/gui/gui_button.cpp
+++ b/engines/ultima/nuvie/gui/gui_button.cpp
@@ -169,7 +169,7 @@ void GUI_Button:: Display(bool full_redraw) {
}
if (!enabled) {
uint8 *pointer;
- int pixel = SDL_MapRGB(surface->format, 0, 0, 0);;
+ int pixel = SDL_MapRGB(surface->format, 0, 0, 0);
uint8 bytepp = surface->format.bytesPerPixel;
if (!SDL_LockSurface(surface)) {
diff --git a/engines/ultima/nuvie/menus/video_dialog.cpp b/engines/ultima/nuvie/menus/video_dialog.cpp
index 0e75db0da7..e4c3b79a76 100644
--- a/engines/ultima/nuvie/menus/video_dialog.cpp
+++ b/engines/ultima/nuvie/menus/video_dialog.cpp
@@ -64,7 +64,7 @@ bool VideoDialog::init() {
int buttonY = 9;
uint8 textY = 11;
uint8 row_h = 13;
- last_index = 0;;
+ last_index = 0;
b_index_num = -1;
bool no_fullscreen = false; // no compatible fullscreen setting found
GUI_Widget *widget;
diff --git a/engines/ultima/nuvie/usecode/u6_usecode.cpp b/engines/ultima/nuvie/usecode/u6_usecode.cpp
index e4ab50c406..b86b23499e 100644
--- a/engines/ultima/nuvie/usecode/u6_usecode.cpp
+++ b/engines/ultima/nuvie/usecode/u6_usecode.cpp
@@ -2040,7 +2040,7 @@ bool U6UseCode::use_balloon(Obj *obj, UseCodeEvent ev) {
// drop on 'spot' instead.
obj_manager->unlink_from_engine(obj);
obj->x = spot.x;
- obj->y = spot.y;;
+ obj->y = spot.y;
obj->z = spot.z;
dropped = true;
}
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index b7c277a51d..1a4987fdf2 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -236,13 +236,13 @@ void GameData::loadU8Data() {
Common::SeekableReadStream *fd = filesystem->ReadFile("@game/static/fixed.dat");
if (!fd)
- error("Unable to load static/fixed.dat");;
+ error("Unable to load static/fixed.dat");
_fixed = new RawArchive(fd);
char langletter = _gameInfo->getLanguageUsecodeLetter();
if (!langletter)
- error("Unknown language. Unable to open usecode");;
+ error("Unknown language. Unable to open usecode");
Std::string filename = "@game/usecode/";
filename += langletter;
@@ -261,7 +261,7 @@ void GameData::loadU8Data() {
if (!sf) sf = filesystem->ReadFile("@game/static/u8shapes.cmp");
if (!sf)
- error("Unable to load static/u8shapes.flx or static/u8shapes.cmp");;
+ error("Unable to load static/u8shapes.flx or static/u8shapes.cmp");
_mainShapes = new MainShapeArchive(sf, MAINSHAPES,
PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
diff --git a/engines/ultima/ultima8/graphics/anim_dat.cpp b/engines/ultima/ultima8/graphics/anim_dat.cpp
index 1fc728f0e7..b264a2f0be 100644
--- a/engines/ultima/ultima8/graphics/anim_dat.cpp
+++ b/engines/ultima/ultima8/graphics/anim_dat.cpp
@@ -135,7 +135,7 @@ uint32 AnimDat::getActionNumberForSequence(Animation::Sequence action, const Act
case Animation::teleportOutReplacement:
return Animation::teleportOut;
default:
- return static_cast<uint32>(action);;
+ return static_cast<uint32>(action);
}
}
}
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index a5c86959d5..e71ad528d9 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -948,7 +948,7 @@ Common::Error Ultima8Engine::loadGameState(int slot) {
}
Common::Error Ultima8Engine::saveGameState(int slot, const Common::String &desc, bool isAutosave) {
- Common::Error result = Shared::UltimaEngine::saveGameState(slot, desc, isAutosave);;
+ Common::Error result = Shared::UltimaEngine::saveGameState(slot, desc, isAutosave);
if (!isAutosave) {
if (result.getCode() == Common::kNoError)
diff --git a/math/vector2d.cpp b/math/vector2d.cpp
index 5d01f98aac..dd11beb8fb 100644
--- a/math/vector2d.cpp
+++ b/math/vector2d.cpp
@@ -48,7 +48,7 @@ Vector2d::Matrix(const float *data) :
void Vector2d::rotateAround(const Vector2d &point, const Angle &angle) {
*this -= point;
float cosa = angle.getCosine();
- float sina = angle.getSine();;
+ float sina = angle.getSine();
float x = value(0) * cosa - value(1) * sina;
value(1) = value(0) * sina + value(1) * cosa;
More information about the Scummvm-git-logs
mailing list