diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/griffon/engine.cpp | 1 | ||||
-rw-r--r-- | engines/griffon/griffon.h | 4 | ||||
-rw-r--r-- | engines/griffon/module.mk | 2 | ||||
-rw-r--r-- | engines/griffon/saveload.cpp (renamed from engines/griffon/state.cpp) | 7 | ||||
-rw-r--r-- | engines/griffon/state.h | 50 |
5 files changed, 8 insertions, 56 deletions
diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp index c85bc70522..cc1fe2b628 100644 --- a/engines/griffon/engine.cpp +++ b/engines/griffon/engine.cpp @@ -36,7 +36,6 @@ #include "griffon/griffon.h" #include "griffon/config.h" -#include "griffon/state.h" #include "common/events.h" #include "common/file.h" diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h index 7da3414ab3..9b811e82bf 100644 --- a/engines/griffon/griffon.h +++ b/engines/griffon/griffon.h @@ -294,6 +294,10 @@ private: void sys_progress(int w, int wm); void sys_setupAudio(); void sys_update(); + + int state_load(int slotnum); + int state_load_player(int slotnum); + int state_save(int slotnum); }; } diff --git a/engines/griffon/module.mk b/engines/griffon/module.mk index 2dbacb5e5a..7df4e2e102 100644 --- a/engines/griffon/module.mk +++ b/engines/griffon/module.mk @@ -5,7 +5,7 @@ MODULE_OBJS := \ engine.o \ griffon.o \ detection.o \ - state.o + saveload.o MODULE_DIRS += \ engines/griffon diff --git a/engines/griffon/state.cpp b/engines/griffon/saveload.cpp index 3aa97d6cc3..11c15cd924 100644 --- a/engines/griffon/state.cpp +++ b/engines/griffon/saveload.cpp @@ -35,7 +35,6 @@ */ #include "griffon/griffon.h" -#include "griffon/state.h" namespace Griffon { @@ -59,7 +58,7 @@ char player_sav[256] = "data/player%i.sav"; extern PLAYERTYPE playera; extern int asecstart; -int state_load(int slotnum) { +int GriffonEngine::state_load(int slotnum) { #if 0 FILE *fp; char line[256]; @@ -137,7 +136,7 @@ int state_load(int slotnum) { } /* fill PLAYERTYPE playera; */ -int state_load_player(int slotnum) { +int GriffonEngine::state_load_player(int slotnum) { #if 0 FILE *fp; char line[256]; @@ -196,7 +195,7 @@ int state_load_player(int slotnum) { return 0; // fail } -int state_save(int slotnum) { +int GriffonEngine::state_save(int slotnum) { #if 0 FILE *fp; char line[256]; diff --git a/engines/griffon/state.h b/engines/griffon/state.h deleted file mode 100644 index ac8ccb111d..0000000000 --- a/engines/griffon/state.h +++ /dev/null @@ -1,50 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * - * Originally written by Syn9 in FreeBASIC with SDL - * http://syn9.thehideoutgames.com/index_backup.php - * - * Ported to plain C for GCW-Zero handheld by Dmitry Smagin - * http://github.com/dmitrysmagin/griffon_legend - * - * - * Programming/Graphics: Daniel "Syn9" Kennedy - * Music/Sound effects: David Turner - * - * Beta testing and gameplay design help: - * Deleter, Cha0s, Aether Fox, and Kiz - * - */ - -#ifndef GRIFFON_STATE_H -#define GRIFFON_STATE_H - -namespace Griffon { - -extern char player_sav[]; - -int state_load(int slotnum); -int state_load_player(int slotnum); -int state_save(int slotnum); - -} // end of namespace Griffon - -#endif |