ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
engines/gob/game.h
+2 -2
View File
@@ -31,7 +31,7 @@ namespace Gob {
class Game {
public:
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct Collision {
int16 id;
@@ -129,7 +129,7 @@ public:
int32 vidBufferSize;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
TotResTable *_totResourceTable;
Collision *_collisionAreas;
engines/gob/goblin.h
+2 -2
View File
@@ -38,7 +38,7 @@ class Goblin {
public:
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct Gob_State {
int16 animation;// +0h
@@ -95,7 +95,7 @@ public:
char y;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
Util::List *_objList;
Gob_Object *_goblins[4];
engines/gob/map.h
+2 -2
View File
@@ -43,7 +43,7 @@ public:
kDirSE = 0x5100
};
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct Point {
int16 x;
@@ -59,7 +59,7 @@ public:
int8 orient; // ??
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
int16 _mapWidth;
int16 _mapHeight;
engines/gob/mult.h
+4 -4
View File
@@ -32,7 +32,7 @@ namespace Gob {
class Mult {
public:
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct Mult_AnimData {
int8 animation;
@@ -158,7 +158,7 @@ public:
int16 field_E;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
// Globals
@@ -292,7 +292,7 @@ protected:
class Mult_v2 : public Mult_v1 {
public:
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct Mult_Data {
int16 palFadeKeysCount;
@@ -344,7 +344,7 @@ public:
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
// in GOB2 is done
engines/gob/scenery.h
+2 -2
View File
@@ -28,7 +28,7 @@ namespace Gob {
class Scenery {
public:
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct PieceDesc {
int16 left; //NOTE:
@@ -73,7 +73,7 @@ public:
AnimFramePiece *frames;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
struct Static {
int16 layersCount;
engines/gob/video.h
+2 -2
View File
@@ -73,7 +73,7 @@ public:
#define DISABLE_SPR_ALLOC 0x20
#define SCUMMVM_CURSOR 0x100
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct Color {
byte red;
@@ -81,7 +81,7 @@ public:
byte blue;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
struct PalDesc {
Color *vgaPal;
engines/lure/res_struct.h
+2 -2
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 {
uint16 id;
@@ -215,7 +215,7 @@ struct RoomExitIndexedHotspotResource {
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
// object when the record containing it is destroyed. It's not
engines/queen/queen.h
+2 -2
View File
@@ -49,7 +49,7 @@ FORCEINLINE int16 READ_BE_INT16(const void *ptr) {
namespace Queen {
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct GameStateHeader {
uint32 version;
@@ -58,7 +58,7 @@ struct GameStateHeader {
char description[32];
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
class BamScene;
class BankManager;
engines/saga/gfx.h
+2 -2
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 {
byte red;
@@ -86,7 +86,7 @@ struct PalEntry {
byte blue;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
struct Color {
int red;
engines/scumm/akos.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
namespace Scumm {
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct AkosHeader {
byte unk_1[2];
@@ -52,7 +52,7 @@ struct AkosOffset {
uint16 akci;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
enum AkosOpcodes {
engines/scumm/base-costume.h
+2 -2
View File
@@ -29,7 +29,7 @@
namespace Scumm {
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct CostumeInfo {
uint16 width, height;
@@ -37,7 +37,7 @@ struct CostumeInfo {
int16 move_x, move_y;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
engines/scumm/boxes.cpp
+2 -2
View File
@@ -31,7 +31,7 @@
namespace Scumm {
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct Box { /* Internal walkbox file format */
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_DEBUG 0
engines/scumm/file.cpp
+2 -2
View File
@@ -1241,7 +1241,7 @@ static ScummNESFile::LFL lfls[] = {
{ -1, NULL }
};
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct _lfl_index {
byte room_lfl[55];
@@ -1254,7 +1254,7 @@ struct _lfl_index {
uint16 sound_addr[100];
} lfl_index;
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
bool ScummNESFile::generateResource(int res) {
engines/scumm/he/intern_he.h
+2 -2
View File
@@ -226,7 +226,7 @@ protected:
const char *desc;
};
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct ArrayHeader {
int32 type; //0
@@ -237,7 +237,7 @@ protected:
byte data[1]; //14
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
const OpcodeEntryV72he *_opcodesV72he;
engines/scumm/he/resource_he.h
+2 -2
View File
@@ -172,7 +172,7 @@ class Win32ResExtractor : public ResExtractor {
* Structures
*/
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct WinLibrary {
Common::File *file;
@@ -454,7 +454,7 @@ class Win32ResExtractor : public ResExtractor {
uint16 number_of_id_entries;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
/*
* Function Prototypes
engines/scumm/intern.h
+2 -2
View File
@@ -519,7 +519,7 @@ protected:
kDwordArray = 6
};
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct ArrayHeader {
int16 dim1;
@@ -528,7 +528,7 @@ protected:
byte data[1];
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
const OpcodeEntryV6 *_opcodesV6;
engines/scumm/object.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
namespace Scumm {
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct BompHeader { /* Bomp header */
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 {
engines/scumm/object.h
+2 -2
View File
@@ -51,7 +51,7 @@ struct ObjectData {
byte flags;
};
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct RoomHeader {
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 {
const CodeHeader *cdhd;
engines/scumm/player_v2.h
+2 -2
View File
@@ -37,7 +37,7 @@ namespace Scumm {
class ScummEngine;
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct channel_data {
uint16 time_left; // 00
@@ -64,7 +64,7 @@ struct channel_data {
uint16 music_script_nr; // 48
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
/**
engines/simon/vga.h
+2 -2
View File
@@ -26,7 +26,7 @@
namespace Simon {
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
// Feeble Files
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 {
kDFFlip = 0x1,
engines/sky/sound.cpp
+2 -2
View File
@@ -37,7 +37,7 @@ namespace Sky {
#define SFXF_START_DELAY 0x80
#define SFXF_SAVE 0x20
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct RoomList {
uint8 room;
@@ -51,7 +51,7 @@ struct Sfx {
RoomList roomList[10];
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
uint16 Sound::_speechConvertTable[8] = {
0, //;Text numbers to file numbers
engines/sky/struc.h
+2 -2
View File
@@ -36,7 +36,7 @@ struct displayText_t {
uint32 textWidth;
};
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct dataFileHeader {
uint16 flag; // bit 0: set for colour data, clear for not
@@ -164,7 +164,7 @@ struct Compact {
MegaSet megaSet3; //
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
} // End of namespace Sky
engines/sword1/mouse.h
+2 -2
View File
@@ -48,7 +48,7 @@ struct MouseObj {
Object *compact;
};
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct MousePtr {
uint16 numFrames;
@@ -59,7 +59,7 @@ struct MousePtr {
uint8 dummyData[0x30];
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
class Logic;
class Menu;
engines/sword1/object.h
+2 -2
View File
@@ -32,7 +32,7 @@ namespace Sword1 {
#define O_GRID_SIZE 200
#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 -
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)
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
} // End of namespace Sword1
engines/sword1/router.h
+2 -2
View File
@@ -27,7 +27,7 @@
namespace Sword1 {
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct BarData {
int16 x1;
@@ -51,7 +51,7 @@ struct NodeData {
int16 dist;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
struct FloorData {
int32 nbars;
engines/sword1/sworddefs.h
+2 -2
View File
@@ -89,7 +89,7 @@ namespace Sword1 {
#define MAX_text_obs 2 //text compacts
#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 {
char type[6];
@@ -132,7 +132,7 @@ struct WalkGridHeader {
int32 numNodes;
};
#include <common/pack-end.h> // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
enum fileTypes {
TYPE_CD1 = 0,
sound/voc.h
+2 -2
View File
@@ -34,7 +34,7 @@ namespace Audio {
class AudioStream;
#include <common/pack-start.h> // START STRUCT PACKING
#include "common/pack-start.h" // START STRUCT PACKING
struct VocFileHeader {
uint8 desc[20];
@@ -50,7 +50,7 @@ struct VocBlockHeader {
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