aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kpathing.cpp
diff options
context:
space:
mode:
authorMax Horn2009-10-07 23:34:24 +0000
committerMax Horn2009-10-07 23:34:24 +0000
commit0988e273eca17749037e501c20715b99b2dfb89a (patch)
treec48e7187c380d78f23de3aa65c5afd4bfe8891e5 /engines/sci/engine/kpathing.cpp
parenta4fa78743d23deed3414f1915694184bac3f2798 (diff)
downloadscummvm-rg350-0988e273eca17749037e501c20715b99b2dfb89a.tar.gz
scummvm-rg350-0988e273eca17749037e501c20715b99b2dfb89a.tar.bz2
scummvm-rg350-0988e273eca17749037e501c20715b99b2dfb89a.zip
SCI: Turn lookup_node & lookup_list into SegManager::lookupNode & SegManager::lookupList
svn-id: r44769
Diffstat (limited to 'engines/sci/engine/kpathing.cpp')
-rw-r--r--engines/sci/engine/kpathing.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index ea6e5c7610..2671aad6b6 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -372,18 +372,18 @@ static void draw_input(EngineState *s, reg_t poly_list, Common::Point start, Com
if (!poly_list.segment)
return;
- list = lookup_list(s, poly_list);
+ list = s->_segMan->lookupList(poly_list);
if (!list) {
warning("[avoidpath] Could not obtain polygon list");
return;
}
- node = lookup_node(s, list->first);
+ node = s->_segMan->lookupNode(list->first);
while (node) {
draw_polygon(s, node->value);
- node = lookup_node(s, node->succ);
+ node = s->_segMan->lookupNode(node->succ);
}
}
@@ -418,7 +418,7 @@ static void print_input(EngineState *s, reg_t poly_list, Common::Point start, Co
if (!poly_list.segment)
return;
- list = lookup_list(s, poly_list);
+ list = s->_segMan->lookupList(poly_list);
if (!list) {
warning("[avoidpath] Could not obtain polygon list");
@@ -426,11 +426,11 @@ static void print_input(EngineState *s, reg_t poly_list, Common::Point start, Co
}
printf("Polygons:\n");
- node = lookup_node(s, list->first);
+ node = s->_segMan->lookupNode(list->first);
while (node) {
print_polygon(s->_segMan, node->value);
- node = lookup_node(s, node->succ);
+ node = s->_segMan->lookupNode(node->succ);
}
}
@@ -1355,11 +1355,11 @@ static PathfindingState *convert_polygon_set(EngineState *s, reg_t poly_list, Co
// Convert all polygons
if (poly_list.segment) {
- List *list = lookup_list(s, poly_list);
- Node *node = lookup_node(s, list->first);
+ List *list = s->_segMan->lookupList(poly_list);
+ Node *node = s->_segMan->lookupNode(list->first);
while (node) {
- Node *dup = lookup_node(s, list->first);
+ Node *dup = s->_segMan->lookupNode(list->first);
// Workaround for game bugs that put a polygon in the list more than once
while (dup != node) {
@@ -1367,7 +1367,7 @@ static PathfindingState *convert_polygon_set(EngineState *s, reg_t poly_list, Co
warning("[avoidpath] Ignoring duplicate polygon");
break;
}
- dup = lookup_node(s, dup->succ);
+ dup = s->_segMan->lookupNode(dup->succ);
}
if (dup == node) {
@@ -1377,7 +1377,7 @@ static PathfindingState *convert_polygon_set(EngineState *s, reg_t poly_list, Co
count += GET_SEL32(node->value, size).toUint16();
}
- node = lookup_node(s, node->succ);
+ node = s->_segMan->lookupNode(node->succ);
}
}