aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/frotz/glk_interface.h
diff options
context:
space:
mode:
authorPaul Gilbert2018-11-13 20:05:59 -0800
committerPaul Gilbert2018-12-08 19:05:59 -0800
commita2104deb4cefdcf0cd6bb3a66ef09bb46cba3f66 (patch)
tree802a8abed7a2f97aa9fa0d7f467054a9e0ab79b8 /engines/glk/frotz/glk_interface.h
parent1fb931fbd950324754536ee0b33ed0b91f68c9a2 (diff)
downloadscummvm-rg350-a2104deb4cefdcf0cd6bb3a66ef09bb46cba3f66.tar.gz
scummvm-rg350-a2104deb4cefdcf0cd6bb3a66ef09bb46cba3f66.tar.bz2
scummvm-rg350-a2104deb4cefdcf0cd6bb3a66ef09bb46cba3f66.zip
GLK: Changing class and namespaces from Gargoyle to Glk
Diffstat (limited to 'engines/glk/frotz/glk_interface.h')
-rw-r--r--engines/glk/frotz/glk_interface.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/glk/frotz/glk_interface.h b/engines/glk/frotz/glk_interface.h
index e3fa2c9081..d78d49ffbb 100644
--- a/engines/glk/frotz/glk_interface.h
+++ b/engines/glk/frotz/glk_interface.h
@@ -23,10 +23,10 @@
#ifndef GLK_FROTZ_GLK_INTERFACE
#define GLK_FROTZ_GLK_INTERFACE
-#include "glk/glk.h"
+#include "glk/glk_api.h"
#include "glk/frotz/mem.h"
-namespace Gargoyle {
+namespace Glk {
namespace Frotz {
enum SoundEffect {
@@ -47,7 +47,7 @@ enum RestartAction {
* Implements an intermediate interface on top of the GLK layer, providing screen
* and sound effect handling
*/
-class GlkInterface : public Glk, public virtual UserOptions, public virtual Mem {
+class GlkInterface : public GlkAPI, public virtual UserOptions, public virtual Mem {
public:
zchar statusline[256];
int oldstyle;
@@ -181,7 +181,7 @@ public:
/**
* Constructor
*/
- GlkInterface(OSystem *syst, const GargoyleGameDescription *gameDesc);
+ GlkInterface(OSystem *syst, const GlkGameDescription *gameDesc);
/**
* Initialization
@@ -190,6 +190,6 @@ public:
};
} // End of namespace Frotz
-} // End of namespace Gargoyle
+} // End of namespace Glk
#endif