[Scummvm-cvs-logs] SF.net SVN: scummvm: [28470] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Mon Aug 6 17:40:13 CEST 2007
Revision: 28470
http://scummvm.svn.sourceforge.net/scummvm/?rev=28470&view=rev
Author: peres001
Date: 2007-08-06 08:40:12 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
Made thickness of balloon borders consistent with original games.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/callables_ns.cpp
scummvm/trunk/engines/parallaction/graphics.cpp
scummvm/trunk/engines/parallaction/location.cpp
Modified: scummvm/trunk/engines/parallaction/callables_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables_ns.cpp 2007-08-06 13:22:21 UTC (rev 28469)
+++ scummvm/trunk/engines/parallaction/callables_ns.cpp 2007-08-06 15:40:12 UTC (rev 28470)
@@ -344,17 +344,13 @@
Common::Rect r(w+5, h+5);
r.moveTo(5, 5);
_gfx->floodFill(Gfx::kBitFront, r, 0);
-
- r.setWidth(w+3);
- r.setHeight(h+3);
- r.moveTo(7, 7);
+ r.grow(-2);
_gfx->floodFill(Gfx::kBitFront, r, 1);
_gfx->setFont(kFontDialogue);
_gfx->displayWrappedString(_location._endComment, 3, 5, 0, 130);
_gfx->updateScreen();
-
Gfx::Palette pal;
_gfx->makeGrayscalePalette(pal);
Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp 2007-08-06 13:22:21 UTC (rev 28469)
+++ scummvm/trunk/engines/parallaction/graphics.cpp 2007-08-06 15:40:12 UTC (rev 28470)
@@ -35,7 +35,8 @@
#define BALLOON_WIDTH 12
#define BALLOON_HEIGHT 10
-byte _resBalloon[2][BALLOON_WIDTH*BALLOON_HEIGHT] = {
+
+byte _resBalloonTail[2][BALLOON_WIDTH*BALLOON_HEIGHT] = {
{
0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02,
0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02,
@@ -67,19 +68,17 @@
Common::Rect q = r;
+ // draws balloon
q.right += 5;
floodFill(kBitFront, q, 0);
-
- q.left++;
- q.top+=2;
- q.right--;
- q.bottom--;
+ q.grow(-1);
floodFill(kBitFront, q, 1);
+ // draws tail
+ // TODO: this bitmap tail should only be used for Dos games. Amiga should use a polygon fill.
winding = (winding == 0 ? 1 : 0);
- byte *s = _resBalloon[winding];
+ byte *s = _resBalloonTail[winding];
byte *d = (byte*)_buffers[kBitFront]->getBasePtr(r.left + (r.width()+5)/2 - 5, r.bottom - 1);
-
for (uint16 i = 0; i < BALLOON_HEIGHT; i++) {
for (uint16 j = 0; j < BALLOON_WIDTH; j++) {
if (*s != 2) *d = *s;
Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp 2007-08-06 13:22:21 UTC (rev 28469)
+++ scummvm/trunk/engines/parallaction/location.cpp 2007-08-06 15:40:12 UTC (rev 28470)
@@ -441,7 +441,7 @@
Common::Rect r(10 + w, 5 + h);
r.moveTo(5, 5);
_gfx->floodFill(Gfx::kBitFront, r, 0);
- r.grow(-1);
+ r.grow(-2);
_gfx->floodFill(Gfx::kBitFront, r, 1);
_gfx->displayWrappedString(_location._comment, 3, 5, 0, 130);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list