diff options
| author | Oliver Kiehl | 2003-04-25 15:17:53 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2003-04-25 15:17:53 +0000 |
| commit | c36bdb3e118670cafdde92659db0719438dc8487 (patch) | |
| tree | fdc98c37f55c5bf02b39ae05e2506468ea734fab /sky/text.cpp | |
| parent | da4a76ed04bd197a9527802d4b72556786226f37 (diff) | |
| download | scummvm-rg350-c36bdb3e118670cafdde92659db0719438dc8487.tar.gz scummvm-rg350-c36bdb3e118670cafdde92659db0719438dc8487.tar.bz2 scummvm-rg350-c36bdb3e118670cafdde92659db0719438dc8487.zip | |
Committing my stuff under pressure from Endy ;)
please note that there are still many bugs in here. several stuff
isn't endian safe either. SkyLogic needs to get split up as well.
svn-id: r7106
Diffstat (limited to 'sky/text.cpp')
| -rw-r--r-- | sky/text.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sky/text.cpp b/sky/text.cpp index cdc6a10a00..222f6cb086 100644 --- a/sky/text.cpp +++ b/sky/text.cpp @@ -81,17 +81,17 @@ void SkyText::fnSetFont(uint32 fontNr) { _dtCharSpacing = newCharSet->charSpacing; } -void SkyText::getText(uint32 textNr, void **itemList, uint16 language) { //load text #"textNr" into textBuffer +void SkyText::getText(uint32 textNr, uint16 language) { //load text #"textNr" into textBuffer uint32 sectionNo = (textNr & 0x0F000) >> 10; - if (itemList[FIRST_TEXT_SEC + sectionNo] == (void*)NULL) { //check if already loaded + if (SkyState::_itemList[FIRST_TEXT_SEC + sectionNo] == (void **)NULL) { //check if already loaded debug(5, "Loading Text item(s) for Section %d", (sectionNo>>2)); uint32 fileNo = (sectionNo >> 2); fileNo += ((language * NO_OF_TEXT_SECTIONS) + 60600); - itemList[FIRST_TEXT_SEC + sectionNo] = (void *)_skyDisk->loadFile((uint16)fileNo, NULL); + SkyState::_itemList[FIRST_TEXT_SEC + sectionNo] = (void **)_skyDisk->loadFile((uint16)fileNo, NULL); } - _textItemPtr = (uint8 *)itemList[FIRST_TEXT_SEC + sectionNo]; + _textItemPtr = (uint8 *)SkyState::_itemList[FIRST_TEXT_SEC + sectionNo]; uint32 offset = 0; uint32 nr32MsgBlocks = (textNr & 0x0fe0); |