libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-04 07:41:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: fixing lf

Browse Source 
(stupid msvc)

svn-id: r54014
This commit is contained in:
Martin Kiewitz 2010-11-01 16:42:54 +00:00
parent 963cf0b08a
commit 548e67f413
3 changed files with 359 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
engines/sci/engine/savegame.h
View File

@ -1,80 +1,80 @@
/* ScummVM - Graphic Adventure Engine /* ScummVM - Graphic Adventure Engine
* *
* ScummVM is the legal property of its developers, whose names * ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT * are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution. * file distributed with this source distribution.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* $URL$ * $URL$
* $Id$ * $Id$
* *
*/ */
#ifndef SCI_ENGINE_SAVEGAME_H #ifndef SCI_ENGINE_SAVEGAME_H
#define SCI_ENGINE_SAVEGAME_H #define SCI_ENGINE_SAVEGAME_H
#include "common/scummsys.h" #include "common/scummsys.h"
#include "common/str.h" #include "common/str.h"
#include "sci/sci.h" #include "sci/sci.h"
namespace Sci { namespace Sci {
struct EngineState; struct EngineState;
enum { enum {
CURRENT_SAVEGAME_VERSION = 27, CURRENT_SAVEGAME_VERSION = 27,
MINIMUM_SAVEGAME_VERSION = 14 MINIMUM_SAVEGAME_VERSION = 14
}; };
// Savegame metadata // Savegame metadata
struct SavegameMetadata { struct SavegameMetadata {
Common::String name; Common::String name;
int version; int version;
Common::String gameVersion; Common::String gameVersion;
int saveDate; int saveDate;
int saveTime; int saveTime;
uint32 playTime; uint32 playTime;
uint16 gameObjectOffset; uint16 gameObjectOffset;
uint16 script0Size; uint16 script0Size;
}; };
/** /**
* Saves a game state to the hard disk in a portable way. * Saves a game state to the hard disk in a portable way.
* @param s The state to save * @param s The state to save
* @param save The stream to save to * @param save The stream to save to
* @param savename The description of the savegame * @param savename The description of the savegame
* @return 0 on success, 1 otherwise * @return 0 on success, 1 otherwise
*/ */
bool gamestate_save(EngineState *s, Common::WriteStream *save, const char *savename, const char *version); bool gamestate_save(EngineState *s, Common::WriteStream *save, const char *savename, const char *version);
/** /**
* Restores a game state from a directory. * Restores a game state from a directory.
* @param s An older state from the same game * @param s An older state from the same game
* @param dirname The subdirectory to restore from * @param dirname The subdirectory to restore from
*/ */
void gamestate_restore(EngineState *s, Common::SeekableReadStream *save); void gamestate_restore(EngineState *s, Common::SeekableReadStream *save);
/** /**
* Read the header from a savegame. * Read the header from a savegame.
*/ */
bool get_savegame_metadata(Common::SeekableReadStream* stream, SavegameMetadata* meta); bool get_savegame_metadata(Common::SeekableReadStream* stream, SavegameMetadata* meta);
} // End of namespace Sci } // End of namespace Sci
#endif // SCI_ENGINE_SAVEGAME_H #endif // SCI_ENGINE_SAVEGAME_H

286
engines/sci/graphics/helpers.h
View File

@ -1,145 +1,145 @@
/* ScummVM - Graphic Adventure Engine /* ScummVM - Graphic Adventure Engine
* *
* ScummVM is the legal property of its developers, whose names * ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT * are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution. * file distributed with this source distribution.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* $URL$ * $URL$
* $Id$ * $Id$
* *
*/ */
#ifndef SCI_GRAPHICS_HELPERS_H #ifndef SCI_GRAPHICS_HELPERS_H
#define SCI_GRAPHICS_HELPERS_H #define SCI_GRAPHICS_HELPERS_H
#include "common/endian.h" // for READ_LE_UINT16 #include "common/endian.h" // for READ_LE_UINT16
#include "common/rect.h" #include "common/rect.h"
#include "common/serializer.h" #include "common/serializer.h"
#include "sci/engine/vm_types.h" #include "sci/engine/vm_types.h"
namespace Sci { namespace Sci {
// Cache limits // Cache limits
#define MAX_CACHED_CURSORS 10 #define MAX_CACHED_CURSORS 10
#define MAX_CACHED_FONTS 20 #define MAX_CACHED_FONTS 20
#define MAX_CACHED_VIEWS 50 #define MAX_CACHED_VIEWS 50
#define SCI_SHAKE_DIRECTION_VERTICAL 1 #define SCI_SHAKE_DIRECTION_VERTICAL 1
#define SCI_SHAKE_DIRECTION_HORIZONTAL 2 #define SCI_SHAKE_DIRECTION_HORIZONTAL 2
typedef int GuiResourceId; // is a resource-number and -1 means no parameter given typedef int GuiResourceId; // is a resource-number and -1 means no parameter given
typedef int16 TextAlignment; typedef int16 TextAlignment;
struct Port { struct Port {
uint16 id; uint16 id;
int16 top, left; int16 top, left;
Common::Rect rect; Common::Rect rect;
int16 curTop, curLeft; int16 curTop, curLeft;
int16 fontHeight; int16 fontHeight;
GuiResourceId fontId; GuiResourceId fontId;
bool greyedOutput; bool greyedOutput;
int16 penClr, backClr; int16 penClr, backClr;
int16 penMode; int16 penMode;
uint16 counterTillFree; uint16 counterTillFree;
Port(uint16 theId) : id(theId), top(0), left(0), Port(uint16 theId) : id(theId), top(0), left(0),
curTop(0), curLeft(0), curTop(0), curLeft(0),
fontHeight(0), fontId(0), greyedOutput(false), fontHeight(0), fontId(0), greyedOutput(false),
penClr(0), backClr(0xFF), penMode(0), counterTillFree(0) { penClr(0), backClr(0xFF), penMode(0), counterTillFree(0) {
} }
}; };
struct Window : public Port, public Common::Serializable { struct Window : public Port, public Common::Serializable {
Common::Rect dims; // client area of window Common::Rect dims; // client area of window
Common::Rect restoreRect; // total area of window including borders Common::Rect restoreRect; // total area of window including borders
uint16 wndStyle; uint16 wndStyle;
uint16 saveScreenMask; uint16 saveScreenMask;
reg_t hSaved1; reg_t hSaved1;
reg_t hSaved2; reg_t hSaved2;
Common::String title; Common::String title;
bool bDrawn; bool bDrawn;
Window(uint16 theId) : Port(theId), Window(uint16 theId) : Port(theId),
wndStyle(0), saveScreenMask(0), wndStyle(0), saveScreenMask(0),
hSaved1(NULL_REG), hSaved2(NULL_REG), hSaved1(NULL_REG), hSaved2(NULL_REG),
bDrawn(false) { bDrawn(false) {
} }
void syncRect(Common::Serializer &ser, Common::Rect targetRect) { void syncRect(Common::Serializer &ser, Common::Rect targetRect) {
ser.syncAsSint16LE(targetRect.top); ser.syncAsSint16LE(targetRect.top);
ser.syncAsSint16LE(targetRect.left); ser.syncAsSint16LE(targetRect.left);
ser.syncAsSint16LE(targetRect.bottom); ser.syncAsSint16LE(targetRect.bottom);
ser.syncAsSint16LE(targetRect.right); ser.syncAsSint16LE(targetRect.right);
} }
virtual void saveLoadWithSerializer(Common::Serializer &ser) { virtual void saveLoadWithSerializer(Common::Serializer &ser) {
ser.syncAsUint16LE(id); ser.syncAsUint16LE(id);
ser.syncAsSint16LE(top); ser.syncAsSint16LE(top);
ser.syncAsSint16LE(left); ser.syncAsSint16LE(left);
syncRect(ser, rect); syncRect(ser, rect);
ser.syncAsSint16LE(curTop); ser.syncAsSint16LE(curTop);
ser.syncAsSint16LE(curLeft); ser.syncAsSint16LE(curLeft);
ser.syncAsSint16LE(fontHeight); ser.syncAsSint16LE(fontHeight);
ser.syncAsSint32LE(fontId); ser.syncAsSint32LE(fontId);
ser.syncAsByte(greyedOutput); ser.syncAsByte(greyedOutput);
ser.syncAsSint16LE(penClr); ser.syncAsSint16LE(penClr);
ser.syncAsSint16LE(backClr); ser.syncAsSint16LE(backClr);
ser.syncAsSint16LE(penMode); ser.syncAsSint16LE(penMode);
ser.syncAsUint16LE(counterTillFree); ser.syncAsUint16LE(counterTillFree);
syncRect(ser, dims); syncRect(ser, dims);
syncRect(ser, restoreRect); syncRect(ser, restoreRect);
ser.syncAsUint16LE(wndStyle); ser.syncAsUint16LE(wndStyle);
ser.syncAsUint16LE(saveScreenMask); ser.syncAsUint16LE(saveScreenMask);
if (ser.isLoading()) { if (ser.isLoading()) {
// The hunk table isn't saved, so we just set both pointers to NULL // The hunk table isn't saved, so we just set both pointers to NULL
hSaved1 = NULL_REG; hSaved1 = NULL_REG;
hSaved2 = NULL_REG; hSaved2 = NULL_REG;
} }
ser.syncString(title); ser.syncString(title);
ser.syncAsByte(bDrawn); ser.syncAsByte(bDrawn);
} }
}; };
struct Color { struct Color {
byte used; byte used;
byte r, g, b; byte r, g, b;
}; };
struct Palette { struct Palette {
byte mapping[256]; byte mapping[256];
uint32 timestamp; uint32 timestamp;
Color colors[256]; Color colors[256];
byte intensity[256]; byte intensity[256];
}; };
struct PalSchedule { struct PalSchedule {
byte from; byte from;
uint32 schedule; uint32 schedule;
}; };
enum ViewType { enum ViewType {
kViewUnknown, kViewUnknown,
kViewEga, kViewEga,
kViewVga, kViewVga,
kViewVga11, kViewVga11,
kViewAmiga kViewAmiga
}; };
} // End of namespace Sci } // End of namespace Sci
#endif #endif

276
engines/sci/graphics/ports.h
View File

@ -1,45 +1,45 @@
/* ScummVM - Graphic Adventure Engine /* ScummVM - Graphic Adventure Engine
* *
* ScummVM is the legal property of its developers, whose names * ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT * are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution. * file distributed with this source distribution.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* $URL$ * $URL$
* $Id$ * $Id$
* *
*/ */
#ifndef SCI_GRAPHICS_PORTS_H #ifndef SCI_GRAPHICS_PORTS_H
#define SCI_GRAPHICS_PORTS_H #define SCI_GRAPHICS_PORTS_H
#include "common/serializer.h" #include "common/serializer.h"
#include "common/list.h" #include "common/list.h"
#include "common/array.h" #include "common/array.h"
namespace Sci { namespace Sci {
class SciGui; class SciGui;
class GfxPaint16; class GfxPaint16;
class GfxScreen; class GfxScreen;
class GfxText16; class GfxText16;
#define PORTS_FIRSTWINDOWID 2 #define PORTS_FIRSTWINDOWID 2
#define PORTS_FIRSTSCRIPTWINDOWID 3 #define PORTS_FIRSTSCRIPTWINDOWID 3
// window styles // window styles
enum { enum {
SCI_WINDOWMGR_STYLE_TRANSPARENT = (1 << 0), SCI_WINDOWMGR_STYLE_TRANSPARENT = (1 << 0),
@ -48,101 +48,101 @@ enum {
SCI_WINDOWMGR_STYLE_TOPMOST = (1 << 3), SCI_WINDOWMGR_STYLE_TOPMOST = (1 << 3),
SCI_WINDOWMGR_STYLE_USER = (1 << 7) SCI_WINDOWMGR_STYLE_USER = (1 << 7)
}; };
/** /**
* Ports class, includes all port managment for SCI0->SCI1.1 games. Ports are some sort of windows in SCI * Ports class, includes all port managment for SCI0->SCI1.1 games. Ports are some sort of windows in SCI
* this class also handles adjusting coordinates to a specific port * this class also handles adjusting coordinates to a specific port
*/ */
class GfxPorts : public Common::Serializable { class GfxPorts : public Common::Serializable {
public: public:
GfxPorts(SegManager *segMan, GfxScreen *screen); GfxPorts(SegManager *segMan, GfxScreen *screen);
~GfxPorts(); ~GfxPorts();
void init(bool usesOldGfxFunctions, GfxPaint16 *paint16, GfxText16 *text16); void init(bool usesOldGfxFunctions, GfxPaint16 *paint16, GfxText16 *text16);
void reset(); void reset();
void kernelSetActive(uint16 portId); void kernelSetActive(uint16 portId);
Common::Rect kernelGetPicWindow(int16 &picTop, int16 &picLeft); Common::Rect kernelGetPicWindow(int16 &picTop, int16 &picLeft);
void kernelSetPicWindow(Common::Rect rect, int16 picTop, int16 picLeft, bool initPriorityBandsFlag); void kernelSetPicWindow(Common::Rect rect, int16 picTop, int16 picLeft, bool initPriorityBandsFlag);
reg_t kernelGetActive(); reg_t kernelGetActive();
reg_t kernelNewWindow(Common::Rect dims, Common::Rect restoreRect, uint16 style, int16 priority, int16 colorPen, int16 colorBack, const char *title); reg_t kernelNewWindow(Common::Rect dims, Common::Rect restoreRect, uint16 style, int16 priority, int16 colorPen, int16 colorBack, const char *title);
void kernelDisposeWindow(uint16 windowId, bool reanimate); void kernelDisposeWindow(uint16 windowId, bool reanimate);
int16 isFrontWindow(Window *wnd); int16 isFrontWindow(Window *wnd);
void beginUpdate(Window *wnd); void beginUpdate(Window *wnd);
void endUpdate(Window *wnd); void endUpdate(Window *wnd);
Window *addWindow(const Common::Rect &dims, const Common::Rect *restoreRect, const char *title, uint16 style, int16 priority, bool draw); Window *addWindow(const Common::Rect &dims, const Common::Rect *restoreRect, const char *title, uint16 style, int16 priority, bool draw);
void drawWindow(Window *wnd); void drawWindow(Window *wnd);
void removeWindow(Window *pWnd, bool reanimate); void removeWindow(Window *pWnd, bool reanimate);
void freeWindow(Window *pWnd); void freeWindow(Window *pWnd);
void updateWindow(Window *wnd); void updateWindow(Window *wnd);
Port *getPortById(uint16 id); Port *getPortById(uint16 id);
Port *setPort(Port *newPort); Port *setPort(Port *newPort);
Port *getPort(); Port *getPort();
void setOrigin(int16 left, int16 top); void setOrigin(int16 left, int16 top);
void moveTo(int16 left, int16 top); void moveTo(int16 left, int16 top);
void move(int16 left, int16 top); void move(int16 left, int16 top);
void openPort(Port *port); void openPort(Port *port);
void penColor(int16 color); void penColor(int16 color);
void backColor(int16 color); void backColor(int16 color);
void penMode(int16 mode); void penMode(int16 mode);
void textGreyedOutput(bool state); void textGreyedOutput(bool state);
int16 getPointSize(); int16 getPointSize();
void offsetRect(Common::Rect &r); void offsetRect(Common::Rect &r);
void offsetLine(Common::Point &start, Common::Point &end); void offsetLine(Common::Point &start, Common::Point &end);
void clipLine(Common::Point &start, Common::Point &end); void clipLine(Common::Point &start, Common::Point &end);
void priorityBandsInit(int16 bandCount, int16 top, int16 bottom); void priorityBandsInit(int16 bandCount, int16 top, int16 bottom);
void priorityBandsInit(byte *data); void priorityBandsInit(byte *data);
void priorityBandsInitSci11(byte *data); void priorityBandsInitSci11(byte *data);
void kernelInitPriorityBands(); void kernelInitPriorityBands();
void kernelGraphAdjustPriority(int top, int bottom); void kernelGraphAdjustPriority(int top, int bottom);
byte kernelCoordinateToPriority(int16 y); byte kernelCoordinateToPriority(int16 y);
int16 kernelPriorityToCoordinate(byte priority); int16 kernelPriorityToCoordinate(byte priority);
Port *_wmgrPort; Port *_wmgrPort;
Window *_picWind; Window *_picWind;
Port *_menuPort; Port *_menuPort;
Common::Rect _menuBarRect; Common::Rect _menuBarRect;
Common::Rect _menuRect; Common::Rect _menuRect;
Common::Rect _menuLine; Common::Rect _menuLine;
Port *_curPort; Port *_curPort;
virtual void saveLoadWithSerializer(Common::Serializer &ser); virtual void saveLoadWithSerializer(Common::Serializer &ser);
private: private:
typedef Common::List<Port *> PortList; typedef Common::List<Port *> PortList;
SegManager *_segMan; SegManager *_segMan;
GfxPaint16 *_paint16; GfxPaint16 *_paint16;
GfxScreen *_screen; GfxScreen *_screen;
GfxText16 *_text16; GfxText16 *_text16;
bool _usesOldGfxFunctions; bool _usesOldGfxFunctions;
uint16 _styleUser; uint16 _styleUser;
// counts windows that got disposed but are not freed yet // counts windows that got disposed but are not freed yet
uint16 _freeCounter; uint16 _freeCounter;
/** The list of open 'windows' (and ports), in visual order. */ /** The list of open 'windows' (and ports), in visual order. */
PortList _windowList; PortList _windowList;
/** The list of all open 'windows' (and ports), ordered by their id. */ /** The list of all open 'windows' (and ports), ordered by their id. */
Common::Array<Port *> _windowsById; Common::Array<Port *> _windowsById;
Common::Rect _bounds; Common::Rect _bounds;
// Priority Bands related variables // Priority Bands related variables
int16 _priorityTop, _priorityBottom, _priorityBandCount; int16 _priorityTop, _priorityBottom, _priorityBandCount;
byte _priorityBands[200]; byte _priorityBands[200];
}; };
} // End of namespace Sci } // End of namespace Sci
#endif #endif