From bed4f81fc616d6ca920e5ab534d4accea9c1a9ef Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 15 Jun 2012 01:21:28 +0200 Subject: WINTERMUTE: Clean out some un-needed headers, and some FORBIDDEN_SYMBOL_EXCEPTIONs --- engines/wintermute/Base/BFont.h | 2 +- engines/wintermute/Base/BGame.cpp | 4 ++-- engines/wintermute/Base/scriptables/ScEngine.cpp | 5 +---- engines/wintermute/Sys/SysClass.h | 3 --- engines/wintermute/dcgf.h | 2 -- engines/wintermute/dcscript.h | 10 +++++++++- engines/wintermute/utils/PathUtil.cpp | 23 ++++++----------------- 7 files changed, 19 insertions(+), 30 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 -#include -#undef FORBIDDEN_SYMBOL_ALLOW_ALL + #include "engines/wintermute/dcgf.h" #include "engines/wintermute/Base/scriptables/ScEngine.h" #include "engines/wintermute/utils/StringUtil.h" diff --git a/engines/wintermute/Sys/SysClass.h b/engines/wintermute/Sys/SysClass.h index 82b612927e..c81e38ee43 100644 --- a/engines/wintermute/Sys/SysClass.h +++ b/engines/wintermute/Sys/SysClass.h @@ -31,9 +31,6 @@ #include "engines/wintermute/persistent.h" #include "engines/wintermute/dctypes.h" - -//#include -//#include #include "common/hashmap.h" #include "common/func.h" #include "common/stream.h" diff --git a/engines/wintermute/dcgf.h b/engines/wintermute/dcgf.h index 855da1d542..74eb7f782a 100644 --- a/engines/wintermute/dcgf.h +++ b/engines/wintermute/dcgf.h @@ -54,8 +54,6 @@ // macros #define RELEASE(obj) if(obj) { obj->Release(); obj = NULL; } else 0 -#define SAFE_DELETE(obj) if(obj) { delete obj; obj = NULL; } else 0 -#define SAFE_DELETE_ARRAY(obj) if(obj) { delete [] obj; obj = NULL; } else 0 #define DegToRad(_val) (_val*PI*(1.0f/180.0f)) #define RadToDeg(_val) (_val*(180/PI)) diff --git a/engines/wintermute/dcscript.h b/engines/wintermute/dcscript.h index 2ebb0fe11a..a4a608da46 100644 --- a/engines/wintermute/dcscript.h +++ b/engines/wintermute/dcscript.h @@ -49,7 +49,15 @@ typedef enum { // script states typedef enum { - SCRIPT_RUNNING, SCRIPT_WAITING, SCRIPT_SLEEPING, SCRIPT_FINISHED, SCRIPT_PERSISTENT, SCRIPT_ERROR, SCRIPT_PAUSED, SCRIPT_WAITING_SCRIPT, SCRIPT_THREAD_FINISHED + SCRIPT_RUNNING, + SCRIPT_WAITING, + SCRIPT_SLEEPING, + SCRIPT_FINISHED, + SCRIPT_PERSISTENT, + SCRIPT_ERROR, + SCRIPT_PAUSED, + SCRIPT_WAITING_SCRIPT, + SCRIPT_THREAD_FINISHED } TScriptState; // opcodes diff --git a/engines/wintermute/utils/PathUtil.cpp b/engines/wintermute/utils/PathUtil.cpp index e2e6c56b9f..284db8acfc 100644 --- a/engines/wintermute/utils/PathUtil.cpp +++ b/engines/wintermute/utils/PathUtil.cpp @@ -25,26 +25,12 @@ * http://dead-code.org/redir.php?target=wmelite * Copyright (c) 2011 Jan Nedoma */ -#define FORBIDDEN_SYMBOL_ALLOW_ALL +#define FORBIDDEN_SYMBOL_EXCEPTION_ifstream #include "engines/wintermute/dcgf.h" -#include #include #include "PathUtil.h" #include "StringUtil.h" - -#ifdef __WIN32__ -# include -#endif - -#ifdef __MACOSX__ -# include -#endif - -#ifdef __IPHONEOS__ -# include "ios_utils.h" -#endif - namespace WinterMute { ////////////////////////////////////////////////////////////////////////// @@ -155,6 +141,8 @@ bool PathUtil::MatchesMask(const AnsiString &fileName, const AnsiString &mask) { ////////////////////////////////////////////////////////////////////////// bool PathUtil::FileExists(const AnsiString &fileName) { + warning("PathUtil::FileExists(%s)", fileName.c_str()); + std::ifstream stream; stream.open(fileName.c_str()); @@ -167,8 +155,9 @@ bool PathUtil::FileExists(const AnsiString &fileName) { ////////////////////////////////////////////////////////////////////////// AnsiString PathUtil::GetUserDirectory() { + warning("PathUtil::GetUserDirectory - stubbed"); AnsiString userDir = "./"; - +#if 0 #ifdef __WIN32__ char buffer[MAX_PATH]; buffer[0] = '\0'; @@ -197,7 +186,7 @@ AnsiString PathUtil::GetUserDirectory() { IOS_GetDataDir(path); userDir = AnsiString(path); #endif - +#endif // 0 return userDir; } -- cgit v1.2.3