diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/gob/game.h | 4 | ||||
-rw-r--r-- | engines/gob/goblin.h | 4 | ||||
-rw-r--r-- | engines/gob/map.h | 4 | ||||
-rw-r--r-- | engines/gob/mult.h | 8 | ||||
-rw-r--r-- | engines/gob/scenery.h | 4 | ||||
-rw-r--r-- | engines/gob/video.h | 4 | ||||
-rw-r--r-- | engines/lure/res_struct.h | 4 | ||||
-rw-r--r-- | engines/queen/queen.h | 4 | ||||
-rw-r--r-- | engines/saga/gfx.h | 4 | ||||
-rw-r--r-- | engines/scumm/akos.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/base-costume.h | 4 | ||||
-rw-r--r-- | engines/scumm/boxes.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/file.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/intern_he.h | 4 | ||||
-rw-r--r-- | engines/scumm/he/resource_he.h | 4 | ||||
-rw-r--r-- | engines/scumm/intern.h | 4 | ||||
-rw-r--r-- | engines/scumm/object.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/object.h | 4 | ||||
-rw-r--r-- | engines/scumm/player_v2.h | 4 | ||||
-rw-r--r-- | engines/simon/vga.h | 4 | ||||
-rw-r--r-- | engines/sky/sound.cpp | 4 | ||||
-rw-r--r-- | engines/sky/struc.h | 4 | ||||
-rw-r--r-- | engines/sword1/mouse.h | 4 | ||||
-rw-r--r-- | engines/sword1/object.h | 4 | ||||
-rw-r--r-- | engines/sword1/router.h | 4 | ||||
-rw-r--r-- | engines/sword1/sworddefs.h | 4 |
26 files changed, 54 insertions, 54 deletions
diff --git a/engines/gob/game.h b/engines/gob/game.h index f6abc2ee67..efb07e7335 100644 --- a/engines/gob/game.h +++ b/engines/gob/game.h @@ -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; diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h index c6b7ae44ed..88c8254c4c 100644 --- a/engines/gob/goblin.h +++ b/engines/gob/goblin.h @@ -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]; diff --git a/engines/gob/map.h b/engines/gob/map.h index ed92116f01..41c81e3ef2 100644 --- a/engines/gob/map.h +++ b/engines/gob/map.h @@ -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; diff --git a/engines/gob/mult.h b/engines/gob/mult.h index dad57b7b1c..8776bf444c 100644 --- a/engines/gob/mult.h +++ b/engines/gob/mult.h @@ -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 diff --git a/engines/gob/scenery.h b/engines/gob/scenery.h index aad6a57dbf..a7d581a5bf 100644 --- a/engines/gob/scenery.h +++ b/engines/gob/scenery.h @@ -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; diff --git a/engines/gob/video.h b/engines/gob/video.h index 61e89b1d77..96f9894e80 100644 --- a/engines/gob/video.h +++ b/engines/gob/video.h @@ -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; diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index d95fec8d7f..eab2a7817e 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -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 diff --git a/engines/queen/queen.h b/engines/queen/queen.h index 9ca46be1c5..a1f8b45aa9 100644 --- a/engines/queen/queen.h +++ b/engines/queen/queen.h @@ -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; diff --git a/engines/saga/gfx.h b/engines/saga/gfx.h index f3a2f14068..1c99b6ce3f 100644 --- a/engines/saga/gfx.h +++ b/engines/saga/gfx.h @@ -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; diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp index 139c18be37..1e6edb9bdd 100644 --- a/engines/scumm/akos.cpp +++ b/engines/scumm/akos.cpp @@ -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 { diff --git a/engines/scumm/base-costume.h b/engines/scumm/base-costume.h index b4e875a4a8..3e8d84a9ee 100644 --- a/engines/scumm/base-costume.h +++ b/engines/scumm/base-costume.h @@ -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 diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp index a066b448de..24cb3659c4 100644 --- a/engines/scumm/boxes.cpp +++ b/engines/scumm/boxes.cpp @@ -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 diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp index b08ec0e41f..d1e77d645c 100644 --- a/engines/scumm/file.cpp +++ b/engines/scumm/file.cpp @@ -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) { diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index 250dbaad5a..dca0c7d19a 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -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; diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index 468812a236..634d5d9494 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -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 diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index 2ccce37b36..0f59212beb 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -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; diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 6ba1d60a60..731e7b3286 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -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 { diff --git a/engines/scumm/object.h b/engines/scumm/object.h index 016aea1803..d5d447dde4 100644 --- a/engines/scumm/object.h +++ b/engines/scumm/object.h @@ -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; diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h index 066da8acde..c1a15f542e 100644 --- a/engines/scumm/player_v2.h +++ b/engines/scumm/player_v2.h @@ -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 /** diff --git a/engines/simon/vga.h b/engines/simon/vga.h index 5b5dbaf63a..29731c29c3 100644 --- a/engines/simon/vga.h +++ b/engines/simon/vga.h @@ -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, diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index ea21253c5f..d13f901511 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -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 diff --git a/engines/sky/struc.h b/engines/sky/struc.h index 5536991e05..ed451e0122 100644 --- a/engines/sky/struc.h +++ b/engines/sky/struc.h @@ -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 diff --git a/engines/sword1/mouse.h b/engines/sword1/mouse.h index c57cab8417..9c4216a5a0 100644 --- a/engines/sword1/mouse.h +++ b/engines/sword1/mouse.h @@ -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; diff --git a/engines/sword1/object.h b/engines/sword1/object.h index 4ab4b735a3..88599a6a62 100644 --- a/engines/sword1/object.h +++ b/engines/sword1/object.h @@ -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 diff --git a/engines/sword1/router.h b/engines/sword1/router.h index 12b8714860..d45a08dca2 100644 --- a/engines/sword1/router.h +++ b/engines/sword1/router.h @@ -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; diff --git a/engines/sword1/sworddefs.h b/engines/sword1/sworddefs.h index b060796655..3f3b5765da 100644 --- a/engines/sword1/sworddefs.h +++ b/engines/sword1/sworddefs.h @@ -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, |