thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

XEEN: Added further enum values to make falling code clearer

Browse source
This commit is contained in:
Paul Gilbert 2018-01-26 07:55:57 -05:00
parent 5b3526e587
commit e4ab945b41
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engines/xeen/interface.cpp
View file

@ -40,7 +40,7 @@
namespace Xeen { namespace Xeen {
enum { enum {
SCENE_WINDOW = 11 SCENE_WINDOW = 11, SCENE_WIDTH = 216, SCENE_HEIGHT = 132
}; };
PartyDrawer::PartyDrawer(XeenEngine *vm): _vm(vm) { PartyDrawer::PartyDrawer(XeenEngine *vm): _vm(vm) {
@ -1297,13 +1297,13 @@ void Interface::handleFalling() {
sound.playFX(11); sound.playFX(11);
sound.playSound("scream.voc"); sound.playSound("scream.voc");
for (int idx = 0, incr = 2; idx < 133; ++incr, idx += incr) { for (int idx = 0, incr = 2; idx <= SCENE_HEIGHT; ++incr, idx += incr) {
fall(idx); fall(idx);
assembleBorder(); assembleBorder();
w.update(); w.update();
} }
fall(132); fall(SCENE_HEIGHT);
assembleBorder(); assembleBorder();
w.update(); w.update();
@ -1311,19 +1311,19 @@ void Interface::handleFalling() {
sound.playSound("unnh.voc"); sound.playSound("unnh.voc");
sound.playFX(31); sound.playFX(31);
fall(127); fall(SCENE_HEIGHT - 5);
assembleBorder(); assembleBorder();
w.update(); w.update();
fall(132); fall(SCENE_HEIGHT);
assembleBorder(); assembleBorder();
w.update(); w.update();
fall(129); fall(SCENE_HEIGHT - 3);
assembleBorder(); assembleBorder();
w.update(); w.update();
fall(132); fall(SCENE_HEIGHT);
assembleBorder(); assembleBorder();
w.update(); w.update();
@ -1335,16 +1335,15 @@ void Interface::handleFalling() {
void Interface::setupFallSurface(bool isTop) { void Interface::setupFallSurface(bool isTop) {
Window &w = (*g_vm->_windows)[SCENE_WINDOW]; Window &w = (*g_vm->_windows)[SCENE_WINDOW];
const Common::Rect &r = w.getBounds();
if (_fallSurface.empty()) if (_fallSurface.empty())
_fallSurface.create(r.width(), r.height() * 2); _fallSurface.create(SCENE_WIDTH, SCENE_HEIGHT * 2);
_fallSurface.blitFrom(w, Common::Point(0, isTop ? 0 : r.height())); _fallSurface.blitFrom(w, Common::Point(0, isTop ? 0 : SCENE_HEIGHT));
} }
void Interface::fall(int yp) { void Interface::fall(int yp) {
Window &w = (*g_vm->_windows)[SCENE_WINDOW]; Window &w = (*g_vm->_windows)[SCENE_WINDOW];
w.blitFrom(_fallSurface, Common::Rect(0, yp, _fallSurface.w, yp + (_fallSurface.h / 2)), Common::Point(0, 0)); w.blitFrom(_fallSurface, Common::Rect(0, yp, SCENE_WIDTH, yp + SCENE_HEIGHT), Common::Point(0, 0));
} }
void Interface::shake(int time) { void Interface::shake(int time) {