[Scummvm-git-logs] scummvm master -> 21a56c729745ad85c051735de8910eef06b83008
sev-
sev at scummvm.org
Thu Mar 29 00:08:42 CEST 2018
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4cce3414b6 BLADERUNNER: Initialize class variables
0d241c200b BLADERUNNER: Added clarifying comment for a bug in original
bfa00a02b1 BLADERUNNER: Fix incorrect loop end check
0201979c55 BLADERUNNER: Fix buffer overflow in PoliceMaze
21a56c7297 BLADERUNNER: Remove unnecessary returns
Commit: 4cce3414b6a776c6fc4a3de7f2a7176cf900a52c
https://github.com/scummvm/scummvm/commit/4cce3414b6a776c6fc4a3de7f2a7176cf900a52c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-29T00:08:34+02:00
Commit Message:
BLADERUNNER: Initialize class variables
Changed paths:
engines/bladerunner/bladerunner.cpp
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 5a9e167..0b1ad83 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -148,6 +148,7 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst, const ADGameDescription *des
_lights = nullptr;
_obstacles = nullptr;
_sceneScript = nullptr;
+ _gameTime = nullptr;
_gameInfo = nullptr;
_waypoints = nullptr;
_gameVars = nullptr;
@@ -181,6 +182,7 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst, const ADGameDescription *des
_mainFont = nullptr;
_esper = nullptr;
_vk = nullptr;
+ _policeMaze = nullptr;
_mouse = nullptr;
_sliceAnimations = nullptr;
_sliceRenderer = nullptr;
Commit: 0d241c200ba6125b5cee1b9444a126e1ee3dca3e
https://github.com/scummvm/scummvm/commit/0d241c200ba6125b5cee1b9444a126e1ee3dca3e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-29T00:08:34+02:00
Commit Message:
BLADERUNNER: Added clarifying comment for a bug in original
Changed paths:
engines/bladerunner/script/ai/rajif.cpp
diff --git a/engines/bladerunner/script/ai/rajif.cpp b/engines/bladerunner/script/ai/rajif.cpp
index 2ac6a5b..26cf412 100644
--- a/engines/bladerunner/script/ai/rajif.cpp
+++ b/engines/bladerunner/script/ai/rajif.cpp
@@ -115,7 +115,7 @@ bool AIScriptRajif::UpdateAnimation(int *animation, int *frame) {
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(751)) {
_animationFrame = 0;
}
- } else {
+ } else { // bug in original. Both branches are equal
*animation = 751;
_animationFrame++;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(751)) {
Commit: bfa00a02b1f1e286cc726054075e8426461df0a6
https://github.com/scummvm/scummvm/commit/bfa00a02b1f1e286cc726054075e8426461df0a6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-29T00:08:34+02:00
Commit Message:
BLADERUNNER: Fix incorrect loop end check
Changed paths:
engines/bladerunner/script/ai/generic_walker_b.cpp
engines/bladerunner/script/ai/generic_walker_c.cpp
diff --git a/engines/bladerunner/script/ai/generic_walker_b.cpp b/engines/bladerunner/script/ai/generic_walker_b.cpp
index a2ff581..cfa9e04 100644
--- a/engines/bladerunner/script/ai/generic_walker_b.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_b.cpp
@@ -435,7 +435,7 @@ bool AIScriptGenericWalkerB::preparePath() {
int waypointEnd = 0;
do {
waypointStart = Random_Query(167, 171);
- } while (waypointEnd == 168 || waypointEnd == 169);
+ } while (waypointStart == 168 || waypointStart == 169);
do {
waypointEnd = Random_Query(167, 171);
} while (waypointEnd == waypointStart || waypointEnd == 168 || waypointEnd == 169);
diff --git a/engines/bladerunner/script/ai/generic_walker_c.cpp b/engines/bladerunner/script/ai/generic_walker_c.cpp
index f317d5a..6979be8 100644
--- a/engines/bladerunner/script/ai/generic_walker_c.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_c.cpp
@@ -438,7 +438,7 @@ bool AIScriptGenericWalkerC::preparePath() {
int waypointEnd = 0;
do {
waypointStart = Random_Query(167, 171);
- } while (waypointEnd == 168 || waypointEnd == 169);
+ } while (waypointStart == 168 || waypointStart == 169);
do {
waypointEnd = Random_Query(167, 171);
} while (waypointEnd == waypointStart || waypointEnd == 168 || waypointEnd == 169);
Commit: 0201979c55010c26b23863908fb278a61dcb766c
https://github.com/scummvm/scummvm/commit/0201979c55010c26b23863908fb278a61dcb766c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-29T00:08:34+02:00
Commit Message:
BLADERUNNER: Fix buffer overflow in PoliceMaze
Changed paths:
engines/bladerunner/script/police_maze.cpp
diff --git a/engines/bladerunner/script/police_maze.cpp b/engines/bladerunner/script/police_maze.cpp
index aaed223..a85fa07 100644
--- a/engines/bladerunner/script/police_maze.cpp
+++ b/engines/bladerunner/script/police_maze.cpp
@@ -186,15 +186,15 @@ void PoliceMazeTargetTrack::add(int trackId, float startX, float startY, float s
double coefY = (endY - startY) * coef;
double coefZ = (endZ - startZ) * coef;
- for (int i = 0; i < steps; i++) {
+ for (int i = 0; i < steps - 1; i++) {
_points[i].x = i * coefX + startX;
_points[i].y = i * coefY + startY;
_points[i].z = i * coefZ + startZ;
}
- _points[steps].x = endX;
- _points[steps].y = endY;
- _points[steps].z = endZ;
+ _points[steps - 1].x = endX;
+ _points[steps - 1].y = endY;
+ _points[steps - 1].z = endZ;
_isPaused = !isActive;
}
Commit: 21a56c729745ad85c051735de8910eef06b83008
https://github.com/scummvm/scummvm/commit/21a56c729745ad85c051735de8910eef06b83008
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-29T00:08:34+02:00
Commit Message:
BLADERUNNER: Remove unnecessary returns
Changed paths:
engines/bladerunner/debugger.cpp
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 87ab5d2..6f5c715 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -257,7 +257,6 @@ bool Debugger::cmdPosition(int argc, const char **argv) {
debugPrintf("actorY(%i) = %f\n", actorId, actor->getY());
debugPrintf("actorZ(%i) = %f\n", actorId, actor->getZ());
debugPrintf("actorFacing(%i) = %i\n", actorId, actor->getFacing());
- return true;
}
if (argc == 3) {
@@ -275,7 +274,6 @@ bool Debugger::cmdPosition(int argc, const char **argv) {
Vector3 position = otherActor->getXYZ();
actor->setSetId(otherActor->getSetId());
actor->setAtXYZ(position, otherActor->getFacing());
- return true;
}
if (argc == 7) {
@@ -285,7 +283,6 @@ bool Debugger::cmdPosition(int argc, const char **argv) {
actor->setSetId(setId);
actor->setAtXYZ(position, facing);
- return true;
}
return true;
}
More information about the Scummvm-git-logs
mailing list