[Scummvm-git-logs] scummvm master -> 4e7f9ee8084e7b58a87941942cb1bdec74270ae0
sev-
sev at scummvm.org
Wed Mar 25 09:34:21 UTC 2020
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
911b7c9c3e LILLIPUT: Remove system include
486c859591 MUTATIONOFJB: Fix includes
42f4eeea8f WINTERMUTE: Fix warning
4e7f9ee808 WINTERMUTE: Do not include standard headers
Commit: 911b7c9c3e2dc12034b44c200be816f1ab428997
https://github.com/scummvm/scummvm/commit/911b7c9c3e2dc12034b44c200be816f1ab428997
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-25T10:14:27+01:00
Commit Message:
LILLIPUT: Remove system include
Changed paths:
engines/lilliput/script.cpp
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index 45b5f7fa7b..505db2e352 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -25,7 +25,6 @@
#include "common/debug.h"
#include "common/system.h"
-#include <climits>
namespace Lilliput {
@@ -2464,7 +2463,7 @@ void LilliputScript::sendSignal(int16 var1, byte var2h, byte characterId, int16
for (int i = 0; i < 10; i++) {
if (_vm->_signalArray[index + 1] == -1) {
_vm->_signalArray[index + 1] = var1;
- _vm->_signalArray[index + 2] = (var2h << 8) + characterId;
+ _vm->_signalArray[index + 2] = (var2h << 8) + characterId;
_vm->_signalArray[index + 0] = _vm->_signalTimer + var4;
return;
}
@@ -2916,7 +2915,7 @@ void LilliputScript::OC_spawnCharacterAtPos() {
byte *isoMapBuf = getMapPtr(pt);
if (isoMapBuf[1] != 0xFF) {
- int minVal = INT_MAX;
+ int minVal = 0x7fffffff;
for (int var2 = 7; var2 >= 0; var2--) {
for (int var3 = 7; var3 >= 0; var3--) {
Common::Point(_viewportPos.x + var2, _viewportPos.y + var3);
Commit: 486c8595919622bee006351a1b17d003b83ee05d
https://github.com/scummvm/scummvm/commit/486c8595919622bee006351a1b17d003b83ee05d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-25T10:31:54+01:00
Commit Message:
MUTATIONOFJB: Fix includes
Changed paths:
engines/mutationofjb/widgets/widget.h
diff --git a/engines/mutationofjb/widgets/widget.h b/engines/mutationofjb/widgets/widget.h
index 108d86c92f..8ce1239d78 100644
--- a/engines/mutationofjb/widgets/widget.h
+++ b/engines/mutationofjb/widgets/widget.h
@@ -23,8 +23,8 @@
#ifndef MUTATIONOFJB_WIDGET_H
#define MUTATIONOFJB_WIDGET_H
-#include <common/scummsys.h>
-#include <common/rect.h>
+#include "common/scummsys.h"
+#include "common/rect.h"
namespace Common {
struct Event;
Commit: 42f4eeea8f931022e6284e4f310b71d0e76a7077
https://github.com/scummvm/scummvm/commit/42f4eeea8f931022e6284e4f310b71d0e76a7077
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-25T10:32:24+01:00
Commit Message:
WINTERMUTE: Fix warning
Changed paths:
engines/wintermute/base/file/base_disk_file.cpp
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 7d09b3d598..4e26ec8920 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -125,7 +125,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
"c:/users/mathieu/desktop/wintermute engine development kit/jeu verve/vervegame/data/", // Machu Mayu refers to "c:\users\mathieu\desktop\wintermute engine development kit\jeu verve\vervegame\data\interface\system\cr<0xE9>dits.script"
"c:/windows/fonts/", // East Side Story refers to "c:\windows\fonts\framd.ttf"
"c:/carol6/svn/data/", // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png"
- "d:/engine/\322\3032/tg_ie_080128_1005/data/", // Tanya Grotter and the Disappearing Floor refers to "d:\engine\<0xD2><0xC3>2\tg_ie_080128_1005\data\interface\pixel\pixel.png"
+ "d:/engine/\322\303" "2/tg_ie_080128_1005/data/", // Tanya Grotter and the Disappearing Floor refers to "d:\engine\<0xD2><0xC3>2\tg_ie_080128_1005\data\interface\pixel\pixel.png"
"e:/users/jonathan/onedrive/knossos/data/", // K'NOSSOS refers to "e:\users\jonathan\onedrive\knossos\data\entities\helprobot\helprobot.script"
"f:/dokument/spel 5/demo/data/", // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg"
"f:/quest!!!/engine/quest/data/" // Book of Gron Part One refers to several files named "f:\quest!!!\engine\quest\data\entities\dver\*"
Commit: 4e7f9ee8084e7b58a87941942cb1bdec74270ae0
https://github.com/scummvm/scummvm/commit/4e7f9ee8084e7b58a87941942cb1bdec74270ae0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-25T10:32:37+01:00
Commit Message:
WINTERMUTE: Do not include standard headers
Changed paths:
engines/wintermute/ad/ad_scene.cpp
engines/wintermute/ad/ad_waypoint_group.cpp
engines/wintermute/base/base_region.cpp
engines/wintermute/base/font/base_font_truetype.cpp
engines/wintermute/wintermute.h
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index ac84496cce..269dbc2a84 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -60,7 +60,6 @@
#include "engines/wintermute/ui/ui_window.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/wintermute.h"
-#include <limits.h>
namespace Wintermute {
@@ -235,7 +234,7 @@ bool AdScene::getPath(const BasePoint &source, const BasePoint &target, AdPath *
// last point
//_pfPath.add(new AdPathPoint(target.x, target.y, INT_MAX));
- pfPointsAdd(target.x, target.y, INT_MAX);
+ pfPointsAdd(target.x, target.y, INT_MAX_VALUE);
// active waypoints
for (uint32 i = 0; i < _waypointGroups.size(); i++) {
@@ -275,7 +274,7 @@ void AdScene::pfAddWaypointGroup(AdWaypointGroup *wpt, BaseObject *requester) {
}
//_pfPath.add(new AdPathPoint(Wpt->_points[i]->x, Wpt->_points[i]->y, INT_MAX));
- pfPointsAdd(wpt->_points[i]->x, wpt->_points[i]->y, INT_MAX);
+ pfPointsAdd(wpt->_points[i]->x, wpt->_points[i]->y, INT_MAX_VALUE);
}
}
@@ -473,7 +472,7 @@ int AdScene::getPointsDist(const BasePoint &p1, const BasePoint &p2, BaseObject
void AdScene::pathFinderStep() {
int i;
// get lowest unmarked
- int lowestDist = INT_MAX;
+ int lowestDist = INT_MAX_VALUE;
AdPathPoint *lowestPt = nullptr;
for (i = 0; i < _pfPointsNum; i++)
@@ -1225,7 +1224,7 @@ bool AdScene::displayRegionContentOld(AdRegion *region) {
// display all objects in region sorted by _posY
do {
obj = nullptr;
- int minY = INT_MAX;
+ int minY = INT_MAX_VALUE;
// global objects
for (uint32 i = 0; i < adGame->_objects.size(); i++) {
@@ -2483,7 +2482,7 @@ bool AdScene::correctTargetPoint(int32 startX, int32 startY, int32 *argX, int32
return STATUS_OK;
}
- int offsetX = INT_MAX, offsetY = INT_MAX;
+ int offsetX = INT_MAX_VALUE, offsetY = INT_MAX_VALUE;
if (foundLeft && foundRight) {
if (abs(lengthLeft) < abs(lengthRight)) {
@@ -3018,4 +3017,3 @@ Common::String AdScene::debuggerToString() const {
return Common::String::format("%p: Scene \"%s\", paralax: %d, autoscroll: %d", (const void *)this, getName(), _paralaxScrolling, _autoScroll);
}
} // End of namespace Wintermute
-
diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 39515e8252..64947ac0a2 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -26,6 +26,7 @@
* Copyright (c) 2011 Jan Nedoma
*/
+#include "engines/wintermute/wintermute.h"
#include "engines/wintermute/ad/ad_waypoint_group.h"
#include "engines/wintermute/base/base_dynamic_buffer.h"
#include "engines/wintermute/base/base_game.h"
@@ -33,7 +34,6 @@
#include "engines/wintermute/base/base_parser.h"
#include "engines/wintermute/base/base_region.h"
#include "engines/wintermute/base/scriptables/script_value.h"
-#include <limits.h>
namespace Wintermute {
@@ -44,7 +44,7 @@ AdWaypointGroup::AdWaypointGroup(BaseGame *inGame) : BaseObject(inGame) {
_active = true;
_editorSelectedPoint = -1;
_lastMimicScale = -1;
- _lastMimicX = _lastMimicY = INT_MIN;
+ _lastMimicX = _lastMimicY = -INT_MAX_VALUE;
}
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index cf32e04289..be8aa1d9d1 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -26,6 +26,7 @@
* Copyright (c) 2011 Jan Nedoma
*/
+#include "engines/wintermute/wintermute.h"
#include "engines/wintermute/base/base_region.h"
#include "engines/wintermute/base/base_parser.h"
#include "engines/wintermute/base/base_dynamic_buffer.h"
@@ -35,7 +36,6 @@
#include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-#include <limits.h>
namespace Wintermute {
@@ -46,7 +46,7 @@ BaseRegion::BaseRegion(BaseGame *inGame) : BaseObject(inGame) {
_active = true;
_editorSelectedPoint = -1;
_lastMimicScale = -1;
- _lastMimicX = _lastMimicY = INT_MIN;
+ _lastMimicX = _lastMimicY = -INT_MAX_VALUE;
_rect.setEmpty();
}
@@ -496,7 +496,7 @@ bool BaseRegion::getBoundingRect(Rect32 *rect) {
if (_points.size() == 0) {
rect->setEmpty();
} else {
- int32 minX = INT_MAX, minY = INT_MAX, maxX = INT_MIN, maxY = INT_MIN;
+ int32 minX = INT_MAX_VALUE, minY = INT_MAX_VALUE, maxX = -INT_MAX_VALUE, maxY = -INT_MAX_VALUE;
for (uint32 i = 0; i < _points.size(); i++) {
minX = MIN(minX, _points[i]->x);
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 98eb4fac8f..cf79f3bbbc 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -38,7 +38,6 @@
#include "graphics/fonts/ttf.h"
#include "graphics/fontman.h"
#include "common/unzip.h"
-#include <limits.h>
namespace Wintermute {
@@ -174,7 +173,7 @@ void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign
BaseRenderer *renderer = _gameRef->_renderer;
// find cached surface, if exists
- uint32 minUseTime = UINT_MAX;
+ uint32 minUseTime = INT_MAX_VALUE;
int minIndex = -1;
BaseSurface *surface = nullptr;
int textOffset = 0;
diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h
index 8042e0e6fa..fcadb1bba8 100644
--- a/engines/wintermute/wintermute.h
+++ b/engines/wintermute/wintermute.h
@@ -35,6 +35,8 @@ class SystemClassRegistry;
class DebuggerController;
struct WMEGameDescription;
+const int INT_MAX_VALUE = 0x7fffffff;
+
// our engine debug channels
enum {
kWintermuteDebugLog = 1 << 0, // The debug-logs from the original engine
More information about the Scummvm-git-logs
mailing list