thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use #include "..." instead of #include <...> for pack-start.h and pack-end.h

Browse source 
for consistency with other #includes.

svn-id: r23585
This commit is contained in:
Torbjörn Andersson 2006-07-23 16:13:26 +00:00
parent eabe720a0e
commit c32076e5d0
27 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/gob/game.h
View file

@ -31,7 +31,7 @@ namespace Gob {
class Game { class Game {
public: public:
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct Collision { struct Collision {
int16 id; int16 id;
@ -129,7 +129,7 @@ public:
int32 vidBufferSize; int32 vidBufferSize;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
TotResTable *_totResourceTable; TotResTable *_totResourceTable;
Collision *_collisionAreas; Collision *_collisionAreas;

4
engines/gob/goblin.h
View file

@ -38,7 +38,7 @@ class Goblin {
public: public:
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct Gob_State { struct Gob_State {
int16 animation;// +0h int16 animation;// +0h
@ -95,7 +95,7 @@ public:
char y; char y;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
Util::List *_objList; Util::List *_objList;
Gob_Object *_goblins[4]; Gob_Object *_goblins[4];

4
engines/gob/map.h
View file

@ -43,7 +43,7 @@ public:
kDirSE = 0x5100 kDirSE = 0x5100
}; };
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct Point { struct Point {
int16 x; int16 x;
@ -59,7 +59,7 @@ public:
int8 orient; // ?? int8 orient; // ??
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
int16 _mapWidth; int16 _mapWidth;
int16 _mapHeight; int16 _mapHeight;

8
engines/gob/mult.h
View file

@ -32,7 +32,7 @@ namespace Gob {
class Mult { class Mult {
public: public:
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct Mult_AnimData { struct Mult_AnimData {
int8 animation; int8 animation;
@ -158,7 +158,7 @@ public:
int16 field_E; int16 field_E;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
// Globals // Globals
@ -292,7 +292,7 @@ protected:
class Mult_v2 : public Mult_v1 { class Mult_v2 : public Mult_v1 {
public: public:
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct Mult_Data { struct Mult_Data {
int16 palFadeKeysCount; int16 palFadeKeysCount;
@ -344,7 +344,7 @@ public:
char *execPtr; char *execPtr;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
Mult_Data *_multData2; // TODO: This'll be _multData once every function using it Mult_Data *_multData2; // TODO: This'll be _multData once every function using it
// in GOB2 is done // in GOB2 is done

4
engines/gob/scenery.h
View file

@ -28,7 +28,7 @@ namespace Gob {
class Scenery { class Scenery {
public: public:
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct PieceDesc { struct PieceDesc {
int16 left; //NOTE: int16 left; //NOTE:
@ -73,7 +73,7 @@ public:
AnimFramePiece *frames; AnimFramePiece *frames;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
struct Static { struct Static {
int16 layersCount; int16 layersCount;

4
engines/gob/video.h
View file

@ -73,7 +73,7 @@ public:
#define DISABLE_SPR_ALLOC 0x20 #define DISABLE_SPR_ALLOC 0x20
#define SCUMMVM_CURSOR 0x100 #define SCUMMVM_CURSOR 0x100
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct Color { struct Color {
byte red; byte red;
@ -81,7 +81,7 @@ public:
byte blue; byte blue;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
struct PalDesc { struct PalDesc {
Color *vgaPal; Color *vgaPal;

4
engines/lure/res_struct.h
View file

@ -37,7 +37,7 @@ extern const char *actionList[];
/* */ /* */
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct VersionStructure { struct VersionStructure {
uint16 id; uint16 id;
@ -215,7 +215,7 @@ struct RoomExitIndexedHotspotResource {
uint16 hotspotId; uint16 hotspotId;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
// Class template for a derived list that destroys the contained // Class template for a derived list that destroys the contained
// object when the record containing it is destroyed. It's not // object when the record containing it is destroyed. It's not

4
engines/queen/queen.h
View file

@ -49,7 +49,7 @@ FORCEINLINE int16 READ_BE_INT16(const void *ptr) {
namespace Queen { namespace Queen {
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct GameStateHeader { struct GameStateHeader {
uint32 version; uint32 version;
@ -58,7 +58,7 @@ struct GameStateHeader {
char description[32]; char description[32];
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
class BamScene; class BamScene;
class BankManager; class BankManager;

4
engines/saga/gfx.h
View file

@ -78,7 +78,7 @@ struct ClipData {
} }
}; };
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct PalEntry { struct PalEntry {
byte red; byte red;
@ -86,7 +86,7 @@ struct PalEntry {
byte blue; byte blue;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
struct Color { struct Color {
int red; int red;

4
engines/scumm/akos.cpp
View file

@ -36,7 +36,7 @@
namespace Scumm { namespace Scumm {
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct AkosHeader { struct AkosHeader {
byte unk_1[2]; byte unk_1[2];
@ -52,7 +52,7 @@ struct AkosOffset {
uint16 akci; uint16 akci;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
enum AkosOpcodes { enum AkosOpcodes {

4
engines/scumm/base-costume.h
View file

@ -29,7 +29,7 @@
namespace Scumm { namespace Scumm {
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct CostumeInfo { struct CostumeInfo {
uint16 width, height; uint16 width, height;
@ -37,7 +37,7 @@ struct CostumeInfo {
int16 move_x, move_y; int16 move_x, move_y;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING

4
engines/scumm/boxes.cpp
View file

@ -31,7 +31,7 @@
namespace Scumm { namespace Scumm {
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct Box { /* Internal walkbox file format */ struct Box { /* Internal walkbox file format */
union { union {
@ -79,7 +79,7 @@ struct Box { /* Internal walkbox file format */
}; };
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
#define BOX_MATRIX_SIZE 2000 #define BOX_MATRIX_SIZE 2000
#define BOX_DEBUG 0 #define BOX_DEBUG 0

4
engines/scumm/file.cpp
View file

@ -1241,7 +1241,7 @@ static ScummNESFile::LFL lfls[] = {
{ -1, NULL } { -1, NULL }
}; };
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct _lfl_index { struct _lfl_index {
byte room_lfl[55]; byte room_lfl[55];
@ -1254,7 +1254,7 @@ struct _lfl_index {
uint16 sound_addr[100]; uint16 sound_addr[100];
} lfl_index; } lfl_index;
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
bool ScummNESFile::generateResource(int res) { bool ScummNESFile::generateResource(int res) {

4
engines/scumm/he/intern_he.h
View file

@ -226,7 +226,7 @@ protected:
const char *desc; const char *desc;
}; };
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct ArrayHeader { struct ArrayHeader {
int32 type; //0 int32 type; //0
@ -237,7 +237,7 @@ protected:
byte data[1]; //14 byte data[1]; //14
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
const OpcodeEntryV72he *_opcodesV72he; const OpcodeEntryV72he *_opcodesV72he;

4
engines/scumm/he/resource_he.h
View file

@ -172,7 +172,7 @@ class Win32ResExtractor : public ResExtractor {
* Structures * Structures
*/ */
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct WinLibrary { struct WinLibrary {
Common::File *file; Common::File *file;
@ -454,7 +454,7 @@ class Win32ResExtractor : public ResExtractor {
uint16 number_of_id_entries; uint16 number_of_id_entries;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
/* /*
* Function Prototypes * Function Prototypes

4
engines/scumm/intern.h
View file

@ -519,7 +519,7 @@ protected:
kDwordArray = 6 kDwordArray = 6
}; };
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct ArrayHeader { struct ArrayHeader {
int16 dim1; int16 dim1;
@ -528,7 +528,7 @@ protected:
byte data[1]; byte data[1];
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
const OpcodeEntryV6 *_opcodesV6; const OpcodeEntryV6 *_opcodesV6;

4
engines/scumm/object.cpp
View file

@ -36,7 +36,7 @@
namespace Scumm { namespace Scumm {
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct BompHeader { /* Bomp header */ struct BompHeader { /* Bomp header */
union { union {
@ -51,7 +51,7 @@ struct BompHeader { /* Bomp header */
}; };
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
bool ScummEngine::getClass(int obj, int cls) const { bool ScummEngine::getClass(int obj, int cls) const {

4
engines/scumm/object.h
View file

@ -51,7 +51,7 @@ struct ObjectData {
byte flags; byte flags;
}; };
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct RoomHeader { struct RoomHeader {
union { union {
@ -157,7 +157,7 @@ struct ImageHeader { /* file format */
}; };
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
struct FindObjectInRoom { struct FindObjectInRoom {
const CodeHeader *cdhd; const CodeHeader *cdhd;

4
engines/scumm/player_v2.h
View file

@ -37,7 +37,7 @@ namespace Scumm {
class ScummEngine; class ScummEngine;
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct channel_data { struct channel_data {
uint16 time_left; // 00 uint16 time_left; // 00
@ -64,7 +64,7 @@ struct channel_data {
uint16 music_script_nr; // 48 uint16 music_script_nr; // 48
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
/** /**

4
engines/simon/vga.h
View file

@ -26,7 +26,7 @@
namespace Simon { namespace Simon {
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
// Feeble Files // Feeble Files
struct VgaFileHeader_Feeble { struct VgaFileHeader_Feeble {
@ -92,7 +92,7 @@ struct AnimationHeader_Simon {
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
enum DrawFlags { enum DrawFlags {
kDFFlip = 0x1, kDFFlip = 0x1,

4
engines/sky/sound.cpp
View file

@ -37,7 +37,7 @@ namespace Sky {
#define SFXF_START_DELAY 0x80 #define SFXF_START_DELAY 0x80
#define SFXF_SAVE 0x20 #define SFXF_SAVE 0x20
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct RoomList { struct RoomList {
uint8 room; uint8 room;
@ -51,7 +51,7 @@ struct Sfx {
RoomList roomList[10]; RoomList roomList[10];
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
uint16 Sound::_speechConvertTable[8] = { uint16 Sound::_speechConvertTable[8] = {
0, //;Text numbers to file numbers 0, //;Text numbers to file numbers

4
engines/sky/struc.h
View file

@ -36,7 +36,7 @@ struct displayText_t {
uint32 textWidth; uint32 textWidth;
}; };
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct dataFileHeader { struct dataFileHeader {
uint16 flag; // bit 0: set for colour data, clear for not uint16 flag; // bit 0: set for colour data, clear for not
@ -164,7 +164,7 @@ struct Compact {
MegaSet megaSet3; // MegaSet megaSet3; //
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
} // End of namespace Sky } // End of namespace Sky

4
engines/sword1/mouse.h
View file

@ -48,7 +48,7 @@ struct MouseObj {
Object *compact; Object *compact;
}; };
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct MousePtr { struct MousePtr {
uint16 numFrames; uint16 numFrames;
@ -59,7 +59,7 @@ struct MousePtr {
uint8 dummyData[0x30]; uint8 dummyData[0x30];
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
class Logic; class Logic;
class Menu; class Menu;

4
engines/sword1/object.h
View file

@ -32,7 +32,7 @@ namespace Sword1 {
#define O_GRID_SIZE 200 #define O_GRID_SIZE 200
#define EXTRA_GRID_SIZE 20 #define EXTRA_GRID_SIZE 20
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct OEventSlot { //receiving event list in the compact - struct OEventSlot { //receiving event list in the compact -
int32 o_event; //array of these with O_TOTAL_EVENTS elements int32 o_event; //array of these with O_TOTAL_EVENTS elements
@ -118,7 +118,7 @@ struct Object {
// mega size = 12340 bytes (+ 8 byte offset table + 20 byte header = 12368) // mega size = 12340 bytes (+ 8 byte offset table + 20 byte header = 12368)
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
} // End of namespace Sword1 } // End of namespace Sword1

4
engines/sword1/router.h
View file

@ -27,7 +27,7 @@
namespace Sword1 { namespace Sword1 {
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct BarData { struct BarData {
int16 x1; int16 x1;
@ -51,7 +51,7 @@ struct NodeData {
int16 dist; int16 dist;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
struct FloorData { struct FloorData {
int32 nbars; int32 nbars;

4
engines/sword1/sworddefs.h
View file

@ -89,7 +89,7 @@ namespace Sword1 {
#define MAX_text_obs 2 //text compacts #define MAX_text_obs 2 //text compacts
#define TEXT_sect 149 //text compacts exist in section 149, probably after all the megas #define TEXT_sect 149 //text compacts exist in section 149, probably after all the megas
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct Header { struct Header {
char type[6]; char type[6];
@ -132,7 +132,7 @@ struct WalkGridHeader {
int32 numNodes; int32 numNodes;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
enum fileTypes { enum fileTypes {
TYPE_CD1 = 0, TYPE_CD1 = 0,

4
sound/voc.h
View file

@ -34,7 +34,7 @@ namespace Audio {
class AudioStream; class AudioStream;
#include <common/pack-start.h> // START STRUCT PACKING #include "common/pack-start.h" // START STRUCT PACKING
struct VocFileHeader { struct VocFileHeader {
uint8 desc[20]; uint8 desc[20];
@ -50,7 +50,7 @@ struct VocBlockHeader {
uint8 pack; uint8 pack;
}; };
#include <common/pack-end.h> // END STRUCT PACKING #include "common/pack-end.h" // END STRUCT PACKING
/** /**
* Take a sample rate parameter as it occurs in a VOC sound header, and * Take a sample rate parameter as it occurs in a VOC sound header, and