aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2018-12-30 01:33:35 +0100
committerEugene Sandulenko2019-11-13 22:07:08 +0100
commitc890f95cf69e87cbe69516277216d6a0d662d4a1 (patch)
tree91950cb0d5d43360142df51005b942546f7af68f /engines
parentd3de41aa5dc10f5e88a1827c080fe0c4ae7d77c9 (diff)
downloadscummvm-rg350-c890f95cf69e87cbe69516277216d6a0d662d4a1.tar.gz
scummvm-rg350-c890f95cf69e87cbe69516277216d6a0d662d4a1.tar.bz2
scummvm-rg350-c890f95cf69e87cbe69516277216d6a0d662d4a1.zip
GRIFFON: More compilation fixes
Diffstat (limited to 'engines')
-rw-r--r--engines/griffon/config.cpp4
-rw-r--r--engines/griffon/detection.cpp7
-rw-r--r--engines/griffon/engine.cpp2
-rw-r--r--engines/griffon/module.mk4
-rw-r--r--engines/griffon/state.cpp6
5 files changed, 19 insertions, 4 deletions
diff --git a/engines/griffon/config.cpp b/engines/griffon/config.cpp
index aa57429a89..cda055470c 100644
--- a/engines/griffon/config.cpp
+++ b/engines/griffon/config.cpp
@@ -60,6 +60,7 @@ char config_ini[64] = "config.ini";
} while(0)
void config_load(CONFIG *config) {
+#if 0
char line[128];
char arg[128];
FILE *fp;
@@ -109,9 +110,11 @@ void config_load(CONFIG *config) {
fclose(fp);
}
+#endif
}
void config_save(CONFIG *config) {
+#if 0
FILE *fp = fopen(config_ini, "w");
if (fp) {
@@ -132,6 +135,7 @@ void config_save(CONFIG *config) {
PRINT("%i", config->effectsvol);
fclose(fp);
}
+#endif
}
} // end of namespace Griffon
diff --git a/engines/griffon/detection.cpp b/engines/griffon/detection.cpp
index 099c85513d..b67241cef4 100644
--- a/engines/griffon/detection.cpp
+++ b/engines/griffon/detection.cpp
@@ -38,7 +38,7 @@ static const ADGameDescription gameDescriptions[] = {
AD_ENTRY1s("objectdb.dat", "ec5371da28f01ccf88980b32d9de2232", 27754),
Common::EN_ANY,
Common::kPlatformWindows,
- ADGF_UNSTABLE,
+ ADGF_UNSTABLE | ADGF_DROPPLATFORM,
GUIO1(GUIO_NONE)
},
@@ -69,7 +69,10 @@ bool GriffonMetaEngine::hasFeature(MetaEngineFeature f) const {
}
bool GriffonMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
- return false;
+ if (desc)
+ *engine = new Griffon::GriffonEngine(syst);
+
+ return desc != nullptr;
}
#if PLUGIN_ENABLED_DYNAMIC(GRIFFON)
diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp
index 0b35809e6a..a9336bb0ea 100644
--- a/engines/griffon/engine.cpp
+++ b/engines/griffon/engine.cpp
@@ -109,7 +109,7 @@ void SDL_BlitSurface(Graphics::Surface *src, Common::Rect *srcRect, Graphics::Tr
void SDL_BlitSurface(Graphics::Surface *src, Common::Rect *srcRect, Graphics::Surface *dst, Common::Rect *dstRect) {}
void SDL_FillRect(Graphics::TransparentSurface *surface, Common::Rect *rect, uint32 color) {}
int SDL_MapRGB(Graphics::PixelFormat format, int r, int g, int b) { return 0; }
-void SDL_SetColorKey(Graphics::Surface *src, int mode, uint32 color);
+void SDL_SetColorKey(Graphics::Surface *src, int mode, uint32 color) {}
Mix_Chunk *Mix_LoadWAV(const char *name) { return NULL; }
bool Mix_Playing(int channel) { return true; }
diff --git a/engines/griffon/module.mk b/engines/griffon/module.mk
index d4208a2a61..2dbacb5e5a 100644
--- a/engines/griffon/module.mk
+++ b/engines/griffon/module.mk
@@ -1,9 +1,11 @@
MODULE := engines/griffon
MODULE_OBJS := \
+ config.o \
engine.o \
griffon.o \
- detection.o
+ detection.o \
+ state.o
MODULE_DIRS += \
engines/griffon
diff --git a/engines/griffon/state.cpp b/engines/griffon/state.cpp
index a1ec297ecf..3aa97d6cc3 100644
--- a/engines/griffon/state.cpp
+++ b/engines/griffon/state.cpp
@@ -60,6 +60,7 @@ extern PLAYERTYPE playera;
extern int asecstart;
int state_load(int slotnum) {
+#if 0
FILE *fp;
char line[256];
@@ -131,11 +132,13 @@ int state_load(int slotnum) {
fclose(fp);
}
+#endif
return 0; // fail
}
/* fill PLAYERTYPE playera; */
int state_load_player(int slotnum) {
+#if 0
FILE *fp;
char line[256];
@@ -188,11 +191,13 @@ int state_load_player(int slotnum) {
fclose(fp);
}
+#endif
return 0; // fail
}
int state_save(int slotnum) {
+#if 0
FILE *fp;
char line[256];
@@ -262,6 +267,7 @@ int state_save(int slotnum) {
return 1; // success
}
+#endif
return 0; // fail
}