diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/gui_lok.h | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/gui_lok.h')
| -rw-r--r-- | engines/kyra/gui_lok.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/gui_lok.h b/engines/kyra/gui_lok.h index 5a8d6ab532..d3e0beaa9e 100644 --- a/engines/kyra/gui_lok.h +++ b/engines/kyra/gui_lok.h @@ -23,7 +23,7 @@ #ifndef KYRA_GUI_LOK_H #define KYRA_GUI_LOK_H -#include "kyra/gui.h" +#include "kyra/gui_v1.h" #include "kyra/screen_lok.h" namespace Kyra { @@ -92,7 +92,7 @@ namespace Kyra { class KyraEngine_LoK; -class GUI_LoK : public GUI { +class GUI_LoK : public GUI_v1 { friend class KyraEngine_LoK; public: GUI_LoK(KyraEngine_LoK *vm, Screen_LoK *screen); |