thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: Move more stuff to DreamBase

Browse source
This commit is contained in:
Max Horn 2011-12-08 20:10:33 +01:00
parent 0d7815e9bb
commit c8d4f60852
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/dreamweb/dreambase.h
View file

@ -69,6 +69,11 @@ public:
Common::Point _lineData[200]; // Output of Bresenham Common::Point _lineData[200]; // Output of Bresenham
void checkDest(const RoomPaths *roomsPaths); void checkDest(const RoomPaths *roomsPaths);
RoomPaths *getRoomsPaths(); RoomPaths *getRoomsPaths();
void faceRightWay();
void setWalk();
void autoSetWalk();
void findXYFromPath();
void bresenhams();
void workoutFrames(); void workoutFrames();
// from print.cpp // from print.cpp

15
engines/dreamweb/pathfind.cpp
View file

@ -73,7 +73,14 @@ RoomPaths *DreamBase::getRoomsPaths() {
return (RoomPaths *)result; return (RoomPaths *)result;
} }
void DreamGenContext::setWalk() { void DreamBase::faceRightWay() {
PathNode *paths = getRoomsPaths()->nodes;
uint8 dir = paths[data.byte(kManspath)].dir;
data.byte(kTurntoface) = dir;
data.byte(kLeavedirection) = dir;
}
void DreamBase::setWalk() {
if (data.byte(kLinepointer) != 254) { if (data.byte(kLinepointer) != 254) {
// Already walking // Already walking
data.byte(kFinaldest) = data.byte(kPointerspath); data.byte(kFinaldest) = data.byte(kPointerspath);
@ -100,7 +107,7 @@ void DreamGenContext::setWalk() {
} }
} }
void DreamGenContext::autoSetWalk() { void DreamBase::autoSetWalk() {
if (data.byte(kFinaldest) == data.byte(kManspath)) if (data.byte(kFinaldest) == data.byte(kManspath))
return; return;
const RoomPaths *roomsPaths = getRoomsPaths(); const RoomPaths *roomsPaths = getRoomsPaths();
@ -137,7 +144,7 @@ void DreamBase::checkDest(const RoomPaths *roomsPaths) {
data.byte(kDestination) = destination; data.byte(kDestination) = destination;
} }
void DreamGenContext::findXYFromPath() { void DreamBase::findXYFromPath() {
const PathNode *roomsPaths = getRoomsPaths()->nodes; const PathNode *roomsPaths = getRoomsPaths()->nodes;
data.byte(kRyanx) = roomsPaths[data.byte(kManspath)].x - 12; data.byte(kRyanx) = roomsPaths[data.byte(kManspath)].x - 12;
data.byte(kRyany) = roomsPaths[data.byte(kManspath)].y - 12; data.byte(kRyany) = roomsPaths[data.byte(kManspath)].y - 12;
@ -153,7 +160,7 @@ bool DreamGenContext::checkIfPathIsOn(uint8 index) {
return pathOn == 0xff; return pathOn == 0xff;
} }
void DreamGenContext::bresenhams() { void DreamBase::bresenhams() {
workoutFrames(); workoutFrames();
Common::Point *lineData = &_lineData[0]; Common::Point *lineData = &_lineData[0];
int16 startX = (int16)data.word(kLinestartx); int16 startX = (int16)data.word(kLinestartx);

7
engines/dreamweb/sprite.cpp
View file

@ -457,13 +457,6 @@ void DreamGenContext::liftSprite(Sprite *sprite, SetObject *objData) {
} }
} }
void DreamGenContext::faceRightWay() {
PathNode *paths = getRoomsPaths()->nodes;
uint8 dir = paths[data.byte(kManspath)].dir;
data.byte(kTurntoface) = dir;
data.byte(kLeavedirection) = dir;
}
Reel *DreamBase::getReelStart(uint16 reelPointer) { Reel *DreamBase::getReelStart(uint16 reelPointer) {
Reel *reel = (Reel *)getSegment(data.word(kReels)).ptr(kReellist + reelPointer * sizeof(Reel) * 8, sizeof(Reel)); Reel *reel = (Reel *)getSegment(data.word(kReels)).ptr(kReellist + reelPointer * sizeof(Reel) * 8, sizeof(Reel));
return reel; return reel;

5
engines/dreamweb/stubs.h
View file

@ -96,9 +96,7 @@
void initMan(); void initMan();
void mainMan(Sprite *sprite); void mainMan(Sprite *sprite);
void mainMan(); void mainMan();
void faceRightWay();
void walking(Sprite *sprite); void walking(Sprite *sprite);
void autoSetWalk();
void aboutTurn(Sprite *sprite); void aboutTurn(Sprite *sprite);
void backObject(Sprite *sprite); void backObject(Sprite *sprite);
void backObject(); void backObject();
@ -161,7 +159,6 @@
void blockNameText(); void blockNameText();
void walkToText(); void walkToText();
void personNameText(); void personNameText();
void findXYFromPath();
void findOrMake(); void findOrMake();
void findOrMake(uint8 index, uint8 value, uint8 type) { void findOrMake(uint8 index, uint8 value, uint8 type) {
DreamBase::findOrMake(index, value, type); DreamBase::findOrMake(index, value, type);
@ -239,7 +236,6 @@
void useText(); void useText();
void getBlockOfPixel(); void getBlockOfPixel();
uint8 getBlockOfPixel(uint8 x, uint8 y); uint8 getBlockOfPixel(uint8 x, uint8 y);
void bresenhams();
void examineObText(); void examineObText();
void sortOutMap(); void sortOutMap();
void showCity(); void showCity();
@ -497,7 +493,6 @@
void openSarters(); void openSarters();
void openLouis(); void openLouis();
void DOSReturn(); void DOSReturn();
void setWalk();
void useLadder(); void useLadder();
void useLadderB(); void useLadderB();
void useCart(); void useCart();