[Scummvm-git-logs] scummvm master -> a1c8db32017885c6f11ca1279a32b2d4e21e466c
eriktorbjorn
noreply at scummvm.org
Mon Jan 29 18:32:33 UTC 2024
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:
a1c8db3201 JANITORIAL: Clean up some whitespace and double semicolons
Commit: a1c8db32017885c6f11ca1279a32b2d4e21e466c
https://github.com/scummvm/scummvm/commit/a1c8db32017885c6f11ca1279a32b2d4e21e466c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-01-29T19:32:00+01:00
Commit Message:
JANITORIAL: Clean up some whitespace and double semicolons
Changed paths:
engines/freescape/freescape.cpp
engines/freescape/language/instruction.cpp
engines/gob/save/saveload_adibou1.cpp
engines/gob/save/saveload_v7.cpp
engines/hpl1/engine/libraries/angelscript/sources/as_builder.cpp
engines/hpl1/engine/libraries/newton/core/dgConvexHull3d.cpp
engines/hpl1/engine/libraries/newton/physics/dgCollisionCompound.cpp
engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.cpp
engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp
engines/kyra/sequence/seqplayer_lok.cpp
engines/m4/adv_db_r/db_catalog.cpp
engines/nancy/action/puzzle/setplayerclock.cpp
engines/nancy/action/soundrecords.cpp
engines/saga2/saveload.cpp
engines/saga2/sensor.cpp
engines/scumm/scumm.h
engines/tetraedge/te/te_renderer.cpp
engines/watchmaker/3d/render/opengl_2d.cpp
engines/watchmaker/classes/do_camera.cpp
engines/watchmaker/classes/do_camera.h
engines/watchmaker/t2d/t2d.cpp
engines/watchmaker/walk/ball.cpp
engines/watchmaker/work_dirs.h
graphics/macgui/mactext.cpp
graphics/tinygl/api.cpp
gui/widgets/grid.cpp
diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index c8795400a66..d366d63bc84 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -782,7 +782,7 @@ void FreescapeEngine::drawStringInSurface(const Common::String &str, int x, int
if (_font.get(position + j * 32 + i))
surface->setPixel(x + 8 - i + 8 * c, y + j, fontColor);
else
- surface->setPixel(x + 8 - i + 8 * c, y + j, backColor);;
+ surface->setPixel(x + 8 - i + 8 * c, y + j, backColor);
}
}
}
diff --git a/engines/freescape/language/instruction.cpp b/engines/freescape/language/instruction.cpp
index 0c85d4340c8..a58b4098077 100644
--- a/engines/freescape/language/instruction.cpp
+++ b/engines/freescape/language/instruction.cpp
@@ -90,7 +90,7 @@ Token::Type FCLInstruction::getType() {
}
bool FreescapeEngine::executeObjectConditions(GeometricObject *obj, bool shot, bool collided, bool activated) {
- bool executed = false;;
+ bool executed = false;
assert(obj != nullptr);
if (!obj->_conditionSource.empty()) {
_firstSound = true;
diff --git a/engines/gob/save/saveload_adibou1.cpp b/engines/gob/save/saveload_adibou1.cpp
index c7718184372..a0f2f1a527c 100644
--- a/engines/gob/save/saveload_adibou1.cpp
+++ b/engines/gob/save/saveload_adibou1.cpp
@@ -57,7 +57,7 @@ SaveLoad_Adibou1::SaveLoad_Adibou1(GobEngine *vm, const char *targetName) :
_saveFiles[index++].handler = _bouHandler = new GameFileHandler(vm, targetName, "bouinf");
_saveFiles[index++].handler = _drawingHandler = new SpriteHandler(vm, targetName, "drawing");
_saveFiles[index++].handler = _constructionHandler = new GameFileHandler(vm, targetName, "construction");
- _saveFiles[index++].handler = _menuHandler = new TempSpriteHandler(vm);;
+ _saveFiles[index++].handler = _menuHandler = new TempSpriteHandler(vm);
for (int i = 0; i < kAdibou1NbrOfDrawings; i++) {
_saveFiles[index++].handler = _drawingWithThumbnailHandler[i] = new DrawingWithThumbnailHandler(vm,
targetName,
@@ -93,7 +93,7 @@ int32 SaveLoad_Adibou1::SpriteHandler::getSize() {
Common::String fileName = _file.build();
if (fileName.empty())
- return -1;;
+ return -1;
SaveReader reader(1, 0, fileName);
SaveHeader header;
diff --git a/engines/gob/save/saveload_v7.cpp b/engines/gob/save/saveload_v7.cpp
index 15d70834983..ca2d1a684f7 100644
--- a/engines/gob/save/saveload_v7.cpp
+++ b/engines/gob/save/saveload_v7.cpp
@@ -859,7 +859,7 @@ int32 SaveLoad_v7::SpriteHandler::getSize() {
Common::String fileName = _file.build();
if (fileName.empty())
- return -1;;
+ return -1;
SaveReader reader(1, 0, fileName);
SaveHeader header;
diff --git a/engines/hpl1/engine/libraries/angelscript/sources/as_builder.cpp b/engines/hpl1/engine/libraries/angelscript/sources/as_builder.cpp
index b5f92f4f41b..9ac60b22471 100644
--- a/engines/hpl1/engine/libraries/angelscript/sources/as_builder.cpp
+++ b/engines/hpl1/engine/libraries/angelscript/sources/as_builder.cpp
@@ -4678,7 +4678,7 @@ int asCBuilder::RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file
else if (funcNode->tokenType == ttIdentifier && file->TokenEquals(funcNode->tokenPos, funcNode->tokenLength, OVERRIDE_TOKEN))
funcTraits.SetTrait(asTRAIT_OVERRIDE, true);
else {
- asCString msg(&file->code[funcNode->tokenPos], funcNode->tokenLength);;
+ asCString msg(&file->code[funcNode->tokenPos], funcNode->tokenLength);
msg.Format(TXT_UNEXPECTED_TOKEN_s, msg.AddressOf());
WriteError(msg.AddressOf(), file, node);
}
diff --git a/engines/hpl1/engine/libraries/newton/core/dgConvexHull3d.cpp b/engines/hpl1/engine/libraries/newton/core/dgConvexHull3d.cpp
index 2aa70a4e801..d6cae9a252e 100644
--- a/engines/hpl1/engine/libraries/newton/core/dgConvexHull3d.cpp
+++ b/engines/hpl1/engine/libraries/newton/core/dgConvexHull3d.cpp
@@ -340,7 +340,7 @@ dgInt32 dgConvexHull3d::InitVertexArray(dgHullVertex *const points, const dgFloa
}
validTetrahedrum = false;
- dgBigVector e2(dgFloat32(0.0f), dgFloat32(0.0f), dgFloat32(0.0f), dgFloat32(0.0f));;
+ dgBigVector e2(dgFloat32(0.0f), dgFloat32(0.0f), dgFloat32(0.0f), dgFloat32(0.0f));
dgBigVector normal(dgFloat32(0.0f), dgFloat32(0.0f), dgFloat32(0.0f), dgFloat32(0.0f));
for (dgInt32 i = 2; i < normalCount; i ++) {
dgInt32 indexSV = SupportVertex(&tree, points, normalArray[i]);
diff --git a/engines/hpl1/engine/libraries/newton/physics/dgCollisionCompound.cpp b/engines/hpl1/engine/libraries/newton/physics/dgCollisionCompound.cpp
index 869c1c6c4c1..56ad36aeea8 100644
--- a/engines/hpl1/engine/libraries/newton/physics/dgCollisionCompound.cpp
+++ b/engines/hpl1/engine/libraries/newton/physics/dgCollisionCompound.cpp
@@ -164,9 +164,9 @@ void dgCollisionCompound::dgNodeBase::reset() {
m_shape = NULL;
m_p0 = dgVector(0.0f, 0.0f, 0.0f, 0.0f);
- m_p1 = dgVector(0.0f, 0.0f, 0.0f, 0.0f);;
- m_size = dgVector(0.0f, 0.0f, 0.0f, 0.0f);;
- m_origin = dgVector(0.0f, 0.0f, 0.0f, 0.0f);;
+ m_p1 = dgVector(0.0f, 0.0f, 0.0f, 0.0f);
+ m_size = dgVector(0.0f, 0.0f, 0.0f, 0.0f);
+ m_origin = dgVector(0.0f, 0.0f, 0.0f, 0.0f);
m_area = 0.0f;
}
@@ -2175,7 +2175,7 @@ dgInt32 dgCollisionCompound::ClosestDitance(dgBody *const compoundBody,
leftDist = left->BoxClosestDistance(points, 8);
}
- const dgNodeBase *const right = me->m_right;;
+ const dgNodeBase *const right = me->m_right;
dgFloat32 rightDist = dgFloat32(0.0f);
if (right->m_type != m_leaf) {
rightDist = right->BoxClosestDistance(points, 8);
diff --git a/engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.cpp b/engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.cpp
index 72d44fe6075..81629be24fc 100644
--- a/engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.cpp
+++ b/engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.cpp
@@ -150,7 +150,7 @@ void dgCollisionUserMesh::DebugCollision(const dgMatrix &matrixPtr,
dgCollisionUserMeshShowPolyContext context;
context.m_matrix = matrixPtr;
- context.m_userData = userData;;
+ context.m_userData = userData;
context.m_callback = callback;
dgVector p0 (dgFloat32 (-1.0e20f), dgFloat32 (-1.0e20f), dgFloat32 (-1.0e20f), dgFloat32 (0.0f));
diff --git a/engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp b/engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp
index 62268464676..2f454f35954 100644
--- a/engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp
+++ b/engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp
@@ -3079,7 +3079,7 @@ void dgJacobianMemory::CalculateForcesSimulationModeSimd(
dgInt32 j;
j = first + k;
// force[j] = dgFloat32 (0.0f);
- // accel[j] -= dgFloat32 (0.0f);;
+ // accel[j] -= dgFloat32 (0.0f);
// deltaAccel[j] = dgFloat32 (0.0f);
// deltaForce[j] = dgFloat32 (0.0f);
normalForceIndex[j] = -1;
@@ -4356,7 +4356,7 @@ dgFloat32 dgJacobianMemory::CalculateJointForcesSimd(dgInt32 joint,
dgInt32 i;
i = first + j;
// force[i] = dgFloat32 (0.0f);
- // accel[j] -= dgFloat32 (0.0f);;
+ // accel[j] -= dgFloat32 (0.0f);
// activeRow[j] = dgFloat32 (0.0f);
// deltaAccel[j] = dgFloat32 (0.0f);
// deltaForce[j] = dgFloat32 (0.0f);
diff --git a/engines/kyra/sequence/seqplayer_lok.cpp b/engines/kyra/sequence/seqplayer_lok.cpp
index 56337b556ce..207ab13ae8d 100644
--- a/engines/kyra/sequence/seqplayer_lok.cpp
+++ b/engines/kyra/sequence/seqplayer_lok.cpp
@@ -46,7 +46,7 @@ SeqPlayer::SeqPlayer(KyraEngine_LoK *vm, OSystem *system) {
_seqWsaCurDecodePage = 0;
_seqDisplayedTextTimer = 0;
_seqDisplayTextFlag = false;
- _seqDisplayedText = 0;;
+ _seqDisplayedText = 0;
_seqDisplayedChar = 0;
_seqDisplayedTextX = 0;
_seqTalkTextPrinted = false;
diff --git a/engines/m4/adv_db_r/db_catalog.cpp b/engines/m4/adv_db_r/db_catalog.cpp
index 449be8301e9..470832e3c4e 100644
--- a/engines/m4/adv_db_r/db_catalog.cpp
+++ b/engines/m4/adv_db_r/db_catalog.cpp
@@ -228,7 +228,7 @@ static char *db_get_catalog_entry(char *c, short *tag, short *room, char *name,
if (name)
snprintf(name, MAX_FILENAME_SIZE, "%s", s);
- for (;; ) {
+ for (;;) {
if (c[x])
break;
x++;
diff --git a/engines/nancy/action/puzzle/setplayerclock.cpp b/engines/nancy/action/puzzle/setplayerclock.cpp
index 33fb892cea2..556c07a78c0 100644
--- a/engines/nancy/action/puzzle/setplayerclock.cpp
+++ b/engines/nancy/action/puzzle/setplayerclock.cpp
@@ -163,7 +163,7 @@ void SetPlayerClock::execute() {
if (_sceneChangeTime == 0) {
if (!g_nancy->_sound->isSoundPlaying(_alarmSetSound)) {
g_nancy->_sound->stopSound(_buttonSound);
- g_nancy->_sound->stopSound(_alarmSetSound);;
+ g_nancy->_sound->stopSound(_alarmSetSound);
NancySceneState.setPlayerTime(_alarmHours * 3600000, false);
_alarmSetScene.execute();
finishExecution();
diff --git a/engines/nancy/action/soundrecords.cpp b/engines/nancy/action/soundrecords.cpp
index db704caba70..b3454400621 100644
--- a/engines/nancy/action/soundrecords.cpp
+++ b/engines/nancy/action/soundrecords.cpp
@@ -271,7 +271,7 @@ void PlayRandomSoundTerse::readData(Common::SeekableReadStream &stream) {
void PlayRandomSoundTerse::execute() {
if (_state == kBegin) {
uint16 randomID = g_nancy->_randomSource->getRandomNumber(_soundNames.size() - 1);
- _sound.name = _soundNames[randomID];;
+ _sound.name = _soundNames[randomID];
_ccText = _ccTexts[randomID];
}
diff --git a/engines/saga2/saveload.cpp b/engines/saga2/saveload.cpp
index d704cda0661..f69061d6ead 100644
--- a/engines/saga2/saveload.cpp
+++ b/engines/saga2/saveload.cpp
@@ -54,7 +54,7 @@ const ChunkID gameID = MKTAG('F', 'T', 'A', '2');
void SaveFileHeader::read(Common::InSaveFile *in) {
char fileName[SaveFileHeader::kSaveNameSize];
- gameID = in->readUint32BE();;
+ gameID = in->readUint32BE();
in->read(fileName, SaveFileHeader::kSaveNameSize);
saveName = fileName;
}
diff --git a/engines/saga2/sensor.cpp b/engines/saga2/sensor.cpp
index 81ce0c59baa..e30d548b407 100644
--- a/engines/saga2/sensor.cpp
+++ b/engines/saga2/sensor.cpp
@@ -619,7 +619,7 @@ ObjectPropertySensor::ObjectPropertySensor(Common::InSaveFile *in, int16 ctr) :
debugC(3, kDebugSaveload, "Loading ObjectPropertySensor");
// Restore the object property ID
- _objectProperty = in->readSint16LE();;
+ _objectProperty = in->readSint16LE();
}
void ObjectPropertySensor::write(Common::MemoryWriteStreamDynamic *out) {
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 45866e07ae4..36b534f551d 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -975,7 +975,7 @@ protected:
const byte *_scriptOrgPointer = nullptr;
const byte * const *_lastCodePtr = nullptr;
byte _opcode = 0;
- bool _debug =false;
+ bool _debug = false;
byte _currentScript = 0xFF; // Let debug() work on init stage
int _scummStackPos = 0;
int _vmStack[256];
diff --git a/engines/tetraedge/te/te_renderer.cpp b/engines/tetraedge/te/te_renderer.cpp
index dbf76cff06d..50da5ce6a82 100644
--- a/engines/tetraedge/te/te_renderer.cpp
+++ b/engines/tetraedge/te/te_renderer.cpp
@@ -106,7 +106,7 @@ void TeRenderer::addTransparentMesh(const TeMesh &mesh, uint i1, uint tricount,
_transparentMeshNormals[propNo + 2] = mesh.normal(mesh.index(meshNo0 + 2));
if (mesh.hasUvs()) {
- _transparentMeshCoords[propNo] = mesh.textureUV(mesh.index(meshNo0));;
+ _transparentMeshCoords[propNo] = mesh.textureUV(mesh.index(meshNo0));
_transparentMeshCoords[propNo + 1] = mesh.textureUV(mesh.index(meshNo0 + 1));
_transparentMeshCoords[propNo + 2] = mesh.textureUV(mesh.index(meshNo0 + 2));
}
diff --git a/engines/watchmaker/3d/render/opengl_2d.cpp b/engines/watchmaker/3d/render/opengl_2d.cpp
index 6dfdb343398..e1495b49918 100644
--- a/engines/watchmaker/3d/render/opengl_2d.cpp
+++ b/engines/watchmaker/3d/render/opengl_2d.cpp
@@ -227,7 +227,7 @@ void rBlitter(WGame &game, int dst, int src, int dposx, int dposy,
int dwWidth, dwHeight;
dwWidth = game._renderer->_viewport.width();
- dwHeight = game._renderer->_viewport.height();;
+ dwHeight = game._renderer->_viewport.height();
if ((sdimx <= 0)) {
sdimx = bitmapList[src].DimX;
diff --git a/engines/watchmaker/classes/do_camera.cpp b/engines/watchmaker/classes/do_camera.cpp
index 5320ae13cb2..806617d30b6 100644
--- a/engines/watchmaker/classes/do_camera.cpp
+++ b/engines/watchmaker/classes/do_camera.cpp
@@ -111,7 +111,7 @@ void GetRealCharPos(Init &init, t3dV3F *Target, int32 oc, uint8 bn) {
}
t3dVectCopy(Target, &mesh->Trasl);
- Target->y = CurFloorY + CHEST_HEIGHT;;
+ Target->y = CurFloorY + CHEST_HEIGHT;
if ((bn) && (frame > 0)) {
if (mesh->Flags & T3D_MESH_DEFAULTANIM)
bone = &mesh->DefaultAnim.BoneTable[bn];
diff --git a/engines/watchmaker/classes/do_camera.h b/engines/watchmaker/classes/do_camera.h
index a08613ff4e6..20ba394446a 100644
--- a/engines/watchmaker/classes/do_camera.h
+++ b/engines/watchmaker/classes/do_camera.h
@@ -32,7 +32,7 @@ extern t3dV3F HeadAngles;
extern t3dF32 CamAngleX, CamAngleY;
void GetCameraTarget(Init &init, t3dV3F *Target);
-t3dCAMERA *PickCamera(t3dBODY *b, unsigned char in);;
+t3dCAMERA *PickCamera(t3dBODY *b, unsigned char in);
void doCamera(WGame &game);
void GetRealCharPos(Init &init, t3dV3F *Target, int32 oc, uint8 bn);
void ResetCameraTarget(void);
diff --git a/engines/watchmaker/t2d/t2d.cpp b/engines/watchmaker/t2d/t2d.cpp
index 9b291e521f8..f8f2f494032 100644
--- a/engines/watchmaker/t2d/t2d.cpp
+++ b/engines/watchmaker/t2d/t2d.cpp
@@ -3173,7 +3173,7 @@ void doT2D(WGame &game) {
switch (bT2DActive) {
case tSCANNER:
w = &t2dWin[T2D_WIN_SCANNER_BACKGROUND];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 0;
w->py = 0;
w->bm[T2D_BM_SCANNER_BACKGROUND_WIN].tnum = LoadDDBitmap(game, "t2d\\Scanner_BackgroundWin.tga", rSURFACESTRETCH);
@@ -3203,7 +3203,7 @@ void doT2D(WGame &game) {
GetDDBitmapExtends(renderer, &b->lim, &w->bm[T2D_BM_SCANNER_BACKGROUND_SELECTOR]);
w = &t2dWin[T2D_WIN_SCANNER_TOOLBAR];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 621;
w->py = 184;
w->bm[T2D_BM_SCANNER_TOOLBAR_WIN].tnum = LoadDDBitmap(game, "t2d\\Scanner_ToolbarWin.tga", rSURFACESTRETCH);
@@ -3267,7 +3267,7 @@ void doT2D(WGame &game) {
b->tnum = EXTRALS_SCAN;
w = &t2dWin[T2D_WIN_SCANNER_PROGRESSBAR];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 280;
w->py = 300;
w->bm[T2D_BM_SCANNER_PROGRESSBAR_WIN].tnum = LoadDDBitmap(game, "t2d\\Scanner_ProgressWin.tga", rSURFACESTRETCH);
@@ -3299,13 +3299,13 @@ void doT2D(WGame &game) {
LinkWinX = 0;
LinkWinY = 0;
- SelectorFlag = false;;
+ SelectorFlag = false;
break;
case tCOMPUTER:
//Inizializzazione finestra BackGround
w = &t2dWin[T2D_WIN_COMPUTER_BACKGROUND];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 0;
w->py = 0;
w->bm[T2D_BM_COMPUTER_BACKGROUND_WIN].tnum = LoadDDBitmap(game, "t2d\\Computer_BackgroundWin.tga", rSURFACESTRETCH);
@@ -3392,7 +3392,7 @@ void doT2D(WGame &game) {
//2: DialError
//3: SearchError
w = &t2dWin[T2D_WIN_COMPUTER_ERROR];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 300;
w->py = 100;
w->bm[T2D_BM_COMPUTER_COMERROR_WIN].tnum = LoadDDBitmap(game, "t2d\\Computer_ComError_Win.tga", rSURFACESTRETCH);
@@ -3472,7 +3472,7 @@ void doT2D(WGame &game) {
//Inizializzazione finestra DialUp
w = &t2dWin[T2D_WIN_COMPUTER_DIALUP];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 300;
w->py = 100;
w->bm[T2D_BM_COMPUTER_DIALUP_WIN].tnum = LoadDDBitmap(game, "t2d\\Computer_DialUpWin.tga", rSURFACESTRETCH);
@@ -3625,7 +3625,7 @@ void doT2D(WGame &game) {
//Inizializzazione finestra Search
w = &t2dWin[T2D_WIN_COMPUTER_SEARCH];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 100;
w->py = 100;
w->bm[T2D_BM_COMPUTER_SEARCH_ALPHABETICAL_WIN].tnum = LoadDDBitmap(game, "t2d\\Computer_Search_Alphabetical.tga", rSURFACESTRETCH);
@@ -3800,7 +3800,7 @@ void doT2D(WGame &game) {
//Inizializzazione finestra EMail
w = &t2dWin[T2D_WIN_COMPUTER_EMAIL];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 50;
w->py = 100;
w->bm[T2D_BM_COMPUTER_EMAIL_WIN].tnum = LoadDDBitmap(game, "t2d\\Computer_EMail_Win.tga", rSURFACESTRETCH);
@@ -3998,7 +3998,7 @@ void doT2D(WGame &game) {
//Inizializzazione finestra DocList
w = &t2dWin[T2D_WIN_COMPUTER_DOCLIST];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 100;
w->py = 150;
w->bm[T2D_BM_COMPUTER_DOCLIST_WIN].tnum = LoadDDBitmap(game, "t2d\\Computer_DocList_Win.tga", rSURFACESTRETCH);
@@ -4178,7 +4178,7 @@ void doT2D(WGame &game) {
case tDIARIO:
w = &t2dWin[T2D_WIN_DIARIO];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 0;
w->py = 0;
w->bm[T2D_BM_DIARIO_PAGE_1].tnum = LoadDDBitmap(game, "t2d\\Diario_Page1.tga", rSURFACESTRETCH);
@@ -4369,7 +4369,7 @@ void doT2D(WGame &game) {
case tPDA:
//Inizializzazione finestra Main
w = &t2dWin[T2D_WIN_PDA_MAIN];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 0;
w->py = 0;
w->bm[T2D_BM_PDA_MAIN_WIN].tnum = LoadDDBitmap(game, "t2d\\PDA_Main_Win.tga", rSURFACESTRETCH);
@@ -4430,7 +4430,7 @@ void doT2D(WGame &game) {
//Inizializzazione finestra Log Viewer
w = &t2dWin[T2D_WIN_PDA_LOG];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 30;
w->py = 31;
w->bm[T2D_BM_PDA_LOG_WIN].tnum = LoadDDBitmap(game, "t2d\\PDA_Log_Win.tga", rSURFACESTRETCH);
@@ -4514,7 +4514,7 @@ void doT2D(WGame &game) {
//Inizializzazione finestra Tone Sequencer
w = &t2dWin[T2D_WIN_PDA_TONE];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 30;
w->py = 31;
w->bm[T2D_BM_PDA_TONE_WIN].tnum = LoadDDBitmap(game, "t2d\\PDA_Tone_Win.tga", rSURFACESTRETCH);
@@ -4591,7 +4591,7 @@ void doT2D(WGame &game) {
//Inizializzazione finestra Help
w = &t2dWin[T2D_WIN_PDA_HELP];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 30;
w->py = 31;
w->bm[T2D_BM_PDA_HELP_WIN].tnum = LoadDDBitmap(game, "t2d\\PDA_Help_Win.tga", rSURFACESTRETCH);
@@ -4692,7 +4692,7 @@ void doT2D(WGame &game) {
//Inizializzazione finestra Main
w = &t2dWin[T2D_WIN_OPTIONS_MAIN];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 0;
w->py = 0;
//Bitmaps
@@ -4937,7 +4937,7 @@ void doT2D(WGame &game) {
optionsCurPos = 0;
optionsSlot = 0;
optionsWhat = 0;
- optionsSaveDescriptActive = false;;
+ optionsSaveDescriptActive = false;
NSaves = 0;
RefreshSaveImg(game, 0, 2);
@@ -4961,7 +4961,7 @@ void doT2D(WGame &game) {
case tMAINMENU:
//Inizializzazione finestra Main
w = &t2dWin[T2D_WIN_MAINMENU_MAIN];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 0;
w->py = 0;
//Bitmaps
@@ -5038,7 +5038,7 @@ void doT2D(WGame &game) {
case tGAMEOVER:
//Inizializzazione finestra Main
w = &t2dWin[T2D_WIN_GAMEOVER_MAIN];
- w->NOTSTRETCHED = false;;
+ w->NOTSTRETCHED = false;
w->px = 0;
w->py = 0;
//Bitmaps
diff --git a/engines/watchmaker/walk/ball.cpp b/engines/watchmaker/walk/ball.cpp
index d707193e5fe..a81daa8ad32 100644
--- a/engines/watchmaker/walk/ball.cpp
+++ b/engines/watchmaker/walk/ball.cpp
@@ -470,7 +470,7 @@ void ProcessGopherCamera(WGame &game) {
zero.y = CHEST_HEIGHT;
GetCameraTarget(game.init, &t3dCurCamera->Target);
- t3dCurCamera->Target.y = LastFloorY + CHEST_HEIGHT;;
+ t3dCurCamera->Target.y = LastFloorY + CHEST_HEIGHT;
t3dVectAdd(&t3dCurCamera->Source, &t3dCurCamera->Target, &zero);
Palla50->Flags |= T3D_CHARACTER_HIDE;
Freccia50->Flags |= T3D_CHARACTER_HIDE;
diff --git a/engines/watchmaker/work_dirs.h b/engines/watchmaker/work_dirs.h
index 4e60ce3bb55..3f9c75117c5 100644
--- a/engines/watchmaker/work_dirs.h
+++ b/engines/watchmaker/work_dirs.h
@@ -54,7 +54,7 @@ public:
Common::String result = first + second;
// Hacky, and assumes the extensions are the same length.
- return result.substr(0, result.size() - extReplacement.size()) + extReplacement;;
+ return result.substr(0, result.size() - extReplacement.size()) + extReplacement;
}
Common::String unwindowsify(const Common::String &str) const {
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index c9a74690bd2..ec2b97c9dab 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1642,7 +1642,7 @@ void MacText::getRowCol(int x, int y, int *sx, int *sy, int *row, int *col, int
int chunk = -1;
if (_canvas._text[nrow].chunks.size() > 0) {
- int alignOffset = _canvas.getAlignOffset(nrow) + _canvas._text[nrow].indent + _canvas._text[nrow].firstLineIndent;;
+ int alignOffset = _canvas.getAlignOffset(nrow) + _canvas._text[nrow].indent + _canvas._text[nrow].firstLineIndent;
int width = 0, pwidth = 0;
int mcol = 0, pmcol = 0;
diff --git a/graphics/tinygl/api.cpp b/graphics/tinygl/api.cpp
index 5bdd9be813d..e70085daa70 100644
--- a/graphics/tinygl/api.cpp
+++ b/graphics/tinygl/api.cpp
@@ -156,7 +156,7 @@ void tglEdgeFlag(TGLboolean flag) {
TinyGL::GLParam p[2];
p[0].op = TinyGL::OP_EdgeFlag;
- p[1].i = flag == TGL_TRUE ? 1 : 0;;
+ p[1].i = flag == TGL_TRUE ? 1 : 0;
c->gl_add_op(p);
}
diff --git a/gui/widgets/grid.cpp b/gui/widgets/grid.cpp
index a31efbe0837..156a6900a8b 100644
--- a/gui/widgets/grid.cpp
+++ b/gui/widgets/grid.cpp
@@ -912,8 +912,8 @@ void GridWidget::calcInnerHeight() {
}
}
x = _scrollWindowPaddingX;
- _sortedEntryList[k]->x = x;;
- _sortedEntryList[k]->y = y;;
+ _sortedEntryList[k]->x = x;
+ _sortedEntryList[k]->y = y;
x = _scrollWindowPaddingX + _gridXSpacing;
++row;
y += _sortedEntryList[k]->h + _gridYSpacing;
More information about the Scummvm-git-logs
mailing list