diff options
| author | Torbjörn Andersson | 2003-10-03 06:54:44 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-10-03 06:54:44 +0000 |
| commit | 10fee205e1d7d064c74040192022440711f3a4ca (patch) | |
| tree | 8e078413dfa5553f307f3c15de6910028424da46 /sword2/speech.cpp | |
| parent | 2c726548969a33c37b4dd79ac9f72ee5b6f80a7c (diff) | |
| download | scummvm-rg350-10fee205e1d7d064c74040192022440711f3a4ca.tar.gz scummvm-rg350-10fee205e1d7d064c74040192022440711f3a4ca.tar.bz2 scummvm-rg350-10fee205e1d7d064c74040192022440711f3a4ca.zip | |
Some renaming (ironic in the light of Fingolfin's recent namespace
suggestion, but I prepared the patch long before reading the mail :-).
Also, the remaining parts of the control panel etc. have been moved into a
class of their own.
This is still work in progress. I'm well aware that some of the classes
aren't as well separated as they ought to be, and that using global
variables to keep track of the different classes probably isn't pretty.
svn-id: r10561
Diffstat (limited to 'sword2/speech.cpp')
| -rw-r--r-- | sword2/speech.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/speech.cpp b/sword2/speech.cpp index ba6c4ce57b..162921aecc 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -976,7 +976,7 @@ int32 FN_i_speak(int32 *params) { // for this line either, then just quit back to script right // now! - if (subtitles == 0 && WantSpeechForLine(params[S_WAV]) == 0) + if (gui._subtitles == 0 && WantSpeechForLine(params[S_WAV]) == 0) return IR_CONT; if (cycle_skip == 0) { @@ -1143,7 +1143,7 @@ int32 FN_i_speak(int32 *params) { // if speech is selected, and this line is allowed speech // (not if it's an fx subtitle!) - if (speechSelected && WantSpeechForLine(officialTextNumber)) { + if (gui._speechSelected && WantSpeechForLine(officialTextNumber)) { // if the wavId paramter is zero because not yet // compiled into speech command, we can still get it // from the 1st 2 chars of the text line @@ -1214,7 +1214,7 @@ int32 FN_i_speak(int32 *params) { } // if we want subtitles, or speech failed to load - if (subtitles || speechRunning == 0) { + if (gui._subtitles || speechRunning == 0) { // then we're going to show the text textRunning = 1; |