diff options
author | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-15 01:48:49 +0200 |
---|---|---|
committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-15 01:48:49 +0200 |
commit | 10b2c562fb7635f9850f1441f08ba8b1a71e31e1 (patch) | |
tree | 34d2b49911923481a41ba8b24edf630bae27d314 /src/common/restext.h | |
parent | e942400c8bb9b6836bdfe705111f7ec63ef19e28 (diff) | |
download | colobot-10b2c562fb7635f9850f1441f08ba8b1a71e31e1.tar.gz colobot-10b2c562fb7635f9850f1441f08ba8b1a71e31e1.tar.bz2 colobot-10b2c562fb7635f9850f1441f08ba8b1a71e31e1.zip |
First approach to port 2D UI Interface
- changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs
- necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile
Diffstat (limited to 'src/common/restext.h')
-rw-r--r-- | src/common/restext.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/restext.h b/src/common/restext.h index d5f22de..abd8fd9 100644 --- a/src/common/restext.h +++ b/src/common/restext.h @@ -18,11 +18,11 @@ #pragma once - +//#include "graphics/engine/engine.h" #include "common/event.h" -class CD3DEngine; +class Gfx::CEngine; @@ -32,7 +32,7 @@ class CD3DEngine; enum ResType { RES_TEXT = 0, // RT_* - RES_EVENT = 1, // EVENT_* (EventMsg) + RES_EVENT = 1, // EVENT_* (EventType) RES_OBJECT = 2, // OBJECT_* (ObjectType) RES_ERR = 3, // ERR_* (Error) RES_KEY = 4, // VK_* (keys) @@ -145,10 +145,10 @@ enum ResTextType }; -static CD3DEngine* g_engine = 0; +static Gfx::CEngine* g_engine = 0; static char g_gamerName[100]; -extern void SetEngine(CD3DEngine *engine); +extern void SetEngine(Gfx::CEngine *engine); extern void SetGlobalGamerName(char *name); extern bool SearchKey(char *cmd, KeyRank &key); extern void PutKeyName(char* dst, char* src); |