[Scummvm-git-logs] scummvm master -> 58246b76be9569347126bb5a4fc8c565ecca1cf5
sev-
sev at scummvm.org
Sat Nov 14 18:27:39 UTC 2020
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
561a0a61be BLADERUNNER: Fix warnings
21e4efec29 GLK: ADRIFT: Fix warning
78c9438f90 PETKA: Fix warning
6214439aa9 STARTREK: Fix warning
7ff469982c TINSEL: Fix warnings
f2a6b34182 TWINE: Fix warning
b6945a834b ULTIMA: ULTIMA4: Fix warnings
58246b76be ULTIMA: ULTIMA8: Fix warnings
Commit: 561a0a61bea09df859a2d4036b8be64ddc4fdf59
https://github.com/scummvm/scummvm/commit/561a0a61bea09df859a2d4036b8be64ddc4fdf59
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-14T19:27:08+01:00
Commit Message:
BLADERUNNER: Fix warnings
Changed paths:
engines/bladerunner/ui/kia_section_settings.cpp
engines/bladerunner/ui/ui_dropdown.h
diff --git a/engines/bladerunner/ui/kia_section_settings.cpp b/engines/bladerunner/ui/kia_section_settings.cpp
index c3873d5240..0be34a9a95 100644
--- a/engines/bladerunner/ui/kia_section_settings.cpp
+++ b/engines/bladerunner/ui/kia_section_settings.cpp
@@ -323,7 +323,7 @@ void KIASectionSettings::draw(Graphics::Surface &surface) {
}
// +2 to the max of original index of textOptions which is 41
const char *textSubtitles = strcmp(_vm->_textOptions->getText(42), "") == 0 ? subtitlesTranslation : _vm->_textOptions->getText(42);
- const char *textLanguageSelect = strcmp(_vm->_textOptions->getText(43), "") == 0 ? languageSelectTranslation : _vm->_textOptions->getText(43);
+ //const char *textLanguageSelect = strcmp(_vm->_textOptions->getText(43), "") == 0 ? languageSelectTranslation : _vm->_textOptions->getText(43);
if (_vm->_language == Common::RU_RUS) {
// special case for Russian version, put the option in a new line to avoid overlap
diff --git a/engines/bladerunner/ui/ui_dropdown.h b/engines/bladerunner/ui/ui_dropdown.h
index 9a89ebee91..413d6cfe5c 100644
--- a/engines/bladerunner/ui/ui_dropdown.h
+++ b/engines/bladerunner/ui/ui_dropdown.h
@@ -45,7 +45,7 @@ class UIDropDown : public UIComponent {
static const int kDropDownButtonShapeHeight = 10;
static const uint8 kFrameRectPaddingPx = 2;
static const int kFurthestLeftForScrollBar = 495;
-
+
static const Color256 kColors[];
int _controlLeftX;
@@ -57,8 +57,8 @@ class UIDropDown : public UIComponent {
Common::String _lineSelectedStr;
UIScrollBox *_lineSelectorScrollBox;
UIImagePicker *_lineDropdownBtn;
- int _lineDropdownBtnTopY;
- int _lineDropdownBtnHeight;
+ //int _lineDropdownBtnTopY;
+ //int _lineDropdownBtnHeight;
Common::Rect _lineSelectorFrameRect;
int _lineSelectorFrameRectColor;
Commit: 21e4efec29cf15eabf4f40b5f8fdad0b31cb875a
https://github.com/scummvm/scummvm/commit/21e4efec29cf15eabf4f40b5f8fdad0b31cb875a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-14T19:27:08+01:00
Commit Message:
GLK: ADRIFT: Fix warning
Changed paths:
engines/glk/adrift/sctaffil.cpp
diff --git a/engines/glk/adrift/sctaffil.cpp b/engines/glk/adrift/sctaffil.cpp
index da9400d216..eea22445e9 100644
--- a/engines/glk/adrift/sctaffil.cpp
+++ b/engines/glk/adrift/sctaffil.cpp
@@ -435,7 +435,7 @@ static sc_bool taf_read_raw(sc_tafref_t taf, sc_read_callbackref_t callback,
totalBytes = bytesLeft + bytesRead;
bytesWritten = taf_append_buffer(taf, buffer, totalBytes);
-
+
bytesLeft = totalBytes - bytesWritten;
if (bytesLeft)
Common::copy(buffer + bytesWritten, buffer + totalBytes, buffer);
@@ -699,7 +699,7 @@ void taf_debug_dump(sc_tafref_t taf) {
sc_trace("taf->slabs = \n");
for (index_ = 0; index_ < taf->slab_count; index_++) {
sc_trace("%3ld : %p, %ld bytes\n", index_,
- taf->slabs[index_].data, taf->slabs[index_].size);
+ (void *)taf->slabs[index_].data, taf->slabs[index_].size);
}
sc_trace("taf->slab_count = %ld\n", taf->slab_count);
Commit: 78c9438f90b1b3f45f80e405333b71eb7041f3e9
https://github.com/scummvm/scummvm/commit/78c9438f90b1b3f45f80e405333b71eb7041f3e9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-14T19:27:08+01:00
Commit Message:
PETKA: Fix warning
Changed paths:
engines/petka/objects/object_star.cpp
diff --git a/engines/petka/objects/object_star.cpp b/engines/petka/objects/object_star.cpp
index 186ac122cc..4e303d8548 100644
--- a/engines/petka/objects/object_star.cpp
+++ b/engines/petka/objects/object_star.cpp
@@ -33,7 +33,7 @@
namespace Petka {
-const uint kFirstCursorId = 5001;
+//const uint kFirstCursorId = 5001;
const uint kCaseButtonIndex = 0;
QObjectStar::QObjectStar() {
Commit: 6214439aa9377f972bac7dc5758ecfa7ce5f4ba5
https://github.com/scummvm/scummvm/commit/6214439aa9377f972bac7dc5758ecfa7ce5f4ba5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-14T19:27:09+01:00
Commit Message:
STARTREK: Fix warning
Changed paths:
engines/startrek/resource.h
diff --git a/engines/startrek/resource.h b/engines/startrek/resource.h
index 751630cc3d..a6d8bffd97 100644
--- a/engines/startrek/resource.h
+++ b/engines/startrek/resource.h
@@ -60,7 +60,7 @@ public:
}
private:
- IWFile *_iwFile;
+ //IWFile *_iwFile;
Common::MacResManager *_macResFork;
Common::Platform _platform;
bool _isDemo;
Commit: 7ff469982c5f30232ca06ed48c5dff17268fcdcb
https://github.com/scummvm/scummvm/commit/7ff469982c5f30232ca06ed48c5dff17268fcdcb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-14T19:27:09+01:00
Commit Message:
TINSEL: Fix warnings
Changed paths:
engines/tinsel/pdisplay.cpp
diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp
index f976db06cd..9eb578be7f 100644
--- a/engines/tinsel/pdisplay.cpp
+++ b/engines/tinsel/pdisplay.cpp
@@ -392,7 +392,7 @@ static bool InHotSpot(int ano, int aniX, int aniY, int *pxtext, int *pytext) {
* the tag or, if tag already displayed, maintain the tag's position on
* the screen.
*/
-static bool ActorTag(int curX, int curY, HotSpotTag *pTag, OBJECT **ppText) {
+static bool ActorTag(int curX_, int curY_, HotSpotTag *pTag, OBJECT **ppText) {
int newX, newY; // new values, to keep tag in place
int ano;
int xtext, ytext;
@@ -449,7 +449,7 @@ static bool ActorTag(int curX, int curY, HotSpotTag *pTag, OBJECT **ppText) {
// For each actor with a tag....
_vm->_actor->FirstTaggedActor();
while ((ano = _vm->_actor->NextTaggedActor()) != 0) {
- if (InHotSpot(ano, curX, curY, &xtext, &ytext)) {
+ if (InHotSpot(ano, curX_, curY_, &xtext, &ytext)) {
// Put up or maintain actor tag
if (*pTag != ACTOR_HOTSPOT_TAG)
newActor = true;
@@ -667,11 +667,11 @@ void TagProcess(CORO_PARAM, const void *) {
while (1) {
if (g_bTagsActive) {
- int curX, curY; // cursor position
- while (!_vm->_cursor->GetCursorXYNoWait(&curX, &curY, true))
+ int curX_, curY_; // cursor position
+ while (!_vm->_cursor->GetCursorXYNoWait(&curX_, &curY_, true))
CORO_SLEEP(1);
- if (!ActorTag(curX, curY, &_ctx->Tag, &_ctx->pText)
+ if (!ActorTag(curX_, curY_, &_ctx->Tag, &_ctx->pText)
&& !PolyTag(&_ctx->Tag, &_ctx->pText)) {
// Nothing tagged. Remove tag, if there is one
if (_ctx->pText) {
Commit: f2a6b34182dfb9a566233378ea758f86642fe8b5
https://github.com/scummvm/scummvm/commit/f2a6b34182dfb9a566233378ea758f86642fe8b5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-14T19:27:09+01:00
Commit Message:
TWINE: Fix warning
Changed paths:
engines/twine/input.h
diff --git a/engines/twine/input.h b/engines/twine/input.h
index 76d519fe0a..15d6e3aaeb 100644
--- a/engines/twine/input.h
+++ b/engines/twine/input.h
@@ -105,7 +105,7 @@ private:
Common::String _currentKeyMap;
uint8 actionStates[TwinEActionType::Max]{false};
- int16 currentKey = 0;
+ //int16 currentKey = 0;
public:
Input(TwinEEngine *engine);
Commit: b6945a834bc8f839f45800a476acfce255689f1c
https://github.com/scummvm/scummvm/commit/b6945a834bc8f839f45800a476acfce255689f1c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-14T19:27:09+01:00
Commit Message:
ULTIMA: ULTIMA4: Fix warnings
Changed paths:
engines/ultima/ultima4/game/armor.cpp
engines/ultima/ultima4/game/armor.h
engines/ultima/ultima4/gfx/screen.cpp
engines/ultima/ultima4/gfx/screen.h
diff --git a/engines/ultima/ultima4/game/armor.cpp b/engines/ultima/ultima4/game/armor.cpp
index 194452c4ed..4536b0b2af 100644
--- a/engines/ultima/ultima4/game/armor.cpp
+++ b/engines/ultima/ultima4/game/armor.cpp
@@ -81,7 +81,7 @@ void Armors::loadConf() {
/*-------------------------------------------------------------------*/
Armor::Armor(ArmorType armorType, const ConfigElement &conf) :
- _type(armorType), _canUse(0xff), _mask(0) {
+ _type(armorType), _canUse(0xff) /*, _mask(0) */ {
_name = conf.getString("name");
_defense = conf.getInt("defense");
diff --git a/engines/ultima/ultima4/game/armor.h b/engines/ultima/ultima4/game/armor.h
index ae676b41a1..0135d3c0f2 100644
--- a/engines/ultima/ultima4/game/armor.h
+++ b/engines/ultima/ultima4/game/armor.h
@@ -58,7 +58,7 @@ private:
Common::String _name;
byte _canUse;
int _defense;
- unsigned short _mask;
+ //unsigned short _mask;
};
class Armors : public Std::vector<Armor *> {
diff --git a/engines/ultima/ultima4/gfx/screen.cpp b/engines/ultima/ultima4/gfx/screen.cpp
index 5bdaf6d5ae..02bc819487 100644
--- a/engines/ultima/ultima4/gfx/screen.cpp
+++ b/engines/ultima/ultima4/gfx/screen.cpp
@@ -58,8 +58,8 @@ Screen *g_screen;
Screen::Screen() : _filterScaler(nullptr), _currentMouseCursor(-1),
_gemLayout(nullptr), _tileAnims(nullptr), _charSetInfo(nullptr),
_gemTilesInfo(nullptr), _needPrompt(1), _currentCycle(0),
- _cursorStatus(0), _cursorEnabled(1), _priorFrameTime(0),
- _continueScreenRefresh(true) {
+ _cursorStatus(0), _cursorEnabled(1), _priorFrameTime(0)
+ /* , _continueScreenRefresh(true) */ {
g_screen = this;
Common::fill(&_mouseCursors[0], &_mouseCursors[5], (MouseCursorSurface *)nullptr);
Common::fill(&_los[0][0], &_los[0][0] + (VIEWPORT_W * VIEWPORT_H), 0);
diff --git a/engines/ultima/ultima4/gfx/screen.h b/engines/ultima/ultima4/gfx/screen.h
index 6a595553fd..3ff5d1ccdc 100644
--- a/engines/ultima/ultima4/gfx/screen.h
+++ b/engines/ultima/ultima4/gfx/screen.h
@@ -118,7 +118,7 @@ private:
int _cursorStatus;
int _cursorEnabled;
int _los[VIEWPORT_W][VIEWPORT_H];
- bool _continueScreenRefresh;
+ //bool _continueScreenRefresh;
uint32 _priorFrameTime;
public:
Commit: 58246b76be9569347126bb5a4fc8c565ecca1cf5
https://github.com/scummvm/scummvm/commit/58246b76be9569347126bb5a4fc8c565ecca1cf5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-14T19:27:09+01:00
Commit Message:
ULTIMA: ULTIMA8: Fix warnings
Changed paths:
engines/ultima/ultima8/games/game_info.cpp
engines/ultima/ultima8/graphics/cycle_process.cpp
diff --git a/engines/ultima/ultima8/games/game_info.cpp b/engines/ultima/ultima8/games/game_info.cpp
index 4dece4a0b1..7807e022a2 100644
--- a/engines/ultima/ultima8/games/game_info.cpp
+++ b/engines/ultima/ultima8/games/game_info.cpp
@@ -185,7 +185,7 @@ void GameInfo::save(Common::WriteStream *ws) {
ws->write(d.c_str(), d.size());
}
-bool GameInfo::load(IDataSource *ids, uint32 version) {
+bool GameInfo::load(IDataSource *ids, uint32 ver) {
Std::string s;
Std::vector<Std::string> parts;
diff --git a/engines/ultima/ultima8/graphics/cycle_process.cpp b/engines/ultima/ultima8/graphics/cycle_process.cpp
index 04fd2e0cd1..0530a6a4d5 100644
--- a/engines/ultima/ultima8/graphics/cycle_process.cpp
+++ b/engines/ultima/ultima8/graphics/cycle_process.cpp
@@ -32,16 +32,16 @@ CycleProcess *CycleProcess::_instance = nullptr;
// Which color to cycle in each of the palette colors 8~14
static const bool CYCLE_COL_FLAGS[7][3] = {
- 1, 0, 0,
- 0, 0, 1,
- 1, 0, 0,
- 0, 0, 1,
- 1, 1, 0,
- 1, 1, 1,
- 0, 1, 0
+ { 1, 0, 0 },
+ { 0, 0, 1 },
+ { 1, 0, 0 },
+ { 0, 0, 1 },
+ { 1, 1, 0 },
+ { 1, 1, 1 },
+ { 0, 1, 0 }
};
-static const uint8 CYCLE_INIT_COLS[7][3] = {0, 0, 0, 0, 0, 0, 124, 0, 0, 0, 0, 124, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const uint8 CYCLE_INIT_COLS[7][3] = {{ 0, 0, 0 }, { 0, 0, 0 }, { 124, 0, 0 }, { 0, 0, 124 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }};
static const bool CYCLE_RANDOMIZE[7] = {
false, false, false, false, false, false, true
More information about the Scummvm-git-logs
mailing list