aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb
diff options
context:
space:
mode:
authorBertrand Augereau2011-09-02 07:56:50 +0200
committerBertrand Augereau2011-09-02 07:57:19 +0200
commitc51797dae69a8f4925d320a20228777dbc2add82 (patch)
treea54c839860bbdf53093632bc654091fa2da25897 /engines/dreamweb
parent98a6b339afcb6bb177ef898f2a83633269d2eea7 (diff)
downloadscummvm-rg350-c51797dae69a8f4925d320a20228777dbc2add82.tar.gz
scummvm-rg350-c51797dae69a8f4925d320a20228777dbc2add82.tar.bz2
scummvm-rg350-c51797dae69a8f4925d320a20228777dbc2add82.zip
DREAMWEB: Removal of a useless stub
Diffstat (limited to 'engines/dreamweb')
-rw-r--r--engines/dreamweb/pathfind.cpp17
-rw-r--r--engines/dreamweb/sprite.cpp2
-rw-r--r--engines/dreamweb/stubs.h3
3 files changed, 8 insertions, 14 deletions
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 9069c9d3be..080f99a477 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -33,7 +33,7 @@ void DreamGenContext::turnpathon() {
void DreamGenContext::turnpathon(uint8 param) {
findormake(param, 0xff, data.byte(kRoomnum) + 100);
- PathNode *roomsPaths = getroomspathsCPP()->nodes;
+ PathNode *roomsPaths = getroomspaths()->nodes;
if (param == 0xff)
return;
roomsPaths[param].on = 0xff;
@@ -45,7 +45,7 @@ void DreamGenContext::turnpathoff() {
void DreamGenContext::turnpathoff(uint8 param) {
findormake(param, 0x00, data.byte(kRoomnum) + 100);
- PathNode *roomsPaths = getroomspathsCPP()->nodes;
+ PathNode *roomsPaths = getroomspaths()->nodes;
if (param == 0xff)
return;
roomsPaths[param].on = 0x00;
@@ -72,12 +72,7 @@ void DreamGenContext::turnanypathoff() {
turnanypathoff(al, ah);
}
-void DreamGenContext::getroomspaths() {
- es = data.word(kReels);
- bx = data.byte(kRoomnum) * 144;
-}
-
-RoomPaths *DreamGenContext::getroomspathsCPP() {
+RoomPaths *DreamGenContext::getroomspaths() {
void *result = segRef(data.word(kReels)).ptr(data.byte(kRoomnum) * 144, 144);
return (RoomPaths *)result;
}
@@ -86,7 +81,7 @@ void DreamGenContext::autosetwalk() {
al = data.byte(kManspath);
if (data.byte(kFinaldest) == al)
return;
- const RoomPaths *roomsPaths = getroomspathsCPP();
+ const RoomPaths *roomsPaths = getroomspaths();
checkdest(roomsPaths);
data.word(kLinestartx) = roomsPaths->nodes[data.byte(kManspath)].x - 12;
data.word(kLinestarty) = roomsPaths->nodes[data.byte(kManspath)].y - 12;
@@ -123,7 +118,7 @@ void DreamGenContext::checkdest(const RoomPaths *roomsPaths) {
}
void DreamGenContext::findxyfrompath() {
- const PathNode *roomsPaths = getroomspathsCPP()->nodes;
+ const PathNode *roomsPaths = getroomspaths()->nodes;
data.byte(kRyanx) = roomsPaths[data.byte(kManspath)].x - 12;
data.byte(kRyany) = roomsPaths[data.byte(kManspath)].y - 12;
}
@@ -133,7 +128,7 @@ void DreamGenContext::checkifpathison() {
}
bool DreamGenContext::checkifpathison(uint8 index) {
- RoomPaths *roomsPaths = getroomspathsCPP();
+ RoomPaths *roomsPaths = getroomspaths();
uint8 pathOn = roomsPaths->nodes[index].on;
return pathOn == 0xff;
}
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index e938f868a5..7cd54c9242 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -501,7 +501,7 @@ void DreamGenContext::liftsprite(Sprite *sprite, SetObject *objData) {
}
void DreamGenContext::facerightway() {
- PathNode *paths = getroomspathsCPP()->nodes;
+ PathNode *paths = getroomspaths()->nodes;
uint8 dir = paths[data.byte(kManspath)].dir;
data.byte(kTurntoface) = dir;
data.byte(kLeavedirection) = dir;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a272407b4f..67bba274a7 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -111,8 +111,7 @@
void turnanypathoff(uint8 param, uint8 room);
void turnanypathon();
void turnanypathoff();
- void getroomspaths();
- RoomPaths *getroomspathsCPP();
+ RoomPaths *getroomspaths();
void makebackob(SetObject *objData);
void modifychar();
void lockmon();