diff options
| author | Torbjörn Andersson | 2003-10-11 12:26:53 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-10-11 12:26:53 +0000 |
| commit | 02a157e745210d8986df83dd2114c2ee0ae86c88 (patch) | |
| tree | 160b1cb10dbbf5ca5ea8a6ebd2f510ab6d3ee88d /sword2/resman.cpp | |
| parent | 650581eef80bcf2fbe5bb55218ae329a8673498e (diff) | |
| download | scummvm-rg350-02a157e745210d8986df83dd2114c2ee0ae86c88.tar.gz scummvm-rg350-02a157e745210d8986df83dd2114c2ee0ae86c88.tar.bz2 scummvm-rg350-02a157e745210d8986df83dd2114c2ee0ae86c88.zip | |
Moved the text drawing stuff into a class of its own. (Adding another
global variable which will hopefully be dealt with later.)
svn-id: r10734
Diffstat (limited to 'sword2/resman.cpp')
| -rw-r--r-- | sword2/resman.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sword2/resman.cpp b/sword2/resman.cpp index 5e3f523f7e..b6db4f0361 100644 --- a/sword2/resman.cpp +++ b/sword2/resman.cpp @@ -1149,7 +1149,7 @@ void ResourceManager::cacheNewCluster(uint32 newCluster) { uint8 *loadingBar; _cdtEntry *cdt; - text_spr = MakeTextSprite(FetchTextLine(res_man.open(2283), 8) + 2, 640, 187, speech_font_id); + text_spr = fontRenderer.makeTextSprite(FetchTextLine(res_man.open(2283), 8) + 2, 640, 187, g_sword2->_speechFontId); frame = (_frameHeader*) text_spr->ad; @@ -1160,7 +1160,7 @@ void ResourceManager::cacheNewCluster(uint32 newCluster) { textSprite.scale = 0; textSprite.scaledWidth = 0; textSprite.scaledHeight = 0; - textSprite.type = RDSPR_DISPLAYALIGN + RDSPR_NOCOMPRESSION + RDSPR_TRANS; + textSprite.type = RDSPR_DISPLAYALIGN | RDSPR_NOCOMPRESSION | RDSPR_TRANS; textSprite.blend = 0; textSprite.colourTable = 0; @@ -1178,7 +1178,7 @@ void ResourceManager::cacheNewCluster(uint32 newCluster) { barSprite.scale = 0; barSprite.scaledWidth = 0; barSprite.scaledHeight = 0; - barSprite.type = RDSPR_RLE256FAST + RDSPR_TRANS; + barSprite.type = RDSPR_RLE256FAST | RDSPR_TRANS; barSprite.blend = 0; barSprite.colourTable = 0; @@ -1375,7 +1375,7 @@ void ResourceManager::getCd(int cd) { textRes = res_man.open(2283); DisplayMsg(FetchTextLine(textRes, 5 + cd) + 2, 0); - text_spr = MakeTextSprite(FetchTextLine(textRes, 5 + cd) + 2, 640, 187, speech_font_id); + text_spr = fontRenderer.makeTextSprite(FetchTextLine(textRes, 5 + cd) + 2, 640, 187, g_sword2->_speechFontId); frame = (_frameHeader*) text_spr->ad; @@ -1386,7 +1386,7 @@ void ResourceManager::getCd(int cd) { spriteInfo.scale = 0; spriteInfo.scaledWidth = 0; spriteInfo.scaledHeight = 0; - spriteInfo.type = RDSPR_DISPLAYALIGN + RDSPR_NOCOMPRESSION + RDSPR_TRANS; + spriteInfo.type = RDSPR_DISPLAYALIGN | RDSPR_NOCOMPRESSION | RDSPR_TRANS; spriteInfo.blend = 0; spriteInfo.data = text_spr->ad + sizeof(_frameHeader); spriteInfo.colourTable = 0; |