diff options
Diffstat (limited to 'engines/wintermute/dctypes.h')
| -rw-r--r-- | engines/wintermute/dctypes.h | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/engines/wintermute/dctypes.h b/engines/wintermute/dctypes.h index 0ee5a6bf54..bd5ec3b6e5 100644 --- a/engines/wintermute/dctypes.h +++ b/engines/wintermute/dctypes.h @@ -29,22 +29,29 @@ #ifndef WINTERMUTE_DCTYPES_H
#define WINTERMUTE_DCTYPES_H
-#include <string>
-#include <list>
-#include <vector>
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
-namespace WinterMute {
+#include "common/str.h"
+#include "common/list.h"
+#include "common/array.h"
+//#include <string>
+//#include <list>
+//#include <vector>
-typedef std::string AnsiString;
-typedef std::string Utf8String;
-typedef std::wstring WideString;
+namespace WinterMute {
+//typedef std::string AnsiString;
+//typedef std::string Utf8String;
+//typedef std::wstring WideString;
+typedef Common::String AnsiString;
+typedef Common::String Utf8String;
+typedef Common::String WideString; // NB: Not actually true I presume.
-typedef std::list<WideString> WideStringList;
-typedef std::list<AnsiString> AnsiStringList;
+typedef Common::List<WideString> WideStringList;
+typedef Common::List<AnsiString> AnsiStringList;
-typedef std::vector<WideString> WideStringArray;
-typedef std::vector<AnsiString> AnsiStringArray;
+typedef Common::Array<WideString> WideStringArray;
+typedef Common::Array<AnsiString> AnsiStringArray;
enum TGameState {
|