aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authoruruk2013-08-30 11:23:17 +0200
committeruruk2013-08-30 11:23:17 +0200
commit06d0ce1b0f4ed08260bdfc408fe31e9d9ebdefa7 (patch)
tree814e43adb59cff396e43f2234d308499f59c77b1 /engines
parentbdde166c4991c5d7de552b7c3bfd59823fc600e8 (diff)
downloadscummvm-rg350-06d0ce1b0f4ed08260bdfc408fe31e9d9ebdefa7.tar.gz
scummvm-rg350-06d0ce1b0f4ed08260bdfc408fe31e9d9ebdefa7.tar.bz2
scummvm-rg350-06d0ce1b0f4ed08260bdfc408fe31e9d9ebdefa7.zip
AVALANCHE: Minor cosmetic fixes.
Diffstat (limited to 'engines')
-rw-r--r--engines/avalanche/avalot.cpp10
-rw-r--r--engines/avalanche/lucerna2.cpp1
-rw-r--r--engines/avalanche/visa2.cpp2
3 files changed, 7 insertions, 6 deletions
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 4306bb2aed..6c80ee9c75 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -233,13 +233,13 @@ void Avalot::run(Common::String arg) {
// ONLY FOR TESTING!!!
- /* for (byte i = 0; i < _vm->_gyro->lineNum; i++)
- _vm->_graphics->_surface.drawLine(_vm->_gyro->lines[i].x1, _vm->_gyro->lines[i].y1, _vm->_gyro->lines[i].x2, _vm->_gyro->lines[i].y2, _vm->_gyro->lines[i].col);
+ for (byte i = 0; i < _vm->_gyro->lineNum; i++)
+ _vm->_graphics->_surface.drawLine(_vm->_gyro->lines[i].x1, _vm->_gyro->lines[i].y1, _vm->_gyro->lines[i].x2, _vm->_gyro->lines[i].y2, _vm->_gyro->lines[i].col);
for (byte i = 0; i < _vm->_gyro->numfields; i++) {
- if (_vm->_gyro->fields[i].x1 < 640)
- _vm->_graphics->_surface.frameRect(Common::Rect(_vm->_gyro->fields[i].x1, _vm->_gyro->fields[i].y1, _vm->_gyro->fields[i].x2, _vm->_gyro->fields[i].y2), lightmagenta);
- }*/
+ if (_vm->_gyro->fields[i].x1 < 640)
+ _vm->_graphics->_surface.frameRect(Common::Rect(_vm->_gyro->fields[i].x1, _vm->_gyro->fields[i].y1, _vm->_gyro->fields[i].x2, _vm->_gyro->fields[i].y2), lightmagenta);
+ }
// ONYL FOR TESTING!!!
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 95011bdde7..c54d56763b 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -91,6 +91,7 @@ void Lucerna::draw_also_lines() {
_vm->_graphics->_magics.frameRect(Common::Rect(0, 45, 640, 161), 15);
for (ff = 0; ff < _vm->_gyro->lineNum; ff++)
+ // We had to check if the lines are within the borders of the screen.
if ((_vm->_gyro->lines[ff].x1 >= 0) && (_vm->_gyro->lines[ff].x1 < _vm->_graphics->kScreenWidth) && (_vm->_gyro->lines[ff].y1 >= 0) && (_vm->_gyro->lines[ff].y1 < _vm->_graphics->kScreenHeight)
&& (_vm->_gyro->lines[ff].x2 >= 0) && (_vm->_gyro->lines[ff].x2 < _vm->_graphics->kScreenWidth) && (_vm->_gyro->lines[ff].y2 >= 0) && (_vm->_gyro->lines[ff].y2 < _vm->_graphics->kScreenHeight))
_vm->_graphics->_magics.drawLine(_vm->_gyro->lines[ff].x1, _vm->_gyro->lines[ff].y1, _vm->_gyro->lines[ff].x2, _vm->_gyro->lines[ff].y2, _vm->_gyro->lines[ff].col);
diff --git a/engines/avalanche/visa2.cpp b/engines/avalanche/visa2.cpp
index b0cabd40e1..0a0c031eff 100644
--- a/engines/avalanche/visa2.cpp
+++ b/engines/avalanche/visa2.cpp
@@ -237,7 +237,7 @@ void Visa::talkto(byte whom) {
}
break;
case _vm->_gyro->pspurge:
- if (~ _vm->_gyro->dna.sitting_in_pub) {
+ if (!_vm->_gyro->dna.sitting_in_pub) {
dixi('q', 71); // Try going over and sitting down.
return;
} else {