[Scummvm-git-logs] scummvm master -> 9473b382b5c60356fb0483f8e526f8a16b8f72e2
bluegr
noreply at scummvm.org
Fri Dec 24 01:25:40 UTC 2021
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
df04cdd3df GRIFFON: Remove unused variable
5641d603c0 SAGA: Remove unused variable
c14e47753d MADE: Disable unused variable
a8745c9f35 NGI: Disable unused variable
aec7ece91e CRYOMNI3D: Remove unused variable
eaf173111c KYRA: Remove unused variable
fe66b2e249 TWINE: Remove unused variable
da5c1cebf3 GLK: JACL: Disable unused variable
9473b382b5 AUDIO: Remove unused variable
Commit: df04cdd3df63bafbcbdb520dc8b435198f871c52
https://github.com/scummvm/scummvm/commit/df04cdd3df63bafbcbdb520dc8b435198f871c52
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:14:06+02:00
Commit Message:
GRIFFON: Remove unused variable
Thanks to eientei for reporting this
Changed paths:
engines/griffon/dialogs.cpp
diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp
index 646c9cdc48..90f255bf27 100644
--- a/engines/griffon/dialogs.cpp
+++ b/engines/griffon/dialogs.cpp
@@ -628,8 +628,6 @@ void GriffonEngine::saveLoadNew() {
"new game", "", "load", "return",
};
- float y = 0.0;
-
_cloudAngle = 0;
int curRow = 0;
@@ -659,8 +657,6 @@ void GriffonEngine::saveLoadNew() {
do {
_videoBuffer->fillRect(Common::Rect(0, 0, _videoBuffer->w, _videoBuffer->h), 0);
- y += 1 * _fpsr;
-
rcDest.left = 256 + 256 * cos(PI / 180 * _cloudAngle * 40);
rcDest.top = 192 + 192 * sin(PI / 180 * _cloudAngle * 40);
rcDest.setWidth(320);
Commit: 5641d603c093edb995728312d6c37a12e4b9f3c2
https://github.com/scummvm/scummvm/commit/5641d603c093edb995728312d6c37a12e4b9f3c2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:14:23+02:00
Commit Message:
SAGA: Remove unused variable
Thanks to eientei for reporting this
Changed paths:
engines/saga/font.cpp
diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp
index adff8dab12..09c983403e 100644
--- a/engines/saga/font.cpp
+++ b/engines/saga/font.cpp
@@ -327,7 +327,6 @@ int DefaultFont::getHeight(FontId fontId, const char *text, int width, FontEffec
int h;
int wc;
int w_total;
- int len_total;
Common::Point textPoint;
textLength = getStringLength(text);
@@ -344,7 +343,6 @@ int DefaultFont::getHeight(FontId fontId, const char *text, int width, FontEffec
// String won't fit on one line
w_total = 0;
- len_total = 0;
wc = 0;
measurePointer = text;
@@ -376,13 +374,11 @@ int DefaultFont::getHeight(FontId fontId, const char *text, int width, FontEffec
return textPoint.y + h;
}
w_total = 0;
- len_total = 0;
wc = 0;
measurePointer = searchPointer;
} else {
// Word will fit ok
w_total += w;
- len_total += len;
wc++;
if (foundPointer == nullptr) {
// Since word hit NULL but fit, we are done
Commit: c14e47753d81e08af7ee61365791cdfce7519377
https://github.com/scummvm/scummvm/commit/c14e47753d81e08af7ee61365791cdfce7519377
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:15:12+02:00
Commit Message:
MADE: Disable unused variable
Thanks to eientei for reporting this
Changed paths:
engines/made/screen.cpp
diff --git a/engines/made/screen.cpp b/engines/made/screen.cpp
index c83db92889..a6e4a1c48c 100644
--- a/engines/made/screen.cpp
+++ b/engines/made/screen.cpp
@@ -553,11 +553,11 @@ uint16 Screen::placeText(uint16 channelIndex, uint16 textObjectIndex, int16 x, i
setFont(fontNum);
int textWidth = _font->getTextWidth(text);
- int textHeight = _font->getHeight();
+ //int textHeight = _font->getHeight();
if (outlineColor != -1) {
textWidth += 2;
- textHeight += 2;
+ //textHeight += 2;
x--;
y--;
}
Commit: a8745c9f35769d3493a0e416a6ee319055d04d2f
https://github.com/scummvm/scummvm/commit/a8745c9f35769d3493a0e416a6ee319055d04d2f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:15:33+02:00
Commit Message:
NGI: Disable unused variable
Thanks to eientei for reporting this
Changed paths:
engines/ngi/anihandler.cpp
diff --git a/engines/ngi/anihandler.cpp b/engines/ngi/anihandler.cpp
index 2d1f3f596c..72558a27ca 100644
--- a/engines/ngi/anihandler.cpp
+++ b/engines/ngi/anihandler.cpp
@@ -79,7 +79,10 @@ MessageQueue *AniHandler::makeQueue(StaticANIObject *ani, int staticsIndex, int,
Common::Point point;
ExCommand *ex;
+#if 0
int i = 0;
+#endif
+
do {
subidx = startidx + endidx * _items[idx].statics.size();
@@ -124,7 +127,9 @@ MessageQueue *AniHandler::makeQueue(StaticANIObject *ani, int staticsIndex, int,
else
step = _items[idx].subItems[subidx].movement->_dynamicPhases.size();
+#if 0
i += step;
+#endif
} while (startidx != endidx);
return mq;
Commit: aec7ece91edc247ad82055b8847ba79ae741bb53
https://github.com/scummvm/scummvm/commit/aec7ece91edc247ad82055b8847ba79ae741bb53
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:17:05+02:00
Commit Message:
CRYOMNI3D: Remove unused variable
Thanks to eientei for reporting this
Changed paths:
engines/cryomni3d/font_manager.cpp
diff --git a/engines/cryomni3d/font_manager.cpp b/engines/cryomni3d/font_manager.cpp
index 6c40cc5294..9b583da58e 100644
--- a/engines/cryomni3d/font_manager.cpp
+++ b/engines/cryomni3d/font_manager.cpp
@@ -245,7 +245,6 @@ bool FontManager::displayBlockText(const Common::U32String &text,
bool has_cr;
calculateWordWrap(text, &ptr, &finalPos, &has_cr, words);
uint spacesWidth = (words.size() - 1) * _spaceWidth;
- uint remainingSpace = (_blockRect.right - finalPos);
uint spaceConsumed = 0;
double spaceWidthPerWord;
if (words.size() == 1) {
@@ -263,7 +262,6 @@ bool FontManager::displayBlockText(const Common::U32String &text,
double sp = (word_i + 1) * spaceWidthPerWord - spaceConsumed;
_blockPos.x += int16(sp);
spaceConsumed += uint(sp);
- remainingSpace -= uint(sp);
}
}
if (_blockPos.y + _lineHeight + getFontMaxHeight() >= _blockRect.bottom) {
Commit: eaf173111c73d444acd208fe53e539f19936ef9d
https://github.com/scummvm/scummvm/commit/eaf173111c73d444acd208fe53e539f19936ef9d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:18:27+02:00
Commit Message:
KYRA: Remove unused variable
Thanks to eientei for reporting this
Changed paths:
engines/kyra/graphics/screen_eob.cpp
diff --git a/engines/kyra/graphics/screen_eob.cpp b/engines/kyra/graphics/screen_eob.cpp
index d63d3fdeaf..e7416f41c9 100644
--- a/engines/kyra/graphics/screen_eob.cpp
+++ b/engines/kyra/graphics/screen_eob.cpp
@@ -1887,7 +1887,6 @@ void OldDOSFont::drawCharIntern(uint16 c, byte *dst, int pitch, int bpp, int col
pitch *= bpp;
const uint8 *src = &_data[_bitmapOffsets[c]];
- uint8 *dst2 = dst + pitch;
int w = (_width - 1) >> 3;
pitch -= _width * bpp;
@@ -1976,7 +1975,6 @@ void OldDOSFont::drawCharIntern(uint16 c, byte *dst, int pitch, int bpp, int col
}
dst += pitch;
- dst2 += pitch;
}
}
Commit: fe66b2e249942e66705035dee53bf883436bf922
https://github.com/scummvm/scummvm/commit/fe66b2e249942e66705035dee53bf883436bf922
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:20:19+02:00
Commit Message:
TWINE: Remove unused variable
Thanks to eientei for reporting this
Changed paths:
engines/twine/holomap.cpp
diff --git a/engines/twine/holomap.cpp b/engines/twine/holomap.cpp
index 8592c132af..067486b235 100644
--- a/engines/twine/holomap.cpp
+++ b/engines/twine/holomap.cpp
@@ -201,7 +201,6 @@ void Holomap::prepareHolomapPolygons() {
int holomapSurfaceArrayIdx = 0;
_projectedSurfaceIndex = 0;
for (int32 alpha = -ANGLE_90; alpha <= ANGLE_90; alpha += ANGLE_11_25) {
- int rotation = ANGLE_0;
for (int32 beta = 0; beta < ANGLE_11_25; ++beta) {
IVec3 *vec = &_holomapSurface[holomapSurfaceArrayIdx++];
const IVec3 &destPos = _engine->_renderer->getBaseRotationPosition(vec->x, vec->y, vec->z);
@@ -213,7 +212,6 @@ void Holomap::prepareHolomapPolygons() {
const IVec3 &projPos = _engine->_renderer->projectPositionOnScreen(destPos);
_projectedSurfacePositions[_projectedSurfaceIndex].x1 = projPos.x;
_projectedSurfacePositions[_projectedSurfaceIndex].y1 = projPos.y;
- rotation += ANGLE_11_25;
++_projectedSurfaceIndex;
}
IVec3 *vec = &_holomapSurface[holomapSurfaceArrayIdx++];
@@ -221,7 +219,6 @@ void Holomap::prepareHolomapPolygons() {
const IVec3 &projPos = _engine->_renderer->projectPositionOnScreen(destPos);
_projectedSurfacePositions[_projectedSurfaceIndex].x1 = projPos.x;
_projectedSurfacePositions[_projectedSurfaceIndex].y1 = projPos.y;
- rotation += ANGLE_11_25;
++_projectedSurfaceIndex;
}
assert(holomapSortArrayIdx == ARRAYSIZE(_holomapSort));
Commit: da5c1cebf33f746f1e7f1620660b10850c90139f
https://github.com/scummvm/scummvm/commit/da5c1cebf33f746f1e7f1620660b10850c90139f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:23:30+02:00
Commit Message:
GLK: JACL: Disable unused variable
Thanks to eientei for reporting this
Changed paths:
engines/glk/jacl/parser.cpp
diff --git a/engines/glk/jacl/parser.cpp b/engines/glk/jacl/parser.cpp
index 0421366dc2..cb2b722f45 100644
--- a/engines/glk/jacl/parser.cpp
+++ b/engines/glk/jacl/parser.cpp
@@ -1616,13 +1616,14 @@ int noun_resolve(struct word_type *scope_word, int finding_from, int noun_number
/* AN AMBIGUOUS REFERENCE WAS MADE. ATTEMPT TO CALL ALL THE disambiguate
* FUNCTIONS TO SEE IF ANY OF THE OBJECT WANTS TO TAKE PREFERENCE IN
* THIS CIRCUMSTANCE */
+
+ /*
int situation = noun_number;
if (finding_from) {
situation += 4;
}
- /*
for (index = 1; index <= objects; index++) {
if (confidence[index] != FALSE) {
strcpy(function_name, "disambiguate");
Commit: 9473b382b5c60356fb0483f8e526f8a16b8f72e2
https://github.com/scummvm/scummvm/commit/9473b382b5c60356fb0483f8e526f8a16b8f72e2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-24T03:25:22+02:00
Commit Message:
AUDIO: Remove unused variable
Thanks to eientei for reporting this
Changed paths:
audio/midiparser_smf.cpp
diff --git a/audio/midiparser_smf.cpp b/audio/midiparser_smf.cpp
index c077f65c11..e66f074b54 100644
--- a/audio/midiparser_smf.cpp
+++ b/audio/midiparser_smf.cpp
@@ -166,7 +166,6 @@ void MidiParser_SMF::parseNextEvent(EventInfo &info) {
bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
uint32 len;
byte midiType;
- uint32 totalSize;
bool isGMF;
unloadMusic();
@@ -217,7 +216,6 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
return false;
}
- totalSize = 0;
int tracksRead = 0;
while (tracksRead < _numTracks) {
if (memcmp(pos, "MTrk", 4) && !isGMF) {
@@ -231,7 +229,6 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
if (!isGMF) {
pos += 4;
len = read4high(pos);
- totalSize += len;
pos += len;
} else {
// An SMF End of Track meta event must be placed
More information about the Scummvm-git-logs
mailing list