From 854de79c236641bdb3414f727d9fee62e70ac463 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 18 Feb 2014 02:34:18 +0100 Subject: AVALANCHE: Make GPL headers consistent in themselves. --- engines/avalanche/nim.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/avalanche/nim.cpp') diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp index e4897a6d49..1430b69ea9 100644 --- a/engines/avalanche/nim.cpp +++ b/engines/avalanche/nim.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- cgit v1.2.3 From 589c6ffed25e818cd332e3ffb462ee13c4c8703e Mon Sep 17 00:00:00 2001 From: uruk Date: Tue, 18 Feb 2014 13:53:20 +0100 Subject: AVALANCHE: Reimplement the rectangle drawing methods. --- engines/avalanche/nim.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/avalanche/nim.cpp') diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp index 1430b69ea9..87af8053e1 100644 --- a/engines/avalanche/nim.cpp +++ b/engines/avalanche/nim.cpp @@ -152,13 +152,13 @@ void Nim::setup() { _vm->fadeIn(); _vm->_graphics->nimLoad(); - _vm->_graphics->drawFilledRectangle(Common::Rect(0, 0, 640, 200), kColorBlack); + _vm->_graphics->drawFilledRectangle(Common::Rect(0, 0, 639, 199), kColorBlack); // Upper left rectangle. - _vm->_graphics->drawRectangle(Common::Rect(10, 5, 381, 71), kColorRed); - _vm->_graphics->drawFilledRectangle(Common::Rect(11, 6, 380, 70), kColorBrown); + _vm->_graphics->drawRectangle(Common::Rect(10, 5, 380, 70), kColorRed); + _vm->_graphics->drawFilledRectangle(Common::Rect(11, 6, 379, 69), kColorBrown); // Bottom right rectangle. - _vm->_graphics->drawRectangle(Common::Rect(394, 50, 635, 198), kColorRed); - _vm->_graphics->drawFilledRectangle(Common::Rect(395, 51, 634, 197), kColorBrown); + _vm->_graphics->drawRectangle(Common::Rect(394, 50, 634, 197), kColorRed); + _vm->_graphics->drawFilledRectangle(Common::Rect(395, 51, 633, 196), kColorBrown); _vm->_graphics->nimDrawLogo(); _vm->_graphics->nimDrawInitials(); -- cgit v1.2.3 From e15dafb9e4f15a1c9095b02bca0d240de9bd2f09 Mon Sep 17 00:00:00 2001 From: uruk Date: Tue, 25 Feb 2014 21:56:32 +0100 Subject: AVALANCHE: Rework use of Common::Rect. Now the right and bottom coordinates of the rectangles aren't included in them. --- engines/avalanche/nim.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/avalanche/nim.cpp') diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp index 87af8053e1..9457a5065b 100644 --- a/engines/avalanche/nim.cpp +++ b/engines/avalanche/nim.cpp @@ -152,13 +152,13 @@ void Nim::setup() { _vm->fadeIn(); _vm->_graphics->nimLoad(); - _vm->_graphics->drawFilledRectangle(Common::Rect(0, 0, 639, 199), kColorBlack); + _vm->_graphics->blackOutScreen(); // Upper left rectangle. - _vm->_graphics->drawRectangle(Common::Rect(10, 5, 380, 70), kColorRed); - _vm->_graphics->drawFilledRectangle(Common::Rect(11, 6, 379, 69), kColorBrown); + _vm->_graphics->drawRectangle(Common::Rect(10, 5, 381, 71), kColorRed); + _vm->_graphics->drawFilledRectangle(Common::Rect(11, 6, 380, 70), kColorBrown); // Bottom right rectangle. - _vm->_graphics->drawRectangle(Common::Rect(394, 50, 634, 197), kColorRed); - _vm->_graphics->drawFilledRectangle(Common::Rect(395, 51, 633, 196), kColorBrown); + _vm->_graphics->drawRectangle(Common::Rect(394, 50, 635, 198), kColorRed); + _vm->_graphics->drawFilledRectangle(Common::Rect(395, 51, 634, 197), kColorBrown); _vm->_graphics->nimDrawLogo(); _vm->_graphics->nimDrawInitials(); @@ -383,8 +383,8 @@ void Nim::takeSome() { int x1 = 63 + (_stones[_row] - _number) * 64; int y1 = 38 + 35 * (_row + 1); - int x2 = 54 + _stones[_row] * 64; - int y2 = 63 + 35 * (_row + 1); + int x2 = 55 + _stones[_row] * 64; + int y2 = 64 + 35 * (_row + 1); _vm->_graphics->drawRectangle(Common::Rect(x1, y1, x2, y2), kColorBlue); // Draw the selection rectangle. _vm->_graphics->refreshScreen(); @@ -396,8 +396,8 @@ void Nim::takeSome() { _vm->_graphics->drawRectangle(Common::Rect(x1, y1, x2, y2), kColorBlack); // Erase the previous selection. x1 = 63 + (_stones[_row] - _number) * 64; y1 = 38 + 35 * (_row + 1); - x2 = 54 + _stones[_row] * 64; - y2 = 63 + 35 * (_row + 1); + x2 = 55 + _stones[_row] * 64; + y2 = 64 + 35 * (_row + 1); _vm->_graphics->drawRectangle(Common::Rect(x1, y1, x2, y2), kColorBlue); // Draw the new one. _vm->_graphics->refreshScreen(); } -- cgit v1.2.3