diff options
| author | Torbjörn Andersson | 2005-05-03 09:00:06 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-05-03 09:00:06 +0000 |
| commit | f5f9da940b6071df1e921faa42fa56a501e2ab62 (patch) | |
| tree | f4ce163f7ed645ed75cae8a98307d8e7a5059101 /sword2/speech.cpp | |
| parent | 5f7b3d8cf2bd69b01258b8facdabc9b9de736555 (diff) | |
| download | scummvm-rg350-f5f9da940b6071df1e921faa42fa56a501e2ab62.tar.gz scummvm-rg350-f5f9da940b6071df1e921faa42fa56a501e2ab62.tar.bz2 scummvm-rg350-f5f9da940b6071df1e921faa42fa56a501e2ab62.zip | |
More cleanup/restructuring: Moved walk-related code from Logic to Router.
(I may have to think up some better name for that class later.)
svn-id: r17901
Diffstat (limited to 'sword2/speech.cpp')
| -rw-r--r-- | sword2/speech.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sword2/speech.cpp b/sword2/speech.cpp index 6702bb9325..80927da502 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -26,7 +26,6 @@ #include "sword2/defs.h" #include "sword2/logic.h" #include "sword2/maketext.h" -#include "sword2/memory.h" #include "sword2/resman.h" namespace Sword2 { @@ -88,7 +87,7 @@ void Logic::locateTalker(int32 *params) { if (cdt_entry->frameType & FRAME_OFFSET) { // The frame has offsets, i.e. it's a scalable mega frame - ObjectMega *ob_mega = (ObjectMega *) _vm->_memory->decodePtr(params[S_OB_MEGA]); + ObjectMega *ob_mega = (ObjectMega *) decodePtr(params[S_OB_MEGA]); // Calculate scale at which to print the sprite, based on feet // y-coord and scaling constants (NB. 'scale' is actually @@ -159,7 +158,7 @@ void Logic::formText(int32 *params) { return; } - ObjectSpeech *ob_speech = (ObjectSpeech *) _vm->_memory->decodePtr(params[S_OB_SPEECH]); + ObjectSpeech *ob_speech = (ObjectSpeech *) decodePtr(params[S_OB_SPEECH]); // Establish the max width allowed for this text sprite. uint32 textWidth = ob_speech->width ? ob_speech->width : 400; |