[Scummvm-cvs-logs] scummvm master -> db34e0ce0d499257df73574f1d9a70312280716b
urukgit
urukgit at users.noreply.github.com
Thu Feb 20 23:35:11 CET 2014
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:
a3d4908e53 AVALANCHE: Put a necessary delay into ShootEmUp's main loop.
acdfcb5272 AVALANCHE: Repair ShootEmUp::plotThem().
73223fd191 AVALANCHE: Repair ShootEmUp::define() and ShootEmUp::defineCameo().
db34e0ce0d AVALANCHE: Repair ShootEmUp::gain().
Commit: a3d4908e53d812cfcc2fd93fbb067345afa577c6
https://github.com/scummvm/scummvm/commit/a3d4908e53d812cfcc2fd93fbb067345afa577c6
Author: uruk (koppirnyo at gmail.com)
Date: 2014-02-20T14:06:49-08:00
Commit Message:
AVALANCHE: Put a necessary delay into ShootEmUp's main loop.
Changed paths:
engines/avalanche/shootemup.cpp
diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp
index 5f48c2f..02d6577 100644
--- a/engines/avalanche/shootemup.cpp
+++ b/engines/avalanche/shootemup.cpp
@@ -116,6 +116,8 @@ void ShootEmUp::run() {
setup();
do {
+ uint32 beginLoop = _vm->_system->getMillis();
+
blankIt();
hitPeople();
plotThem();
@@ -133,6 +135,11 @@ void ShootEmUp::run() {
_cp = !_cp;
_vm->_graphics->refreshScreen();
+
+ uint32 delay = _vm->_system->getMillis() - beginLoop;
+ if (delay <= 55)
+ _vm->_system->delayMillis(55 - delay); // Replaces slowdown(); 55 comes from 18.2 Hz (B Flight).
+
} while (_time != 0);
_vm->fadeOut();
Commit: acdfcb527294a1b44f647fe4c91115ee0918a6f6
https://github.com/scummvm/scummvm/commit/acdfcb527294a1b44f647fe4c91115ee0918a6f6
Author: uruk (koppirnyo at gmail.com)
Date: 2014-02-20T14:28:34-08:00
Commit Message:
AVALANCHE: Repair ShootEmUp::plotThem().
Changed paths:
engines/avalanche/shootemup.cpp
diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp
index 02d6577..baf51a2 100644
--- a/engines/avalanche/shootemup.cpp
+++ b/engines/avalanche/shootemup.cpp
@@ -200,7 +200,7 @@ void ShootEmUp::plotThem() {
if (_sprites[i]._timeout > 0) {
_sprites[i]._timeout--;
if (_sprites[i]._timeout == 0)
- _sprites[i]._y = kFlag;
+ _sprites[i]._x = kFlag;
}
}
}
Commit: 73223fd1914306e8332b315033633097f78ddabc
https://github.com/scummvm/scummvm/commit/73223fd1914306e8332b315033633097f78ddabc
Author: uruk (koppirnyo at gmail.com)
Date: 2014-02-20T14:30:12-08:00
Commit Message:
AVALANCHE: Repair ShootEmUp::define() and ShootEmUp::defineCameo().
Changed paths:
engines/avalanche/shootemup.cpp
diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp
index baf51a2..1ade16f 100644
--- a/engines/avalanche/shootemup.cpp
+++ b/engines/avalanche/shootemup.cpp
@@ -218,6 +218,7 @@ void ShootEmUp::define(int16 x, int16 y, byte p, int8 ix, int8 iy, int16 time, b
_sprites[i]._cameo = false;
_sprites[i]._missile = isAMissile;
_sprites[i]._wipe = doWeWipe;
+ return;
}
}
}
@@ -235,6 +236,7 @@ void ShootEmUp::defineCameo(int16 x, int16 y, byte p, int16 time) {
_sprites[i]._cameoFrame = p + 1;
_sprites[i]._missile = false;
_sprites[i]._wipe = false;
+ return;
}
}
}
Commit: db34e0ce0d499257df73574f1d9a70312280716b
https://github.com/scummvm/scummvm/commit/db34e0ce0d499257df73574f1d9a70312280716b
Author: uruk (koppirnyo at gmail.com)
Date: 2014-02-20T14:34:22-08:00
Commit Message:
AVALANCHE: Repair ShootEmUp::gain().
Changed paths:
engines/avalanche/shootemup.cpp
diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp
index 1ade16f..2c4777e 100644
--- a/engines/avalanche/shootemup.cpp
+++ b/engines/avalanche/shootemup.cpp
@@ -275,7 +275,7 @@ void ShootEmUp::showTime() {
}
void ShootEmUp::gain(int8 howMuch) {
- if ((_score + howMuch) == 0) // howMuch can be negative!
+ if ((_score + howMuch) < 0) // howMuch can be negative!
_score = 0;
else
_score += howMuch;
More information about the Scummvm-git-logs
mailing list