[Scummvm-cvs-logs] CVS: scummvm/scumm intern_he.h,NONE,2.1 actor.cpp,1.403,1.404 akos.cpp,1.252,1.253 cursor.cpp,2.53,2.54 floodfill_he.cpp,2.5,2.6 gfx.cpp,2.491,2.492 input.cpp,2.50,2.51 intern.h,2.551,2.552 logic_he.cpp,2.28,2.29 logic_he.h,2.16,2.17 object.cpp,1.261,1.262 palette_he.cpp,1.26,1.27 resource.cpp,1.360,1.361 resource_v7he.cpp,1.58,1.59 resource_v7he.h,1.18,1.19 room.cpp,1.27,1.28 saveload.cpp,1.262,1.263 script_v100he.cpp,2.193,2.194 script_v6he.cpp,2.171,2.172 script_v72he.cpp,2.323,2.324 script_v7he.cpp,2.180,2.181 script_v80he.cpp,2.131,2.132 script_v90he.cpp,2.296,2.297 scumm.cpp,1.715,1.716 sprite_he.cpp,1.165,1.166 string.cpp,1.324,1.325 vars.cpp,1.166,1.167 wiz_he.cpp,2.122,2.123
Max Horn
fingolfin at users.sourceforge.net
Sat Feb 4 04:12:08 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16516
Modified Files:
actor.cpp akos.cpp cursor.cpp floodfill_he.cpp gfx.cpp
input.cpp intern.h logic_he.cpp logic_he.h object.cpp
palette_he.cpp resource.cpp resource_v7he.cpp resource_v7he.h
room.cpp saveload.cpp script_v100he.cpp script_v6he.cpp
script_v72he.cpp script_v7he.cpp script_v80he.cpp
script_v90he.cpp scumm.cpp sprite_he.cpp string.cpp vars.cpp
wiz_he.cpp
Added Files:
intern_he.h
Log Message:
Split intern.h and moved HE stuff into the new file intern_he.h
--- NEW FILE: intern_he.h ---
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
* Copyright (C) 2001-2006 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $Header: /cvsroot/scummvm/scummvm/scumm/intern_he.h,v 2.1 2006/02/04 12:11:07 fingolfin Exp $
*
*/
#ifndef SCUMM_INTERN_HE_H
#define SCUMM_INTERN_HE_H
#include "scumm/intern.h"
#ifndef DISABLE_HE
#include "scumm/floodfill_he.h"
#include "scumm/wiz_he.h"
#endif
namespace Scumm {
#ifndef DISABLE_HE
class ResExtractor;
class LogicHE;
class Sprite;
#endif
class ScummEngine_v60he : public ScummEngine_v6 {
protected:
typedef void (ScummEngine_v60he::*OpcodeProcv60he)();
struct OpcodeEntryv60he {
OpcodeProcv60he proc;
const char *desc;
};
const OpcodeEntryv60he *_opcodesv60he;
Common::File _hFileTable[17];
public:
ScummEngine_v60he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex) : ScummEngine_v6(detector, syst, gs, md5sum, substResFileNameIndex) {}
virtual void scummInit();
protected:
virtual void setupOpcodes();
virtual void executeOpcode(byte i);
virtual const char *getOpcodeDesc(byte i);
virtual void saveOrLoad(Serializer *s);
void localizeArray(int slot, byte scriptSlot);
void redimArray(int arrayId, int newX, int newY, int d);
int readFileToArray(int slot, int32 size);
void writeFileFromArray(int slot, int resID);
int virtScreenSave(byte *dst, int x1, int y1, int x2, int y2);
void virtScreenLoad(int resIdx, int x1, int y1, int x2, int y2);
virtual void decodeParseString(int a, int b);
void swapObjects(int object1, int object2);
/* HE version 60 script opcodes */
void o60_setState();
void o60_roomOps();
void o60_actorOps();
void o60_wait();
void o60_kernelSetFunctions();
void o60_kernelGetFunctions();
void o60_openFile();
void o60_closeFile();
void o60_deleteFile();
void o60_readFile();
void o60_rename();
void o60_writeFile();
void o60_soundOps();
void o60_seekFilePos();
void o60_localizeArrayToScript();
void o60_redimArray();
void o60_readFilePos();
};
#ifndef DISABLE_HE
class ScummEngine_v70he : public ScummEngine_v60he {
friend class ResExtractor;
friend class Wiz;
protected:
typedef void (ScummEngine_v70he::*OpcodeProcv70he)();
struct OpcodeEntryv70he {
OpcodeProcv70he proc;
const char *desc;
};
const OpcodeEntryv70he *_opcodesv70he;
ResExtractor *_resExtractor;
byte *_heV7RoomOffsets;
int32 _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags, _heSndSoundFreq;
bool _skipProcessActors;
public:
ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
~ScummEngine_v70he();
Wiz *_wiz;
byte *heFindResourceData(uint32 tag, byte *ptr);
byte *heFindResource(uint32 tag, byte *ptr);
byte *findWrappedBlock(uint32 tag, byte *ptr, int state, bool flagError);
protected:
virtual void setupOpcodes();
virtual void executeOpcode(byte i);
virtual const char *getOpcodeDesc(byte i);
virtual void setupScummVars();
virtual void initScummVars();
virtual void saveOrLoad(Serializer *s);
virtual void readRoomsOffsets();
virtual void readGlobalObjects();
virtual void readIndexBlock(uint32 blocktype, uint32 itemsize);
virtual int getActorFromPos(int x, int y);
int getStringCharWidth(byte chr);
virtual int setupStringArray(int size);
void appendSubstring(int dst, int src, int len2, int len);
virtual void setCursorFromImg(uint img, uint room, uint imgindex);
virtual void clearDrawQueues();
void remapHEPalette(const uint8 *src, uint8 *dst);
/* HE version 70 script opcodes */
void o70_startSound();
void o70_pickupObject();
void o70_getActorRoom();
void o70_resourceRoutines();
void o70_systemOps();
void o70_kernelSetFunctions();
void o70_seekFilePos();
void o70_copyString();
void o70_getStringWidth();
void o70_getStringLen();
void o70_appendString();
void o70_concatString();
void o70_compareString();
void o70_isResourceLoaded();
void o70_readINI();
void o70_writeINI();
void o70_getStringLenForWidth();
void o70_getCharIndexInString();
void o70_setFilePath();
void o70_setWindowCaption();
void o70_polygonOps();
void o70_polygonHit();
byte VAR_NUM_SOUND_CHANNELS;
byte VAR_WIZ_TCOLOR;
};
class ScummEngine_v71he : public ScummEngine_v70he {
public:
ScummEngine_v71he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
protected:
virtual void saveOrLoad(Serializer *s);
virtual void redrawBGAreas();
virtual void processActors();
void preProcessAuxQueue();
void postProcessAuxQueue();
public:
/* Actor AuxQueue stuff (HE) */
AuxBlock _auxBlocks[16];
uint16 _auxBlocksNum;
AuxEntry _auxEntries[16];
uint16 _auxEntriesNum;
void queueAuxBlock(Actor *a);
void queueAuxEntry(int actorNum, int subIndex);
};
class ScummEngine_v72he : public ScummEngine_v71he {
protected:
typedef void (ScummEngine_v72he::*OpcodeProcV72he)();
struct OpcodeEntryV72he {
OpcodeProcV72he proc;
const char *desc;
};
#if !defined(__GNUC__)
#pragma START_PACK_STRUCTS
#endif
struct ArrayHeader {
int32 type; //0
int32 dim1start; //4
int32 dim1end; //8
int32 dim2start; //0C
int32 dim2end; //10
byte data[1]; //14
} GCC_PACK;
#if !defined(__GNUC__)
#pragma END_PACK_STRUCTS
#endif
const OpcodeEntryV72he *_opcodesV72he;
int _stringLength;
byte _stringBuffer[4096];
WizParameters _wizParams;
public:
ScummEngine_v72he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
virtual void scummInit();
protected:
virtual void setupOpcodes();
virtual void executeOpcode(byte i);
virtual const char *getOpcodeDesc(byte i);
virtual void setupScummVars();
virtual void initScummVars();
virtual void readArrayFromIndexFile();
virtual byte *getStringAddress(int i);
virtual void readMAXS(int blockSize);
virtual void redrawBGAreas();
ArrayHeader *defineArray(int array, int type, int dim2start, int dim2end, int dim1start, int dim1end);
virtual int readArray(int array, int idx2, int idx1);
virtual void writeArray(int array, int idx2, int idx1, int value);
void redimArray(int arrayId, int newDim2start, int newDim2end,
int newDim1start, int newDim1end, int type);
void checkArrayLimits(int array, int dim2start, int dim2end, int dim1start, int dim1end);
void copyArray(int array1, int a1_dim2start, int a1_dim2end, int a1_dim1start, int a1_dim1end,
int array2, int a2_dim2start, int a2_dim2end, int a2_dim1start, int a2_dim1end);
void copyArrayHelper(ArrayHeader *ah, int idx2, int idx1, int len1, byte **data, int *size, int *num);
virtual int setupStringArray(int size);
int readFileToArray(int slot, int32 size);
void writeFileFromArray(int slot, int resID);
virtual void decodeParseString(int a, int b);
void decodeScriptString(byte *dst, bool scriptString = false);
void copyScriptString(byte *dst, int dstSize);
int convertFilePath(byte *dst, bool setFilePath = false);
int findObject(int x, int y, int num, int *args);
int getSoundResourceSize(int id);
virtual bool handleNextCharsetCode(Actor *a, int *c);
/* HE version 72 script opcodes */
void o72_pushDWord();
void o72_getScriptString();
void o72_isAnyOf();
void o72_resetCutscene();
void o72_findObjectWithClassOf();
void o72_getObjectImageX();
void o72_getObjectImageY();
void o72_captureWizImage();
void o72_getTimer();
void o72_setTimer();
void o72_getSoundPosition();
void o72_startScript();
void o72_startObject();
void o72_drawObject();
void o72_printWizImage();
void o72_getArrayDimSize();
void o72_getNumFreeArrays();
void o72_roomOps();
void o72_actorOps();
void o72_verbOps();
void o72_findObject();
void o72_arrayOps();
void o72_systemOps();
void o72_talkActor();
void o72_talkEgo();
void o72_dimArray();
void o72_dim2dimArray();
void o72_traceStatus();
void o72_debugInput();
void o72_drawWizImage();
void o72_kernelGetFunctions();
void o72_jumpToScript();
void o72_openFile();
void o72_readFile();
void o72_writeFile();
void o72_findAllObjects();
void o72_deleteFile();
void o72_rename();
void o72_getPixel();
void o72_pickVarRandom();
void o72_redimArray();
void o72_readINI();
void o72_writeINI();
void o72_getResourceSize();
void o72_setFilePath();
void o72_setWindowCaption();
byte VAR_NUM_ROOMS;
byte VAR_NUM_SCRIPTS;
byte VAR_NUM_SOUNDS;
byte VAR_NUM_COSTUMES;
byte VAR_NUM_IMAGES;
byte VAR_NUM_CHARSETS;
byte VAR_POLYGONS_ONLY;
};
class ScummEngine_v80he : public ScummEngine_v72he {
protected:
typedef void (ScummEngine_v80he::*OpcodeProcV80he)();
struct OpcodeEntryV80he {
OpcodeProcV80he proc;
const char *desc;
};
const OpcodeEntryV80he *_opcodesV80he;
int32 _heSndResId, _curSndId, _sndPtrOffs, _sndTmrOffs;
public:
ScummEngine_v80he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
protected:
virtual void setupOpcodes();
virtual void executeOpcode(byte i);
virtual const char *getOpcodeDesc(byte i);
virtual void setupScummVars();
virtual void initScummVars();
virtual void initCharset(int charset);
virtual void clearDrawQueues();
void createSound(int snd1id, int snd2id);
void drawLine(int x1, int y1, int x, int unk1, int unk2, int type, int id);
void drawPixel(int x, int y, int flags);
/* HE version 80 script opcodes */
void o80_createSound();
void o80_getFileSize();
void o80_stringToInt();
void o80_getSoundVar();
void o80_localizeArrayToRoom();
void o80_readConfigFile();
void o80_writeConfigFile();
void o80_cursorCommand();
void o80_setState();
void o80_drawWizPolygon();
void o80_drawLine();
void o80_pickVarRandom();
byte VAR_PLATFORM;
byte VAR_WINDOWS_VERSION;
byte VAR_CURRENT_CHARSET;
byte VAR_COLOR_DEPTH;
};
class ScummEngine_v90he : public ScummEngine_v80he {
friend class LogicHE;
friend class Sprite;
protected:
typedef void (ScummEngine_v90he::*OpcodeProcV90he)();
struct OpcodeEntryV90he {
OpcodeProcV90he proc;
const char *desc;
};
const OpcodeEntryV90he *_opcodesV90he;
FloodFillParameters _floodFillParams;
struct VideoParameters {
byte filename[260];
int32 status;
int32 flags;
int32 unk2;
int32 wizResNum;
};
VideoParameters _videoParams;
int32 _heObject, _heObjectNum;
int32 _hePaletteNum;
int32 _curMaxSpriteId;
int32 _curSpriteId;
int32 _curSpriteGroupId;
public:
ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
~ScummEngine_v90he();
virtual void scummInit();
LogicHE *_logicHE;
Sprite *_sprite;
protected:
virtual void allocateArrays();
virtual void setupOpcodes();
virtual void executeOpcode(byte i);
virtual const char *getOpcodeDesc(byte i);
virtual void setupScummVars();
virtual void initScummVars();
virtual void saveOrLoad(Serializer *s);
virtual void readMAXS(int blockSize);
virtual void processActors();
int computeWizHistogram(int resnum, int state, int x, int y, int w, int h);
void getArrayDim(int array, int *dim2start, int *dim2end, int *dim1start, int *dim1end);
void sortArray(int array, int dim2start, int dim2end, int dim1start, int dim1end, int sortOrder);
public:
int getGroupSpriteArray(int spriteGroupId);
protected:
uint8 *getHEPaletteIndex(int palSlot);
int getHEPaletteColor(int palSlot, int color);
int getHEPaletteSimilarColor(int palSlot, int red, int green, int start, int end);
int getHEPaletteColorComponent(int palSlot, int color, int component);
void setHEPaletteColor(int palSlot, uint8 color, uint8 r, uint8 g, uint8 b);
void setHEPaletteFromPtr(int palSlot, const uint8 *palData);
void setHEPaletteFromCostume(int palSlot, int resId);
void setHEPaletteFromImage(int palSlot, int resId, int state);
void setHEPaletteFromRoom(int palSlot, int resId, int state);
void restoreHEPalette(int palSlot);
void copyHEPalette(int dstPalSlot, int srcPalSlot);
void copyHEPaletteColor(int palSlot, uint8 dstColor, uint8 srcColor);
void setDefaultCursor();
protected:
/* HE version 90 script opcodes */
void o90_dup_n();
void o90_min();
void o90_max();
void o90_sin();
void o90_cos();
void o90_sqrt();
void o90_atan2();
void o90_getSegmentAngle();
void o90_getActorData();
void o90_startScriptUnk();
void o90_jumpToScriptUnk();
void o90_videoOps();
void o90_getVideoData();
void o90_wizImageOps();
void o90_getDistanceBetweenPoints();
void o90_getSpriteInfo();
void o90_setSpriteInfo();
void o90_getSpriteGroupInfo();
void o90_setSpriteGroupInfo();
void o90_getWizData();
void o90_floodFill();
void o90_mod();
void o90_shl();
void o90_shr();
void o90_xor();
void o90_findAllObjectsWithClassOf();
void o90_getPolygonOverlap();
void o90_cond();
void o90_dim2dim2Array();
void o90_redim2dimArray();
void o90_getLinesIntersectionPoint();
void o90_sortArray();
void o90_getObjectData();
void o90_getPaletteData();
void o90_paletteOps();
void o90_fontUnk();
void o90_getActorAnimProgress();
void o90_kernelGetFunctions();
void o90_kernelSetFunctions();
byte VAR_NUM_SPRITE_GROUPS;
byte VAR_NUM_SPRITES;
byte VAR_NUM_PALETTES;
byte VAR_NUM_UNK;
byte VAR_U32_VERSION;
byte VAR_U32_ARRAY_UNK;
};
class ScummEngine_v99he : public ScummEngine_v90he {
public:
ScummEngine_v99he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex) : ScummEngine_v90he(detector, syst, gs, md5sum, substResFileNameIndex) {}
virtual void scummInit();
protected:
virtual void initScummVars();
virtual void readMAXS(int blockSize);
virtual void saveOrLoad(Serializer *s);
virtual void copyPalColor(int dst, int src);
virtual void darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor);
virtual void setPaletteFromPtr(const byte *ptr, int numcolor = -1);
virtual void setPalColor(int index, int r, int g, int b);
virtual void updatePalette();
};
class ScummEngine_v100he : public ScummEngine_v99he {
protected:
typedef void (ScummEngine_v100he::*OpcodeProcV100he)();
struct OpcodeEntryV100he {
OpcodeProcV100he proc;
const char *desc;
};
int32 _heResId, _heResType;
const OpcodeEntryV100he *_opcodesV100he;
public:
ScummEngine_v100he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex) : ScummEngine_v99he(detector, syst, gs, md5sum, substResFileNameIndex) {}
protected:
virtual void setupOpcodes();
virtual void executeOpcode(byte i);
virtual const char *getOpcodeDesc(byte i);
virtual void saveOrLoad(Serializer *s);
virtual void decodeParseString(int a, int b);
/* HE version 100 script opcodes */
void o100_actorOps();
void o100_arrayOps();
void o100_dim2dimArray();
void o100_redim2dimArray();
void o100_dimArray();
void o100_drawLine();
void o100_drawObject();
void o100_floodFill();
void o100_setSpriteGroupInfo();
void o100_resourceRoutines();
void o100_wizImageOps();
void o100_jumpToScript();
void o100_createSound();
void o100_dim2dim2Array();
void o100_paletteOps();
void o100_jumpToScriptUnk();
void o100_startScriptUnk();
void o100_redimArray();
void o100_roomOps();
void o100_startSound();
void o100_setSpriteInfo();
void o100_startScript();
void o100_systemOps();
void o100_cursorCommand();
void o100_videoOps();
void o100_wait();
void o100_writeFile();
void o100_isResourceLoaded();
void o100_getResourceSize();
void o100_getSpriteGroupInfo();
void o100_getPaletteData();
void o100_readFile();
void o100_getSpriteInfo();
void o100_getWizData();
void o100_getVideoData();
};
#endif
} // End of namespace Scumm
#endif
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -d -r1.403 -r1.404
--- actor.cpp 23 Jan 2006 20:09:23 -0000 1.403
+++ actor.cpp 4 Feb 2006 12:11:05 -0000 1.404
@@ -28,6 +28,7 @@
#include "scumm/charset.h"
#include "scumm/costume.h"
#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/saveload.h"
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- akos.cpp 4 Feb 2006 10:18:25 -0000 1.252
+++ akos.cpp 4 Feb 2006 12:11:06 -0000 1.253
@@ -28,6 +28,7 @@
#include "scumm/imuse.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/sound.h"
#include "scumm/util.h"
#include "scumm/wiz_he.h"
Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.53
retrieving revision 2.54
diff -u -d -r2.53 -r2.54
--- cursor.cpp 29 Jan 2006 09:27:17 -0000 2.53
+++ cursor.cpp 4 Feb 2006 12:11:06 -0000 2.54
@@ -25,6 +25,7 @@
#include "scumm/bomp.h"
#include "scumm/charset.h"
#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/object.h"
#include "scumm/resource_v7he.h"
#include "scumm/saveload.h"
Index: floodfill_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/floodfill_he.cpp,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- floodfill_he.cpp 27 Jan 2006 00:27:57 -0000 2.5
+++ floodfill_he.cpp 4 Feb 2006 12:11:06 -0000 2.6
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
#include "scumm/floodfill_he.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/resource.h"
#include "scumm/scumm.h"
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.491
retrieving revision 2.492
diff -u -d -r2.491 -r2.492
--- gfx.cpp 28 Jan 2006 22:39:26 -0000 2.491
+++ gfx.cpp 4 Feb 2006 12:11:06 -0000 2.492
@@ -25,6 +25,9 @@
#include "scumm/actor.h"
#include "scumm/charset.h"
#include "scumm/intern.h"
+#ifndef DISABLE_HE
+#include "scumm/intern_he.h"
+#endif
#include "scumm/resource.h"
#include "scumm/usage_bits.h"
#include "scumm/wiz_he.h"
Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.50
retrieving revision 2.51
diff -u -d -r2.50 -r2.51
--- input.cpp 18 Jan 2006 17:39:43 -0000 2.50
+++ input.cpp 4 Feb 2006 12:11:07 -0000 2.51
@@ -32,6 +32,9 @@
#include "scumm/dialogs.h"
#include "scumm/insane/insane.h"
#include "scumm/imuse.h"
+#ifndef DISABLE_HE
+#include "scumm/intern_he.h"
+#endif
#include "scumm/logic_he.h"
#include "scumm/scumm.h"
#include "scumm/sound.h"
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.551
retrieving revision 2.552
diff -u -d -r2.551 -r2.552
--- intern.h 4 Feb 2006 09:38:51 -0000 2.551
+++ intern.h 4 Feb 2006 12:11:07 -0000 2.552
@@ -20,21 +20,13 @@
*
*/
-#ifndef INTERN_H
-#define INTERN_H
+#ifndef SCUMM_INTERN_H
+#define SCUMM_INTERN_H
#include "scumm/scumm.h"
-#include "scumm/floodfill_he.h"
-#include "scumm/wiz_he.h"
namespace Scumm {
-#ifndef DISABLE_HE
-class ResExtractor;
-class LogicHE;
-class Sprite;
-#endif
-
// This is to help devices with small memory (PDA, smartphones, ...)
// to save abit of memory used by opcode names in the Scumm engine.
#ifndef REDUCE_MEMORY_USAGE
@@ -768,567 +760,6 @@
byte VAR_TIMEDATE_SECOND;
};
-class ScummEngine_v60he : public ScummEngine_v6 {
-protected:
- typedef void (ScummEngine_v60he::*OpcodeProcv60he)();
- struct OpcodeEntryv60he {
- OpcodeProcv60he proc;
- const char *desc;
- };
-
- const OpcodeEntryv60he *_opcodesv60he;
-
- Common::File _hFileTable[17];
-
-public:
- ScummEngine_v60he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex) : ScummEngine_v6(detector, syst, gs, md5sum, substResFileNameIndex) {}
-
- virtual void scummInit();
-
-protected:
- virtual void setupOpcodes();
- virtual void executeOpcode(byte i);
- virtual const char *getOpcodeDesc(byte i);
-
- virtual void saveOrLoad(Serializer *s);
-
- void localizeArray(int slot, byte scriptSlot);
- void redimArray(int arrayId, int newX, int newY, int d);
- int readFileToArray(int slot, int32 size);
- void writeFileFromArray(int slot, int resID);
- int virtScreenSave(byte *dst, int x1, int y1, int x2, int y2);
- void virtScreenLoad(int resIdx, int x1, int y1, int x2, int y2);
- virtual void decodeParseString(int a, int b);
- void swapObjects(int object1, int object2);
-
- /* HE version 60 script opcodes */
- void o60_setState();
- void o60_roomOps();
- void o60_actorOps();
- void o60_wait();
- void o60_kernelSetFunctions();
- void o60_kernelGetFunctions();
- void o60_openFile();
- void o60_closeFile();
- void o60_deleteFile();
- void o60_readFile();
- void o60_rename();
- void o60_writeFile();
- void o60_soundOps();
- void o60_seekFilePos();
- void o60_localizeArrayToScript();
- void o60_redimArray();
- void o60_readFilePos();
-};
-
-#ifndef DISABLE_HE
-class ScummEngine_v70he : public ScummEngine_v60he {
- friend class ResExtractor;
- friend class Wiz;
-
-protected:
- typedef void (ScummEngine_v70he::*OpcodeProcv70he)();
- struct OpcodeEntryv70he {
- OpcodeProcv70he proc;
- const char *desc;
- };
-
- const OpcodeEntryv70he *_opcodesv70he;
-
- ResExtractor *_resExtractor;
-
- byte *_heV7RoomOffsets;
-
- int32 _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags, _heSndSoundFreq;
-
- bool _skipProcessActors;
-
-public:
- ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
- ~ScummEngine_v70he();
-
- Wiz *_wiz;
-
- byte *heFindResourceData(uint32 tag, byte *ptr);
- byte *heFindResource(uint32 tag, byte *ptr);
- byte *findWrappedBlock(uint32 tag, byte *ptr, int state, bool flagError);
-
-protected:
- virtual void setupOpcodes();
- virtual void executeOpcode(byte i);
- virtual const char *getOpcodeDesc(byte i);
-
- virtual void setupScummVars();
- virtual void initScummVars();
-
- virtual void saveOrLoad(Serializer *s);
-
- virtual void readRoomsOffsets();
- virtual void readGlobalObjects();
- virtual void readIndexBlock(uint32 blocktype, uint32 itemsize);
-
- virtual int getActorFromPos(int x, int y);
-
- int getStringCharWidth(byte chr);
- virtual int setupStringArray(int size);
- void appendSubstring(int dst, int src, int len2, int len);
-
- virtual void setCursorFromImg(uint img, uint room, uint imgindex);
-
- virtual void clearDrawQueues();
-
- void remapHEPalette(const uint8 *src, uint8 *dst);
-
- /* HE version 70 script opcodes */
- void o70_startSound();
- void o70_pickupObject();
- void o70_getActorRoom();
- void o70_resourceRoutines();
- void o70_systemOps();
- void o70_kernelSetFunctions();
- void o70_seekFilePos();
- void o70_copyString();
- void o70_getStringWidth();
- void o70_getStringLen();
- void o70_appendString();
- void o70_concatString();
- void o70_compareString();
- void o70_isResourceLoaded();
- void o70_readINI();
- void o70_writeINI();
- void o70_getStringLenForWidth();
- void o70_getCharIndexInString();
- void o70_setFilePath();
- void o70_setWindowCaption();
- void o70_polygonOps();
- void o70_polygonHit();
-
- byte VAR_NUM_SOUND_CHANNELS;
- byte VAR_WIZ_TCOLOR;
-};
-
-class ScummEngine_v71he : public ScummEngine_v70he {
-public:
- ScummEngine_v71he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
-
-protected:
- virtual void saveOrLoad(Serializer *s);
-
- virtual void redrawBGAreas();
-
- virtual void processActors();
- void preProcessAuxQueue();
- void postProcessAuxQueue();
-
-public:
- /* Actor AuxQueue stuff (HE) */
- AuxBlock _auxBlocks[16];
- uint16 _auxBlocksNum;
- AuxEntry _auxEntries[16];
- uint16 _auxEntriesNum;
-
- void queueAuxBlock(Actor *a);
- void queueAuxEntry(int actorNum, int subIndex);
-};
-
-class ScummEngine_v72he : public ScummEngine_v71he {
-protected:
- typedef void (ScummEngine_v72he::*OpcodeProcV72he)();
- struct OpcodeEntryV72he {
- OpcodeProcV72he proc;
- const char *desc;
- };
-
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
-#endif
-
- struct ArrayHeader {
- int32 type; //0
- int32 dim1start; //4
- int32 dim1end; //8
- int32 dim2start; //0C
- int32 dim2end; //10
- byte data[1]; //14
- } GCC_PACK;
-
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
-#endif
-
- const OpcodeEntryV72he *_opcodesV72he;
-
- int _stringLength;
- byte _stringBuffer[4096];
-
- WizParameters _wizParams;
-
-public:
- ScummEngine_v72he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
-
- virtual void scummInit();
-
-protected:
- virtual void setupOpcodes();
- virtual void executeOpcode(byte i);
- virtual const char *getOpcodeDesc(byte i);
-
- virtual void setupScummVars();
- virtual void initScummVars();
- virtual void readArrayFromIndexFile();
-
- virtual byte *getStringAddress(int i);
- virtual void readMAXS(int blockSize);
-
- virtual void redrawBGAreas();
-
- ArrayHeader *defineArray(int array, int type, int dim2start, int dim2end, int dim1start, int dim1end);
- virtual int readArray(int array, int idx2, int idx1);
- virtual void writeArray(int array, int idx2, int idx1, int value);
- void redimArray(int arrayId, int newDim2start, int newDim2end,
- int newDim1start, int newDim1end, int type);
- void checkArrayLimits(int array, int dim2start, int dim2end, int dim1start, int dim1end);
- void copyArray(int array1, int a1_dim2start, int a1_dim2end, int a1_dim1start, int a1_dim1end,
- int array2, int a2_dim2start, int a2_dim2end, int a2_dim1start, int a2_dim1end);
- void copyArrayHelper(ArrayHeader *ah, int idx2, int idx1, int len1, byte **data, int *size, int *num);
- virtual int setupStringArray(int size);
- int readFileToArray(int slot, int32 size);
- void writeFileFromArray(int slot, int resID);
-
- virtual void decodeParseString(int a, int b);
- void decodeScriptString(byte *dst, bool scriptString = false);
- void copyScriptString(byte *dst, int dstSize);
- int convertFilePath(byte *dst, bool setFilePath = false);
-
- int findObject(int x, int y, int num, int *args);
- int getSoundResourceSize(int id);
-
- virtual bool handleNextCharsetCode(Actor *a, int *c);
-
- /* HE version 72 script opcodes */
- void o72_pushDWord();
- void o72_getScriptString();
- void o72_isAnyOf();
- void o72_resetCutscene();
- void o72_findObjectWithClassOf();
- void o72_getObjectImageX();
- void o72_getObjectImageY();
- void o72_captureWizImage();
- void o72_getTimer();
- void o72_setTimer();
- void o72_getSoundPosition();
- void o72_startScript();
- void o72_startObject();
- void o72_drawObject();
- void o72_printWizImage();
- void o72_getArrayDimSize();
- void o72_getNumFreeArrays();
- void o72_roomOps();
- void o72_actorOps();
- void o72_verbOps();
- void o72_findObject();
- void o72_arrayOps();
- void o72_systemOps();
- void o72_talkActor();
- void o72_talkEgo();
- void o72_dimArray();
- void o72_dim2dimArray();
- void o72_traceStatus();
- void o72_debugInput();
- void o72_drawWizImage();
- void o72_kernelGetFunctions();
- void o72_jumpToScript();
- void o72_openFile();
- void o72_readFile();
- void o72_writeFile();
- void o72_findAllObjects();
- void o72_deleteFile();
- void o72_rename();
- void o72_getPixel();
- void o72_pickVarRandom();
- void o72_redimArray();
- void o72_readINI();
- void o72_writeINI();
- void o72_getResourceSize();
- void o72_setFilePath();
- void o72_setWindowCaption();
-
- byte VAR_NUM_ROOMS;
- byte VAR_NUM_SCRIPTS;
- byte VAR_NUM_SOUNDS;
- byte VAR_NUM_COSTUMES;
- byte VAR_NUM_IMAGES;
- byte VAR_NUM_CHARSETS;
-
- byte VAR_POLYGONS_ONLY;
-};
-
-class ScummEngine_v80he : public ScummEngine_v72he {
-protected:
- typedef void (ScummEngine_v80he::*OpcodeProcV80he)();
- struct OpcodeEntryV80he {
- OpcodeProcV80he proc;
- const char *desc;
- };
-
- const OpcodeEntryV80he *_opcodesV80he;
-
- int32 _heSndResId, _curSndId, _sndPtrOffs, _sndTmrOffs;
-
-public:
- ScummEngine_v80he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
-
-protected:
- virtual void setupOpcodes();
- virtual void executeOpcode(byte i);
- virtual const char *getOpcodeDesc(byte i);
-
- virtual void setupScummVars();
- virtual void initScummVars();
-
- virtual void initCharset(int charset);
-
- virtual void clearDrawQueues();
-
- void createSound(int snd1id, int snd2id);
-
- void drawLine(int x1, int y1, int x, int unk1, int unk2, int type, int id);
- void drawPixel(int x, int y, int flags);
-
- /* HE version 80 script opcodes */
- void o80_createSound();
- void o80_getFileSize();
- void o80_stringToInt();
- void o80_getSoundVar();
- void o80_localizeArrayToRoom();
- void o80_readConfigFile();
- void o80_writeConfigFile();
- void o80_cursorCommand();
- void o80_setState();
- void o80_drawWizPolygon();
- void o80_drawLine();
- void o80_pickVarRandom();
-
- byte VAR_PLATFORM;
- byte VAR_WINDOWS_VERSION;
- byte VAR_CURRENT_CHARSET;
- byte VAR_COLOR_DEPTH;
-};
-
-class ScummEngine_v90he : public ScummEngine_v80he {
- friend class LogicHE;
- friend class Sprite;
-
-protected:
- typedef void (ScummEngine_v90he::*OpcodeProcV90he)();
- struct OpcodeEntryV90he {
- OpcodeProcV90he proc;
- const char *desc;
- };
-
- const OpcodeEntryV90he *_opcodesV90he;
-
- FloodFillParameters _floodFillParams;
-
- struct VideoParameters {
- byte filename[260];
- int32 status;
- int32 flags;
- int32 unk2;
- int32 wizResNum;
- };
-
- VideoParameters _videoParams;
-
- int32 _heObject, _heObjectNum;
- int32 _hePaletteNum;
-
- int32 _curMaxSpriteId;
- int32 _curSpriteId;
- int32 _curSpriteGroupId;
-
-public:
- ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
- ~ScummEngine_v90he();
-
- virtual void scummInit();
-
- LogicHE *_logicHE;
- Sprite *_sprite;
-
-protected:
- virtual void allocateArrays();
- virtual void setupOpcodes();
- virtual void executeOpcode(byte i);
- virtual const char *getOpcodeDesc(byte i);
-
- virtual void setupScummVars();
- virtual void initScummVars();
-
- virtual void saveOrLoad(Serializer *s);
-
- virtual void readMAXS(int blockSize);
-
- virtual void processActors();
-
- int computeWizHistogram(int resnum, int state, int x, int y, int w, int h);
- void getArrayDim(int array, int *dim2start, int *dim2end, int *dim1start, int *dim1end);
- void sortArray(int array, int dim2start, int dim2end, int dim1start, int dim1end, int sortOrder);
-
-public:
- int getGroupSpriteArray(int spriteGroupId);
-
-protected:
- uint8 *getHEPaletteIndex(int palSlot);
- int getHEPaletteColor(int palSlot, int color);
- int getHEPaletteSimilarColor(int palSlot, int red, int green, int start, int end);
- int getHEPaletteColorComponent(int palSlot, int color, int component);
- void setHEPaletteColor(int palSlot, uint8 color, uint8 r, uint8 g, uint8 b);
- void setHEPaletteFromPtr(int palSlot, const uint8 *palData);
- void setHEPaletteFromCostume(int palSlot, int resId);
- void setHEPaletteFromImage(int palSlot, int resId, int state);
- void setHEPaletteFromRoom(int palSlot, int resId, int state);
- void restoreHEPalette(int palSlot);
- void copyHEPalette(int dstPalSlot, int srcPalSlot);
- void copyHEPaletteColor(int palSlot, uint8 dstColor, uint8 srcColor);
-
-
- void setDefaultCursor();
-
-protected:
- /* HE version 90 script opcodes */
- void o90_dup_n();
- void o90_min();
- void o90_max();
- void o90_sin();
- void o90_cos();
- void o90_sqrt();
- void o90_atan2();
- void o90_getSegmentAngle();
- void o90_getActorData();
- void o90_startScriptUnk();
- void o90_jumpToScriptUnk();
- void o90_videoOps();
- void o90_getVideoData();
- void o90_wizImageOps();
- void o90_getDistanceBetweenPoints();
- void o90_getSpriteInfo();
- void o90_setSpriteInfo();
- void o90_getSpriteGroupInfo();
- void o90_setSpriteGroupInfo();
- void o90_getWizData();
- void o90_floodFill();
- void o90_mod();
- void o90_shl();
- void o90_shr();
- void o90_xor();
- void o90_findAllObjectsWithClassOf();
- void o90_getPolygonOverlap();
- void o90_cond();
- void o90_dim2dim2Array();
- void o90_redim2dimArray();
- void o90_getLinesIntersectionPoint();
- void o90_sortArray();
- void o90_getObjectData();
- void o90_getPaletteData();
- void o90_paletteOps();
- void o90_fontUnk();
- void o90_getActorAnimProgress();
- void o90_kernelGetFunctions();
- void o90_kernelSetFunctions();
-
- byte VAR_NUM_SPRITE_GROUPS;
- byte VAR_NUM_SPRITES;
- byte VAR_NUM_PALETTES;
- byte VAR_NUM_UNK;
-
- byte VAR_U32_VERSION;
- byte VAR_U32_ARRAY_UNK;
-};
-
-class ScummEngine_v99he : public ScummEngine_v90he {
-public:
- ScummEngine_v99he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex) : ScummEngine_v90he(detector, syst, gs, md5sum, substResFileNameIndex) {}
-
- virtual void scummInit();
-
-protected:
- virtual void initScummVars();
-
- virtual void readMAXS(int blockSize);
-
- virtual void saveOrLoad(Serializer *s);
-
- virtual void copyPalColor(int dst, int src);
- virtual void darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor);
- virtual void setPaletteFromPtr(const byte *ptr, int numcolor = -1);
- virtual void setPalColor(int index, int r, int g, int b);
- virtual void updatePalette();
-};
-
-class ScummEngine_v100he : public ScummEngine_v99he {
-protected:
- typedef void (ScummEngine_v100he::*OpcodeProcV100he)();
- struct OpcodeEntryV100he {
- OpcodeProcV100he proc;
- const char *desc;
- };
-
- int32 _heResId, _heResType;
-
- const OpcodeEntryV100he *_opcodesV100he;
-
-public:
- ScummEngine_v100he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex) : ScummEngine_v99he(detector, syst, gs, md5sum, substResFileNameIndex) {}
-
-protected:
- virtual void setupOpcodes();
- virtual void executeOpcode(byte i);
- virtual const char *getOpcodeDesc(byte i);
-
- virtual void saveOrLoad(Serializer *s);
-
- virtual void decodeParseString(int a, int b);
-
- /* HE version 100 script opcodes */
- void o100_actorOps();
- void o100_arrayOps();
- void o100_dim2dimArray();
- void o100_redim2dimArray();
- void o100_dimArray();
- void o100_drawLine();
- void o100_drawObject();
- void o100_floodFill();
- void o100_setSpriteGroupInfo();
- void o100_resourceRoutines();
- void o100_wizImageOps();
- void o100_jumpToScript();
- void o100_createSound();
- void o100_dim2dim2Array();
- void o100_paletteOps();
- void o100_jumpToScriptUnk();
- void o100_startScriptUnk();
- void o100_redimArray();
- void o100_roomOps();
- void o100_startSound();
- void o100_setSpriteInfo();
- void o100_startScript();
- void o100_systemOps();
- void o100_cursorCommand();
- void o100_videoOps();
- void o100_wait();
- void o100_writeFile();
- void o100_isResourceLoaded();
- void o100_getResourceSize();
- void o100_getSpriteGroupInfo();
- void o100_getPaletteData();
- void o100_readFile();
- void o100_getSpriteInfo();
- void o100_getWizData();
- void o100_getVideoData();
-};
-#endif
-
#ifndef DISABLE_SCUMM_7_8
class ScummEngine_v7 : public ScummEngine_v6 {
public:
Index: logic_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/logic_he.cpp,v
retrieving revision 2.28
retrieving revision 2.29
diff -u -d -r2.28 -r2.29
--- logic_he.cpp 18 Jan 2006 17:39:43 -0000 2.28
+++ logic_he.cpp 4 Feb 2006 12:11:07 -0000 2.29
@@ -21,7 +21,7 @@
#include "common/stdafx.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/logic_he.h"
namespace Scumm {
@@ -37,6 +37,10 @@
free(_userDataD);
}
+void LogicHE::writeScummVar(int var, int32 value) {
+ _vm->writeVar(var, value);
+}
+
static int32 scumm_round(double arg) {
return (int32)(arg + 0.5);
}
Index: logic_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/logic_he.h,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- logic_he.h 18 Jan 2006 17:39:43 -0000 2.16
+++ logic_he.h 4 Feb 2006 12:11:07 -0000 2.17
@@ -24,10 +24,10 @@
#include "common/stdafx.h"
-#include "scumm/intern.h"
-
namespace Scumm {
+class ScummEngine_v90he;
+
class LogicHE {
public:
float *_userData;
@@ -37,7 +37,7 @@
LogicHE(ScummEngine_v90he *vm);
virtual ~LogicHE();
- void writeScummVar(int var, int32 value) { _vm->writeVar(var, value); }
+ void writeScummVar(int var, int32 value);
int getFromArray(int arg0, int idx2, int idx1);
void putInArray(int arg0, int idx2, int idx1, int val);
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- object.cpp 18 Jan 2006 17:39:43 -0000 1.261
+++ object.cpp 4 Feb 2006 12:11:07 -0000 1.262
@@ -25,6 +25,9 @@
#include "scumm/actor.h"
#include "scumm/bomp.h"
#include "scumm/intern.h"
+#ifndef DISABLE_HE
+#include "scumm/intern_he.h"
+#endif
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/usage_bits.h"
Index: palette_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette_he.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- palette_he.cpp 18 Jan 2006 17:39:45 -0000 1.26
+++ palette_he.cpp 4 Feb 2006 12:11:07 -0000 1.27
@@ -22,7 +22,7 @@
#include "common/stdafx.h"
#include "common/system.h"
#include "scumm/scumm.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/resource.h"
#include "scumm/util.h"
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -d -r1.360 -r1.361
--- resource.cpp 27 Jan 2006 19:33:40 -0000 1.360
+++ resource.cpp 4 Feb 2006 12:11:07 -0000 1.361
@@ -28,6 +28,9 @@
#include "scumm/imuse.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/intern.h"
+#ifndef DISABLE_HE
+#include "scumm/intern_he.h"
+#endif
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/scumm.h"
@@ -52,7 +55,9 @@
static uint16 newTag2Old(uint32 newTag);
static const byte *findResourceSmall(uint32 tag, const byte *searchin);
+#ifndef DISABLE_HE
static bool checkTryMedia(BaseScummFile *handle);
+#endif
/* Open a room */
Index: resource_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- resource_v7he.cpp 21 Jan 2006 13:01:19 -0000 1.58
+++ resource_v7he.cpp 4 Feb 2006 12:11:09 -0000 1.59
@@ -25,7 +25,7 @@
#include "common/stdafx.h"
#include "scumm/scumm.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/resource.h"
#include "scumm/resource_v7he.h"
#include "scumm/sound.h"
Index: resource_v7he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- resource_v7he.h 18 Jan 2006 17:39:45 -0000 1.18
+++ resource_v7he.h 4 Feb 2006 12:11:09 -0000 1.19
@@ -114,6 +114,8 @@
if (!check_offset(fi->memory, fi->total_size, fi->file->name(), x, s)) \
return (r);
+class ScummEngine_v70he;
+
class ResExtractor {
public:
ResExtractor(ScummEngine_v70he *scumm);
Index: room.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/room.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- room.cpp 18 Jan 2006 17:39:45 -0000 1.27
+++ room.cpp 4 Feb 2006 12:11:09 -0000 1.28
@@ -25,6 +25,9 @@
#include "scumm/actor.h"
#include "scumm/boxes.h"
#include "scumm/intern.h"
+#ifndef DISABLE_HE
+#include "scumm/intern_he.h"
+#endif
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/scumm.h"
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- saveload.cpp 4 Feb 2006 09:38:51 -0000 1.262
+++ saveload.cpp 4 Feb 2006 12:11:09 -0000 1.263
@@ -31,6 +31,7 @@
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/imuse.h"
#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/saveload.h"
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.193
retrieving revision 2.194
diff -u -d -r2.193 -r2.194
--- script_v100he.cpp 4 Feb 2006 08:19:10 -0000 2.193
+++ script_v100he.cpp 4 Feb 2006 12:11:09 -0000 2.194
@@ -24,7 +24,7 @@
#include "scumm/actor.h"
#include "scumm/charset.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/resource_v7he.h"
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.171
retrieving revision 2.172
diff -u -d -r2.171 -r2.172
--- script_v6he.cpp 18 Jan 2006 17:39:47 -0000 2.171
+++ script_v6he.cpp 4 Feb 2006 12:11:09 -0000 2.172
@@ -26,7 +26,7 @@
#include "scumm/actor.h"
#include "scumm/charset.h"
#include "scumm/imuse.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/scumm.h"
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.323
retrieving revision 2.324
diff -u -d -r2.323 -r2.324
--- script_v72he.cpp 18 Jan 2006 17:39:47 -0000 2.323
+++ script_v72he.cpp 4 Feb 2006 12:11:09 -0000 2.324
@@ -28,7 +28,7 @@
#include "scumm/actor.h"
#include "scumm/charset.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/resource_v7he.h"
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.180
retrieving revision 2.181
diff -u -d -r2.180 -r2.181
--- script_v7he.cpp 27 Jan 2006 00:50:27 -0000 2.180
+++ script_v7he.cpp 4 Feb 2006 12:11:09 -0000 2.181
@@ -26,7 +26,7 @@
#include "scumm/actor.h"
#include "scumm/charset.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/resource_v7he.h"
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.131
retrieving revision 2.132
diff -u -d -r2.131 -r2.132
--- script_v80he.cpp 18 Jan 2006 17:39:47 -0000 2.131
+++ script_v80he.cpp 4 Feb 2006 12:11:09 -0000 2.132
@@ -28,7 +28,7 @@
#include "scumm/actor.h"
#include "scumm/charset.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/resource_v7he.h"
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.296
retrieving revision 2.297
diff -u -d -r2.296 -r2.297
--- script_v90he.cpp 4 Feb 2006 08:19:10 -0000 2.296
+++ script_v90he.cpp 4 Feb 2006 12:11:09 -0000 2.297
@@ -24,7 +24,7 @@
#include "scumm/actor.h"
#include "scumm/charset.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/logic_he.h"
#include "scumm/object.h"
#include "scumm/resource.h"
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.715
retrieving revision 1.716
diff -u -d -r1.715 -r1.716
--- scumm.cpp 2 Feb 2006 05:13:39 -0000 1.715
+++ scumm.cpp 4 Feb 2006 12:11:09 -0000 1.716
@@ -43,6 +43,7 @@
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/insane/insane.h"
#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/logic_he.h"
#include "scumm/player_nes.h"
#include "scumm/player_v1.h"
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- sprite_he.cpp 4 Feb 2006 09:38:51 -0000 1.165
+++ sprite_he.cpp 4 Feb 2006 12:11:10 -0000 1.166
@@ -22,7 +22,7 @@
#include "common/stdafx.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/resource.h"
#include "scumm/saveload.h"
#include "scumm/scumm.h"
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -d -r1.324 -r1.325
--- string.cpp 24 Jan 2006 07:20:15 -0000 1.324
+++ string.cpp 4 Feb 2006 12:11:10 -0000 1.325
@@ -30,6 +30,9 @@
#include "scumm/dialogs.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/intern.h"
+#ifndef DISABLE_HE
+#include "scumm/intern_he.h"
+#endif
#include "scumm/verbs.h"
#include "scumm/sound.h"
#include "scumm/util.h"
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- vars.cpp 23 Jan 2006 20:09:25 -0000 1.166
+++ vars.cpp 4 Feb 2006 12:11:10 -0000 1.167
@@ -24,6 +24,9 @@
#include "common/config-manager.h"
#include "scumm/scumm.h"
#include "scumm/intern.h"
+#ifndef DISABLE_HE
+#include "scumm/intern_he.h"
+#endif
#include "scumm/logic_he.h"
#include "sound/mididrv.h"
Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.122
retrieving revision 2.123
diff -u -d -r2.122 -r2.123
--- wiz_he.cpp 3 Feb 2006 09:31:07 -0000 2.122
+++ wiz_he.cpp 4 Feb 2006 12:11:10 -0000 2.123
@@ -22,7 +22,7 @@
#include "common/stdafx.h"
-#include "scumm/intern.h"
+#include "scumm/intern_he.h"
#include "scumm/resource.h"
#include "scumm/scumm.h"
#include "scumm/wiz_he.h"
More information about the Scummvm-git-logs
mailing list