aboutsummaryrefslogtreecommitdiff
path: root/engines/prince/prince.h
diff options
context:
space:
mode:
authorlukaslw2014-07-19 01:55:58 +0200
committerlukaslw2014-07-19 01:55:58 +0200
commit6016f492e54d5629e330a0b489294bf2a6f50f01 (patch)
tree8881d631409eb35f883963c6530ecc0d0931cc86 /engines/prince/prince.h
parentd62a85c7859c83a2251e901ed1b235b205139016 (diff)
downloadscummvm-rg350-6016f492e54d5629e330a0b489294bf2a6f50f01.tar.gz
scummvm-rg350-6016f492e54d5629e330a0b489294bf2a6f50f01.tar.bz2
scummvm-rg350-6016f492e54d5629e330a0b489294bf2a6f50f01.zip
PRINCE: findPoint() fix and clean-up
Diffstat (limited to 'engines/prince/prince.h')
-rw-r--r--engines/prince/prince.h35
1 files changed, 12 insertions, 23 deletions
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 7715737b1e..b5790983b9 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -439,17 +439,8 @@ public:
static const int32 kTracePts = 8000;
static const int32 kPBW = kMaxPicWidth / 16; // PathBitmapWidth
byte *_roomPathBitmap; // PL - Sala
- byte *_roomPathBitmapTemp; // PL -SSala
-
- int _destX;
- int _destY;
- int _destX2;
- int _destY2;
- int _fpFlag;
- int _fpX;
- int _fpY;
- int _fpX1;
- int _fpY1;
+ byte *_roomPathBitmapTemp; // PL - SSala
+
Direction _direction;
byte *_coordsBufEnd;
byte *_coordsBuf; // optimal path
@@ -466,17 +457,17 @@ public:
byte *_directionTable;
int _shanLen1;
- byte *_checkBitmapTemp; //esi
- byte *_checkBitmap; // ebp
- int _checkMask; // dl
- int _checkX; // eax
- int _checkY; // ebx
+ byte *_checkBitmapTemp;
+ byte *_checkBitmap;
+ int _checkMask;
+ int _checkX;
+ int _checkY;
- byte *_rembBitmapTemp; // esi
- byte *_rembBitmap; // ebp
- int _rembMask; // dl
- int _rembX; // eax
- int _rembY; // ebx
+ byte *_rembBitmapTemp;
+ byte *_rembBitmap;
+ int _rembMask;
+ int _rembX;
+ int _rembY;
struct fpResult {
int x1;
@@ -488,8 +479,6 @@ public:
bool loadPath(const char *resourceName);
byte *makePath(int destX, int destY);
void findPoint(int x1, int y1, int x2, int y2);
- int fpGetPixelAddr(int x, int y);
- int fpGetPixel(int x, int y);
int getPixelAddr(byte *pathBitmap, int x, int y);
static void plotTraceLine(int x, int y, int color, void *data);
void specialPlotInside(int x, int y);