[Scummvm-git-logs] scummvm master -> 9045bceac988ee3efd08afc8077e2f0e455ac77c
sev-
sev at scummvm.org
Sat Oct 24 23:03:07 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:
18626c2e96 COMMON: Add a signed variant of getRandomNumberRng.
0d43a003bf HADESCH: Use getRandomNumberRngSigned when generating a signed random
d8fc5bad56 HADESCH: fix signedness warnings
bed87e92d1 HADESCH: fix typo in loop variable
1464115ccb HADESCH: fix warnings in minotaur.cpp
03ce7bfd6c HADESCH: fix medisle warnings
76eade7718 HADESCH: Fix shadowing
9045bceac9 HADESCH: Use getRandomBit rather than getRandomNumber(0, 1)
Commit: 18626c2e964a60ea454044b8a486258e0dda22e1
https://github.com/scummvm/scummvm/commit/18626c2e964a60ea454044b8a486258e0dda22e1
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T01:02:58+02:00
Commit Message:
COMMON: Add a signed variant of getRandomNumberRng.
Useful for generating negative numbers
Changed paths:
common/random.cpp
common/random.h
diff --git a/common/random.cpp b/common/random.cpp
index 86bde77e82..d39f9a4255 100644
--- a/common/random.cpp
+++ b/common/random.cpp
@@ -59,4 +59,8 @@ uint RandomSource::getRandomNumberRng(uint min, uint max) {
return getRandomNumber(max - min) + min;
}
+int RandomSource::getRandomNumberRngSigned(int min, int max) {
+ return getRandomNumber(max - min) + min;
+}
+
} // End of namespace Common
diff --git a/common/random.h b/common/random.h
index 29f648ecd2..90422e328e 100644
--- a/common/random.h
+++ b/common/random.h
@@ -82,6 +82,14 @@ public:
* @return a random number in the interval [min, max]
*/
uint getRandomNumberRng(uint min, uint max);
+
+ /**
+ * Generates a random signed integer in the interval [min, max].
+ * @param min the lower bound
+ * @param max the upper bound
+ * @return a random number in the interval [min, max]
+ */
+ int getRandomNumberRngSigned(int min, int max);
};
/** @} */
Commit: 0d43a003bf2f468dcff9c91fa7ec60d76c236526
https://github.com/scummvm/scummvm/commit/0d43a003bf2f468dcff9c91fa7ec60d76c236526
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T01:02:58+02:00
Commit Message:
HADESCH: Use getRandomNumberRngSigned when generating a signed random
Unsignedone is technically undefined even though practically equivalent
Changed paths:
engines/hadesch/rooms/monster/illusion.cpp
engines/hadesch/rooms/monster/projectile.cpp
diff --git a/engines/hadesch/rooms/monster/illusion.cpp b/engines/hadesch/rooms/monster/illusion.cpp
index 8f7079779d..7f3f01acba 100644
--- a/engines/hadesch/rooms/monster/illusion.cpp
+++ b/engines/hadesch/rooms/monster/illusion.cpp
@@ -186,11 +186,11 @@ void Bird::makeFlightParams() {
_flightLengthMs = _flightLengthFrames * 100;
_attractor1 = Common::Point(
- g_vm->getRnd().getRandomNumberRng(-600, 600),
- g_vm->getRnd().getRandomNumberRng(-600, 600));
+ g_vm->getRnd().getRandomNumberRngSigned(-600, 600),
+ g_vm->getRnd().getRandomNumberRngSigned(-600, 600));
_attractor2 = Common::Point(
- g_vm->getRnd().getRandomNumberRng(-600, 600),
- g_vm->getRnd().getRandomNumberRng(-600, 600));
+ g_vm->getRnd().getRandomNumberRngSigned(-600, 600),
+ g_vm->getRnd().getRandomNumberRngSigned(-600, 600));
unsigned lastGoodShootFrame = 11;
for (; (int) lastGoodShootFrame < _flightLengthFrames; lastGoodShootFrame++) {
diff --git a/engines/hadesch/rooms/monster/projectile.cpp b/engines/hadesch/rooms/monster/projectile.cpp
index dcc5a4cfc2..56f8211d78 100644
--- a/engines/hadesch/rooms/monster/projectile.cpp
+++ b/engines/hadesch/rooms/monster/projectile.cpp
@@ -87,15 +87,15 @@ void Projectile::makeFlightParams(int xmomentum) {
switch (rnd.getRandomNumberRng(0, 2)) {
case 0:
_target = Common::Point(
- -50, rnd.getRandomNumberRng(-50, 400));
+ -50, rnd.getRandomNumberRngSigned(-50, 400));
break;
case 1:
_target = Common::Point(
- rnd.getRandomNumberRng(-50, 650), -50);
+ rnd.getRandomNumberRngSigned(-50, 650), -50);
break;
case 2:
_target = Common::Point(
- 650, rnd.getRandomNumberRng(-50, 400));
+ 650, rnd.getRandomNumberRngSigned(-50, 400));
break;
}
} else {
@@ -112,17 +112,17 @@ void Projectile::makeFlightParams(int xmomentum) {
break;
case -1:
_attractor1 = Common::Point(
- rnd.getRandomNumberRng(-600, 0),
+ rnd.getRandomNumberRngSigned(-600, 0),
rnd.getRandomNumberRng(0, 300));
break;
case 0:
_attractor1 = Common::Point(
- rnd.getRandomNumberRng(-600, 600),
- rnd.getRandomNumberRng(-600, 600));
+ rnd.getRandomNumberRngSigned(-600, 600),
+ rnd.getRandomNumberRngSigned(-600, 600));
break;
}
_attractor2 = Common::Point(
- rnd.getRandomNumberRng(-600, 600),
+ rnd.getRandomNumberRngSigned(-600, 600),
rnd.getRandomNumberRng(0, 600));
}
Commit: d8fc5bad563715de721408003388f157973cb1dc
https://github.com/scummvm/scummvm/commit/d8fc5bad563715de721408003388f157973cb1dc
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T01:02:58+02:00
Commit Message:
HADESCH: fix signedness warnings
Changed paths:
engines/hadesch/pod_image.cpp
engines/hadesch/rooms/monster/illusion.cpp
engines/hadesch/rooms/monster/projectile.cpp
diff --git a/engines/hadesch/pod_image.cpp b/engines/hadesch/pod_image.cpp
index 5b8c0eea02..82f5e79536 100644
--- a/engines/hadesch/pod_image.cpp
+++ b/engines/hadesch/pod_image.cpp
@@ -103,8 +103,8 @@ bool PodImage::loadImage(const PodFile &col, int index) {
}
infoTagStream->skip(0xc);
- int x = -infoTagStream->readUint32BE();
- int y = -infoTagStream->readUint32BE();
+ int x = -(int32)infoTagStream->readUint32BE();
+ int y = -(int32)infoTagStream->readUint32BE();
_pos = Common::Point(x,y);
_w = infoTagStream->readUint32BE();
_h = infoTagStream->readUint32BE();
diff --git a/engines/hadesch/rooms/monster/illusion.cpp b/engines/hadesch/rooms/monster/illusion.cpp
index 7f3f01acba..f99c112c01 100644
--- a/engines/hadesch/rooms/monster/illusion.cpp
+++ b/engines/hadesch/rooms/monster/illusion.cpp
@@ -256,7 +256,7 @@ void Bird::handleAbsoluteClick(Common::Point p) {
return;
FlightPosition fp = getFlightPosition(_flightCounterMs / (double) _flightLengthMs);
int r = fp.scale * 40 / 100;
- if (p.sqrDist(fp.centerPos) > r * r)
+ if ((int) p.sqrDist(fp.centerPos) > r * r)
return;
room->stopAnim(LayerId(birdInfo[_birdType]._flyAnim, _id, "bird"));
room->stopAnim(LayerId(birdInfo[_birdType]._shootAnim, _id, "bird"));
diff --git a/engines/hadesch/rooms/monster/projectile.cpp b/engines/hadesch/rooms/monster/projectile.cpp
index 56f8211d78..888754ef59 100644
--- a/engines/hadesch/rooms/monster/projectile.cpp
+++ b/engines/hadesch/rooms/monster/projectile.cpp
@@ -290,7 +290,7 @@ void Projectile::handleAbsoluteClick(Common::SharedPtr <Projectile> backRef, Com
return;
FlightPosition fp = getFlightPosition(_flightCounterMs / (double) _flightLengthMs);
int r = fp.scale * 40 / 100;
- if (p.sqrDist(fp.centerPos) > r * r)
+ if ((int) p.sqrDist(fp.centerPos) > r * r)
return;
room->stopAnim(LayerId(_flyAnim, _projectileId, "projectile"));
_isFlightFinished = true;
Commit: bed87e92d11424278220b273e8aa4d0e94416723
https://github.com/scummvm/scummvm/commit/bed87e92d11424278220b273e8aa4d0e94416723
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T01:02:58+02:00
Commit Message:
HADESCH: fix typo in loop variable
Changed paths:
engines/hadesch/persistent.cpp
diff --git a/engines/hadesch/persistent.cpp b/engines/hadesch/persistent.cpp
index 2c36db31fe..050cad24db 100644
--- a/engines/hadesch/persistent.cpp
+++ b/engines/hadesch/persistent.cpp
@@ -96,7 +96,7 @@ Persistent::Persistent() {
_medislePlayedPerseusIntro = false;
_medisleShowFates = false;
_medisleShowFatesIntro = false;
- for (unsigned i = 0; i < ARRAYSIZE(_statuePhase); i++)
+ for (unsigned i = 0; i < ARRAYSIZE(_medislePlacedItems); i++)
_medislePlacedItems[i] = false;
_medisleEyeballIsActive = false;
_medisleEyePosition = kLachesis;
Commit: 1464115ccb11adf991cd9420f5d28692f03227c4
https://github.com/scummvm/scummvm/commit/1464115ccb11adf991cd9420f5d28692f03227c4
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T01:02:58+02:00
Commit Message:
HADESCH: fix warnings in minotaur.cpp
They're real warnings but let's convert tem to TODOs.
Changed paths:
engines/hadesch/rooms/minotaur.cpp
diff --git a/engines/hadesch/rooms/minotaur.cpp b/engines/hadesch/rooms/minotaur.cpp
index e545a01166..878ad9c526 100644
--- a/engines/hadesch/rooms/minotaur.cpp
+++ b/engines/hadesch/rooms/minotaur.cpp
@@ -313,6 +313,9 @@ private:
room->enableMouse();
setDialogState(kMinotaur0);
return;
+ default:
+ // TODO: implement this;
+ return;
}
}
@@ -499,7 +502,7 @@ private:
int numWalls = line.substr(cur).asUint64();
cur = line.findFirstNotOf(kDigits, cur);
cur = line.findFirstOf(kDigits, cur);
- int rotatable = line.substr(cur).asUint64();
+ /*int rotatable =*/ line.substr(cur).asUint64();
cur = line.findFirstNotOf(kDigits, cur);
cur = line.findFirstOf(kDigits, cur);
for (int j = 0; j < numWalls; j++) {
Commit: 03ce7bfd6c65b42e1c6165fd843d4dc5304a22d2
https://github.com/scummvm/scummvm/commit/03ce7bfd6c65b42e1c6165fd843d4dc5304a22d2
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T01:02:58+02:00
Commit Message:
HADESCH: fix medisle warnings
Changed paths:
engines/hadesch/rooms/medisle.cpp
diff --git a/engines/hadesch/rooms/medisle.cpp b/engines/hadesch/rooms/medisle.cpp
index 71073870ad..0931567b34 100644
--- a/engines/hadesch/rooms/medisle.cpp
+++ b/engines/hadesch/rooms/medisle.cpp
@@ -1011,8 +1011,6 @@ private:
void enforceEyeConsistency() {
Persistent *persistent = g_vm->getPersistent();
- if (persistent->_medisleEyePosition < 0)
- return;
if (showFate(persistent->_medisleEyePosition))
return;
@@ -1027,7 +1025,7 @@ private:
Persistent *persistent = g_vm->getPersistent();
static const InventoryItem mapping[3] = {kHelmet, kBag, kSandals};
- if (persistent->_quest != kMedusaQuest || !persistent->_medisleShowFates)
+ if (persistent->_quest != kMedusaQuest || !persistent->_medisleShowFates || fate >= kNumFates)
return false;
InventoryItem mapped = mapping[fate];
Commit: 76eade771808f69351b1a8e5fa75a34bda5bc474
https://github.com/scummvm/scummvm/commit/76eade771808f69351b1a8e5fa75a34bda5bc474
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T01:02:58+02:00
Commit Message:
HADESCH: Fix shadowing
Changed paths:
engines/hadesch/video.cpp
diff --git a/engines/hadesch/video.cpp b/engines/hadesch/video.cpp
index a1a696f38a..4def3236ff 100644
--- a/engines/hadesch/video.cpp
+++ b/engines/hadesch/video.cpp
@@ -101,9 +101,9 @@ PlayAnimParams PlayAnimParams::backwards() const {
return ret;
}
-PlayAnimParams::PlayAnimParams(bool loop, bool keepLastFrame) {
- _loop = loop;
- _keepLastFrame = keepLastFrame;
+PlayAnimParams::PlayAnimParams(bool isLoop, bool isKeepLastFrame) {
+ _loop = isLoop;
+ _keepLastFrame = isKeepLastFrame;
_firstFrame = 0;
_lastFrame = -1;
_msperframe = kDefaultSpeed;
Commit: 9045bceac988ee3efd08afc8077e2f0e455ac77c
https://github.com/scummvm/scummvm/commit/9045bceac988ee3efd08afc8077e2f0e455ac77c
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T01:02:58+02:00
Commit Message:
HADESCH: Use getRandomBit rather than getRandomNumber(0, 1)
Changed paths:
engines/hadesch/rooms/crete.cpp
engines/hadesch/rooms/daedalus.cpp
engines/hadesch/rooms/medisle.cpp
engines/hadesch/rooms/monster.cpp
engines/hadesch/rooms/monster/illusion.cpp
engines/hadesch/rooms/monster/typhoon.cpp
engines/hadesch/rooms/quiz.cpp
engines/hadesch/rooms/troy.cpp
engines/hadesch/rooms/walloffame.cpp
diff --git a/engines/hadesch/rooms/crete.cpp b/engines/hadesch/rooms/crete.cpp
index 76f398749b..67960c1f8b 100644
--- a/engines/hadesch/rooms/crete.cpp
+++ b/engines/hadesch/rooms/crete.cpp
@@ -1070,8 +1070,8 @@ TODO:
if (quest != kCreteQuest && quest != kTroyQuest)
toughGuyPosition = 1;
else
- toughGuyPosition = g_vm->getRnd().getRandomNumberRng(0, 1);
- womanSmellPosition = g_vm->getRnd().getRandomNumberRng(0, 1);
+ toughGuyPosition = g_vm->getRnd().getRandomBit();
+ womanSmellPosition = g_vm->getRnd().getRandomBit();
break;
case 6:
showWomanGraffiti = true;
@@ -1079,7 +1079,7 @@ TODO:
if (quest != kCreteQuest && quest != kTroyQuest)
toughGuyPosition = 1;
else
- toughGuyPosition = g_vm->getRnd().getRandomNumberRng(0, 1);
+ toughGuyPosition = g_vm->getRnd().getRandomBit();
break;
case 7:
womanSmellPosition = g_vm->getRnd().getRandomNumberRng(0, 2);
@@ -1400,7 +1400,7 @@ private:
}
bool randomBool() const {
- return g_vm->getRnd().getRandomNumberRng(0, 1);
+ return g_vm->getRnd().getRandomBit();
}
void renderAtlantisDisks() {
diff --git a/engines/hadesch/rooms/daedalus.cpp b/engines/hadesch/rooms/daedalus.cpp
index 9f29a8660c..b9455e7db0 100644
--- a/engines/hadesch/rooms/daedalus.cpp
+++ b/engines/hadesch/rooms/daedalus.cpp
@@ -145,7 +145,7 @@ public:
playDaedalusVideo("daedalus exclaims", 13008, Common::Point(0, 2));
else {
// Original goes to event 4009
- if (g_vm->getRnd().getRandomNumberRng(0, 1))
+ if (g_vm->getRnd().getRandomBit())
playDaedalusVideo("daedalus congrats 1", 4009, Common::Point(70, 30));
else
playDaedalusVideo("daedalus congrats 2", 4009, Common::Point(68, 32));
diff --git a/engines/hadesch/rooms/medisle.cpp b/engines/hadesch/rooms/medisle.cpp
index 0931567b34..699d775fa8 100644
--- a/engines/hadesch/rooms/medisle.cpp
+++ b/engines/hadesch/rooms/medisle.cpp
@@ -669,7 +669,7 @@ TODO (medusa quest):
if (!showFate(fate) && fate == kLachesis) {
room->playSound(
- g_vm->getRnd().getRandomNumberRng(0, 1) ? "m2160wb0" : "m2160wa0", 11616);
+ g_vm->getRnd().getRandomBit() ? "m2160wb0" : "m2160wa0", 11616);
break;
}
@@ -689,7 +689,7 @@ TODO (medusa quest):
break;
}
- int off = variants == 1 ? 0 : g_vm->getRnd().getRandomNumberRng(0, 1);
+ int off = variants == 1 ? 0 : g_vm->getRnd().getRandomBit();
FateId moveTo = kLachesis;
int j = 0;
@@ -710,7 +710,7 @@ TODO (medusa quest):
switch (fate) {
case kLachesis:
room->stopAnim("m2140od0");
- if (g_vm->getRnd().getRandomNumberRng(0, 1)) {
+ if (g_vm->getRnd().getRandomBit()) {
room->playAnimWithSound("m2140ba0", "m2140ea0", 1500,
PlayAnimParams::disappear(), 11617, kOffsetRightRoom);
} else {
@@ -1189,7 +1189,7 @@ private:
}
void playFatesLairBackupSound() {
- if (g_vm->getRnd().getRandomNumberRng(0, 1))
+ if (g_vm->getRnd().getRandomBit())
fatesShadowSound("m2190wb0", 11629);
else
fatesShadowSound("m2190wd0", 11630);
diff --git a/engines/hadesch/rooms/monster.cpp b/engines/hadesch/rooms/monster.cpp
index 7289a5a585..ca834c00f5 100644
--- a/engines/hadesch/rooms/monster.cpp
+++ b/engines/hadesch/rooms/monster.cpp
@@ -97,7 +97,7 @@ public:
room->playVideo("V7180BB0", 0, 15361, Common::Point(0, 216));
break;
case 15357:
- room->playSkippableSound(g_vm->getRnd().getRandomNumberRng(0, 1)
+ room->playSkippableSound(g_vm->getRnd().getRandomBit()
? "V7150WC0" : "V7150WB0",
15353);
break;
@@ -152,7 +152,7 @@ public:
15375);
break;
case 15375:
- room->playSound(g_vm->getRnd().getRandomNumberRng(0, 1) ? "v7150wd0" : "v7150we0",
+ room->playSound(g_vm->getRnd().getRandomBit() ? "v7150wd0" : "v7150we0",
15376);
replenishPowers();
break;
@@ -168,7 +168,7 @@ public:
handleEvent(15390);
break;
case 15379:
- room->playSound(g_vm->getRnd().getRandomNumberRng(0, 1) ? "v7150wd0" : "v7150we0",
+ room->playSound(g_vm->getRnd().getRandomBit() ? "v7150wd0" : "v7150we0",
15380);
replenishPowers();
break;
diff --git a/engines/hadesch/rooms/monster/illusion.cpp b/engines/hadesch/rooms/monster/illusion.cpp
index f99c112c01..e8303e9ab3 100644
--- a/engines/hadesch/rooms/monster/illusion.cpp
+++ b/engines/hadesch/rooms/monster/illusion.cpp
@@ -161,19 +161,20 @@ FlightPosition Bird::getFlightPosition(double t) {
}
void Bird::makeFlightParams() {
+ Common::RandomSource &rnd = g_vm->getRnd();
_startPos = Common::Point(
- g_vm->getRnd().getRandomNumberRng(250, 350),
- g_vm->getRnd().getRandomNumberRng(160, 310));
+ rnd.getRandomNumberRng(250, 350),
+ rnd.getRandomNumberRng(160, 310));
- if (g_vm->getRnd().getRandomNumberRng(0, 1)) {
+ if (rnd.getRandomBit()) {
_targetPos = Common::Point(
- 650, g_vm->getRnd().getRandomNumberRng(100, 300));
+ 650, rnd.getRandomNumberRng(100, 300));
_field84 = 1;
- _birdType = g_vm->getRnd().getRandomNumberRng(0, 3);
+ _birdType = rnd.getRandomNumberRng(0, 3);
} else {
- _targetPos = Common::Point(-50, g_vm->getRnd().getRandomNumberRng(100, 300));
+ _targetPos = Common::Point(-50, rnd.getRandomNumberRng(100, 300));
_field84 = -1;
- _birdType = 4 + g_vm->getRnd().getRandomNumberRng(0, 3);
+ _birdType = 4 + rnd.getRandomNumberRng(0, 3);
}
int _flightLengthFrames;
@@ -186,11 +187,11 @@ void Bird::makeFlightParams() {
_flightLengthMs = _flightLengthFrames * 100;
_attractor1 = Common::Point(
- g_vm->getRnd().getRandomNumberRngSigned(-600, 600),
- g_vm->getRnd().getRandomNumberRngSigned(-600, 600));
+ rnd.getRandomNumberRngSigned(-600, 600),
+ rnd.getRandomNumberRngSigned(-600, 600));
_attractor2 = Common::Point(
- g_vm->getRnd().getRandomNumberRngSigned(-600, 600),
- g_vm->getRnd().getRandomNumberRngSigned(-600, 600));
+ rnd.getRandomNumberRngSigned(-600, 600),
+ rnd.getRandomNumberRngSigned(-600, 600));
unsigned lastGoodShootFrame = 11;
for (; (int) lastGoodShootFrame < _flightLengthFrames; lastGoodShootFrame++) {
@@ -199,7 +200,7 @@ void Bird::makeFlightParams() {
break;
}
lastGoodShootFrame--;
- _flightShootAnimFrame = g_vm->getRnd().getRandomNumberRng(10, lastGoodShootFrame);
+ _flightShootAnimFrame = rnd.getRandomNumberRng(10, lastGoodShootFrame);
_flightShootProjectileFrame = _flightShootAnimFrame + birdInfo[_birdType]._projectileFrame;
_flightShootEndFrame = _flightShootAnimFrame + (birdInfo[_birdType]._projectileFrame == 6 ? 13 : 18);
_hasShot = false;
diff --git a/engines/hadesch/rooms/monster/typhoon.cpp b/engines/hadesch/rooms/monster/typhoon.cpp
index 324d7df6b8..427a180ac1 100644
--- a/engines/hadesch/rooms/monster/typhoon.cpp
+++ b/engines/hadesch/rooms/monster/typhoon.cpp
@@ -181,7 +181,7 @@ void Typhoon::typhoonA() {
if (g_vm->getRnd().getRandomNumberRng(0, 3)) {
room->playAnim("v7050ba0", 500, PlayAnimParams::disappear(), 15153);
- } else if (g_vm->getRnd().getRandomNumberRng(0, 1)) {
+ } else if (g_vm->getRnd().getRandomBit()) {
room->playAnim("v7210bi0", 500, PlayAnimParams::disappear().partial(0, 6), 15160);
room->playSound("v7140ec0");
}
diff --git a/engines/hadesch/rooms/quiz.cpp b/engines/hadesch/rooms/quiz.cpp
index 22dd31d320..63e265bcd1 100644
--- a/engines/hadesch/rooms/quiz.cpp
+++ b/engines/hadesch/rooms/quiz.cpp
@@ -337,9 +337,9 @@ public:
_shrinkLevel = 0;
_hadesCancelableVideo = false;
memset(_frames, 0, sizeof (_frames));
- _hades_dislike_counter = g_vm->getRnd().getRandomNumberRng(0, 1);
- _hades_like_counter = g_vm->getRnd().getRandomNumberRng(0, 1);
- _naggingCounter = g_vm->getRnd().getRandomNumberRng(0, 1);
+ _hades_dislike_counter = g_vm->getRnd().getRandomBit();
+ _hades_like_counter = g_vm->getRnd().getRandomBit();
+ _naggingCounter = g_vm->getRnd().getRandomBit();
g_vm->addTimer(kHadesNagging, 5000, -1);
_rightAnswerCount = 0;
_wrongAnswerCount = 0;
diff --git a/engines/hadesch/rooms/troy.cpp b/engines/hadesch/rooms/troy.cpp
index 5ec1fddff1..cb704e2b2c 100644
--- a/engines/hadesch/rooms/troy.cpp
+++ b/engines/hadesch/rooms/troy.cpp
@@ -539,6 +539,7 @@ public:
Common::SharedPtr<VideoRoom> room = g_vm->getVideoRoom();
Persistent *persistent = g_vm->getPersistent();
Quest quest = persistent->_quest;
+ Common::RandomSource &rnd = g_vm->getRnd();
room->loadHotZones("troy.HOT", false);
room->addStaticLayer("t1010pa0", kBackgroundZ);
room->setPannable(true);
@@ -581,9 +582,9 @@ public:
room->disableMouse();
showIdleOdysseus();
}
- _soldier1IsCrazy = randomBool();
- _soldier2IsCrazy = randomBool();
- _soldier3IsCrazy = randomBool();
+ _soldier1IsCrazy = rnd.getRandomBit();
+ _soldier2IsCrazy = rnd.getRandomBit();
+ _soldier3IsCrazy = rnd.getRandomBit();
room->addStaticLayer("t1010pd0", 121, Common::Point(712, 187));
room->setLayerParallax("t1010pd0", -160);
soldiersDisplay();
@@ -630,7 +631,7 @@ public:
room->selectFrame("t2070bb0", kMenelausZ, 0, kOffsetRightRoom);
room->selectFrame(Common::String::format("t2010o%c0",
- g_vm->getRnd().getRandomNumberRng('g', 'i')),
+ rnd.getRandomNumberRng('g', 'i')),
141, 0, kOffsetRightRoom);
if (!persistent->_troyMessageIsDelivered) {
@@ -757,10 +758,6 @@ private:
}
}
- bool randomBool() const {
- return g_vm->getRnd().getRandomNumberRng(0, 1);
- }
-
void soldiersDisplay() {
Common::SharedPtr<VideoRoom> room = g_vm->getVideoRoom();
room->selectFrame(soldier1(), kSoldier1Z, 0, Common::Point(980, 0));
diff --git a/engines/hadesch/rooms/walloffame.cpp b/engines/hadesch/rooms/walloffame.cpp
index aa348fba13..104e7f698d 100644
--- a/engines/hadesch/rooms/walloffame.cpp
+++ b/engines/hadesch/rooms/walloffame.cpp
@@ -762,7 +762,7 @@ public:
break;
}
- if (g_vm->getRnd().getRandomNumberRng(0, 1)) {
+ if (g_vm->getRnd().getRandomBit()) {
room->playVideo("phil not a mind reader", 0, 19901);
} else {
room->playVideo("phil type in your name", 0, 19901);
More information about the Scummvm-git-logs
mailing list