diff options
| author | Vicent Marti | 2008-09-05 14:48:47 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-09-05 14:48:47 +0000 |
| commit | e0592c7d25acd42cd93b9dab5048209bab858ba8 (patch) | |
| tree | 485a24967de1b0a8e50204c95191fb0b07388acd /gui | |
| parent | 020be5bc2183ef8cdf27595a476b8b1cc4cff194 (diff) | |
| download | scummvm-rg350-e0592c7d25acd42cd93b9dab5048209bab858ba8.tar.gz scummvm-rg350-e0592c7d25acd42cd93b9dab5048209bab858ba8.tar.bz2 scummvm-rg350-e0592c7d25acd42cd93b9dab5048209bab858ba8.zip | |
Fixed severe bottleneck in the XML Parser code.
Applied Max's patch for character drawing.
Added new FP squareroot function.
svn-id: r34354
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/newgui.cpp | 4 | ||||
| -rw-r--r-- | gui/newgui.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 097a38291a..3361a76602 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -106,7 +106,7 @@ NewGui::~NewGui() { delete _theme; } -bool NewGui::loadNewTheme(const Common::String &filename, ThemeEngine::GraphicsMode gfx) { +bool NewGui::loadNewTheme(Common::String filename, ThemeEngine::GraphicsMode gfx) { if (_theme && filename == _theme->getThemeFileName() && gfx == _theme->getGraphicsMode()) return true; @@ -124,8 +124,6 @@ bool NewGui::loadNewTheme(const Common::String &filename, ThemeEngine::GraphicsM } delete _theme; - _theme = 0; - _theme = new ThemeEngine(filename, gfx); if (!_theme) diff --git a/gui/newgui.h b/gui/newgui.h index 9dace522ab..0b3de01c83 100644 --- a/gui/newgui.h +++ b/gui/newgui.h @@ -78,7 +78,7 @@ public: bool isActive() const { return ! _dialogStack.empty(); } - bool loadNewTheme(const Common::String &file, ThemeEngine::GraphicsMode gfx = ThemeEngine::kGfxDisabled); + bool loadNewTheme(Common::String file, ThemeEngine::GraphicsMode gfx = ThemeEngine::kGfxDisabled); Theme *theme() { return _theme; } ThemeEval *xmlEval() { return _theme->evaluator(); } |