diff options
| -rw-r--r-- | engines/dreamweb/dreambase.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamweb.h | 3 | ||||
| -rw-r--r-- | engines/dreamweb/pathfind.cpp | 6 | ||||
| -rw-r--r-- | engines/dreamweb/sprite.cpp | 4 |
4 files changed, 4 insertions, 10 deletions
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h index b1bdf62126..e68c6d3d19 100644 --- a/engines/dreamweb/dreambase.h +++ b/engines/dreamweb/dreambase.h @@ -61,6 +61,7 @@ public: public: // from pathfind.cpp + Common::Point _lineData[200]; // Output of Bresenham void checkDest(const RoomPaths *roomsPaths); // from print.cpp diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index db0b4d3e32..1d16a188d2 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -48,9 +48,6 @@ namespace DreamGen { const uint16 addr_backobject = 0xc170; const uint16 addr_mainman = 0xc138; -// Output of Bresenham -extern Common::Point g_lineData[200]; - // Keyboard buffer. data.word(kBufferin) and data.word(kBufferout) are indexes // into this, making it a ring buffer extern uint8 g_keyBuffer[16]; diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp index 9f6a382a11..ff2659c235 100644 --- a/engines/dreamweb/pathfind.cpp +++ b/engines/dreamweb/pathfind.cpp @@ -24,10 +24,6 @@ namespace DreamGen { -// Output of Bresenham -Common::Point g_lineData[200]; - - void DreamGenContext::turnPathOn() { turnPathOn(al); } @@ -159,7 +155,7 @@ bool DreamGenContext::checkIfPathIsOn(uint8 index) { void DreamGenContext::bresenhams() { workoutFrames(); - Common::Point *lineData = &g_lineData[0]; + Common::Point *lineData = &_lineData[0]; int16 startX = (int16)data.word(kLinestartx); int16 startY = (int16)data.word(kLinestarty); int16 endX = (int16)data.word(kLineendx); diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index fd6d2dc9e8..a7e6379eb3 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -196,8 +196,8 @@ void DreamGenContext::walking(Sprite *sprite) { comp = data.byte(kLinelength); } if (data.byte(kLinepointer) < comp) { - sprite->x = (uint8)g_lineData[data.byte(kLinepointer)].x; - sprite->y = (uint8)g_lineData[data.byte(kLinepointer)].y; + sprite->x = (uint8)_lineData[data.byte(kLinepointer)].x; + sprite->y = (uint8)_lineData[data.byte(kLinepointer)].y; return; } |