diff options
author | Strangerke | 2013-03-20 07:47:39 +0100 |
---|---|---|
committer | Strangerke | 2013-03-20 07:47:39 +0100 |
commit | 56ae0044750a6f4bbe936ba304e9f726fba70dad (patch) | |
tree | cf9f952747e1e3988782088d191a6bd74db20601 /engines/hopkins/lines.cpp | |
parent | 6a446ff9d170640bf698f7ef19386050ee4bd9c2 (diff) | |
download | scummvm-rg350-56ae0044750a6f4bbe936ba304e9f726fba70dad.tar.gz scummvm-rg350-56ae0044750a6f4bbe936ba304e9f726fba70dad.tar.bz2 scummvm-rg350-56ae0044750a6f4bbe936ba304e9f726fba70dad.zip |
HOPKINS: Remove setParent() from LinesManager
Diffstat (limited to 'engines/hopkins/lines.cpp')
-rw-r--r-- | engines/hopkins/lines.cpp | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp index 816f4f855e..476477b573 100644 --- a/engines/hopkins/lines.cpp +++ b/engines/hopkins/lines.cpp @@ -30,26 +30,9 @@ namespace Hopkins { +LinesManager::LinesManager(HopkinsEngine *vm) { + _vm = vm; -int LigneItem::appendToRouteInc(int from, int to, RouteItem *route, int index) { - if (to == -1) - to = _lineDataEndIdx; - - for (int i = from; i < to; ++i) - route[index++].set(_lineData[2*i], _lineData[2*i+1], _directionRouteInc); - return index; -} -int LigneItem::appendToRouteDec(int from, int to, RouteItem *route, int index) { - if (from == -1) - from = _lineDataEndIdx - 1; - - for (int i = from; i > to; --i) - route[index++].set(_lineData[2*i], _lineData[2*i+1], _directionRouteDec); - return index; -} - - -LinesManager::LinesManager() { for (int i = 0; i < MAX_LINES; ++i) { Common::fill((byte *)&_zoneLine[i], (byte *)&_zoneLine[i] + sizeof(LigneZoneItem), 0); Common::fill((byte *)&_lineItem[i], (byte *)&_lineItem[i] + sizeof(LigneItem), 0); @@ -100,8 +83,21 @@ LinesManager::~LinesManager() { _vm->_globals->freeMemory((byte *) _testRoute2); } -void LinesManager::setParent(HopkinsEngine *vm) { - _vm = vm; +int LigneItem::appendToRouteInc(int from, int to, RouteItem *route, int index) { + if (to == -1) + to = _lineDataEndIdx; + + for (int i = from; i < to; ++i) + route[index++].set(_lineData[2*i], _lineData[2*i+1], _directionRouteInc); + return index; +} +int LigneItem::appendToRouteDec(int from, int to, RouteItem *route, int index) { + if (from == -1) + from = _lineDataEndIdx - 1; + + for (int i = from; i > to; --i) + route[index++].set(_lineData[2*i], _lineData[2*i+1], _directionRouteDec); + return index; } /** |