More BS2 restructuring.

The various game settings are no longer stored in the Gui class. They are
stored in the class that use them.

Code that doesn't belong in the Gui class, e.g. the "restart" code, has
been moved out of it.

Afterwards, the Gui class had been reduced to nothing more than a handful
of trivial methods for invoking the in-game dialogs. So the entire Gui
class has been removed.

svn-id: r16827
This commit is contained in:
Torbjörn Andersson committed 2005-02-20 15:38:48 +00:00
1 parent b1039bb59e
commit 807b33ec29
11 files changed
+825 -775

No files matched your search

+2 -3
View File
@@ -26,7 +26,6 @@
#include "sword2/defs.h"
#include "sword2/build_display.h"
#include "sword2/console.h"
#include "sword2/controls.h"
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
@@ -1246,7 +1245,7 @@ int32 Logic::fnISpeak(int32 *params) {
// we don't want to use a wav for this line either, then just
// quit back to script right now!
if (!_vm->_gui->_subtitles && !wantSpeechForLine(params[S_WAV]))
if (!_vm->getSubtitles() && !wantSpeechForLine(params[S_WAV]))
return IR_CONT;
// Drop out for 1st cycle to allow walks/anims to end and
@@ -1411,7 +1410,7 @@ int32 Logic::fnISpeak(int32 *params) {
}
}
if (_vm->_gui->_subtitles || !speechRunning) {
if (_vm->getSubtitles() || !speechRunning) {
// We want subtitles, or the speech failed to load.
// Either way, we're going to show the text so create
// the text sprite.