[Scummvm-cvs-logs] CVS: scummvm saveload.h,NONE,1.1 saveload.cpp,1.51,1.52 scumm.h,1.173,1.174
Max Horn
fingolfin at users.sourceforge.net
Tue Jul 2 13:59:45 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv19514
Modified Files:
saveload.cpp scumm.h
Added Files:
saveload.h
Log Message:
added saveload.h; moved some stuff out of scumm.h into saveload.h/.cpp (no need why other code has to see this)
--- NEW FILE: saveload.h ---
/* ScummVM - Scumm Interpreter
* Copyright (C) 2002 The ScummVM project
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /cvsroot/scummvm/scummvm/saveload.h,v 1.1 2002/07/02 20:57:27 fingolfin Exp $
*
*/
#ifndef SAVELOAD_H
#define SAVELOAD_H
struct SerializerStream {
#ifdef NONSTANDARD_SAVE
void *context;
bool fopen(const char *filename, const char *mode);
void fclose();
int fread(void *buf, int size, int cnt);
int fwrite(void *buf, int size, int cnt);
#else
FILE *out;
FILE *fopen(const char *filename, const char *mode) {
return out = ::fopen(filename, mode);
}
void fclose() {
::fclose(out);
}
int fread(void *buf, int size, int cnt) {
return ::fread(buf, size, cnt, out);
}
int fwrite(void *buf, int size, int cnt) {
return ::fwrite(buf, size, cnt, out);
}
#endif
};
#endif
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- saveload.cpp 16 May 2002 10:43:17 -0000 1.51
+++ saveload.cpp 2 Jul 2002 20:57:27 -0000 1.52
@@ -26,12 +26,53 @@
#include "sound/imuse.h"
#include "actor.h"
#include "config-file.h"
+#include "saveload.h"
struct SaveGameHeader {
uint32 type;
uint32 size;
uint32 ver;
char name[32];
+};
+
+struct SaveLoadEntry {
+ uint32 offs;
+ uint8 type;
+ uint8 size;
+};
+
+typedef int SerializerSaveReference(void *me, byte type, void *ref);
+typedef void *SerializerLoadReference(void *me, byte type, int ref);
+
+struct Serializer {
+ SerializerStream _saveLoadStream;
+
+ union {
+ SerializerSaveReference *_save_ref;
+ SerializerLoadReference *_load_ref;
+ void *_saveload_ref;
+ };
+ void *_ref_me;
+
+ bool _saveOrLoad;
+
+ void saveLoadBytes(void *b, int len);
+ void saveLoadArrayOf(void *b, int len, int datasize, byte filetype);
+ void saveLoadEntries(void *d, const SaveLoadEntry *sle);
+ void saveLoadArrayOf(void *b, int num, int datasize, const SaveLoadEntry *sle);
+
+ void saveUint32(uint32 d);
+ void saveWord(uint16 d);
+ void saveByte(byte b);
+
+ byte loadByte();
+ uint16 loadWord();
+ uint32 loadUint32();
+
+ bool isSaving() { return _saveOrLoad; }
+
+ bool checkEOFLoadStream();
+
};
// Support for "old" savegames (made with 2501 CVS build)
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- scumm.h 2 Jul 2002 20:14:49 -0000 1.173
+++ scumm.h 2 Jul 2002 20:57:27 -0000 1.174
@@ -1154,7 +1154,6 @@
int _maxBoxVertexHeap, _boxPathVertexHeapIndex, _boxMatrixItem;
byte *_boxMatrixPtr4, *_boxMatrixPtr1, *_boxMatrixPtr3;
-// ScummPoint p[5]; /* Gate locations */
ScummPoint gateLoc[5]; /* Gate locations */
int gate1ax, gate1ay, gate1bx, gate1by, gate2ax, gate2ay, gate2bx, gate2by;
uint16 _extraBoxFlags[65];
@@ -1683,74 +1682,6 @@
void printScripts();
};
-struct SaveLoadEntry {
- uint32 offs;
- uint8 type;
- uint8 size;
-};
-
-typedef int SerializerSaveReference(void *me, byte type, void *ref);
-typedef void *SerializerLoadReference(void *me, byte type, int ref);
-
-
-struct SerializerStream {
-#ifdef NONSTANDARD_SAVE
- void *context;
-
- bool fopen(const char *filename, const char *mode);
- void fclose();
- int fread(void *buf, int size, int cnt);
- int fwrite(void *buf, int size, int cnt);
-#else
- FILE *out;
-
- FILE *fopen(const char *filename, const char *mode) {
- return out = ::fopen(filename, mode);
- }
- void fclose() {
- ::fclose(out);
- }
- int fread(void *buf, int size, int cnt) {
- return ::fread(buf, size, cnt, out);
- }
- int fwrite(void *buf, int size, int cnt) {
- return ::fwrite(buf, size, cnt, out);
- }
-#endif
-};
-
-struct Serializer {
- SerializerStream _saveLoadStream;
-
- union {
- SerializerSaveReference *_save_ref;
- SerializerLoadReference *_load_ref;
- void *_saveload_ref;
- };
- void *_ref_me;
-
- bool _saveOrLoad;
-
- void saveLoadBytes(void *b, int len);
- void saveLoadArrayOf(void *b, int len, int datasize, byte filetype);
- void saveLoadEntries(void *d, const SaveLoadEntry *sle);
- void saveLoadArrayOf(void *b, int num, int datasize, const SaveLoadEntry *sle);
-
- void saveUint32(uint32 d);
- void saveWord(uint16 d);
- void saveByte(byte b);
-
- byte loadByte();
- uint16 loadWord();
- uint32 loadUint32();
-
- bool isSaving() { return _saveOrLoad; }
-
- bool checkEOFLoadStream();
-
-};
-
-
extern const uint32 IMxx_tags[];
extern const byte default_scale_table[768];
extern uint16 _debugLevel;
@@ -1768,19 +1699,11 @@
void CDECL warning(const char *s, ...);
void CDECL debug(int level, const char *s, ...);
void checkHeap();
-//void initGraphics(Scumm *s, bool fullScreen, unsigned int scaleFactor = 2);
-//void updateScreen(Scumm *s);
-//void drawMouse(int x, int y, int color, byte *mask, bool visible);
-//void drawMouse(int x, int y, int w, int h, byte *buf, bool visible);
void blit(byte *dst, byte *src, int w, int h);
byte *findResource(uint32 tag, byte *searchin, int index);
byte *findResourceSmall(uint32 tag, byte *searchin, int index);
byte *findResource(uint32 tag, byte *searchin);
byte *findResourceSmall(uint32 tag, byte *searchin);
-//void playSfxSound(void *sound, uint32 size, uint rate);
-//bool isSfxFinished();
-//void waitForTimer(Scumm *s, int msec_delay);
-//void setShakePos(Scumm *s, int shake_pos);
void setWindowName(Scumm *s);
uint16 newTag2Old(uint32 oldTag);
More information about the Scummvm-git-logs
mailing list