[Scummvm-cvs-logs] scummvm master -> f87e8b53f333c6799302d620a2c36668b92c77f0
DrMcCoy
drmccoy at drmccoy.de
Mon Jun 11 15:11:44 CEST 2012
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:
f538b76586 GOB: Don't recalculate the AdLib frequencies table on every player reset
c3f89b78c9 README: Update Gob game list
a3db17033f GOB: Update list of games in the comment
f87e8b53f3 GOB: Fix an AmigaOS compile error
Commit: f538b7658684aad26a38b2e3685a322ecc14a720
https://github.com/scummvm/scummvm/commit/f538b7658684aad26a38b2e3685a322ecc14a720
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-06-11T06:10:59-07:00
Commit Message:
GOB: Don't recalculate the AdLib frequencies table on every player reset
Changed paths:
engines/gob/sound/adlib.cpp
engines/gob/sound/adlib.h
diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp
index 3f46f6c..d9fc362 100644
--- a/engines/gob/sound/adlib.cpp
+++ b/engines/gob/sound/adlib.cpp
@@ -98,6 +98,8 @@ AdLib::AdLib(Audio::Mixer &mixer) : _mixer(&mixer), _opl(0),
_rate = _mixer->getOutputRate();
+ initFreqs();
+
createOPL();
initOPL();
@@ -295,7 +297,7 @@ void AdLib::initOPL() {
_opl->reset();
initOperatorVolumes();
- initFreqs();
+ resetFreqs();
setPercussionMode(false);
@@ -581,6 +583,10 @@ void AdLib::initFreqs() {
for (int i = 0; i < kPitchStepCount; i++)
setFreqs(_freqs[i], i * numStep, 100);
+ resetFreqs();
+}
+
+void AdLib::resetFreqs() {
for (int i = 0; i < kMaxVoiceCount; i++) {
_freqPtr [i] = _freqs[0];
_halfToneOffset[i] = 0;
diff --git a/engines/gob/sound/adlib.h b/engines/gob/sound/adlib.h
index 17ab950..bd1778d 100644
--- a/engines/gob/sound/adlib.h
+++ b/engines/gob/sound/adlib.h
@@ -295,6 +295,7 @@ private:
void initFreqs();
void setFreqs(uint16 *freqs, int32 num, int32 denom);
int32 calcFreq(int32 deltaDemiToneNum, int32 deltaDemiToneDenom);
+ void resetFreqs();
void changePitch(uint8 voice, uint16 pitchBend);
Commit: c3f89b78c9462b406821a7b80ebf99d8a5245132
https://github.com/scummvm/scummvm/commit/c3f89b78c9462b406821a7b80ebf99d8a5245132
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-06-11T06:11:15-07:00
Commit Message:
README: Update Gob game list
Changed paths:
README
diff --git a/README b/README
index 81b2883..1024c67 100644
--- a/README
+++ b/README
@@ -235,13 +235,17 @@ AGOS Games by Adventuresoft/Horrorsoft:
The Feeble Files [feeble]
GOB Games by Coktel Vision:
+ Bambou le sauveur de la jungle [bambou]
Bargon Attack [bargon]
+ Fascination [fascination]
+ Geisha [geisha]
Gobliiins [gob1]
Gobliins 2 [gob2]
Goblins 3 [gob3]
Lost in Time [lostintime]
The Bizarre Adventures of Woodruff
and the Schnibble [woodruff]
+ Urban Runner [urban]
Ween: The Prophecy [ween]
MADE Games by Activision:
Commit: a3db17033f9b251760e76d4ba7c7e66003cc228d
https://github.com/scummvm/scummvm/commit/a3db17033f9b251760e76d4ba7c7e66003cc228d
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-06-11T06:11:15-07:00
Commit Message:
GOB: Update list of games in the comment
Changed paths:
engines/gob/gob.h
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index ea23238..6277585 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -50,6 +50,10 @@ class StaticTextWidget;
* - Bargon Attack
* - Lost in Time
* - The Bizarre Adventures of Woodruff and the Schnibble
+ * - Fascination
+ * - Urban Runner
+ * - Bambou le sauveur de la jungle
+ * - Geisha
*/
namespace Gob {
Commit: f87e8b53f333c6799302d620a2c36668b92c77f0
https://github.com/scummvm/scummvm/commit/f87e8b53f333c6799302d620a2c36668b92c77f0
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-06-11T06:11:15-07:00
Commit Message:
GOB: Fix an AmigaOS compile error
Should close bug #3534287.
Changed paths:
engines/gob/minigames/geisha/meter.cpp
diff --git a/engines/gob/minigames/geisha/meter.cpp b/engines/gob/minigames/geisha/meter.cpp
index 719ecf3..7ec3119 100644
--- a/engines/gob/minigames/geisha/meter.cpp
+++ b/engines/gob/minigames/geisha/meter.cpp
@@ -67,7 +67,7 @@ int32 Meter::increase(int32 n) {
if (n < 0)
return decrease(-n);
- int32 overflow = MAX(0, (_value + n) - _maxValue);
+ int32 overflow = MAX<int32>(0, (_value + n) - _maxValue);
int32 value = CLIP<int32>(_value + n, 0, _maxValue);
if (_value == value)
@@ -83,7 +83,7 @@ int32 Meter::decrease(int32 n) {
if (n < 0)
return increase(-n);
- int32 underflow = -MIN(0, _value - n);
+ int32 underflow = -MIN<int32>(0, _value - n);
int32 value = CLIP<int32>(_value - n, 0, _maxValue);
if (_value == value)
More information about the Scummvm-git-logs
mailing list