diff options
Diffstat (limited to 'engines/wintermute/Base')
-rw-r--r-- | engines/wintermute/Base/BFont.h | 2 | ||||
-rw-r--r-- | engines/wintermute/Base/BGame.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/Base/scriptables/ScEngine.cpp | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/engines/wintermute/Base/BFont.h b/engines/wintermute/Base/BFont.h index 0cfb5ed681..148cbe7ed8 100644 --- a/engines/wintermute/Base/BFont.h +++ b/engines/wintermute/Base/BFont.h @@ -44,7 +44,7 @@ public: virtual int GetLetterHeight();
virtual void InitLoop() {};
-
+ virtual void AfterLoad() {};
CBFont(CBGame *inGame);
virtual ~CBFont();
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 00e5cc8ea7..f643d3e302 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/Base/BFader.h"
#include "engines/wintermute/Base/file/BFile.h"
#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/BFontTT.h"
+#include "engines/wintermute/Base/BFont.h"
#include "engines/wintermute/Base/BFontStorage.h"
#include "engines/wintermute/Base/BImage.h"
#include "engines/wintermute/Base/BKeyboardState.h"
@@ -3397,7 +3397,7 @@ void CBGame::AfterLoadSound(void *Sound, void *Data) { //////////////////////////////////////////////////////////////////////////
void CBGame::AfterLoadFont(void *Font, void *Data) {
- ((CBFontTT *)Font)->AfterLoad();
+ ((CBFont*)Font)->AfterLoad();
}
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp index 30bda66558..e8560bca6f 100644 --- a/engines/wintermute/Base/scriptables/ScEngine.cpp +++ b/engines/wintermute/Base/scriptables/ScEngine.cpp @@ -25,10 +25,7 @@ * http://dead-code.org/redir.php?target=wmelite
* Copyright (c) 2011 Jan Nedoma
*/
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
-#include <algorithm>
-#include <vector>
-#undef FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "engines/wintermute/dcgf.h"
#include "engines/wintermute/Base/scriptables/ScEngine.h"
#include "engines/wintermute/utils/StringUtil.h"
|