aboutsummaryrefslogtreecommitdiff
path: root/engines/macventure/world.cpp
diff options
context:
space:
mode:
authorBorja Lorente2016-06-25 17:38:15 +0200
committerBorja Lorente2016-08-14 18:39:05 +0200
commit8dd52b6cce3835950f255f48d13f3d09a7dbe0ff (patch)
treec2338539d10fd5c6546984798a04eb779471584b /engines/macventure/world.cpp
parent499ebc0b54c79e89f4ee38628cea1f64cdf40bf2 (diff)
downloadscummvm-rg350-8dd52b6cce3835950f255f48d13f3d09a7dbe0ff.tar.gz
scummvm-rg350-8dd52b6cce3835950f255f48d13f3d09a7dbe0ff.tar.bz2
scummvm-rg350-8dd52b6cce3835950f255f48d13f3d09a7dbe0ff.zip
MACVENTURE: Complete text decoding
Diffstat (limited to 'engines/macventure/world.cpp')
-rw-r--r--engines/macventure/world.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/macventure/world.cpp b/engines/macventure/world.cpp
index 2ee7bae92f..02d388ab5f 100644
--- a/engines/macventure/world.cpp
+++ b/engines/macventure/world.cpp
@@ -25,9 +25,6 @@ World::World(MacVentureEngine *engine, Common::MacResManager *resMan) {
warning("Test functions about to happen");
_gameText = new Container("Shadowgate II/Shadow Text");
-
- ObjID tid = (ObjID)1;
- TextAsset test = TextAsset(tid, _gameText, _engine->isOldText(), _engine->getDecodingHuffman());
delete saveGameRes;
saveGameFile.close();
@@ -153,8 +150,8 @@ void World::captureChildren(ObjID objID) {
void World::releaseChildren(ObjID objID) {
}
-Common::String World::getText(ObjID objID) {
- TextAsset text = TextAsset(objID, _gameText, _engine->isOldText(), _engine->getDecodingHuffman());
+Common::String World::getText(ObjID objID, ObjID source, ObjID target) {
+ TextAsset text = TextAsset(_engine, objID, source, target, _gameText, _engine->isOldText(), _engine->getDecodingHuffman());
return *text.decode();
}