aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Hoops2011-10-02 21:22:52 -0400
committerMatthew Hoops2011-10-02 21:22:52 -0400
commita57b1de6ee146e4722b86095eb1fe44afdc9bf0c (patch)
tree70ebec19ec3c3e3b23285274e251e8283ada2ae7 /engines
parentb31efb02b58e6f36807a5d98241fb9737e734300 (diff)
downloadscummvm-rg350-a57b1de6ee146e4722b86095eb1fe44afdc9bf0c.tar.gz
scummvm-rg350-a57b1de6ee146e4722b86095eb1fe44afdc9bf0c.tar.bz2
scummvm-rg350-a57b1de6ee146e4722b86095eb1fe44afdc9bf0c.zip
PEGASUS: Add a hack to skip energy bar calibration for now
Diffstat (limited to 'engines')
-rwxr-xr-xengines/pegasus/energymonitor.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/engines/pegasus/energymonitor.cpp b/engines/pegasus/energymonitor.cpp
index 9a82e36d84..94ac093c99 100755
--- a/engines/pegasus/energymonitor.cpp
+++ b/engines/pegasus/energymonitor.cpp
@@ -248,7 +248,7 @@ void EnergyMonitor::calibrateEnergyBar() {
_calibrating = true;
- // TODO: set death reason to -1
+ vm->setEnergyDeathReason(-1);
uint32 numFrames = _energyLight.getNumFrames();
for (uint32 i = 1; i < numFrames; i++) {
@@ -261,18 +261,25 @@ void EnergyMonitor::calibrateEnergyBar() {
_energyLight.setCurrentFrameIndex(0);
_energyLight.hide();
+
+#if 0
+ // FIXME: This doesn't work yet
show();
setEnergyValue(0);
setEnergyDrainRate(-kMaxJMPEnergy / 2);
// Make sure warning light is hidden...
_energyLight.hide();
- while (getCurrentEnergy() != (int32)kMaxJMPEnergy)
+ while (getCurrentEnergy() != (int32)kMaxJMPEnergy) {
+ vm->checkCallBacks();
vm->refreshDisplay();
+ g_system->delayMillis(10);
+ }
vm->refreshDisplay();
setEnergyDrainRate(0);
hide();
+#endif
_calibrating = false;
}