diff options
| author | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
| commit | d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd (patch) | |
| tree | e6e98f266610f6428c248aed6abc75e637e45231 | |
| parent | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (diff) | |
| download | scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.gz scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.bz2 scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.zip | |
Fixed the spaces before tabs.
svn-id: r30667
207 files changed, 6069 insertions, 6069 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 5b33796eb0..123ab2dc33 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -96,7 +96,7 @@ DefaultEventManager::DefaultEventManager(OSystem *boss) : _modifierState(0), _shouldQuit(false) { - assert(_boss); + assert(_boss); _recordFile = NULL; _recordTimeFile = NULL; diff --git a/backends/fs/abstract-fs.h b/backends/fs/abstract-fs.h index f593023d24..8125ad7d95 100644 --- a/backends/fs/abstract-fs.h +++ b/backends/fs/abstract-fs.h @@ -53,8 +53,8 @@ protected: * handle this gracefully by returning 0. * * Example: - * Calling getChild() for a node with path "/foo/bar" using name="file.txt", - * would produce a new node with "/foo/bar/file.txt" as path. + * Calling getChild() for a node with path "/foo/bar" using name="file.txt", + * would produce a new node with "/foo/bar/file.txt" as path. * * @note This function will append a separator char (\ or /) to the end of the * path if needed. @@ -106,8 +106,8 @@ public: * Returns the last component of the path pointed by this FilesystemNode. * * Examples (POSIX): - * /foo/bar.txt would return /bar.txt - * /foo/bar/ would return /bar/ + * /foo/bar.txt would return /bar.txt + * /foo/bar/ would return /bar/ * * @note This method is very architecture dependent, please check the concrete implementation for more information. */ diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index 16a95cc779..3f4ba18a30 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -380,7 +380,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b if (entry) { //FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode // specification, the following call had to be changed: - // if (entry->isValid()) + // if (entry->isValid()) // Please verify that the logic of the code remains coherent. Also, remember // that the isReadable() and isWritable() methods are available. if (entry->exists()) @@ -542,7 +542,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const { if (entry) { //FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode // specification, the following call had to be changed: - // if (entry->isValid()) + // if (entry->isValid()) // Please verify that the logic of the code remains coherent. Also, remember // that the isReadable() and isWritable() methods are available. if(entry->exists()) diff --git a/backends/fs/dc/dc-fs.cpp b/backends/fs/dc/dc-fs.cpp index 307f6f8852..88eae128d3 100644 --- a/backends/fs/dc/dc-fs.cpp +++ b/backends/fs/dc/dc-fs.cpp @@ -73,8 +73,8 @@ public: * Returns the last component of a given path. * * Examples: - * /foo/bar.txt would return /bar.txt - * /foo/bar/ would return /bar/ + * /foo/bar.txt would return /bar.txt + * /foo/bar/ would return /bar/ * * @param str String containing the path. * @return Pointer to the first char of the last component inside str. diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index 6a1279e1e1..79b957f2e2 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -35,7 +35,7 @@ namespace DS { // DSFileSystemNode - Flash ROM file system using Zip files // ////////////////////////////////////////////////////////////// -ZipFile* DSFileSystemNode::_zipFile = NULL; +ZipFile* DSFileSystemNode::_zipFile = NULL; char currentDir[128]; DSFileSystemNode::DSFileSystemNode() { @@ -803,8 +803,8 @@ int std_ferror(FILE* handle) { * Returns the last component of a given path. * * Examples: - * /foo/bar.txt would return /bar.txt - * /foo/bar/ would return /bar/ + * /foo/bar.txt would return /bar.txt + * /foo/bar/ would return /bar/ * * @param str String containing the path. * @return Pointer to the first char of the last component inside str. diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h index 6b3452b53b..389702b330 100644 --- a/backends/fs/ds/ds-fs.h +++ b/backends/fs/ds/ds-fs.h @@ -179,17 +179,17 @@ struct fileHandle { #define FILE DS::fileHandle // Please do not remove any of these prototypes that appear not to be required. -FILE* std_fopen(const char* name, const char* mode); -void std_fclose(FILE* handle); -int std_getc(FILE* handle); -size_t std_fread(const void* ptr, size_t size, size_t numItems, FILE* handle); -size_t std_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle); -bool std_feof(FILE* handle); +FILE* std_fopen(const char* name, const char* mode); +void std_fclose(FILE* handle); +int std_getc(FILE* handle); +size_t std_fread(const void* ptr, size_t size, size_t numItems, FILE* handle); +size_t std_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle); +bool std_feof(FILE* handle); long int std_ftell(FILE* handle); -int std_fseek(FILE* handle, long int offset, int whence); -void std_clearerr(FILE* handle); -void std_cwd(char* dir); -void std_fflush(FILE* handle); +int std_fseek(FILE* handle, long int offset, int whence); +void std_clearerr(FILE* handle); +void std_cwd(char* dir); +void std_fflush(FILE* handle); } //namespace DS diff --git a/backends/fs/gp32/gp32-fs.cpp b/backends/fs/gp32/gp32-fs.cpp index 56705b90fc..06830c13f5 100644 --- a/backends/fs/gp32/gp32-fs.cpp +++ b/backends/fs/gp32/gp32-fs.cpp @@ -74,8 +74,8 @@ const char gpRootPath[] = "gp:\\"; * Returns the last component of a given path. * * Examples: - * gp:\foo\bar.txt would return "\bar.txt" - * gp:\foo\bar\ would return "\bar\" + * gp:\foo\bar.txt would return "\bar.txt" + * gp:\foo\bar\ would return "\bar\" * * @param str Path to obtain the last component from. * @return Pointer to the first char of the last component inside str. diff --git a/backends/fs/morphos/abox-fs.cpp b/backends/fs/morphos/abox-fs.cpp index bccd77a40f..9274c3804b 100644 --- a/backends/fs/morphos/abox-fs.cpp +++ b/backends/fs/morphos/abox-fs.cpp @@ -312,7 +312,7 @@ bool ABoxFilesystemNode::getChildren(AbstractFSList &list, ListMode mode, bool h { //FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode // specification, the following call had to be changed: - // if (entry->isValid()) + // if (entry->isValid()) // Please verify that the logic of the code remains coherent. Also, remember // that the isReadable() and isWritable() methods are available. if (entry->exists()) @@ -396,7 +396,7 @@ AbstractFSList ABoxFilesystemNode::getRootChildren() { //FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode // specification, the following call had to be changed: - // if (entry->isValid()) + // if (entry->isValid()) // Please verify that the logic of the code remains coherent. Also, remember // that the isReadable() and isWritable() methods are available. if (entry->exists()) diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp index 335aa7e8dd..49d3e3dc93 100644 --- a/backends/fs/palmos/palmos-fs.cpp +++ b/backends/fs/palmos/palmos-fs.cpp @@ -76,7 +76,7 @@ private: * @param mode Mode to use while adding the file entry to the list. * @param base String with the directory being listed. * @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find. - */ + */ static void addFile(AbstractFSList &list, ListMode mode, const Char *base, FileInfoType* find_data); }; @@ -84,8 +84,8 @@ private: * Returns the last component of a given path. * * Examples: - * /foo/bar.txt would return /bar.txt - * /foo/bar/ would return /bar/ + * /foo/bar.txt would return /bar.txt + * /foo/bar/ would return /bar/ * * @param str String containing the path. * @return Pointer to the first char of the last component inside str. diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 8ed6d9be6a..5cde32c851 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -84,8 +84,8 @@ private: * Returns the last component of a given path. * * Examples: - * /foo/bar.txt would return /bar.txt - * /foo/bar/ would return /bar/ + * /foo/bar.txt would return /bar.txt + * /foo/bar/ would return /bar/ * * @param str String containing the path. * @return Pointer to the first char of the last component inside str. diff --git a/backends/fs/psp/psp-fs.cpp b/backends/fs/psp/psp-fs.cpp index 7e850e3a52..3fe6060928 100644 --- a/backends/fs/psp/psp-fs.cpp +++ b/backends/fs/psp/psp-fs.cpp @@ -75,8 +75,8 @@ public: * Returns the last component of a given path. * * Examples: - * /foo/bar.txt would return /bar.txt - * /foo/bar/ would return /bar/ + * /foo/bar.txt would return /bar.txt + * /foo/bar/ would return /bar/ * * @param str String containing the path. * @return Pointer to the first char of the last component inside str. diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp index d4c4513d90..e4482e85ce 100644 --- a/backends/fs/symbian/symbian-fs.cpp +++ b/backends/fs/symbian/symbian-fs.cpp @@ -81,8 +81,8 @@ public: * Returns the last component of a given path. * * Examples: - * c:\foo\bar.txt would return "\bar.txt" - * c:\foo\bar\ would return "\bar\" + * c:\foo\bar.txt would return "\bar.txt" + * c:\foo\bar\ would return "\bar\" * * @param str Path to obtain the last component from. * @return Pointer to the first char of the last component inside str. diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index a766132e94..c09735d8c5 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -79,8 +79,8 @@ public: * * Examples: * path=c:\foo\bar.txt, currentDir=false -> c:\foo\bar.txt - * path=c:\foo\bar.txt, currentDir=true -> current directory - * path=NULL, currentDir=true -> current directory + * path=c:\foo\bar.txt, currentDir=true -> current directory + * path=NULL, currentDir=true -> current directory * * @param path String with the path the new node should point to. * @param currentDir if true, the path parameter will be ignored and the resulting node will point to the current directory. @@ -108,7 +108,7 @@ private: * @param mode Mode to use while adding the file entry to the list. * @param base String with the directory being listed. * @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find. - */ + */ static void addFile(AbstractFSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data); /** @@ -116,7 +116,7 @@ private: * * @param str String to convert from Unicode to Ascii. * @return str in Ascii format. - */ + */ static char *toAscii(TCHAR *str); /** @@ -124,7 +124,7 @@ private: * * @param str String to convert from Ascii to Unicode. * @return str in Unicode format. - */ + */ static const TCHAR* toUnicode(const char *str); }; @@ -132,8 +132,8 @@ private: * Returns the last component of a given path. * * Examples: - * c:\foo\bar.txt would return "\bar.txt" - * c:\foo\bar\ would return "\bar\" + * c:\foo\bar.txt would return "\bar.txt" + * c:\foo\bar\ would return "\bar\" * * @param str Path to obtain the last component from. * @return Pointer to the first char of the last component inside str. diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp index 10a9d166b4..b1c2aa61c7 100644 --- a/backends/midi/zodiac.cpp +++ b/backends/midi/zodiac.cpp @@ -53,7 +53,7 @@ int MidiDriver_Zodiac::open() { Err e; if (e = TwMidiOpen(&_midiHandle)) - return MERR_DEVICE_NOT_AVAILABLE; + return MERR_DEVICE_NOT_AVAILABLE; TwMidiGetMasterVolume(&_oldVol); TwMidiSetMasterVolume(twMidiMaxVolume); // TODO : set volume based on gVars diff --git a/backends/platform/PalmOS/Rsc/StarterRsc.h b/backends/platform/PalmOS/Rsc/StarterRsc.h index 5e78736135..fba46b310b 100644 --- a/backends/platform/PalmOS/Rsc/StarterRsc.h +++ b/backends/platform/PalmOS/Rsc/StarterRsc.h @@ -10,7 +10,7 @@ // THIS IS AN AUTOMATICALLY GENERATED HEADER FILE // DO NOT EDIT - CHANGES MADE TO THIS FILE WILL BE LOST // -// Palm App Name: "ScummVM" +// Palm App Name: "ScummVM" // // Palm App Version: "1.0" diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.h b/backends/platform/PalmOS/Src/cd_aeroplayer.h index e54bc1d5ff..e661e06d52 100644 --- a/backends/platform/PalmOS/Src/cd_aeroplayer.h +++ b/backends/platform/PalmOS/Src/cd_aeroplayer.h @@ -41,7 +41,7 @@ public: void play(int track, int num_loops, int start_frame, int duration); void stop(); - void setVolume(int volume); + void setVolume(int volume); private: OSystem *_sys; @@ -53,9 +53,9 @@ private: UInt32 getPosition(); void forceStop(); - UInt16 _volumeLimit; + UInt16 _volumeLimit; - Boolean _isPlaying; + Boolean _isPlaying; // cdrom UInt16 _pckLoops, _pckTrack; UInt32 _pckTrackStartFrame, _pckTrackEndFrame; diff --git a/backends/platform/PalmOS/Src/cd_default.h b/backends/platform/PalmOS/Src/cd_default.h index 491937f38d..69d909b1e7 100644 --- a/backends/platform/PalmOS/Src/cd_default.h +++ b/backends/platform/PalmOS/Src/cd_default.h @@ -30,20 +30,20 @@ class DefaultCDPlayer : public CDAudio { public: - DefaultCDPlayer(OSystem *sys); + DefaultCDPlayer(OSystem *sys); - bool init(); - void release(); + bool init(); + void release(); - bool poll(); - void update(); - void play(int track, int num_loops, int start_frame, int duration); - void stop(); + bool poll(); + void update(); + void play(int track, int num_loops, int start_frame, int duration); + void stop(); private: - OSystem *_sys; + OSystem *_sys; - // cdrom + // cdrom UInt16 _defLoops; UInt32 _defStopTime, _defTrackEndFrame, _defTrackLength; }; diff --git a/backends/platform/PalmOS/Src/cd_msa.h b/backends/platform/PalmOS/Src/cd_msa.h index 93ab279c8c..223bc0efcf 100644 --- a/backends/platform/PalmOS/Src/cd_msa.h +++ b/backends/platform/PalmOS/Src/cd_msa.h @@ -30,28 +30,28 @@ class MsaCDPlayer : public CDAudio { public: - MsaCDPlayer(OSystem *sys); + MsaCDPlayer(OSystem *sys); - bool init(); - void release(); + bool init(); + void release(); - bool poll(); - void update(); - void play(int track, int num_loops, int start_frame, int duration); - void stop(); + bool poll(); + void update(); + void play(int track, int num_loops, int start_frame, int duration); + void stop(); - void setVolume(int volume); + void setVolume(int volume); private: - void initInternal(); + void initInternal(); - OSystem *_sys; - UInt16 _msaRefNum; + OSystem *_sys; + UInt16 _msaRefNum; UInt32 _volumeLLimit; UInt32 _volumeRLimit; - // cdrom + // cdrom AlbumInfoType _msaAlbum; UInt16 _msaLoops; diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.h b/backends/platform/PalmOS/Src/cd_pockettunes.h index 4a8d797158..77938d846a 100644 --- a/backends/platform/PalmOS/Src/cd_pockettunes.h +++ b/backends/platform/PalmOS/Src/cd_pockettunes.h @@ -31,35 +31,35 @@ class PckTunesCDPlayer : public CDAudio { public: - PckTunesCDPlayer(OSystem *sys); + PckTunesCDPlayer(OSystem *sys); - bool init(); - void release(); + bool init(); + void release(); - bool poll(); - void update(); - void play(int track, int num_loops, int start_frame, int duration); - void stop(); + bool poll(); + void update(); + void play(int track, int num_loops, int start_frame, int duration); + void stop(); - void setVolume(int volume); + void setVolume(int volume); private: - OSystem *_sys; - Char gameP[15]; + OSystem *_sys; + Char gameP[15]; - PocketTunesAction *_pAction; // prevent memory fragmentation - EventType _eAction; + PocketTunesAction *_pAction; // prevent memory fragmentation + EventType _eAction; - UInt32 getStatus(); - void setPosition(UInt32 value); - UInt32 getDuration(); - UInt32 getPosition(UInt32 deft); + UInt32 getStatus(); + void setPosition(UInt32 value); + UInt32 getDuration(); + UInt32 getPosition(UInt32 deft); - UInt32 _volumeLimit; - UInt32 getVolumeLimit(); + UInt32 _volumeLimit; + UInt32 getVolumeLimit(); - Boolean _isPlaying; - // cdrom + Boolean _isPlaying; + // cdrom UInt16 _pckLoops, _pckTrack; UInt32 _pckTrackStartFrame, _pckTrackEndFrame; UInt32 _pckStopTime, _pckTrackDuration; diff --git a/backends/platform/PalmOS/Src/globals.h b/backends/platform/PalmOS/Src/globals.h index 05e9fe70b6..796832df82 100644 --- a/backends/platform/PalmOS/Src/globals.h +++ b/backends/platform/PalmOS/Src/globals.h @@ -94,7 +94,7 @@ extern GlobalsDataPtr gVars; #define DO_VARS(z, t, o) \ { Int8 *tmp = (Int8 *)gVars + o + 8; \ for (Int8 cnt = 0; cnt < gVars->z; cnt++) \ - { UInt##t val = *((UInt##t *)tmp); \ + { UInt##t val = *((UInt##t *)tmp); \ val = ByteSwap##t(val); \ *((UInt##t *)tmp) = val; \ tmp += (t / 8); \ diff --git a/backends/platform/PalmOS/Src/init_palmos.h b/backends/platform/PalmOS/Src/init_palmos.h index 34b8ca1451..d4691dd15b 100644 --- a/backends/platform/PalmOS/Src/init_palmos.h +++ b/backends/platform/PalmOS/Src/init_palmos.h @@ -26,7 +26,7 @@ #ifndef INIT_PALMOS_H #define INIT_PALMOS_H -#define PALM_PORTRAIT 1 +#define PALM_PORTRAIT 1 #define PALM_LANDSCAPE 2 void PalmInit(UInt8 init); @@ -39,4 +39,4 @@ void PalmHRRelease(); UInt8 PalmScreenSize(Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh); void PalmGetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFreeP, UInt32 *dynamicFreeP); -#endif
\ No newline at end of file +#endif diff --git a/backends/platform/PalmOS/Src/init_sony.cpp b/backends/platform/PalmOS/Src/init_sony.cpp index ede7ae997a..f6728d08b3 100644 --- a/backends/platform/PalmOS/Src/init_sony.cpp +++ b/backends/platform/PalmOS/Src/init_sony.cpp @@ -45,13 +45,13 @@ UInt16 SilkInit(UInt32 *retVersion) { e = FtrGet(sonySysFtrCreator, sonySysFtrNumVskVersion, &version); if (e) { // v1 = NR - e = SilkLibOpen(slkRefNum); + e = SilkLibOpen(slkRefNum); if (!e) version = vskVersionNum1; } else { // v2 = NX/NZ // v3 = UX... - e = VskOpen(slkRefNum); + e = VskOpen(slkRefNum); } } } else diff --git a/backends/platform/PalmOS/Src/init_stuffs.cpp b/backends/platform/PalmOS/Src/init_stuffs.cpp index 753d2ae548..51bfe755eb 100644 --- a/backends/platform/PalmOS/Src/init_stuffs.cpp +++ b/backends/platform/PalmOS/Src/init_stuffs.cpp @@ -80,11 +80,11 @@ void StuffsGetFeatures() { OPTIONS_SET(kOptDeviceOS5); // ARM ? - if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType)) - if (sysFtrNumProcessorIsARM(ulProcessorType)) - OPTIONS_SET(kOptDeviceARM); - else if (ulProcessorType == sysFtrNumProcessorx86) - OPTIONS_SET(kOptDeviceProcX86); + if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType)) + if (sysFtrNumProcessorIsARM(ulProcessorType)) + OPTIONS_SET(kOptDeviceARM); + else if (ulProcessorType == sysFtrNumProcessorx86) + OPTIONS_SET(kOptDeviceProcX86); // 5Way Navigator if (!FtrGet(hsFtrCreator, hsFtrIDNavigationSupported, &version)) { diff --git a/backends/platform/PalmOS/Src/launcher/app.cpp b/backends/platform/PalmOS/Src/launcher/app.cpp index 31c94da5b6..9bb1c1479b 100644 --- a/backends/platform/PalmOS/Src/launcher/app.cpp +++ b/backends/platform/PalmOS/Src/launcher/app.cpp @@ -202,7 +202,7 @@ static void AppStartCheckScreenSize() { #define max(id,value) gVars->memory[id] = (gVars->memory[id] < value ? value : gVars->memory[id]) #define min(id,value) gVars->memory[id] = (gVars->memory[id] > value ? value : gVars->memory[id]) -#define threshold 700 +#define threshold 700 static void AppStartSetMemory() { UInt32 mem, def; @@ -221,7 +221,7 @@ Err AppStart(void) { #ifndef _DEBUG_ENGINE // delete old databases - ModDelete(); + ModDelete(); #endif // allocate global variables space @@ -295,7 +295,7 @@ Err AppStart(void) { GamImportDatabase(); AppStartCheckScreenSize(); - AppStartCheckNotify(); // not fatal error if not avalaible + AppStartCheckNotify(); // not fatal error if not avalaible return error; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp index 9970e608c9..ca2e18ee6d 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp @@ -121,8 +121,8 @@ static Boolean MainFormDoCommand(UInt16 command) break; case MainOptionsAbout: - FrmPopupForm(InfoForm); - handled = true; + FrmPopupForm(InfoForm); + handled = true; break; case MainGamesMusicSound: @@ -252,7 +252,7 @@ Boolean MainFormHandleEvent(EventPtr eventP) break; case MainAboutButton: - FrmPopupForm(InfoForm); + FrmPopupForm(InfoForm); break; // case MainListTypeSelTrigger: diff --git a/backends/platform/PalmOS/Src/launcher/forms/formtabs.h b/backends/platform/PalmOS/Src/launcher/forms/formtabs.h index 5371485bf1..f14c2ff4e4 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formtabs.h +++ b/backends/platform/PalmOS/Src/launcher/forms/formtabs.h @@ -17,8 +17,8 @@ typedef struct { } TabType, *TabPtr; TabType *TabNewTabs (UInt16 cnt); -void TabDeleteTabs (TabType *tabP); -Err TabAddContent (FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0); -void TabSetActive (FormType *frmP, TabType *tabP, UInt16 num); +void TabDeleteTabs (TabType *tabP); +Err TabAddContent (FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0); +void TabSetActive (FormType *frmP, TabType *tabP, UInt16 num); void TabMoveUpObject (FormType *frmP, UInt16 objID, Coord amount); #endif diff --git a/backends/platform/PalmOS/Src/launcher/games.cpp b/backends/platform/PalmOS/Src/launcher/games.cpp index b223897fd5..c3f7ef3e4a 100644 --- a/backends/platform/PalmOS/Src/launcher/games.cpp +++ b/backends/platform/PalmOS/Src/launcher/games.cpp @@ -414,8 +414,8 @@ void GamImportDatabase() { return; } - // get current db info and rename it - DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0); + // get current db info and rename it + DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0); GamCloseDatabase(true); e = DmDeleteDatabase(oCardNo, oDbID); diff --git a/backends/platform/PalmOS/Src/launcher/games.h b/backends/platform/PalmOS/Src/launcher/games.h index 4b53503d60..0572504dc8 100644 --- a/backends/platform/PalmOS/Src/launcher/games.h +++ b/backends/platform/PalmOS/Src/launcher/games.h @@ -53,9 +53,9 @@ typedef struct { UInt16 icnID; // icon to display on the list Boolean selected; - Char nameP[50]; // game name to display in list - Char pathP[150]; // path to the game files - Char gameP[10]; // scumm name of the game + Char nameP[50]; // game name to display in list + Char pathP[150]; // path to the game files + Char gameP[10]; // scumm name of the game UInt16 gfxMode; Boolean autoLoad; @@ -75,9 +75,9 @@ typedef struct { UInt16 icnID; // icon to display on the list Boolean selected; - Char nameP[50]; // game name to display in list - Char pathP[150]; // path to the game files - Char gameP[10]; // scumm name of the game + Char nameP[50]; // game name to display in list + Char pathP[150]; // path to the game files + Char gameP[10]; // scumm name of the game UInt16 gfxMode; Boolean autoLoad; @@ -127,9 +127,9 @@ typedef struct { UInt16 icnID; // icon to display on the list Boolean selected; - Char nameP[50]; // game name to display in list - Char pathP[150]; // path to the game files - Char gameP[15]; // scumm name of the game + Char nameP[50]; // game name to display in list + Char pathP[150]; // path to the game files + Char gameP[15]; // scumm name of the game UInt16 gfxMode; Boolean autoLoad; @@ -142,13 +142,13 @@ typedef struct { UInt16 bootValue; UInt16 talkValue; UInt8 platform; - UInt8 language; // |- v2.5 + UInt8 language; // |- v2.5 - Boolean filter; // v2.6 + Boolean filter; // v2.6 Boolean fullscreen; // | Boolean aspectRatio; // |- v2.7 - MusicInfoType musicInfo;// v3.0 + MusicInfoType musicInfo;// v3.0 UInt8 engine; // |- v3.1 UInt8 renderMode; // |- v3.2 diff --git a/backends/platform/PalmOS/Src/launcher/skin.cpp b/backends/platform/PalmOS/Src/launcher/skin.cpp index 3e8b0f0b96..4c3f722aa1 100644 --- a/backends/platform/PalmOS/Src/launcher/skin.cpp +++ b/backends/platform/PalmOS/Src/launcher/skin.cpp @@ -134,7 +134,7 @@ static void SknCopyBits(DmOpenRef skinDBP, DmResID bitmapID, const RectangleType WinDrawBitmap(bmpTemp, 0, 0); WinSetDrawWindow(old); - bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL); + bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL); copy.topLeft.x = destX / 2; copy.topLeft.y = destY / 2; diff --git a/backends/platform/PalmOS/Src/native/pace.h b/backends/platform/PalmOS/Src/native/pace.h index b3e2d14593..37b903b2c3 100644 --- a/backends/platform/PalmOS/Src/native/pace.h +++ b/backends/platform/PalmOS/Src/native/pace.h @@ -89,14 +89,14 @@ extern GlobalsType global; PACE_EMULSTATE->regData[2] = pinTrap; \ return ((returnType)((PACE_CALLBACK_PTR)( \ static_cast<void *>(PACE_EMULSTATE), \ - PceNativeTrapNo(sysTrapPinsDispatch), \ + PceNativeTrapNo(sysTrapPinsDispatch), \ NULL, 0))); #define PACE_PIN_EXEC(pinTrap, returnType) \ PACE_EMULSTATE->regData[2] = pinTrap; \ return ((returnType)((PACE_CALLBACK_PTR)( \ static_cast<void *>(PACE_EMULSTATE), \ - PceNativeTrapNo(sysTrapPinsDispatch), \ + PceNativeTrapNo(sysTrapPinsDispatch), \ ¶ms, \ sizeof(params)))); diff --git a/backends/platform/PalmOS/Src/os5_renderer.cpp b/backends/platform/PalmOS/Src/os5_renderer.cpp index 4580db4d53..2c1c122a7d 100644 --- a/backends/platform/PalmOS/Src/os5_renderer.cpp +++ b/backends/platform/PalmOS/Src/os5_renderer.cpp @@ -79,10 +79,10 @@ void OSystem_PalmOS5::render_landscapeAny(RectangleType &r, PointType &p) { void OSystem_PalmOS5::render_landscape15x(RectangleType &r, PointType &p) { Coord x, y, o = 0; - int16 *dst = _workScreenP; + int16 *dst = _workScreenP; if (_overlayVisible) { - int16 *src = _overlayP; + int16 *src = _overlayP; for (y = 0; y < 100; y++) { // draw 2 lines diff --git a/backends/platform/ds/arm7/Makefile b/backends/platform/ds/arm7/Makefile index 9bb8e68b78..e6a190b1ce 100644 --- a/backends/platform/ds/arm7/Makefile +++ b/backends/platform/ds/arm7/Makefile @@ -25,7 +25,7 @@ ARCH := -mthumb-interwork # note: arm9tdmi isn't the correct CPU arch, but anything newer and LD # *insists* it has a FPU or VFP, and it won't take no for an answer! CFLAGS := -g -Wall -O2\ - -mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\ + -mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\ -ffast-math \ $(ARCH) diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp index dc2ff42fcb..0e31204ef7 100644 --- a/backends/platform/ds/arm7/source/main.cpp +++ b/backends/platform/ds/arm7/source/main.cpp @@ -547,17 +547,17 @@ void initDebugger() { while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank(); fifo_temp=REG_IPC_FIFO_RX; if (fifo_temp==0x12345678) break; - } + } - while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank(); - fifo_temp=REG_IPC_FIFO_RX; // give next value to wifi_init - Wifi_Init(fifo_temp); + while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank(); + fifo_temp=REG_IPC_FIFO_RX; // give next value to wifi_init + Wifi_Init(fifo_temp); - irqSet(IRQ_FIFO_NOT_EMPTY,arm7_fifo); // set up fifo irq - irqEnable(IRQ_FIFO_NOT_EMPTY); - REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_RECV_IRQ; + irqSet(IRQ_FIFO_NOT_EMPTY,arm7_fifo); // set up fifo irq + irqEnable(IRQ_FIFO_NOT_EMPTY); + REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_RECV_IRQ; - Wifi_SetSyncHandler(arm7_synctoarm9); // allow wifi lib to notify arm9 + Wifi_SetSyncHandler(arm7_synctoarm9); // allow wifi lib to notify arm9 // arm7 wifi init complete } diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index bc3d532e8d..116d75b191 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -268,14 +268,14 @@ endif ARM7BIN := -7 $(CURDIR)/../../arm7/arm7.bin -ICON := -b ../../../logo.bmp "ScummVM;By Neil Millstone;" +ICON := -b ../../../logo.bmp "ScummVM;By Neil Millstone;" CC = arm-eabi-gcc CXX = arm-eabi-g++ CFLAGS = -Wno-multichar -Wall\ -Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \ - -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\ + -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\ -ffast-math -mthumb-interwork ifdef USE_DEBUGGER diff --git a/backends/platform/ds/arm9/source/adpcm_arm.s b/backends/platform/ds/arm9/source/adpcm_arm.s index 38e8e60c6d..178a63bb8c 100755 --- a/backends/platform/ds/arm9/source/adpcm_arm.s +++ b/backends/platform/ds/arm9/source/adpcm_arm.s @@ -55,14 +55,14 @@ ARM_adpcm loop: LDRH r10,[r11,r2] @ r10 = stepTab[stepTableIndex] TST r12,#4 @ if ((offset & 4) == 0) - MOVEQ r9, #0 @ r9 = diff = 0 + MOVEQ r9, #0 @ r9 = diff = 0 MOVNE r9, r10 @ else r9 = diff = stepTab[stepTableIndex] TST r12,#2 @ if (offset & 2) - ADDNE r9, r9, r10,ASR #1 @ diff += r10>>1 + ADDNE r9, r9, r10,ASR #1 @ diff += r10>>1 TST r12,#1 @ if (offset & 1) - ADDNE r9, r9, r10,ASR #2 @ diff += r10>>2 + ADDNE r9, r9, r10,ASR #2 @ diff += r10>>2 ADD r9, r9, r10,ASR #3 @ diff += r10>>3 diff --git a/backends/platform/ds/arm9/source/blitters_arm.s b/backends/platform/ds/arm9/source/blitters_arm.s index 93d5db7ea9..fa7613929b 100644 --- a/backends/platform/ds/arm9/source/blitters_arm.s +++ b/backends/platform/ds/arm9/source/blitters_arm.s @@ -292,7 +292,7 @@ xLoop4: ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src0] AND r9, r14,r10,LSR #16 @ r9 = src2 LDR r9, [r13,r9, LSL #2] @ r9 = pal[src2] - MOV r10,r10,LSR #24 @ r10= src3 + MOV r10,r10,LSR #24 @ r10= src3 LDR r10,[r13,r10,LSL #2] @ r10= pal[src3] ADD r6, r6, r7 @ r6 = dst0<<2 AND r6, r8, r6, LSR #2 @ r6 = dst0 (split) @@ -322,7 +322,7 @@ xLoop4: ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src5] MOV r9, r11,LSR #24 @ r9 = src7 LDR r9, [r13,r9, LSL #2] @ r9 = pal[src7] - AND r10,r14,r12 @ r10= src8 + AND r10,r14,r12 @ r10= src8 LDR r10,[r13,r10,LSL #2] @ r10= pal[src8] ADD r6, r6, r7 @ r6 = dst4<<2 AND r6, r8, r6, LSR #2 @ r6 = dst4 (split) @@ -354,7 +354,7 @@ xLoop4: ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src10] AND r9, r14,r10 @ r9 = src12 LDR r9, [r13,r9, LSL #2] @ r9 = pal[src12] - AND r12,r14,r10,LSR #8 @ r11= src13 + AND r12,r14,r10,LSR #8 @ r11= src13 LDR r12,[r13,r12,LSL #2] @ r11= pal[src13] ADD r6, r6, r7 @ r6 = dst8<<2 AND r6, r8, r6, LSR #2 @ r6 = dst8 (split) @@ -384,7 +384,7 @@ xLoop4: ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src15] AND r9, r14,r11,LSR #8 @ r9 = src17 LDR r9, [r13,r9, LSL #2] @ r9 = pal[src17] - AND r12,r14,r11,LSR #16 @ r11= src18 + AND r12,r14,r11,LSR #16 @ r11= src18 LDR r12,[r13,r12,LSL #2] @ r11= pal[src18] ADD r6, r6, r7 @ r6 = dst12<<2 AND r6, r8, r6, LSR #2 @ r6 = dst12 (split) diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp index 2897a9364b..e8c9f55ef1 100644 --- a/backends/platform/ds/arm9/source/cdaudio.cpp +++ b/backends/platform/ds/arm9/source/cdaudio.cpp @@ -55,12 +55,12 @@ struct WaveHeader { } __attribute__ ((packed)); struct chunkHeader { - char name[4]; + char name[4]; u32 size; } __attribute__ ((packed)); struct Header { - s16 firstSample; + s16 firstSample; char stepTableIndex; char reserved; } __attribute__ ((packed)); diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index 45b76fe0f1..0aed095244 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -220,7 +220,7 @@ int hBlankCount = 0; gameListType gameList[NUM_SUPPORTED_GAMES] = { // Unknown game - use normal SCUMM controls - {"unknown", CONT_SCUMM_ORIGINAL}, + {"unknown", CONT_SCUMM_ORIGINAL}, // SCUMM games {"maniac", CONT_SCUMM_ORIGINAL}, @@ -1810,7 +1810,7 @@ void VBlankHandler(void) { if (zooming) { subScX = subScTargetX; subScY = subScTargetY; - triggerIcon(5); + triggerIcon(5); } } else if ( ((subScreenWidth) > 128 - 8) && ((subScreenWidth) < 128 + 8) ) { subScreenWidth = 128; diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h index 04be57f2eb..85212a2d01 100644 --- a/backends/platform/ds/arm9/source/dsmain.h +++ b/backends/platform/ds/arm9/source/dsmain.h @@ -42,98 +42,98 @@ enum controlType { }; struct gameListType { - char gameId[16]; - controlType control; + char gameId[16]; + controlType control; }; // Pen reading functions -void penInit(); -void penUpdate(); -bool getPenDown(); -bool getPenHeld(); -bool getPenReleased(); -int getPenX(); -int getPenY(); +void penInit(); +void penUpdate(); +bool getPenDown(); +bool getPenHeld(); +bool getPenReleased(); +int getPenX(); +int getPenY(); GLvector getPenPos(); -void consumePenEvents(); +void consumePenEvents(); // Pad reading -int getKeysHeld(); -void keysUpdate(); -int getKeysDown(); -int getKeysReleased(); -void consumeKeys(); -int leftHandedSwap(int keys); +int getKeysHeld(); +void keysUpdate(); +int getKeysDown(); +int getKeysReleased(); +void consumeKeys(); +int leftHandedSwap(int keys); // Video -void displayMode8Bit(); // Switch to 8-bit mode5 -void displayMode16Bit(); // Switch to 16-bit mode5 +void displayMode8Bit(); // Switch to 8-bit mode5 +void displayMode16Bit(); // Switch to 16-bit mode5 // Flip double buffer -void displayMode16BitFlipBuffer(); +void displayMode16BitFlipBuffer(); // Get address of current back buffer -u16* get16BitBackBuffer(); -u16* get8BitBackBuffer(); +u16* get16BitBackBuffer(); +u16* get8BitBackBuffer(); -void setTalkPos(int x, int y); -void setTopScreenTarget(int x, int y); +void setTalkPos(int x, int y); +void setTopScreenTarget(int x, int y); void set200PercentFixedScale(bool on); // Timers -void setTimerCallback(OSystem_DS::TimerProc proc, int interval); // Setup a callback function at a regular interval -int getMillis(); // Return the current runtime in milliseconds -void doTimerCallback(); // Call callback function if required +void setTimerCallback(OSystem_DS::TimerProc proc, int interval); // Setup a callback function at a regular interval +int getMillis(); // Return the current runtime in milliseconds +void doTimerCallback(); // Call callback function if required // Sound -void setSoundProc(OSystem_DS::SoundProc proc, void* param); // Setup a callback function for sound -void doSoundCallback(); // Call function if sound buffers need more data -void playSound(const void* data, u32 length, bool loop, bool adpcm = false, int rate = 22050); // Start a sound -void stopSound(int channel); +void setSoundProc(OSystem_DS::SoundProc proc, void* param); // Setup a callback function for sound +void doSoundCallback(); // Call function if sound buffers need more data +void playSound(const void* data, u32 length, bool loop, bool adpcm = false, int rate = 22050); // Start a sound +void stopSound(int channel); int getSoundFrequency(); // Event queue -void addEventsToQueue(); -void VBlankHandler(); +void addEventsToQueue(); +void VBlankHandler(); // Sam and Max Stuff -void setGameID(int id); -void setCursorIcon(const u8* icon, uint w, uint h, byte keycolor, int hotspotX, int hotspotY); +void setGameID(int id); +void setCursorIcon(const u8* icon, uint w, uint h, byte keycolor, int hotspotX, int hotspotY); void setShowCursor(bool enable); void setMouseCursorVisible(bool visible); // Shake -void setShakePos(int shakePos); +void setShakePos(int shakePos); // Reports -void memoryReport(); +void memoryReport(); // GBAMP -bool isGBAMPAvailable(); +bool isGBAMPAvailable(); // Sleep (I'd like some of that right now) -void checkSleepMode(); +void checkSleepMode(); // Virtual keyboard -void setKeyboardIcon(bool enable); -bool getKeyboardIcon(); -void setKeyboardEnable(bool en); -bool getKeyboardEnable(); +void setKeyboardIcon(bool enable); +bool getKeyboardIcon(); +void setKeyboardEnable(bool en); +bool getKeyboardEnable(); // Options -void setLeftHanded(bool enable); -void setTouchXOffset(int x); -void setTouchYOffset(int y); -void setUnscaledMode(bool enable); +void setLeftHanded(bool enable); +void setTouchXOffset(int x); +void setTouchYOffset(int y); +void setUnscaledMode(bool enable); void setSnapToBorder(bool enable); -void setIndyFightState(bool st); -bool getIndyFightState(); +void setIndyFightState(bool st); +bool getIndyFightState(); bool isCpuScalerEnabled(); void setCpuScalerEnable(bool enable); // Display -bool getIsDisplayMode8Bit(); -void setGameSize(int width, int height); +bool getIsDisplayMode8Bit(); +void setGameSize(int width, int height); int getGameWidth(); int getGameHeight(); diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c index 9594066f03..fffd8ab88b 100644 --- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c +++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c @@ -362,7 +362,7 @@ u32 FAT_NextCluster(u32 cluster) if (cluster & 0x01) { nextCluster = nextCluster >> 4; - } else { + } else { nextCluster &= 0x0FFF; } @@ -1231,7 +1231,7 @@ bool FAT_GetAlias (char* alias) // Read in the last accessed directory entry disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer); - return FAT_GetFilename (((DIR_ENT*)globalBuffer)[wrkDirOffset], alias); + return FAT_GetFilename (((DIR_ENT*)globalBuffer)[wrkDirOffset], alias); } /*----------------------------------------------------------------- @@ -1245,7 +1245,7 @@ u32 FAT_GetFileSize (void) // Read in the last accessed directory entry disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer); - return ((DIR_ENT*)globalBuffer)[wrkDirOffset].fileSize; + return ((DIR_ENT*)globalBuffer)[wrkDirOffset].fileSize; } /*----------------------------------------------------------------- @@ -1258,7 +1258,7 @@ u32 FAT_GetFileCluster (void) // Read in the last accessed directory entry disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer); - return (((DIR_ENT*)globalBuffer)[wrkDirOffset].startCluster) | (((DIR_ENT*)globalBuffer)[wrkDirOffset].startClusterHigh << 16); + return (((DIR_ENT*)globalBuffer)[wrkDirOffset].startCluster) | (((DIR_ENT*)globalBuffer)[wrkDirOffset].startClusterHigh << 16); } /*----------------------------------------------------------------- @@ -1271,7 +1271,7 @@ u8 FAT_GetFileAttributes (void) // Read in the last accessed directory entry disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer); - return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib; + return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib; } #ifdef CAN_WRITE_TO_DISC @@ -1297,7 +1297,7 @@ u8 FAT_SetFileAttributes (const char* filename, u8 attributes, u8 mask) disc_WriteSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer); - return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib; + return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib; } #endif @@ -1327,7 +1327,7 @@ time_t FAT_GetFileCreationTime (void) // Read in the last accessed directory entry disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer); - return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].cTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].cDate); + return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].cTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].cDate); } /*----------------------------------------------------------------- @@ -1340,7 +1340,7 @@ time_t FAT_GetFileLastWriteTime (void) // Read in the last accessed directory entry disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer); - return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].mTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].mDate); + return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].mTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].mDate); } #endif diff --git a/backends/platform/ds/arm9/source/fat/io_dldi.s b/backends/platform/ds/arm9/source/fat/io_dldi.s index 311d43f3ff..657e475086 100644 --- a/backends/platform/ds/arm9/source/fat/io_dldi.s +++ b/backends/platform/ds/arm9/source/fat/io_dldi.s @@ -17,7 +17,7 @@ .byte 0x01 @ Version number .byte 0x0F @32KiB @ Log [base-2] of the size of this driver in bytes. .byte 0x00 @ Sections to fix - .byte 0x0F @32KiB @ Log [base-2] of the allocated space in bytes. + .byte 0x0F @32KiB @ Log [base-2] of the allocated space in bytes. @--------------------------------------------------------------------------------- @ Text identifier - can be anything up to 47 chars + terminating null -- 16 bytes diff --git a/backends/platform/ds/arm9/source/fat/io_njsd.c b/backends/platform/ds/arm9/source/fat/io_njsd.c index 12388da8e9..d8a0ff69ac 100644 --- a/backends/platform/ds/arm9/source/fat/io_njsd.c +++ b/backends/platform/ds/arm9/source/fat/io_njsd.c @@ -445,7 +445,7 @@ static bool _NJSD_cardInit (void) { _NJSD_sendCLK (SD_CLK_200KHz, 8); _NJSD_sendCLK (SD_CLK_200KHz, 256); - _NJSD_sendCMDN (SD_CLK_200KHz, GO_IDLE_STATE, 0); + _NJSD_sendCMDN (SD_CLK_200KHz, GO_IDLE_STATE, 0); _NJSD_sendCLK (SD_CLK_200KHz, 8); for (i = 0; i < MAX_STARTUP_TRIES ; i++) { @@ -473,7 +473,7 @@ static bool _NJSD_cardInit (void) { break; } } - if (i >= MAX_STARTUP_TRIES) { + if (i >= MAX_STARTUP_TRIES) { return false; } @@ -525,7 +525,7 @@ bool _NJSD_startup(void) { bool _NJSD_writeSectors (u32 sector, u32 numSectors, const void* buffer) { - u8 crc[8]; + u8 crc[8]; u32 offset = sector * BYTES_PER_READ; u8* data = (u8*) buffer; diff --git a/backends/platform/ds/arm9/source/fat/io_nmmc.c b/backends/platform/ds/arm9/source/fat/io_nmmc.c index 261096a27b..e9331ae58e 100644 --- a/backends/platform/ds/arm9/source/fat/io_nmmc.c +++ b/backends/platform/ds/arm9/source/fat/io_nmmc.c @@ -73,7 +73,7 @@ static inline void Neo_MK2GameMode() { static inline void Neo_EnableEEPROM( bool enable ) { Neo_OpenSPI(spi_freq); if(enable) Neo_SPI(0x06); - else Neo_SPI(0x0E); + else Neo_SPI(0x0E); Neo_CloseSPI(); } @@ -294,7 +294,7 @@ bool NMMC_WriteSectors (u32 sector, u8 numSecs, void* buffer) Neo_SPI( 0xFF ); // Send fake CRC16 Neo_SPI( 0xFF ); // Send fake CRC16 - Neo_SPI (0xFF); // Send 8 clocks + Neo_SPI (0xFF); // Send 8 clocks while( Neo_SPI( 0xFF ) == 0x00 ); // Wait for the busy signal to clear diff --git a/backends/platform/ds/arm9/source/fat/io_sd_common.c b/backends/platform/ds/arm9/source/fat/io_sd_common.c index ade9df0d80..36d4a3bfc8 100644 --- a/backends/platform/ds/arm9/source/fat/io_sd_common.c +++ b/backends/platform/ds/arm9/source/fat/io_sd_common.c @@ -169,7 +169,7 @@ bool _SD_InitCard (_SD_FN_CMD_6BYTE_RESPONSE cmd_6byte_response, break; } } - if (i >= MAX_STARTUP_TRIES) { + if (i >= MAX_STARTUP_TRIES) { return false; } diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp index 5927f204da..5ff162cc4f 100644 --- a/backends/platform/ds/arm9/source/touchkeyboard.cpp +++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp @@ -194,7 +194,7 @@ void drawKeyboard(int tileBase, int mapBase, u16* saveSpace) { for (int y = 0 ; y < 8; y++) { for (int x = 0; x < 2; x++) { *(tileAddr + (y * 2) + x) =(*(src + (y * 752) + (x * 4) + 0) & 0x0F) - | ((*(src + (y * 752) + (x * 4) + 1) & 0x0F) << 4) + | ((*(src + (y * 752) + (x * 4) + 1) & 0x0F) << 4) | ((*(src + (y * 752) + (x * 4) + 2) & 0x0F) << 8) | ((*(src + (y * 752) + (x * 4) + 3) & 0x0F) << 12); @@ -317,7 +317,7 @@ void clearAutoComplete() { void typeCompletion(int current) { Common::Event event; - OSystem_DS* system = OSystem_DS::instance(); + OSystem_DS* system = OSystem_DS::instance(); strcat(autoCompleteBuffer, &autoCompleteWord[current][charactersEntered]); strcat(autoCompleteBuffer, " "); @@ -350,7 +350,7 @@ void updateTypeEvents() if (autoCompleteBuffer[0] != '\0') { Common::Event event; - OSystem_DS* system = OSystem_DS::instance(); + OSystem_DS* system = OSystem_DS::instance(); event.kbd.keycode = (Common::KeyCode) autoCompleteBuffer[0]; event.kbd.ascii = autoCompleteBuffer[0]; @@ -433,7 +433,7 @@ void addKeyboardEvents() { for (int r = 0; r < DS_NUM_KEYS; r++) { if (( (tx >= keys[r].x) && (tx <= keys[r].x + 1)) && (ty >= keys[r].y) && (ty <= keys[r].y + 1)) { - OSystem_DS* system = OSystem_DS::instance(); + OSystem_DS* system = OSystem_DS::instance(); Common::Event event; // consolePrintf("Key: %d\n", r); @@ -491,7 +491,7 @@ void addKeyboardEvents() { if (keys[r].pressed) { DS::setKeyHighlight(r, false); - OSystem_DS* system = OSystem_DS::instance(); + OSystem_DS* system = OSystem_DS::instance(); Common::Event event; createKeyEvent(r, event); diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp index 7af0718a44..8ba56c2b7c 100644 --- a/backends/platform/ds/arm9/source/zipreader.cpp +++ b/backends/platform/ds/arm9/source/zipreader.cpp @@ -98,7 +98,7 @@ bool ZipFile::currentFileInFolder() { if (_directory[0] == 0) { // Root directory name[strlen(name) - 1] = 0; - return !strchr(name, '\\'); // Not in root if contains a / character before the last character + return !strchr(name, '\\'); // Not in root if contains a / character before the last character } else { /* if (name starts with directory && it's not the directory && (no slashes after the directory || it's the last character) @@ -170,7 +170,7 @@ int ZipFile::getFileSize() { } bool ZipFile::isDirectory() { - return _currentFile->fileSize == 0; // This is a bit wrong, but seems to work. + return _currentFile->fileSize == 0; // This is a bit wrong, but seems to work. } char* ZipFile::getFile() { diff --git a/backends/platform/gp2x/events.cpp b/backends/platform/gp2x/events.cpp index d9ff45130a..b68c2619cc 100644 --- a/backends/platform/gp2x/events.cpp +++ b/backends/platform/gp2x/events.cpp @@ -214,7 +214,7 @@ void OSystem_GP2X::moveStick() { } else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])){ if (_km.y_down_count!=2){ _km.y_vel = 1; - _km.y_down_count = 1; + _km.y_down_count = 1; }else _km.y_vel = 4; } @@ -297,7 +297,7 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) { Combos: GP2X_BUTTON_VOLUP & GP2X_BUTTON_VOLDOWN 0 (For Monkey 2 CP) - GP2X_BUTTON_L & GP2X_BUTTON_SELECT Common::EVENT_QUIT (Calls Sync() to make sure SD is flushed) + GP2X_BUTTON_L & GP2X_BUTTON_SELECT Common::EVENT_QUIT (Calls Sync() to make sure SD is flushed) GP2X_BUTTON_L & GP2X_BUTTON_Y Toggles setZoomOnMouse() for larger then 320*240 games to scale to the point + raduis. GP2X_BUTTON_L & GP2X_BUTTON_A Common::EVENT_PREDICTIVE_DIALOG for predictive text entry box (AGI games) */ diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h index 1aa5107fcc..3d4a4c90a0 100644 --- a/backends/platform/gp2x/gp2x-common.h +++ b/backends/platform/gp2x/gp2x-common.h @@ -309,7 +309,7 @@ protected: int16 x, y; // The size and hotspot of the original cursor image. - int16 w, h; + int16 w, h; int16 hotX, hotY; // The size and hotspot of the pre-scaled cursor image, in real diff --git a/backends/platform/gp2x/graphics.cpp b/backends/platform/gp2x/graphics.cpp index 1aa7519f86..2f16cf7068 100644 --- a/backends/platform/gp2x/graphics.cpp +++ b/backends/platform/gp2x/graphics.cpp @@ -1222,29 +1222,29 @@ void OSystem_GP2X::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x _mouseKeyColor = keycolor; - _cursorTargetScale = cursorTargetScale; + _cursorTargetScale = cursorTargetScale; - if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) { - _mouseCurState.w = w; - _mouseCurState.h = h; + if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) { + _mouseCurState.w = w; + _mouseCurState.h = h; - if (_mouseOrigSurface) - SDL_FreeSurface(_mouseOrigSurface); + if (_mouseOrigSurface) + SDL_FreeSurface(_mouseOrigSurface); // Allocate bigger surface because AdvMame2x adds black pixel at [0,0] - _mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, - _mouseCurState.w + 2, - _mouseCurState.h + 2, - 16, - _hwscreen->format->Rmask, - _hwscreen->format->Gmask, - _hwscreen->format->Bmask, - _hwscreen->format->Amask); - - if (_mouseOrigSurface == NULL) - error("allocating _mouseOrigSurface failed"); - SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey); - } + _mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, + _mouseCurState.w + 2, + _mouseCurState.h + 2, + 16, + _hwscreen->format->Rmask, + _hwscreen->format->Gmask, + _hwscreen->format->Bmask, + _hwscreen->format->Amask); + + if (_mouseOrigSurface == NULL) + error("allocating _mouseOrigSurface failed"); + SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey); + } free(_mouseData); @@ -1260,7 +1260,7 @@ void OSystem_GP2X::blitCursor() { int w, h, i, j; if (!_mouseOrigSurface || !_mouseData) - return; + return; w = _mouseCurState.w; h = _mouseCurState.h; @@ -1297,7 +1297,7 @@ void OSystem_GP2X::blitCursor() { srcPtr++; } dstPtr += _mouseOrigSurface->pitch - w * 2; - } + } int rW, rH; @@ -1338,7 +1338,7 @@ void OSystem_GP2X::blitCursor() { _mouseCurState.vH = h; _mouseCurState.vHotX = _mouseCurState.hotX; _mouseCurState.vHotY = _mouseCurState.hotY; - } + } int rH1 = rH; // store original to pass to aspect-correction function later if (_adjustAspectRatio && _cursorTargetScale == 1) { @@ -1366,7 +1366,7 @@ void OSystem_GP2X::blitCursor() { error("allocating _mouseSurface failed"); SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey); - } + } SDL_LockSurface(_mouseSurface); @@ -1429,7 +1429,7 @@ void OSystem_GP2X::undrawMouse() { void OSystem_GP2X::drawMouse() { if (!_mouseVisible || !_mouseSurface) { _mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0; - return; + return; } SDL_Rect zoomdst; diff --git a/backends/platform/gp32/Makefile b/backends/platform/gp32/Makefile index d3ae963ca2..327bee9d10 100644 --- a/backends/platform/gp32/Makefile +++ b/backends/platform/gp32/Makefile @@ -56,7 +56,7 @@ GPSDK = /usr/compat/gp32/share/sdk LDSPECS = -specs=gp32_gpsdk.specs -LDFLAGS = $(STRIP_DEBUG) -Wl,-Map,$(MAPFILE) $(LDSPECS) -Wl,--no-warn-mismatch +LDFLAGS = $(STRIP_DEBUG) -Wl,-Map,$(MAPFILE) $(LDSPECS) -Wl,--no-warn-mismatch LIBS += -L$(GPSDK)/lib \ -lgpmem -lgpos -lgpstdio -lgpstdlib -lgpsound -lgpgraphic -lgpfont \ @@ -75,7 +75,7 @@ FXE = scummvm.fxe # Plugins hack srcdir = ./ -DEFINES = -D__GP32__ +DEFINES = -D__GP32__ DEFINES += -DNONSTANDARD_PORT # Disable new themes. GP32 has LOW memory! @@ -132,7 +132,7 @@ OBJS += backends/platform/gp32/gp32std.o \ #backends/platform/gp32/dmaaudio.o \ #Main ScummVM for the GP32 Backend -OBJS += backends/platform/gp32/gp32_main.o \ +OBJS += backends/platform/gp32/gp32_main.o \ backends/platform/gp32/gp32_launcher.o \ backends/platform/gp32/gp32_osys.o \ backends/fs/gp32/gp32-fs.o diff --git a/backends/platform/gp32/debug-gdbstub-usb.cpp b/backends/platform/gp32/debug-gdbstub-usb.cpp index 9899ae47ec..76b7fad13b 100644 --- a/backends/platform/gp32/debug-gdbstub-usb.cpp +++ b/backends/platform/gp32/debug-gdbstub-usb.cpp @@ -141,7 +141,7 @@ static char * arm_register_name_strings[] = // Some USB stuff GPN_DESC g_CommDesc; GPN_COMM g_Comm; -const char HexDigits[17] = "0123456789abcdef"; +const char HexDigits[17] = "0123456789abcdef"; char g_SendBuffer[256]; char g_TempBuffer[256]; char g_ReadBuffer[0x100]; @@ -592,7 +592,7 @@ int GetBytes(char *pBuffer) void SendMemory(void *pAddr, int iBytes) { unsigned char *pData; - unsigned char iData; + unsigned char iData; int iBufferPos = 0; int iBytesToSend; char Byte; @@ -1016,7 +1016,7 @@ void BreakPoint() int iResult; int iMessageLength; int iOffsetAdd; - int iNullVal = 0; + int iNullVal = 0; void *pAddr; int iOffset; int iBytes; @@ -1871,7 +1871,7 @@ unsigned int DecodeLSRO(lsro Instr, unsigned int uiPC) unsigned int DecodeLSM(lsm Instr, unsigned int uiPC) { unsigned int uiRnValue = g_Registers[Instr.Rn]; - unsigned int uiOffsetToPC = 0; + unsigned int uiOffsetToPC = 0; unsigned int uiMemValue; // Make sure PC is destination and it's Load instruction diff --git a/backends/platform/gp32/gp32std_memory.h b/backends/platform/gp32/gp32std_memory.h index 6fe5804453..b824e33838 100644 --- a/backends/platform/gp32/gp32std_memory.h +++ b/backends/platform/gp32/gp32std_memory.h @@ -30,6 +30,6 @@ extern void * gp_memcpy(void *dst, const void *src, size_t count); extern void * gp_memset(void *dst, int val, size_t count); extern void * gp_malloc(size_t size); extern void * gp_calloc(size_t nitems, size_t size); -extern void gp_free(void *block); +extern void gp_free(void *block); #endif diff --git a/backends/platform/iphone/iphone_keyboard.m b/backends/platform/iphone/iphone_keyboard.m index 923b7be46d..dc2d417746 100644 --- a/backends/platform/iphone/iphone_keyboard.m +++ b/backends/platform/iphone/iphone_keyboard.m @@ -42,7 +42,7 @@ - (id)initWithKeyboard:(SoftKeyboard*)keyboard; { self = [super initWithFrame:CGRectMake(0.0f, 0.0f, 0.0f, 0.0f)]; - softKeyboard = keyboard; + softKeyboard = keyboard; return self; } @@ -85,4 +85,4 @@ [inputDelegate handleKeyPress:c]; } -@end
\ No newline at end of file +@end diff --git a/backends/platform/iphone/iphone_video.m b/backends/platform/iphone/iphone_video.m index d3a0b00bbe..6c6944045e 100644 --- a/backends/platform/iphone/iphone_video.m +++ b/backends/platform/iphone/iphone_video.m @@ -70,7 +70,7 @@ void iPhone_initSurface(int width, int height, bool landscape) { _height = height; _landscape = landscape; - [sharedInstance performSelectorOnMainThread:@selector(initSurface) withObject:nil waitUntilDone: YES]; + [sharedInstance performSelectorOnMainThread:@selector(initSurface) withObject:nil waitUntilDone: YES]; } bool iPhone_fetchEvent(int *outEvent, float *outX, float *outY) { @@ -134,14 +134,14 @@ bool getLocalMouseCoords(CGPoint *point) { - (void)drawRect:(CGRect)frame { // if (lastTick == 0) { - // lastTick = time(0); + // lastTick = time(0); // } // // frames++; // if (time(0) > lastTick) { - // lastTick = time(0); - // printf("FPS: %i\n", frames); - // frames = 0; + // lastTick = time(0); + // printf("FPS: %i\n", frames); + // frames = 0; // } } @@ -336,25 +336,25 @@ bool getLocalMouseCoords(CGPoint *point) { // struct CGPoint point = GSEventGetLocationInWindow(event); // // if (!getLocalMouseCoords(&point)) - // return; + // return; // // [self addEvent: - // [[NSDictionary alloc] initWithObjectsAndKeys: - // [NSNumber numberWithInt:kInputMouseSecondToggled], @"type", - // [NSNumber numberWithFloat:point.x], @"x", - // [NSNumber numberWithFloat:point.y], @"y", - // nil - // ] + // [[NSDictionary alloc] initWithObjectsAndKeys: + // [NSNumber numberWithInt:kInputMouseSecondToggled], @"type", + // [NSNumber numberWithFloat:point.x], @"x", + // [NSNumber numberWithFloat:point.y], @"y", + // nil + // ] // ]; } - (void)mouseExited:(GSEvent*)event { //printf("mouseExited().\n"); // [self addEvent: - // [[NSDictionary alloc] initWithObjectsAndKeys: - // @"mouseExited", @"type", - // nil - // ] + // [[NSDictionary alloc] initWithObjectsAndKeys: + // @"mouseExited", @"type", + // nil + // ] // ]; } diff --git a/backends/platform/iphone/osys_iphone.cpp b/backends/platform/iphone/osys_iphone.cpp index 2ca629d0e2..5bbb1b4ca9 100644 --- a/backends/platform/iphone/osys_iphone.cpp +++ b/backends/platform/iphone/osys_iphone.cpp @@ -728,7 +728,7 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) { //printf("Mouse dragged at (%u, %u)\n", x, y); if (_secondaryTapped) { if (_gestureStartX == -1 || _gestureStartY == -1) { - return false; + return false; } int vecX = (x - _gestureStartX); diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 59b05c8e0b..384ec1f935 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -465,7 +465,7 @@ void OSystem_PS2::soundThread(void) { " addiu $t8, 32\n\t" " bnez $t9, loop\n\t" // loop : // outputs - : "r"(soundBufL), "r"(soundBufR) // inputs + : "r"(soundBufL), "r"(soundBufR) // inputs // : "$t2", "$t3", "$t4", "$t5", "$t6", "$t7", "$t8", "$t9" // destroyed : "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25" // destroyed ); diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile index 2ff47e057b..094eac9c18 100644 --- a/backends/platform/psp/Makefile +++ b/backends/platform/psp/Makefile @@ -20,8 +20,8 @@ LD = psp-gcc AR = psp-ar cru RANLIB = psp-ranlib STRIP = psp-strip -MKDIR = mkdir -p -RM = rm -f +MKDIR = mkdir -p +RM = rm -f MKSFO = mksfo PACK_PBP = pack-pbp FIXUP = psp-fixup-imports diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP index 9fff9178bd..1f3aa6a10a 100644 --- a/backends/platform/psp/README.PSP +++ b/backends/platform/psp/README.PSP @@ -12,12 +12,12 @@ Installation Controls ======== -Left trigger - ESC -Right trigger - Enter -Analog - Mouse movement +Left trigger - ESC +Right trigger - Enter +Analog - Mouse movement Directionals - Mouse movement Analog + triangle - Fine control mouse -Cross - Mouse button 1 +Cross - Mouse button 1 Circle - Mouse button 2 Square - '.' (skip dialogue in some games) Select - Show/Hide Virtual Keyboard @@ -76,9 +76,9 @@ To build ScummVM for PSP you need: - PSP toolchain (svn co svn://svn.pspdev.org/psp/trunk/psptoolchain) -- PSPSDK (svn co svn://svn.pspdev.org/psp/trunk/pspsdk) - Note: This usually gets installed by the PSP toolchain, - so you don't have to do it manually. +- PSPSDK (svn co svn://svn.pspdev.org/psp/trunk/pspsdk) + Note: This usually gets installed by the PSP toolchain, + so you don't have to do it manually. - SDL (svn co svn://svn.pspdev.org/psp/trunk/SDL) diff --git a/backends/platform/psp/osys_psp_gu.cpp b/backends/platform/psp/osys_psp_gu.cpp index 8925300c51..7e36fe6db0 100644 --- a/backends/platform/psp/osys_psp_gu.cpp +++ b/backends/platform/psp/osys_psp_gu.cpp @@ -65,7 +65,7 @@ unsigned char kbd_ascii_cl[] = {'!', '@', '#', '$', '%', '^', '&', '*', '(', ')' Common::KeyCode kbd_code_cl[] = {Common::KEYCODE_EXCLAIM, Common::KEYCODE_AT, Common::KEYCODE_HASH, Common::KEYCODE_DOLLAR, (Common::KeyCode)37, Common::KEYCODE_CARET, Common::KEYCODE_AMPERSAND, Common::KEYCODE_ASTERISK, Common::KEYCODE_LEFTPAREN, Common::KEYCODE_RIGHTPAREN, Common::KEYCODE_UNDERSCORE, Common::KEYCODE_PLUS, (Common::KeyCode)123, (Common::KeyCode)125, (Common::KeyCode)124, Common::KEYCODE_COLON, Common::KEYCODE_QUOTEDBL, Common::KEYCODE_LESS, Common::KEYCODE_GREATER, Common::KEYCODE_QUESTION, (Common::KeyCode)126}; #define CAPS_LOCK (1 << 0) -#define SYMBOLS (1 << 1) +#define SYMBOLS (1 << 1) OSystem_PSP_GU::OSystem_PSP_GU() { @@ -278,9 +278,9 @@ void OSystem_PSP_GU::updateScreen() { sceGuClutLoad(32, clut256); // upload 32*8 entries (256) sceGuTexMode(GU_PSM_T8, 0, 0, 0); // 8-bit image if (_screenWidth == 320) - sceGuTexImage(0, 512, 256, _screenWidth, _offscreen); + sceGuTexImage(0, 512, 256, _screenWidth, _offscreen); else - sceGuTexImage(0, 512, 512, _screenWidth, _offscreen); + sceGuTexImage(0, 512, 512, _screenWidth, _offscreen); sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGB); sceGuTexFilter(GU_LINEAR, GU_LINEAR); sceGuTexOffset(0,0); @@ -349,7 +349,7 @@ void OSystem_PSP_GU::updateScreen() { } // draw mouse - if (_mouseVisible) { + if (_mouseVisible) { sceGuTexMode(GU_PSM_T8, 0, 0, 0); // 8-bit image sceGuClutMode(GU_PSM_5551, 0, 0xff, 0); sceGuClutLoad(32, mouseClut); // upload 32*8 entries (256) diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp index eb71a1ba0e..b9d1e37c05 100644 --- a/backends/platform/sdl/graphics.cpp +++ b/backends/platform/sdl/graphics.cpp @@ -1289,29 +1289,29 @@ void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, _mouseKeyColor = keycolor; - _cursorTargetScale = cursorTargetScale; + _cursorTargetScale = cursorTargetScale; - if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) { - _mouseCurState.w = w; - _mouseCurState.h = h; + if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) { + _mouseCurState.w = w; + _mouseCurState.h = h; - if (_mouseOrigSurface) - SDL_FreeSurface(_mouseOrigSurface); + if (_mouseOrigSurface) + SDL_FreeSurface(_mouseOrigSurface); // Allocate bigger surface because AdvMame2x adds black pixel at [0,0] - _mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, - _mouseCurState.w + 2, - _mouseCurState.h + 2, - 16, - _hwscreen->format->Rmask, - _hwscreen->format->Gmask, - _hwscreen->format->Bmask, - _hwscreen->format->Amask); - - if (_mouseOrigSurface == NULL) - error("allocating _mouseOrigSurface failed"); - SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey); - } + _mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, + _mouseCurState.w + 2, + _mouseCurState.h + 2, + 16, + _hwscreen->format->Rmask, + _hwscreen->format->Gmask, + _hwscreen->format->Bmask, + _hwscreen->format->Amask); + + if (_mouseOrigSurface == NULL) + error("allocating _mouseOrigSurface failed"); + SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey); + } free(_mouseData); @@ -1327,7 +1327,7 @@ void OSystem_SDL::blitCursor() { int w, h, i, j; if (!_mouseOrigSurface || !_mouseData) - return; + return; w = _mouseCurState.w; h = _mouseCurState.h; @@ -1364,7 +1364,7 @@ void OSystem_SDL::blitCursor() { srcPtr++; } dstPtr += _mouseOrigSurface->pitch - w * 2; - } + } int rW, rH; @@ -1405,7 +1405,7 @@ void OSystem_SDL::blitCursor() { _mouseCurState.vH = h; _mouseCurState.vHotX = _mouseCurState.hotX; _mouseCurState.vHotY = _mouseCurState.hotY; - } + } #ifndef DISABLE_SCALERS int rH1 = rH; // store original to pass to aspect-correction function later @@ -1436,7 +1436,7 @@ void OSystem_SDL::blitCursor() { error("allocating _mouseSurface failed"); SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey); - } + } SDL_LockSurface(_mouseSurface); @@ -1510,7 +1510,7 @@ void OSystem_SDL::undrawMouse() { void OSystem_SDL::drawMouse() { if (!_mouseVisible || !_mouseSurface) { _mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0; - return; + return; } SDL_Rect dst; diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 827e8c300b..1ddd74693c 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -312,7 +312,7 @@ protected: int16 x, y; // The size and hotspot of the original cursor image. - int16 w, h; + int16 w, h; int16 hotX, hotY; // The size and hotspot of the pre-scaled cursor image, in real diff --git a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl index 7b07993c4e..a40f8b7663 100644 --- a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl +++ b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl @@ -320,7 +320,7 @@ my $header = " { PrintErrorMessage("'abld build $TargetName urel' apparently failed."); if ($HaltOnError) - { + { PrintErrorMessage("Halting on error as requested!"); exit 1; } diff --git a/backends/platform/symbian/S60/ScummVM_S60.mmp.in b/backends/platform/symbian/S60/ScummVM_S60.mmp.in index 2720264971..099b33ed95 100644 --- a/backends/platform/symbian/S60/ScummVM_S60.mmp.in +++ b/backends/platform/symbian/S60/ScummVM_S60.mmp.in @@ -63,8 +63,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version +SYSTEMINCLUDE \epoc32\include\ESDL +SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version SYSTEMINCLUDE \epoc32\include\libc SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in index ae43031356..f175ecc05c 100644 --- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in +++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in @@ -41,7 +41,7 @@ TARGETPATH \Resource\Apps LANG SC END -SOURCEPATH ..\res +SOURCEPATH ..\res START RESOURCE ScummVM.rss HEADER TARGETPATH \Resource\Apps @@ -89,8 +89,8 @@ staticlibrary rate_arm_asm.o codec47ARM.o gfxARM.o USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version +SYSTEMINCLUDE \epoc32\include\ESDL +SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version SYSTEMINCLUDE \epoc32\include\libc SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/S80/ScummVM_S80.mmp.in b/backends/platform/symbian/S80/ScummVM_S80.mmp.in index 326e895941..95879dd2af 100644 --- a/backends/platform/symbian/S80/ScummVM_S80.mmp.in +++ b/backends/platform/symbian/S80/ScummVM_S80.mmp.in @@ -61,8 +61,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version +SYSTEMINCLUDE \epoc32\include\ESDL +SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version SYSTEMINCLUDE \epoc32\include\libc SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/S90/Scummvm_S90.mmp.in b/backends/platform/symbian/S90/Scummvm_S90.mmp.in index df8872515f..47a3d9a1d4 100644 --- a/backends/platform/symbian/S90/Scummvm_S90.mmp.in +++ b/backends/platform/symbian/S90/Scummvm_S90.mmp.in @@ -61,8 +61,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version +SYSTEMINCLUDE \epoc32\include\ESDL +SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version SYSTEMINCLUDE \epoc32\include\libc SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in b/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in index cfd6c27fd6..e9dff7b94f 100644 --- a/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in +++ b/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in @@ -59,8 +59,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version +SYSTEMINCLUDE \epoc32\include\ESDL +SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version SYSTEMINCLUDE \epoc32\include\libc SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in index 0b43f7b4c6..634b41a60f 100644 --- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in +++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in @@ -41,7 +41,7 @@ TARGETPATH \Resource\Apps LANG SC END -SOURCEPATH . +SOURCEPATH . START RESOURCE ScummVM.rss HEADER TARGETPATH \Resource\Apps @@ -89,8 +89,8 @@ staticlibrary rate_arm_asm.o codec47ARM.o gfxARM.o USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version +SYSTEMINCLUDE \epoc32\include\ESDL +SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version SYSTEMINCLUDE \epoc32\include\libc SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in index 13df4c2460..7bccafc5e1 100644 --- a/backends/platform/symbian/mmp/scummvm_base.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in @@ -67,8 +67,8 @@ ALWAYS_BUILD_AS_ARM USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version +SYSTEMINCLUDE \epoc32\include\ESDL +SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version SYSTEMINCLUDE \epoc32\include\libc SYSTEMINCLUDE \epoc32\include\tremor SYSTEMINCLUDE \epoc32\include @@ -119,6 +119,6 @@ source backends\timer\default\default-timer.cpp source backends\saves\savefile.cpp source backends\saves\default\default-saves.cpp source backends\saves\compressed\compressed-saves.cpp -source engines\engine.cpp +source engines\engine.cpp // backend specific includes // backend specific includes diff --git a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in index a079297364..fabaaf232f 100644 --- a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in @@ -65,7 +65,7 @@ SOURCEPATH ..\..\..\..\engines\scumm USERINCLUDE ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version +SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version SYSTEMINCLUDE \epoc32\include\libc SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/src/ScummApp.cpp b/backends/platform/symbian/src/ScummApp.cpp index cb08ccdd42..82e62412e8 100644 --- a/backends/platform/symbian/src/ScummApp.cpp +++ b/backends/platform/symbian/src/ScummApp.cpp @@ -77,7 +77,7 @@ CApaApplication* NewApplication() { #include <eikstart.h> // E32Main() contains the program's start up code, the entry point for an EXE. GLDEF_C TInt E32Main() { - return EikStart::RunApplication(NewApplication); + return EikStart::RunApplication(NewApplication); } #endif diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index e76f6a93df..341f551716 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -243,7 +243,7 @@ void OSystem_SDL_Symbian::symbianMixCallback(void *s, byte *samples, int len) { void OSystem_SDL_Symbian::symbianMix(byte *samples, int len) { // If not stereo then we need to downmix if (_channels != 2) { - _sound_proc(_sound_proc_param, _stereo_mix_buffer, len * 2); + _sound_proc(_sound_proc_param, _stereo_mix_buffer, len * 2); int16 *bitmixDst = (int16 *)samples; int16 *bitmixSrc = (int16 *)_stereo_mix_buffer; @@ -440,7 +440,7 @@ struct TSymbianFileEntry { #define FILE void -FILE* symbian_fopen(const char* name, const char* mode) { +FILE* symbian_fopen(const char* name, const char* mode) { TSymbianFileEntry* fileEntry = new TSymbianFileEntry; if (fileEntry != NULL) { diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index cfaafe9ece..5db6c99da6 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -98,7 +98,7 @@ return (SIGND (dl1) ? -l : l); } - /* okay, okay: I admit it: I absolutely have _NO_ idea why __fixdfdi does not get linked in by gcc from libgcc.a + /* okay, okay: I admit it: I absolutely have _NO_ idea why __fixdfdi does not get linked in by gcc from libgcc.a because I know it's in there: I checked with `ar x _fixdfdi.o libgcc.a` and the symbol is in there, so I'm lost and had to fix it this way. I tried all gcc and ld options I could find: no hope :( If someone can enlighten me: feel free to let me know at sumthinwicked@users.sf.net! Much obliged. diff --git a/backends/platform/wince/missing/dirent.h b/backends/platform/wince/missing/dirent.h index 82dd0b2ee7..07e54bbb9d 100644 --- a/backends/platform/wince/missing/dirent.h +++ b/backends/platform/wince/missing/dirent.h @@ -7,7 +7,7 @@ struct dirent long d_ino; /* Always zero. */ unsigned short d_reclen; /* Always zero. */ unsigned short d_namlen; /* Length of name in d_name. */ - char* d_name; /* File name. */ + char* d_name; /* File name. */ /* NOTE: The name in the dirent structure points to the name in the * finddata_t structure in the DIR. */ }; @@ -44,7 +44,7 @@ typedef struct DIR* opendir (const char*); struct dirent* readdir (DIR*); -int closedir (DIR*); +int closedir (DIR*); /* void rewinddir (DIR*); long telldir (DIR*); diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index 3123baa7fb..8cf5fac279 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -1122,7 +1122,7 @@ bool OSystem_WINCE3::update_scalers() { _adjustAspectRatio = false; if (CEDevice::hasPocketPCResolution()) { - if ( (!_orientationLandscape && (_screenWidth == 320 || !_screenWidth)) + if ( (!_orientationLandscape && (_screenWidth == 320 || !_screenWidth)) || CEDevice::hasSquareQVGAResolution() ) { if (getScreenWidth() != 320) { _scaleFactorXm = 3; @@ -1157,14 +1157,14 @@ bool OSystem_WINCE3::update_scalers() { _scalerProc = Normal1x; _modeFlags = 0; } - } else if (_screenWidth == 640 && !(isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) { + } else if (_screenWidth == 640 && !(isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) { _scaleFactorXm = 1; _scaleFactorXd = 2; _scaleFactorYm = 1; _scaleFactorYd = 2; _scalerProc = PocketPCHalf; _modeFlags = 0; - } else if (_screenWidth == 640 && (isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) { + } else if (_screenWidth == 640 && (isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) { _scaleFactorXm = 1; _scaleFactorXd = 1; _scaleFactorYm = 1; @@ -2433,7 +2433,7 @@ void OSystem_WINCE3::getTimeAndDate(struct tm &t) const { SYSTEMTIME systime; GetLocalTime(&systime); - t.tm_year = systime.wYear - 1900; + t.tm_year = systime.wYear - 1900; t.tm_mon = systime.wMonth - 1; t.tm_wday = systime.wDayOfWeek; t.tm_mday = systime.wDay; diff --git a/backends/platform/x11/x11.cpp b/backends/platform/x11/x11.cpp index 3c809c8c06..329d994335 100644 --- a/backends/platform/x11/x11.cpp +++ b/backends/platform/x11/x11.cpp @@ -439,7 +439,7 @@ void OSystem_X11::setPalette(const byte *colors, uint start, uint num) { _palette_changed = true; } -#define AddDirtyRec(xi,yi,wi,hi) \ +#define AddDirtyRec(xi,yi,wi,hi) \ if (_num_of_dirty_rects < MAX_NUMBER_OF_DIRTY_RECTS) { \ _ds[_num_of_dirty_rects].x = xi; \ _ds[_num_of_dirty_rects].y = yi; \ diff --git a/base/version.h b/base/version.h index 268fd5667e..1ad6d48b8b 100644 --- a/base/version.h +++ b/base/version.h @@ -29,6 +29,6 @@ extern const char *gScummVMVersion; // e.g. "0.4.1" extern const char *gScummVMBuildDate; // e.g. "2003-06-24" extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)" extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)" -extern const char *gScummVMFeatures; // e.g. "ALSA MPEG2 zLib" +extern const char *gScummVMFeatures; // e.g. "ALSA MPEG2 zLib" #endif diff --git a/common/events.h b/common/events.h index 6e6485f184..55392fc7db 100644 --- a/common/events.h +++ b/common/events.h @@ -78,24 +78,24 @@ enum EventType { * Implementation wise, we might want to use the classic * union-of-structs trick. It goes roughly like this: * struct BasicEvent { - * EventType type; + * EventType type; * }; * struct MouseMovedEvent : BasicEvent { - * Common::Point pos; + * Common::Point pos; * }; * struct MouseButtonEvent : MouseMovedEvent { - * int button; + * int button; * }; * struct KeyEvent : BasicEvent { - * ... + * ... * }; * ... * union Event { * EventType type; - * MouseMovedEvent mouse; - * MouseButtonEvent button; - * KeyEvent key; - * ... + * MouseMovedEvent mouse; + * MouseButtonEvent button; + * KeyEvent key; + * ... * }; */ struct Event { diff --git a/common/file.cpp b/common/file.cpp index 3ddd3d2cc5..ccfeb5f322 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -77,18 +77,18 @@ #include "backends/fs/ds/ds-fs.h" - //void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp - //void std_fflush(FILE* handle); // used in common/util.cpp + //void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp + //void std_fflush(FILE* handle); // used in common/util.cpp - //char* std_fgets(char* str, int size, FILE* file); // not used - //int std_getc(FILE* handle); // not used - //char* std_getcwd(char* dir, int dunno); // not used - //void std_cwd(char* dir); // not used - //int std_ferror(FILE* handle); // not used + //char* std_fgets(char* str, int size, FILE* file); // not used + //int std_getc(FILE* handle); // not used + //char* std_getcwd(char* dir, int dunno); // not used + //void std_cwd(char* dir); // not used + //int std_ferror(FILE* handle); // not used // Only functions used in the ScummVM source have been defined here! - #define fopen(name, mode) DS::std_fopen(name, mode) - #define fclose(handle) DS::std_fclose(handle) + #define fopen(name, mode) DS::std_fopen(name, mode) + #define fclose(handle) DS::std_fclose(handle) #define fread(ptr, size, items, file) DS::std_fread(ptr, size, items, file) #define fwrite(ptr, size, items, file) DS::std_fwrite(ptr, size, items, file) #define feof(handle) DS::std_feof(handle) @@ -114,18 +114,18 @@ #define FILE void - FILE* symbian_fopen(const char* name, const char* mode); - void symbian_fclose(FILE* handle); - size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle); - size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle); - bool symbian_feof(FILE* handle); + FILE* symbian_fopen(const char* name, const char* mode); + void symbian_fclose(FILE* handle); + size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle); + size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle); + bool symbian_feof(FILE* handle); long int symbian_ftell(FILE* handle); - int symbian_fseek(FILE* handle, long int offset, int whence); - void symbian_clearerr(FILE* handle); + int symbian_fseek(FILE* handle, long int offset, int whence); + void symbian_clearerr(FILE* handle); // Only functions used in the ScummVM source have been defined here! - #define fopen(name, mode) symbian_fopen(name, mode) - #define fclose(handle) symbian_fclose(handle) + #define fopen(name, mode) symbian_fopen(name, mode) + #define fclose(handle) symbian_fclose(handle) #define fread(ptr, size, items, file) symbian_fread(ptr, size, items, file) #define fwrite(ptr, size, items, file) symbian_fwrite(ptr, size, items, file) #define feof(handle) symbian_feof(handle) diff --git a/common/iff_container.h b/common/iff_container.h index 10175d42e9..9d477276fc 100644 --- a/common/iff_container.h +++ b/common/iff_container.h @@ -218,11 +218,11 @@ public: return &_chunk; } - IFF_ID _typeId; + IFF_ID _typeId; protected: - IFFChunk _formChunk; - IFFChunk _chunk; + IFFChunk _formChunk; + IFFChunk _chunk; }; } // namespace Common diff --git a/common/rect.h b/common/rect.h index 2230111538..d88f400039 100644 --- a/common/rect.h +++ b/common/rect.h @@ -31,7 +31,7 @@ namespace Common { -/*! @brief simple class for handling both 2D position and size +/*! @brief simple class for handling both 2D position and size This small class is an helper for position and size values. */ @@ -65,7 +65,7 @@ struct Point { } }; -/*! @brief simple class for handling a rectangular zone. +/*! @brief simple class for handling a rectangular zone. This small class is an helper for rectangles. Note: This implementation is built around the assumption that (top,left) is diff --git a/common/str.h b/common/str.h index f19ad4e606..d42320f2d9 100644 --- a/common/str.h +++ b/common/str.h @@ -61,7 +61,7 @@ protected: * a lot. Yes, we limit ourselves to strings shorter than 4GB -- * on purpose :-). */ - uint32 _len; + uint32 _len; /** * Pointer to the actual string storage. Either points to _storage, @@ -81,7 +81,7 @@ protected: */ struct { mutable int *_refCount; - uint32 _capacity; + uint32 _capacity; } _extern; }; diff --git a/common/util.cpp b/common/util.cpp index 6b2e16ee88..19f506cf6e 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -53,8 +53,8 @@ extern bool isSmartphone(void); #define stderr ((DS::fileHandle*) -2) #define stdin ((DS::fileHandle*) -3) - void std_fprintf(FILE* handle, const char* fmt, ...); - void std_fflush(FILE* handle); + void std_fprintf(FILE* handle, const char* fmt, ...); + void std_fflush(FILE* handle); #define fprintf(file, fmt, ...) { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); } #define fflush(file) DS::std_fflush(file) diff --git a/common/util.h b/common/util.h index 979f98bf4c..05e821eb01 100644 --- a/common/util.h +++ b/common/util.h @@ -57,15 +57,15 @@ namespace Common { * Taken from exult/files/listfiles.cc * * Token meaning: - * "*": any character, any amount of times. - * "?": any character, only once. + * "*": any character, any amount of times. + * "?": any character, only once. * * Example strings/patterns: - * String: monkey.s?? Pattern: monkey.s01 => true - * String: monkey.s?? Pattern: monkey.s101 => false - * String: monkey.s?1 Pattern: monkey.s99 => false - * String: monkey.s* Pattern: monkey.s101 => true - * String: monkey.s*1 Pattern: monkey.s99 => false + * String: monkey.s?? Pattern: monkey.s01 => true + * String: monkey.s?? Pattern: monkey.s101 => false + * String: monkey.s?1 Pattern: monkey.s99 => false + * String: monkey.s* Pattern: monkey.s101 => true + * String: monkey.s*1 Pattern: monkey.s99 => false * * @param str Text to be matched against the given pattern. * @param pat Glob pattern. diff --git a/engines/agi/agi.h b/engines/agi/agi.h index b6358bd405..938177ce13 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -517,7 +517,7 @@ struct AgiGame { int lineMinPrint; /**< num lines to print on */ int cursorPos; /**< column where the input cursor is */ uint8 inputBuffer[40]; /**< buffer for user input */ - uint8 echoBuffer[40]; /**< buffer for echo.line */ + uint8 echoBuffer[40]; /**< buffer for echo.line */ int keypress; #define INPUT_NORMAL 0x01 #define INPUT_GETSTRING 0x02 @@ -577,7 +577,7 @@ struct AgiGame { AgiDir dirSound[MAX_DIRS]; /* resources */ - AgiPicture pictures[MAX_DIRS]; /**< AGI picture resources */ + AgiPicture pictures[MAX_DIRS]; /**< AGI picture resources */ AgiLogic logics[MAX_DIRS]; /**< AGI logic resources */ AgiView views[MAX_DIRS]; /**< AGI view resources */ AgiSound *sounds[MAX_DIRS]; /**< Pointers to AGI sound resources */ diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp index d4ec193376..7502c63c6c 100644 --- a/engines/agi/preagi_troll.cpp +++ b/engines/agi/preagi_troll.cpp @@ -723,7 +723,7 @@ void Troll::fillOffsets() { // Init void Troll::init() { - _vm->_picture->setPictureVersion(AGIPIC_V15); + _vm->_picture->setPictureVersion(AGIPIC_V15); //SetScreenPar(320, 200, (char*)ibm_fontdata); const int gaps[] = { 0x3A40, 0x4600, 0x4800, 0x5800, 0x5a00, 0x6a00, diff --git a/engines/agi/view.h b/engines/agi/view.h index f07e3cae41..a94de53c87 100644 --- a/engines/agi/view.h +++ b/engines/agi/view.h @@ -92,7 +92,7 @@ struct VtEntry { #define CYCLE_NORMAL 0 #define CYCLE_END_OF_LOOP 1 -#define CYCLE_REV_LOOP 2 +#define CYCLE_REV_LOOP 2 #define CYCLE_REVERSE 3 uint8 cycle; diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 7e5613f027..12e91b9fd0 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -338,8 +338,8 @@ AGOSEngine::AGOSEngine(OSystem *syst) _syncCount = 0; - _iconToggleCount = 0; - _voiceCount = 0; + _iconToggleCount = 0; + _voiceCount = 0; _lastTickCount = 0; _thisTickCount = 0; diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 2e8a20f6fd..93ccdb8b21 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -324,8 +324,8 @@ protected: uint8 _wallOn; uint16 _hyperLink, _newLines; - uint16 _oracleMaxScrollY, _noOracleScroll; - uint16 _interactY; + uint16 _oracleMaxScrollY, _noOracleScroll; + uint16 _interactY; int16 _scriptVerb, _scriptNoun1, _scriptNoun2; int16 _scriptAdj1, _scriptAdj2; @@ -1634,8 +1634,8 @@ protected: void sendInteractText(uint16 num, const char *fmt, ...); void checkLinkBox(); - void hyperLinkOn(uint16 x); - void hyperLinkOff(); + void hyperLinkOn(uint16 x); + void hyperLinkOff(); void linksUp(); void linksDown(); diff --git a/engines/agos/charset-fontdata.cpp b/engines/agos/charset-fontdata.cpp index 8a37de335a..bcb08b7abe 100644 --- a/engines/agos/charset-fontdata.cpp +++ b/engines/agos/charset-fontdata.cpp @@ -1403,7 +1403,7 @@ static const byte french_commonFont[] = { 0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00, 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00, 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00, - 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, + 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, 0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00, 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00, 0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00, @@ -1504,7 +1504,7 @@ static const byte english_commonFont[] = { 0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00, 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00, 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00, - 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, + 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, 0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00, 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00, 0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00, diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index 1755f63f61..1cbfdaed7b 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -37,7 +37,7 @@ namespace AGOS { static const uint16 _common_mouseInfo[32] = { 0xC000, 0x8000, 0xE000, 0xC000, 0xF000, 0xE000, 0xF800, 0xF000, 0xFC00, 0xF800, 0xFE00, 0xFC00, 0xFC00, 0xF000, 0x9800, 0x9000, - 0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000, + 0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index 9e1248382c..ef778b651d 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -750,10 +750,10 @@ static const AGOSGameDescription gameDescriptions[] = { "Floppy", { - { "gamebase.dat", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1}, - { "icondata.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, - { "stripped.dat", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1}, - { "tbllist.dat", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, + { "gamebase.dat", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1}, + { "icondata.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, + { "stripped.dat", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1}, + { "tbllist.dat", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, { NULL, 0, NULL, 0} }, Common::EN_ANY, @@ -773,11 +773,11 @@ static const AGOSGameDescription gameDescriptions[] = { "CD Demo", { - { "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1}, - { "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1}, - { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, - { "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1}, - { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, + { "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1}, + { "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1}, + { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, + { "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1}, + { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, { NULL, 0, NULL, 0} }, Common::EN_ANY, @@ -797,11 +797,11 @@ static const AGOSGameDescription gameDescriptions[] = { "CD", { - { "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", -1}, - { "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", -1}, - { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, - { "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1}, - { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, + { "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", -1}, + { "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", -1}, + { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, + { "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1}, + { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, { NULL, 0, NULL, 0} }, Common::EN_ANY, @@ -1189,11 +1189,11 @@ static const AGOSGameDescription gameDescriptions[] = { "CD Demo", { - { "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1}, - { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1}, - { "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, - { "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1}, - { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, + { "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1}, + { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1}, + { "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, + { "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1}, + { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, { NULL, 0, NULL, 0} }, Common::EN_ANY, diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp index c19fad5e4e..0eb42c1bc3 100644 --- a/engines/agos/draw.cpp +++ b/engines/agos/draw.cpp @@ -848,8 +848,8 @@ void AGOSEngine::slowFadeIn() { memcpy(_videoBuf1 + 1024, _displayPalette, 1024); for (c = 255; c >= 0; c -= 4) { - src = _videoBuf1 + 1024; - dst = _videoBuf1; + src = _videoBuf1 + 1024; + dst = _videoBuf1; for (p = _fastFadeInFlag; p !=0 ; p -= 3) { if (src[0] >= c) @@ -860,10 +860,10 @@ void AGOSEngine::slowFadeIn() { dst[2] += 4; src += 4; dst += 4; - } - _system->setPalette(_videoBuf1, 0, _fastFadeCount); - delay(5); - } + } + _system->setPalette(_videoBuf1, 0, _fastFadeCount); + delay(5); + } _fastFadeInFlag = 0; } diff --git a/engines/agos/oracle.cpp b/engines/agos/oracle.cpp index 0057fc34a8..d15e68828e 100644 --- a/engines/agos/oracle.cpp +++ b/engines/agos/oracle.cpp @@ -184,7 +184,7 @@ void AGOSEngine_Feeble::oracleTextUp() { changeWindow(3); _noOracleScroll = 0; - if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up + if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up _oracleMaxScrollY = _textWindow->scrollY; while (1) { if (_textWindow->scrollY == _oracleMaxScrollY) @@ -218,7 +218,7 @@ void AGOSEngine_Feeble::oracleTextDown() { changeWindow(3); _noOracleScroll = 0; - if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up + if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up _oracleMaxScrollY = _textWindow->scrollY; while (1) { if (_textWindow->scrollY == 0) @@ -411,7 +411,7 @@ void AGOSEngine_Feeble::listSaveGames(int n) { showMessageFormat("\n"); hyperLinkOn(j + 400); setTextColor(116); - showMessageFormat(" %d. ",1); + showMessageFormat(" %d. ",1); hyperLinkOff(); setTextColor(113); k++; diff --git a/engines/agos/res_ami.cpp b/engines/agos/res_ami.cpp index a40ca54c58..3bd951365f 100644 --- a/engines/agos/res_ami.cpp +++ b/engines/agos/res_ami.cpp @@ -129,7 +129,7 @@ static void convertCompressedImage(const byte *src, byte *dst, uint8 colorDepth, free(uncbfrout); for (i = 0; i < colorDepth; ++i) { free(uncptr[i]); - } + } } byte *AGOSEngine::convertImage(VC10_state *state, bool compressed) { diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index cb87e0ec05..65b35a426a 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -1235,7 +1235,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) { SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType); if (sr) { uint16 n = sr->roomX * sr->roomY * sr->roomZ; - for (i = j = 0; i != n; i++) + for (i = j = 0; i != n; i++) sr->roomExitStates[j++] = f->readUint16BE(); } @@ -1384,7 +1384,7 @@ bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) { SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType); if (sr) { uint16 n = sr->roomX * sr->roomY * sr->roomZ; - for (i = j = 0; i != n; i++) + for (i = j = 0; i != n; i++) f->writeUint16BE(sr->roomExitStates[j++]); } diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 6714659449..dbfa36279b 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -217,7 +217,7 @@ static const byte charWidth[226] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 7 + 0, 0, 0, 0, 0, 7 }; const char *getPixelLength(const char *string, uint16 maxWidth, uint16 &pixels) { @@ -410,8 +410,8 @@ void AGOSEngine_Feeble::printScreenText(uint vgaSpriteId, uint color, const char if (spaces != 0) spaces--; while (spaces) { - *convertedString2++ = ' '; - spaces--; + *convertedString2++ = ' '; + spaces--; } strcpy(convertedString2, string); break; @@ -425,8 +425,8 @@ void AGOSEngine_Feeble::printScreenText(uint vgaSpriteId, uint color, const char if (spaces != 0) spaces--; while (spaces) { - *convertedString2++ = ' '; - spaces--; + *convertedString2++ = ' '; + spaces--; } b = string2 - string; strncpy(convertedString2, string, b); @@ -574,7 +574,7 @@ uint16 AGOSEngine_Waxworks::getBoxSize() { case 3: if (_lineCounts[0] <= 37) { if (_lineCounts[1] <= 37) { if (_lineCounts[2] <= 37) - return 3; + return 3; if (_lineCounts[2] <= 84) if (checkFit(_linePtrs[2], 42, 2)) return 4; @@ -590,7 +590,7 @@ uint16 AGOSEngine_Waxworks::getBoxSize() { if (checkFit(_linePtrs[2], 48, 2)) return 5; return 6; - } + } if ((_lineCounts[1] <= 144) && (checkFit(_linePtrs[1], 48, 3))) { if (_lineCounts[2] <= 48) return 5; diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 178720a4ef..b19db5e19f 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -241,7 +241,7 @@ static const CINEGameDescription gameDescriptions[] = { { "os", "256 colors", - AD_ENTRY1("procs00", "d6752e7d25924cb866b61eb7cb0c8b56"), + AD_ENTRY1("procs00", "d6752e7d25924cb866b61eb7cb0c8b56"), Common::EN_GRB, Common::kPlatformPC, Common::ADGF_NO_FLAGS diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index 1af8cfb3cf..263a5a2e49 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -323,7 +323,7 @@ void CineEngine::mainLoop(int bootScriptIdx) { freePrcLinkedList(); releaseObjectScripts(); // if (g_cine->getGameType() == Cine::GType_OS) { - // freeUnkList(); + // freeUnkList(); // } freeBgIncrustList(); closePart(); diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index f81aed92fd..50846f7321 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -406,7 +406,7 @@ bool CineEngine::makeLoad(char *saveName) { freeAnimDataTable(); unloadAllMasks(); // if (g_cine->getGameType() == Cine::GType_OS) { - // freeUnkList(); + // freeUnkList(); // } freePrcLinkedList(); releaseObjectScripts(); diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp index 6963aaef83..a8c2bc79bb 100644 --- a/engines/cruise/font.cpp +++ b/engines/cruise/font.cpp @@ -230,7 +230,7 @@ void flipGen(void *var, int32 length) { void renderWord(uint8 * fontPtr_Data, uint8 * outBufferPtr, int32 drawPosPixel_X, int32 heightOff, int32 height, int32 param4, - int32 stringRenderBufferSize, int32 width, int32 charWidth) { + int32 stringRenderBufferSize, int32 width, int32 charWidth) { int i; int j; uint8 *fontPtr_Data2 = fontPtr_Data + height * 2; diff --git a/engines/cruise/perso.cpp b/engines/cruise/perso.cpp index c25476ee2a..046e3d15b1 100644 --- a/engines/cruise/perso.cpp +++ b/engines/cruise/perso.cpp @@ -169,9 +169,9 @@ int cor_droite(int x1, int y1, int x2, int y2, point* outputTable) { } void processActorWalk(int16 resx_y[4], int16 *inc_droite, int16 *inc_droite0, - int16 *inc_chemin, point* cor_joueur, - int16 solution0[NUM_NODES + 3][2], int16 *inc_jo1, int16 *inc_jo2, - int16 *dir_perso, int16 *inc_jo0, int16 num) { + int16 *inc_chemin, point* cor_joueur, + int16 solution0[NUM_NODES + 3][2], int16 *inc_jo1, int16 *inc_jo2, + int16 *dir_perso, int16 *inc_jo0, int16 num) { int x1, x2, y1, y2; int i, u; diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 84f154b7c0..bb6e708353 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -240,7 +240,7 @@ int DrasculaEngine::go() { lee_dibujos("95.alg"); descomprime_dibujo(dir_mesa, 1); - } + } memset(nombre_icono, 0, sizeof(nombre_icono)); strcpy(nombre_icono[1], "look"); strcpy(nombre_icono[2], "take"); @@ -2316,7 +2316,7 @@ void DrasculaEngine::print_abc(const char *dicho, int x_pantalla, int y_pantalla x_de_letra = X_N0; else y_de_letra = Y_ACENTOS; - } + } pos_texto[0] = x_de_letra; pos_texto[1] = y_de_letra; @@ -3733,7 +3733,7 @@ void DrasculaEngine::actualiza_refresco() { else if (!strcmp(num_room, "62.alg")) refresca_62(); } else if (num_ejec == 2) { - if (!strcmp(num_room, "3.alg")) + if (!strcmp(num_room, "3.alg")) refresca_3(); else if (!strcmp(num_room, "2.alg")) refresca_2(); @@ -3890,7 +3890,7 @@ void DrasculaEngine::pon_hare() { paso_y = PASO_HARE_Y; hare_x = sitio_x - ancho_hare + 4; hare_y = sitio_y - alto_hare; - } + } } } } @@ -4413,7 +4413,7 @@ bool DrasculaEngine::banderas(int fl) { else if (objeto_que_lleva == HABLAR && fl == 15) hablar(TEXT118, "118.als"); else - hay_respuesta = 0; + hay_respuesta = 0; } else if (num_ejec == 6) { if (objeto_que_lleva == MIRAR && fl == 28) hablar(TEXT328, "328.als"); @@ -4441,7 +4441,7 @@ bool DrasculaEngine::banderas(int fl) { hablar(TEXT313, "313.als"); else if (objeto_que_lleva == HABLAR && fl == 50) hablar(TEXT314, "314.als"); - else if (!strcmp(num_room, "62.alg")) + else if (!strcmp(num_room, "62.alg")) pantalla_62(fl); else if (!strcmp(num_room, "63.alg")) pantalla_63(fl); diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp index df5811150e..64a2b15ef4 100644 --- a/engines/gob/goblin.cpp +++ b/engines/gob/goblin.cpp @@ -1121,7 +1121,7 @@ void Goblin::moveTreatRopeStairs(Gob_Object *gobDesc) { } if ((gobDesc->nextState == 29) && - (_vm->_map->getPass(_vm->_map->_curGoblinX, _vm->_map->_curGoblinY + 1) == 6)) { + (_vm->_map->getPass(_vm->_map->_curGoblinX, _vm->_map->_curGoblinY + 1) == 6)) { _forceNextState[0] = 29; _forceNextState[1] = -1; } diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index aae6892ee0..fffbdaceaf 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -1384,7 +1384,7 @@ void Inter_v2::o2_initScreen() { _vm->_system->beginGFXTransaction(); _vm->_system->initSize(_vm->_width, _vm->_height); _vm->initCommonGFX(true); - _vm->_system->endGFXTransaction(); + _vm->_system->endGFXTransaction(); } else if (_vm->_global->_videoMode == 0x10) { if (width == -1) width = 320; diff --git a/engines/igor/igor.cpp b/engines/igor/igor.cpp index 2bd6f3b69a..018709f34f 100644 --- a/engines/igor/igor.cpp +++ b/engines/igor/igor.cpp @@ -2619,7 +2619,7 @@ void IgorEngine::buildWalkPathAreaRightDirection(int srcX, int srcY, int dstX, i WalkData::setNextFrame(kFacingPositionRight, _walkCurrentFrame); } } else { - if (_walkCurrentPosLocalVar == 2 && _walkToObjectPosX == dstX && _walkToObjectPosY == dstY) { + if (_walkCurrentPosLocalVar == 2 && _walkToObjectPosX == dstX && _walkToObjectPosY == dstY) { _walkData[_walkDataLastIndex] = _walkData[_walkDataLastIndex - 1]; _walkData[_walkDataLastIndex].posNum = 2; _walkData[_walkDataLastIndex].frameNum = 1; diff --git a/engines/igor/parts/part_23.cpp b/engines/igor/parts/part_23.cpp index b1451442ac..70d3646a01 100644 --- a/engines/igor/parts/part_23.cpp +++ b/engines/igor/parts/part_23.cpp @@ -179,7 +179,7 @@ void IgorEngine::PART_23_HELPER_4() { _walkData[0].setPos(233, 120, 3, 0); _walkData[0].setDefaultScale(); _walkDataLastIndex = 0; - _roomObjectAreasTable[_screenLayer2[38633]].area = 1; + _roomObjectAreasTable[_screenLayer2[38633]].area = 1; buildWalkPathSimple(233, 120, 233, 137); _roomObjectAreasTable[_screenLayer2[38633]].area = 0; _walkData[_walkDataLastIndex].frameNum = 0; diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 87c6d4f843..4c154bf8f1 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -960,7 +960,7 @@ int KyraEngine_v1::checkForNPCScriptRun(int xpos, int ypos) { charRight = currentChar->x1 + 11; charTop = currentChar->y1 - 48; // if (!i) - // charBottom = currentChar->y2 - 16; + // charBottom = currentChar->y2 - 16; // else charBottom = currentChar->y1; diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 5f0d1a1e50..8801e8050a 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -419,7 +419,7 @@ void KyraEngine_v2::handleInput(int x, int y) { } else { int skipHandling = 0; - if (checkItemCollision(x, y) == -1) { + if (checkItemCollision(x, y) == -1) { resetGameFlag(0x1EF); skipHandling = handleInputUnkSub(x, y) ? 1 : 0; diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 546ab6f6a5..d57511509d 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -2942,7 +2942,7 @@ void Screen::drawCharSJIS(uint16 c, int x, int y) { return; } - destPage += y * 640 + x; + destPage += y * 640 + x; uint8 *src = 0, *dst = 0; if (color2 != 0x80) { diff --git a/engines/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp index 785b0b3aed..c78fdb352d 100644 --- a/engines/kyra/sequences_v1.cpp +++ b/engines/kyra/sequences_v1.cpp @@ -1126,7 +1126,7 @@ void KyraEngine_v1::seq_playCredits() { } if (*currentString == 1) { - currentString++; + currentString++; if (!_flags.isTalkie) _screen->setFont(Screen::FID_CRED6_FNT); } else { diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index 0de8522736..e1b69dec6e 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -1853,7 +1853,7 @@ void KyraEngine_v2::seq_nestedSequenceFrame(int command, int wsaNum) { _activeWSA[wsaNum].movie->setX(0); _activeWSA[wsaNum].movie->setY(0); seq_animatedSubFrame(8, 2, 7, 8, _activeWSA[wsaNum].movie->xAdd(), _activeWSA[wsaNum].movie->yAdd(), - _activeWSA[wsaNum].movie->width(), _activeWSA[wsaNum].movie->height(), 0, 2); + _activeWSA[wsaNum].movie->width(), _activeWSA[wsaNum].movie->height(), 0, 2); break; case 3: diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index df5af4ab3e..2f447b9973 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -1257,10 +1257,10 @@ void KyraEngine_v1::setupMenu() { {1, 0, 0, 0, 110, 0, 30, 64, 15, 252, 253, 5, 0, 248, 249, 250, &KyraEngine_v1::gui_controlsChangeMusic, -1, 0, 34, 32, 0, 0}, - {1, 0, 0, 0, 110, 0, 47, 64, 15, 252, 253, 5, 0, + {1, 0, 0, 0, 110, 0, 47, 64, 15, 252, 253, 5, 0, 248, 249, 250, &KyraEngine_v1::gui_controlsChangeSounds, -1, 0, 34, 49, 0, 0}, - {1, 0, 0, 0, 110, 0, 64, 64, 15, 252, 253, 5, 0, + {1, 0, 0, 0, 110, 0, 64, 64, 15, 252, 253, 5, 0, 248, 249, 250, &KyraEngine_v1::gui_controlsChangeWalk, -1, 0, 34, 66, 0, 0}, {1, 0, 0, 0, 110, 0, 81, 64, 15, 252, 253, 5, 0, diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp index 618f5d49db..30e0e571b7 100644 --- a/engines/lure/events.cpp +++ b/engines/lure/events.cpp @@ -180,7 +180,7 @@ bool Events::pollEvent() { break; default: - break; + break; } return true; diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index cd9daa3265..c29a82eed2 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -3143,7 +3143,7 @@ void HotspotTickHandlers::droppingTorchAnimHandler(Hotspot &h) { fire->loadOffset = 4; res.activateHotspot(0x418); } - } + } } void HotspotTickHandlers::playerSewerExitAnimHandler(Hotspot &h) { diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h index f2baab134d..2f78ec6133 100644 --- a/engines/parallaction/defs.h +++ b/engines/parallaction/defs.h @@ -38,8 +38,8 @@ class ManagedList : public Common::List<T> { public: - typedef typename Common::List<T> Common_List; - typedef typename Common::List<T>::iterator iterator; + typedef typename Common::List<T> Common_List; + typedef typename Common::List<T>::iterator iterator; typedef int (*CompareFunction) (const T& a, const T& b); diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index b2bf878cbe..68859112dd 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -64,10 +64,10 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { { "disk2", 0, "bfdd7bcfbc226f4acf3f67fa9efa2826", 907205}, { "disk3", 0, "eec08180240888d76e3cfe3e183d5d5d", 1030721}, { "disk4", 0, "5bffddc7db226bdaa7dd3e10e5a15e68", 1151403}, - { "en", 0, "65cbfa81eafe308621184796ed116700", 399360}, - { "fr", 0, "ac20c743ea10f2cb4491f76c5644582c", 410624}, - { "ge", 0, "50916bfa34aee1380e0e959b37eceb5a", 410624}, - { "it", 0, "89964aef04d2c53a615ee8983caf2775", 410624}, + { "en", 0, "65cbfa81eafe308621184796ed116700", 399360}, + { "fr", 0, "ac20c743ea10f2cb4491f76c5644582c", 410624}, + { "ge", 0, "50916bfa34aee1380e0e959b37eceb5a", 410624}, + { "it", 0, "89964aef04d2c53a615ee8983caf2775", 410624}, { NULL, 0, NULL, 0} }, Common::UNK_LANG, @@ -83,14 +83,14 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { "nippon", "Multi-lingual", { - { "disk0", 0, "16cca8724fdf4ec8234385497a0c728a", 208437}, - { "disk1", 0, "6b29987cfe2298d3745b6d99a0080c44", 901120}, - { "disk2", 0, "2db40bf8198a57d18e4471a6deaab970", 901120}, - { "disk3", 0, "0486972962b2bfc230e789b9f88f9ec8", 901120}, - { "disk4", 0, "6f625e7f05da4a2f57d6b62d57013614", 901120}, - { "en", 0, "c9ec4f2267d736eef4877c5133e1c6e1", 174074}, - { "ge", 0, "42d6f10a4ebdadb25a6161d53ea4f450", 182298}, - { "fr", 0, "cf17defc24f143d1a9acb52eaa5c2406", 179958}, + { "disk0", 0, "16cca8724fdf4ec8234385497a0c728a", 208437}, + { "disk1", 0, "6b29987cfe2298d3745b6d99a0080c44", 901120}, + { "disk2", 0, "2db40bf8198a57d18e4471a6deaab970", 901120}, + { "disk3", 0, "0486972962b2bfc230e789b9f88f9ec8", 901120}, + { "disk4", 0, "6f625e7f05da4a2f57d6b62d57013614", 901120}, + { "en", 0, "c9ec4f2267d736eef4877c5133e1c6e1", 174074}, + { "ge", 0, "42d6f10a4ebdadb25a6161d53ea4f450", 182298}, + { "fr", 0, "cf17defc24f143d1a9acb52eaa5c2406", 179958}, { NULL, 0, NULL, 0} }, Common::UNK_LANG, @@ -107,7 +107,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { "Demo", { { "disk0", 0, "6fed2e18a6bfe5e8bb49144fcc95fd11", 624640}, - { "fr", 0, "72f04be4320dfac719431419ec2b9a0d", 12778}, + { "fr", 0, "72f04be4320dfac719431419ec2b9a0d", 12778}, { NULL, 0, NULL, 0} }, Common::EN_ANY, @@ -124,11 +124,11 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { "nippon", "", { - { "disk0", 0, "bfee75d8015f1fb97e75dbe08df4bef7", 354304}, - { "disk1", 0, "f339dd108c1a1f5cd4853d9966e5d01f", 901120}, - { "disk2", 0, "2db40bf8198a57d18e4471a6deaab970", 901120}, - { "disk3", 0, "0486972962b2bfc230e789b9f88f9ec8", 901120}, - { "disk4", 0, "6f625e7f05da4a2f57d6b62d57013614", 901120}, + { "disk0", 0, "bfee75d8015f1fb97e75dbe08df4bef7", 354304}, + { "disk1", 0, "f339dd108c1a1f5cd4853d9966e5d01f", 901120}, + { "disk2", 0, "2db40bf8198a57d18e4471a6deaab970", 901120}, + { "disk3", 0, "0486972962b2bfc230e789b9f88f9ec8", 901120}, + { "disk4", 0, "6f625e7f05da4a2f57d6b62d57013614", 901120}, { "it", 0, "746088eb8de2b2713685d243a4e4678f", 185344}, { NULL, 0, NULL, 0} }, diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index 6d756f172f..73414ce0b4 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -30,7 +30,7 @@ namespace Parallaction { -#define MAX_PASSWORD_LENGTH 7 +#define MAX_PASSWORD_LENGTH 7 #define QUESTION_BALLOON_X 140 #define QUESTION_BALLOON_Y 10 @@ -46,9 +46,9 @@ class DialogueManager { SpeakData *_data; Dialogue *_dialogue; - bool _askPassword; + bool _askPassword; - bool isNpc; + bool isNpc; Frames *_questioner; Frames *_answerer; diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h index f6bb87d247..b79c8125b9 100644 --- a/engines/parallaction/disk.h +++ b/engines/parallaction/disk.h @@ -71,20 +71,20 @@ public: -#define MAX_ARCHIVE_ENTRIES 384 +#define MAX_ARCHIVE_ENTRIES 384 class Archive : public Common::SeekableReadStream { protected: - bool _file; + bool _file; uint32 _fileOffset; uint32 _fileCursor; uint32 _fileEndOffset; Common::String _archiveName; - char _archiveDir[MAX_ARCHIVE_ENTRIES][32]; + char _archiveDir[MAX_ARCHIVE_ENTRIES][32]; uint32 _archiveLenghts[MAX_ARCHIVE_ENTRIES]; uint32 _archiveOffsets[MAX_ARCHIVE_ENTRIES]; - Common::File _archive; + Common::File _archive; uint32 _numFiles; protected: @@ -110,8 +110,8 @@ class Disk_ns : public Disk { protected: Archive _resArchive; Archive _locArchive; - char _languageDir[3]; - Parallaction *_vm; + char _languageDir[3]; + Parallaction *_vm; protected: void errorFileNotFound(const char *s); @@ -201,7 +201,7 @@ public: class DosDisk_br : public Disk { protected: - Parallaction *_vm; + Parallaction *_vm; char _partPath[PATH_LEN]; char _languageDir[2]; diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp index 91a8809070..c7f6464696 100644 --- a/engines/parallaction/exec_ns.cpp +++ b/engines/parallaction/exec_ns.cpp @@ -29,7 +29,7 @@ namespace Parallaction { -#define INST_ON 1 +#define INST_ON 1 #define INST_OFF 2 #define INST_X 3 #define INST_Y 4 @@ -722,8 +722,8 @@ Zone *Parallaction::hitZone(uint32 type, uint16 x, uint16 y) { _e = ((_si >= a->_left + a->width()) || (_si <= a->_left)) ? 0 : 1; // _e: horizontal range _f = ((_di >= a->_top + a->height()) || (_di <= a->_top)) ? 0 : 1; // _f: vertical range - _b = ((type != 0) || (a->_type == kZoneYou)) ? 0 : 1; // _b: (no type specified) AND (Animation is not the character) - _c = (a->_type & 0xFFFF0000) ? 0 : 1; // _c: Animation is not an object + _b = ((type != 0) || (a->_type == kZoneYou)) ? 0 : 1; // _b: (no type specified) AND (Animation is not the character) + _c = (a->_type & 0xFFFF0000) ? 0 : 1; // _c: Animation is not an object _d = ((a->_type & 0xFFFF0000) != type) ? 0 : 1; // _d: Animation is an object of the same type if ((_a != 0 && _e != 0 && _f != 0) && ((_b != 0 && _c != 0) || (a->_type == type) || (_d != 0))) { diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index 07e736a6d3..64d2d170ee 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -239,7 +239,7 @@ public: class DosDialogueFont : public DosFont { private: - static const byte _glyphWidths[126]; + static const byte _glyphWidths[126]; protected: uint16 width(byte c) { diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index e2051a85ab..15f08df37a 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -179,7 +179,7 @@ void Palette::rotate(uint first, uint last, bool forward) { byte tmp[3]; - if (forward) { // forward + if (forward) { // forward tmp[0] = _data[first * 3]; tmp[1] = _data[first * 3 + 1]; diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index 852e7bb792..2e0930a49e 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -177,8 +177,8 @@ public: struct Cnv : public Frames { - uint16 _count; // # of frames - uint16 _width; // + uint16 _count; // # of frames + uint16 _width; // uint16 _height; // byte** field_8; // unused byte* _data; @@ -330,8 +330,8 @@ public: PaletteFxRange _palettefx[6]; Palette _palette; - int _backgroundWidth; - int _backgroundHeight; + int _backgroundWidth; + int _backgroundHeight; uint _screenX; // scrolling position uint _screenY; diff --git a/engines/parallaction/gui_ns.cpp b/engines/parallaction/gui_ns.cpp index 8033378c08..93ed953163 100644 --- a/engines/parallaction/gui_ns.cpp +++ b/engines/parallaction/gui_ns.cpp @@ -67,11 +67,11 @@ const char *loadGameMsg[] = { }; -#define BLOCK_WIDTH 16 +#define BLOCK_WIDTH 16 #define BLOCK_HEIGHT 24 -#define BLOCK_X 112 -#define BLOCK_Y 130 +#define BLOCK_X 112 +#define BLOCK_Y 130 #define BLOCK_SELECTION_X (BLOCK_X-1) #define BLOCK_SELECTION_Y (BLOCK_Y-1) diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp index 085d6c0940..05202809a9 100644 --- a/engines/parallaction/inventory.cpp +++ b/engines/parallaction/inventory.cpp @@ -38,13 +38,13 @@ namespace Parallaction { // but only 24x24 pixels are actually copied to graphic memory // -#define INVENTORY_MAX_ITEMS 30 +#define INVENTORY_MAX_ITEMS 30 #define INVENTORY_FIRST_ITEM 4 // first four entries are used up by verbs #define INVENTORY_ITEMS_PER_LINE 5 -#define INVENTORY_LINES 6 +#define INVENTORY_LINES 6 -#define INVENTORY_WIDTH (INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH) +#define INVENTORY_WIDTH (INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH) #define INVENTORY_HEIGHT (INVENTORY_LINES*INVENTORYITEM_HEIGHT) diff --git a/engines/parallaction/inventory.h b/engines/parallaction/inventory.h index 8a80c0f316..8c32c09219 100644 --- a/engines/parallaction/inventory.h +++ b/engines/parallaction/inventory.h @@ -38,8 +38,8 @@ struct InventoryItem { uint16 _index; // index to frame in objs file }; -#define INVENTORYITEM_PITCH 32 -#define INVENTORYITEM_WIDTH 24 +#define INVENTORYITEM_PITCH 32 +#define INVENTORYITEM_WIDTH 24 #define INVENTORYITEM_HEIGHT 24 #define MAKE_INVENTORY_ID(x) (((x) & 0xFFFF) << 16) @@ -75,7 +75,7 @@ public: class InventoryRenderer { Parallaction *_vm; - Inventory *_inv; + Inventory *_inv; Common::Point _pos; Graphics::Surface _surf; diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index 28904c6d9e..7384878f64 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -44,17 +44,17 @@ struct Instruction; struct Program; enum ZoneTypes { - kZoneExamine = 1, // zone displays comment if activated - kZoneDoor = 2, // zone activated on click (after some walk if needed) - kZoneGet = 4, // for pickable items - kZoneMerge = 8, // tags items which can be merged in inventory + kZoneExamine = 1, // zone displays comment if activated + kZoneDoor = 2, // zone activated on click (after some walk if needed) + kZoneGet = 4, // for pickable items + kZoneMerge = 8, // tags items which can be merged in inventory kZoneTaste = 0x10, // NEVER USED kZoneHear = 0x20, // NEVER USED: they ran out of time before integrating sfx kZoneFeel = 0x40, // NEVER USED kZoneSpeak = 0x80, // tags NPCs the character can talk with - kZoneNone = 0x100, // used to prevent parsing on peculiar Animations - kZoneTrap = 0x200, // zone activated when character enters - kZoneYou = 0x400, // marks the character + kZoneNone = 0x100, // used to prevent parsing on peculiar Animations + kZoneTrap = 0x200, // zone activated when character enters + kZoneYou = 0x400, // marks the character kZoneCommand = 0x800 }; @@ -64,14 +64,14 @@ enum ZoneFlags { kFlagsActive = 2, // Zone/Animation: object is visible kFlagsRemove = 4, // Zone/Animation: object is soon to be removed kFlagsActing = 8, // Animation: script execution is active - kFlagsLocked = 0x10, // Zone: door or switch cannot be toggled - kFlagsFixed = 0x20, // Zone: Zone item cannot be picked up - kFlagsNoName = 0x40, // Zone with no name (used to prevent some kEvEnterZone events) - kFlagsNoMasked = 0x80, // Animation is to be drawn ignoring z buffer + kFlagsLocked = 0x10, // Zone: door or switch cannot be toggled + kFlagsFixed = 0x20, // Zone: Zone item cannot be picked up + kFlagsNoName = 0x40, // Zone with no name (used to prevent some kEvEnterZone events) + kFlagsNoMasked = 0x80, // Animation is to be drawn ignoring z buffer kFlagsLooping = 0x100, // Animation: script is to be executed repeatedly - kFlagsAdded = 0x200, // NEVER USED in Nippon Safes - kFlagsCharacter = 0x400, // - kFlagsNoWalk = 0x800, // Zone: character doesn't need to walk towards object to interact + kFlagsAdded = 0x200, // NEVER USED in Nippon Safes + kFlagsCharacter = 0x400, // + kFlagsNoWalk = 0x800, // Zone: character doesn't need to walk towards object to interact // BRA specific kFlagsYourself = 0x1000, @@ -84,7 +84,7 @@ enum ZoneFlags { enum CommandFlags { kFlagsVisited = 1, kFlagsExit = 0x10000000, - kFlagsEnter = 0x20000000, + kFlagsEnter = 0x20000000, kFlagsGlobal = 0x40000000, // BRA specific @@ -93,7 +93,7 @@ enum CommandFlags { struct CommandData { uint32 _flags; - Animation * _animation; + Animation * _animation; Zone* _zone; char* _string; uint16 _callable; @@ -126,7 +126,7 @@ struct CommandData { struct Command { uint16 _id; - CommandData u; + CommandData u; uint32 _flagsOn; uint32 _flagsOff; @@ -138,7 +138,7 @@ typedef ManagedList<Command*> CommandList; #define NUM_QUESTIONS 20 -#define NUM_ANSWERS 5 +#define NUM_ANSWERS 5 struct Answer { char* _text; @@ -206,7 +206,7 @@ struct ExamineData { // size = 28 }; struct DoorData { // size = 28 char* _location; - Frames *_cnv; + Frames *_cnv; byte* _background; Common::Point _startPos; uint16 _startFrame; @@ -240,7 +240,7 @@ struct MergeData { // size = 12 }; struct TypeData { - GetData *get; + GetData *get; SpeakData *speak; ExamineData *examine; DoorData *door; @@ -263,7 +263,7 @@ struct TypeData { struct Zone { char _name[ZONENAME_LENGTH]; - int16 _left; + int16 _left; int16 _top; int16 _right; int16 _bottom; @@ -273,7 +273,7 @@ struct Zone { uint16 field_2C; // unused uint16 field_2E; // unused TypeData u; - CommandList _commands; + CommandList _commands; Common::Point _moveTo; // BRA specific @@ -314,7 +314,7 @@ enum ParaFlags { struct ScriptVar { - uint32 _flags; + uint32 _flags; int16 _value; int16* _pvalue; @@ -327,8 +327,8 @@ struct ScriptVar { void setLocal(LocalVariable *local); void setField(int16 *field); - void setImmediate(int16 value); - void setRandom(int16 seed); + void setImmediate(int16 value); + void setRandom(int16 seed); }; enum InstructionFlags { @@ -378,8 +378,8 @@ struct Program { Program(); ~Program(); - int16 findLocal(const char* name); - int16 addLocal(const char *name, int16 value = 0, int16 min = -10000, int16 max = 10000); + int16 findLocal(const char* name); + int16 addLocal(const char *name, int16 value = 0, int16 min = -10000, int16 max = 10000); }; @@ -387,8 +387,8 @@ struct Program { struct Animation : public Zone { Common::Point _oldPos; - Program *_program; - Frames *_cnv; + Program *_program; + Frames *_cnv; char *_scriptName; int16 _frame; uint16 field_50; // unused diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 182749f367..33789b399c 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -548,7 +548,7 @@ bool Parallaction::translateInventoryInput() { _input._event = kEvCloseInventory; _input._inventoryIndex = getHoverInventoryItem(_mousePos.x, _mousePos.y); - highlightInventoryItem(_transCurrentHoverItem, 12); // disable + highlightInventoryItem(_transCurrentHoverItem, 12); // disable if ((_engineFlags & kEngineDragging) == 0) { return true; diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 283e6164b7..9c5565915e 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -100,17 +100,17 @@ enum { kMouseLeftUp = 1, kMouseLeftDown = 2, kMouseRightUp = 3, - kMouseRightDown = 4 + kMouseRightDown = 4 }; enum EngineFlags { - kEngineQuit = (1 << 0), + kEngineQuit = (1 << 0), kEnginePauseJobs = (1 << 1), kEngineInventory = (1 << 2), kEngineWalking = (1 << 3), kEngineChangeLocation = (1 << 4), kEngineBlockInput = (1 << 5), - kEngineDragging = (1 << 6), + kEngineDragging = (1 << 6), kEngineTransformedDonna = (1 << 7) }; @@ -144,7 +144,7 @@ struct PARALLACTIONGameDescription; struct Job; struct Job { - uint16 _count; // # of executions left + uint16 _count; // # of executions left uint16 _tag; // used for ordering uint16 _finished; void * _parm; @@ -155,27 +155,27 @@ public: }; -extern uint16 _mouseButtons; +extern uint16 _mouseButtons; extern char _password[8]; -extern uint16 _score; -extern uint16 _language; -extern uint32 _engineFlags; -extern Command *_forwardedCommands[]; -extern char _forwardedAnimationNames[][20]; -extern uint16 _numForwards; -extern char _slideText[][40]; -extern uint16 _introSarcData3; // sarcophagus stuff to be saved -extern uint16 _introSarcData2; // sarcophagus stuff to be saved -extern char _saveData1[]; -extern uint32 _commandFlags; -extern const char *_dinoName; -extern const char *_donnaName; -extern const char *_doughName; -extern const char *_drkiName; -extern const char *_minidinoName; -extern const char *_minidonnaName; -extern const char *_minidoughName; -extern const char *_minidrkiName; +extern uint16 _score; +extern uint16 _language; +extern uint32 _engineFlags; +extern Command *_forwardedCommands[]; +extern char _forwardedAnimationNames[][20]; +extern uint16 _numForwards; +extern char _slideText[][40]; +extern uint16 _introSarcData3; // sarcophagus stuff to be saved +extern uint16 _introSarcData2; // sarcophagus stuff to be saved +extern char _saveData1[]; +extern uint32 _commandFlags; +extern const char *_dinoName; +extern const char *_donnaName; +extern const char *_doughName; +extern const char *_drkiName; +extern const char *_minidinoName; +extern const char *_minidonnaName; +extern const char *_minidoughName; +extern const char *_minidrkiName; void waitUntilLeftClick(); @@ -216,7 +216,7 @@ struct Character { Animation _ani; Frames *_head; Frames *_talk; - Frames *_objs; + Frames *_objs; PathBuilder _builder; WalkNodeList *_walkPath; @@ -372,10 +372,10 @@ public: virtual bool loadGame() = 0; virtual bool saveGame() = 0; - uint16 readInput(); + uint16 readInput(); void updateInput(); - void waitTime(uint32 t); + void waitTime(uint32 t); enum { kInputModeGame = 0, @@ -389,7 +389,7 @@ public: uint _lookup; Common::Stack<OpcodeSet*> _opcodes; - Common::Stack<Table*> _statements; + Common::Stack<Table*> _statements; OpcodeSet *_currentOpcodes; Table *_currentStatements; void pushParserTables(OpcodeSet *opcodes, Table* statements); @@ -415,32 +415,32 @@ public: void showCursor(bool visible); - Job *addJob(uint functionId, void *parm, uint16 tag); - void removeJob(Job *j); - void pauseJobs(); - void resumeJobs(); - void runJobs(); + Job *addJob(uint functionId, void *parm, uint16 tag); + void removeJob(Job *j); + void pauseJobs(); + void resumeJobs(); + void runJobs(); virtual JobOpcode* createJobOpcode(uint functionId, Job *job) = 0; - void finalizeWalk(WalkNodeList *list); - int16 selectWalkFrame(const Common::Point& pos, const WalkNode* from); - void clipMove(Common::Point& pos, const WalkNode* from); + void finalizeWalk(WalkNodeList *list); + int16 selectWalkFrame(const Common::Point& pos, const WalkNode* from); + void clipMove(Common::Point& pos, const WalkNode* from); - Zone *findZone(const char *name); - Zone *hitZone(uint32 type, uint16 x, uint16 y); + Zone *findZone(const char *name); + Zone *hitZone(uint32 type, uint16 x, uint16 y); uint16 runZone(Zone*); - void freeZones(); + void freeZones(); - void runDialogue(SpeakData*); + void runDialogue(SpeakData*); - void runCommands(CommandList& list, Zone *z = NULL); + void runCommands(CommandList& list, Zone *z = NULL); - Animation *findAnimation(const char *name); + Animation *findAnimation(const char *name); void sortAnimations(); - void freeAnimations(); + void freeAnimations(); - void setBackground(const char *background, const char *mask, const char *path); - void freeBackground(); + void setBackground(const char *background, const char *mask, const char *path); + void freeBackground(); Table *_globalTable; Table *_objectsNames; @@ -461,8 +461,8 @@ private: public: // info int32 _screenWidth; - int32 _screenHeight; - int32 _screenSize; + int32 _screenHeight; + int32 _screenSize; PathBuffer *_pathBuffer; @@ -486,10 +486,10 @@ public: p = _mousePos; } - Zone *_activeZone; + Zone *_activeZone; - ZoneList _zones; - AnimationList _animations; + ZoneList _zones; + AnimationList _animations; Font *_labelFont; Font *_menuFont; @@ -522,7 +522,7 @@ protected: // data int16 _transCurrentHoverItem; uint32 _baseTime; - char _characterName1[50]; // only used in changeCharacter + char _characterName1[50]; // only used in changeCharacter JobList _jobs; @@ -545,9 +545,9 @@ protected: // members uint32 getElapsedTime(); void resetTimer(); - InputData *translateInput(); - bool translateGameInput(); - bool translateInventoryInput(); + InputData *translateInput(); + bool translateGameInput(); + bool translateInventoryInput(); void processInput(InputData*); @@ -556,17 +556,17 @@ protected: // members virtual void changeLocation(char *location) = 0; virtual void changeCharacter(const char *name) = 0; void allocateLocationSlot(const char *name); - void finalizeLocationParsing(); - void freeLocation(); - void showLocationComment(const char *text, bool end); + void finalizeLocationParsing(); + void freeLocation(); + void showLocationComment(const char *text, bool end); - void displayComment(ExamineData *data); + void displayComment(ExamineData *data); - uint16 checkDoor(); + uint16 checkDoor(); - void freeCharacter(); + void freeCharacter(); - int16 pickupItem(Zone *z); + int16 pickupItem(Zone *z); public: virtual void callFunction(uint index, void* parm) { } @@ -675,8 +675,8 @@ public: typedef void (Parallaction_ns::*JobFn)(void*, Job*); - const JobFn *_jobsFn; - JobOpcode* createJobOpcode(uint functionId, Job *job); + const JobFn *_jobsFn; + JobOpcode* createJobOpcode(uint functionId, Job *job); bool loadGame(); bool saveGame(); @@ -776,8 +776,8 @@ protected: const char *filename; Script *script; - Zone *z; - Animation *a; + Zone *z; + Animation *a; int nextToken; CommandList *list; bool endcommands; @@ -847,14 +847,14 @@ protected: void parseZone(Script &script, ZoneList &list, char *name); void parseZoneTypeBlock(Script &script, Zone *z); - void parseWalkNodes(Script& script, WalkNodeList &list); + void parseWalkNodes(Script& script, WalkNodeList &list); Animation *parseAnimation(Script &script, AnimationList &list, char *name); void parseCommands(Script &script, CommandList&); void parseCommandFlags(); void createCommand(uint id); void addCommand(); - void initOpcodes(); - void initParsers(); + void initOpcodes(); + void initParsers(); // program parser OpcodeSet _instructionParsers; @@ -891,7 +891,7 @@ protected: void loadProgram(Animation *a, const char *filename); void parseLValue(ScriptVar &var, const char *str); virtual void parseRValue(ScriptVar &var, const char *str); - void wrapLocalVar(LocalVariable *local); + void wrapLocalVar(LocalVariable *local); DECLARE_UNQUALIFIED_COMMAND_OPCODE(invalid); DECLARE_UNQUALIFIED_COMMAND_OPCODE(set); @@ -931,14 +931,14 @@ protected: void guiStart(); int guiSelectCharacter(); - void guiSplash(); + void guiSplash(); int guiNewGame(); uint16 guiChooseLanguage(); uint16 guiSelectGame(); int guiGetSelectedBlock(const Common::Point &p); - void switchBackground(const char* background, const char* mask); - void showSlide(const char *name); + void switchBackground(const char* background, const char* mask); + void showSlide(const char *name); }; @@ -974,10 +974,10 @@ public: int _zeta2; int16 _lipSyncVal; - uint _subtitleLipSync; + uint _subtitleLipSync; - Label _subtitle0; - Label _subtitle1; + Label _subtitle0; + Label _subtitle1; Zone *_activeZone2; @@ -986,11 +986,11 @@ public: uint32 _zoneFlags[NUM_LOCATIONS][NUM_ZONES]; private: - void initResources(); - void initFonts(); - void freeFonts(); - void initOpcodes(); - void initParsers(); + void initResources(); + void initFonts(); + void freeFonts(); + void initOpcodes(); + void initParsers(); void initJobs(); void setArrowCursor(); @@ -998,10 +998,10 @@ private: typedef void (Parallaction_br::*JobFn)(void*, Job*); - const JobFn *_jobsFn; - JobOpcode* createJobOpcode(uint functionId, Job *job); + const JobFn *_jobsFn; + JobOpcode* createJobOpcode(uint functionId, Job *job); - void changeLocation(char *location); + void changeLocation(char *location); void changeCharacter(const char *name); void initPart(); @@ -1011,10 +1011,10 @@ private: void setMousePointer(int16 index); void initCursors(); - Frames *_dinoCursor; + Frames *_dinoCursor; Frames *_dougCursor; Frames *_donnaCursor; - Frames *_mouseArrow; + Frames *_mouseArrow; int showMenu(); diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp index d4fcceafd5..1f83c346bd 100644 --- a/engines/parallaction/parser_br.cpp +++ b/engines/parallaction/parser_br.cpp @@ -779,10 +779,10 @@ void Parallaction_br::parseRValue(ScriptVar &v, const char *str) { typedef OpcodeImpl<Parallaction_br> OpcodeV2; #define INSTRUCTION_PARSER(sig) OpcodeV2(this, &Parallaction_br::instParse_##sig) -#define ZONE_PARSER(sig) OpcodeV2(this, &Parallaction_br::locZoneParse_##sig) -#define ANIM_PARSER(sig) OpcodeV2(this, &Parallaction_br::locAnimParse_##sig) -#define LOCATION_PARSER(sig) OpcodeV2(this, &Parallaction_br::locParse_##sig) -#define COMMAND_PARSER(sig) OpcodeV2(this, &Parallaction_br::cmdParse_##sig) +#define ZONE_PARSER(sig) OpcodeV2(this, &Parallaction_br::locZoneParse_##sig) +#define ANIM_PARSER(sig) OpcodeV2(this, &Parallaction_br::locAnimParse_##sig) +#define LOCATION_PARSER(sig) OpcodeV2(this, &Parallaction_br::locParse_##sig) +#define COMMAND_PARSER(sig) OpcodeV2(this, &Parallaction_br::cmdParse_##sig) #define WARNING_PARSER(sig) OpcodeV2(this, &Parallaction_br::warning_##sig) diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp index b593cc23bf..6cd298ea0c 100644 --- a/engines/parallaction/parser_ns.cpp +++ b/engines/parallaction/parser_ns.cpp @@ -29,16 +29,16 @@ namespace Parallaction { -#define CMD_SET 1 +#define CMD_SET 1 #define CMD_CLEAR 2 #define CMD_START 3 #define CMD_SPEAK 4 -#define CMD_GET 5 +#define CMD_GET 5 #define CMD_LOCATION 6 #define CMD_OPEN 7 #define CMD_CLOSE 8 #define CMD_ON 9 -#define CMD_OFF 10 +#define CMD_OFF 10 #define CMD_CALL 11 #define CMD_TOGGLE 12 #define CMD_DROP 13 @@ -46,7 +46,7 @@ namespace Parallaction { #define CMD_MOVE 15 #define CMD_STOP 16 -#define INST_ON 1 +#define INST_ON 1 #define INST_OFF 2 #define INST_X 3 #define INST_Y 4 @@ -1034,10 +1034,10 @@ void Parallaction_ns::parseWalkNodes(Script& script, WalkNodeList &list) { typedef OpcodeImpl<Parallaction_ns> OpcodeV1; #define INSTRUCTION_PARSER(sig) OpcodeV1(this, &Parallaction_ns::instParse_##sig) -#define ZONE_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locZoneParse_##sig) -#define ANIM_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locAnimParse_##sig) -#define LOCATION_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locParse_##sig) -#define COMMAND_PARSER(sig) OpcodeV1(this, &Parallaction_ns::cmdParse_##sig) +#define ZONE_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locZoneParse_##sig) +#define ANIM_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locAnimParse_##sig) +#define LOCATION_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locParse_##sig) +#define COMMAND_PARSER(sig) OpcodeV1(this, &Parallaction_ns::cmdParse_##sig) #define WARNING_PARSER(sig) OpcodeV1(this, &Parallaction_br::warning_##sig) diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h index 9d6ea01485..8842558ae9 100644 --- a/engines/parallaction/sound.h +++ b/engines/parallaction/sound.h @@ -46,8 +46,8 @@ class MidiPlayer; class SoundMan { protected: - Parallaction *_vm; - Audio::Mixer *_mixer; + Parallaction *_vm; + Audio::Mixer *_mixer; char _musicFile[PATH_LEN]; public: @@ -67,7 +67,7 @@ public: class DosSoundMan : public SoundMan { - MidiPlayer *_midiPlayer; + MidiPlayer *_midiPlayer; int _musicData1; public: diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp index d35132fc35..3b5948fe92 100644 --- a/engines/parallaction/walk.cpp +++ b/engines/parallaction/walk.cpp @@ -31,7 +31,7 @@ static uint16 _doorData1 = 1000; static Zone *_zoneTrap = NULL; static uint16 walkData1 = 0; -static uint16 walkData2 = 0; // next walk frame +static uint16 walkData2 = 0; // next walk frame inline byte PathBuffer::getValue(uint16 x, uint16 y) { diff --git a/engines/parallaction/walk.h b/engines/parallaction/walk.h index e06ef02741..fea83e5a23 100644 --- a/engines/parallaction/walk.h +++ b/engines/parallaction/walk.h @@ -48,7 +48,7 @@ public: typedef ManagedList<WalkNode*> WalkNodeList; -void jobWalk(void*, Job *j); +void jobWalk(void*, Job *j); struct PathBuffer { // handles a 1-bit depth buffer used for masking non-walkable areas @@ -86,10 +86,10 @@ public: class PathBuilder { - Animation *_anim; + Animation *_anim; - WalkNodeList *_list; - Common::List<WalkNode*> _subPath; + WalkNodeList *_list; + Common::List<WalkNode*> _subPath; void correctPathPoint(Common::Point &to); uint32 buildSubPath(const Common::Point& pos, const Common::Point& stop); diff --git a/engines/queen/command.h b/engines/queen/command.h index a3058c10de..5d2f91d9a9 100644 --- a/engines/queen/command.h +++ b/engines/queen/command.h @@ -199,7 +199,7 @@ private: //! returns true if the specified verb is an inventory scroll bool isVerbInvScroll(Verb v) const { return v == VERB_SCROLL_UP || v == VERB_SCROLL_DOWN; } - //! commands list for each possible action + //! commands list for each possible action CmdListData *_cmdList; uint16 _numCmdList; diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index d20384f2bc..5a8db74e3b 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -314,7 +314,7 @@ const RetailGameVersion *Resource::detectGameVersionFromSize(uint32 size) { if (_gameVersions[i].dataFileSize == size) { return &_gameVersions[i]; } - } + } return NULL; } diff --git a/engines/queen/sound.h b/engines/queen/sound.h index e2a279c09b..c2c1481cc6 100644 --- a/engines/queen/sound.h +++ b/engines/queen/sound.h @@ -138,7 +138,7 @@ public: void stopSpeech() { _mixer->stopHandle(_speechHandle); } bool isSpeechActive() const { return _mixer->isSoundHandleActive(_speechHandle); } - bool isSfxActive() const { return _mixer->isSoundHandleActive(_sfxHandle); } + bool isSfxActive() const { return _mixer->isSoundHandleActive(_sfxHandle); } void setVolume(int vol); diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp index eef2954d9a..7765828bd7 100644 --- a/engines/queen/walk.cpp +++ b/engines/queen/walk.cpp @@ -469,8 +469,8 @@ int16 Walk::findAreaPosition(int16 *x, int16 *y, bool recalibrate) { pos = i; } } - // we now have the closest area near X,Y, so we can recalibrate - // the X,Y coord to be in this area + // we now have the closest area near X,Y, so we can recalibrate + // the X,Y coord to be in this area if (recalibrate) { b = &_roomArea[pos].box; if (*x < b->x1) *x = b->x1; diff --git a/engines/queen/xref.txt b/engines/queen/xref.txt index 9e562069e3..171ae930b0 100644 --- a/engines/queen/xref.txt +++ b/engines/queen/xref.txt @@ -180,7 +180,7 @@ USE_CLOTHES() Logic::joeUseClothes USE_DRESS() Logic::joeUseDress - CUTJOEF Logic::_joe.cutFacing -JOE_RESPstr Logic::_joeResponse +JOE_RESPstr Logic::_joeResponse JOEF,JX,JY,JDIR Logic::_joe.* JOEWALK Logic::_joe.walk @@ -219,13 +219,13 @@ SETUP_FURNITURE() Graphics::setupRoomFurniture SETUP_ROOM() Logic::changeRoom SETUP_SCREENS() *not needed* (only calls Display::setupPanel) SETUP_VARS() *not needed* (equivalent to Command::clear(), SCENE=0, clear(gamestate)) -update() QueenEngine::update +update() QueenEngine::update - -A_ANIMstr Logic::_aAnim +A_ANIMstr Logic::_aAnim A_ANIM_MAX Logic::_numAAnim -A_NAMEstr Logic::_aName +A_NAMEstr Logic::_aName A_NAME_MAX Logic::_numAName -A_FILEstr Logic::_aFile +A_FILEstr Logic::_aFile A_FILE_MAX Logic::_numAFile ACTOR_DATA_MAX Logic::_numActors bamflag BamScene::_flag @@ -250,7 +250,7 @@ OBJECT_DATA Logic::_objectData OBJECT_DESCRstr Logic::_objDescription OBJECT_NAMEstr Logic::_objName OBJTOT Logic::_numObjects -OLDROOM,ROOM,NEW_ROOM Logic::_*oom +OLDROOM,ROOM,NEW_ROOM Logic::_*oom ROOMTOT Logic::_numRooms ROOM_DATA Logic::_roomData ROOM_NAMEstr Logic::_roomName @@ -282,9 +282,9 @@ SFRAME Person.bobFrame RESOURCE ======== -tflen() Resource::fileSize +tflen() Resource::fileSize topen() Resource::loadFile -tseek() *not needed* +tseek() *not needed* SCREEN @@ -375,10 +375,10 @@ TEXTS ===== blanktexts() Display::clearTexts drawtext() Display::drawTexts -Ink() Display::textCurrentColor -MIDDLE() Display::textCenterX / Display::textSetCentered +Ink() Display::textCurrentColor +MIDDLE() Display::textCenterX / Display::textSetCentered text() Display::setText -textlen() Display::textWidth +textlen() Display::textWidth - textcol Display::_curTextColor texts Display::_texts diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp index 4b07134b1d..d1f592e38b 100644 --- a/engines/saga/gfx.cpp +++ b/engines/saga/gfx.cpp @@ -401,7 +401,7 @@ void Gfx::blackToPal(PalEntry *srcPal, double percent) { // Used in IHNM only void Gfx::palFade(PalEntry *srcPal, int16 from, int16 to, int16 start, int16 numColors, double percent) { - int i; + int i; int new_entry; byte *ppal; PalEntry *palE; diff --git a/engines/saga/itedata.cpp b/engines/saga/itedata.cpp index 999c963d52..1274f72b45 100644 --- a/engines/saga/itedata.cpp +++ b/engines/saga/itedata.cpp @@ -60,169 +60,169 @@ ActorTableData ITE_ActorTable[ITE_ACTORCOUNT] = { { 0, 56, 49, 1384, 792, 0, 95, 193, 20, 72, 0, 0, 0}, // faire goer 1b (otter) { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 2a { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 2b - { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 3a - { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 3b - { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 4a - { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 4b - { 0, 18, 32, 764, 448, 0, 55, 150, 0, 48, 10, 4, 4}, // Scorry - { 0, 35, 32, 0, 0, 0, 56, 151, 0, 112, 0, 0, 0}, // grand puzzler - { 0, 36, 32, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0}, // Rhene - { 0, 32, 32, 0, 0, 0, 91, 190, 0, 98, 0, 0, 0}, // elk captain - { 0, 31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0}, // elk guard 1 - { 0, 31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0}, // elk guard 2 - { 0, 31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0}, // elk guard 3 - { 0, 31, 32, 0, 0, 0, 79, 172, 0, 18, 0, 0, 0}, // boar sergeant - { 0, 21, 50, 664, 400, 0, 76, 171, 2, 74, 0, 4, 4}, // boar sentry 1 - { 0, 21, 50, 892, 428, 0, 76, 171, 2, 74, 0, 4, 4}, // boar sentry 2 - { 0, 9, 51, 904, 936, 0, 51, 145, 35, 5, 0, 0, 0}, // hall rat 1 - { 0, 9, 51, 872, 840, 0, 51, 145, 36, 5, 0, 0, 0}, // hall rat 2 - { 0, 9, 51, 1432, 344, 0, 51, 145, 37, 5, 0, 0, 0}, // hall rat 3 - { 0, 9, 51, 664, 472, 0, 51, 145, 38, 5, 0, 0, 0}, // hall rat 4 - { 0, 10, 51, 1368, 1464, 0, 80, 146, 39, 147, 0, 0, 0}, // book rat 1 - { 0, 10, 51, 1416, 1624, 0, 80, 146, 40, 147, 0, 0, 0}, // book rat 2 - { 0, 10, 51, 1752, 120, 0, 80, 146, 41, 147, 0, 0, 0}, // book rat 3 - { 0, 10, 51, 984, 408, 0, 80, 146, 42, 147, 0, 0, 0}, // book rat 4 - { 0, 14, 52, 856, 376, 0, 82, 174, 8, 73, 0, 0, 0}, // grounds servant 1 - { 0, 14, 52, 808, 664, 0, 82, 174, 9, 73, 0, 0, 0}, // grounds servant 2 - { 0, 14, 52, 440, 568, 0, 82, 174, 10, 73, 0, 0, 0}, // grounds servant 3 - { 0, 14, 52, 392, 776, 0, 82, 174, 11, 73, 0, 0, 0}, // grounds servant 4 - { 0, 21, 4, 240, 384, 0, 79, 172, 0, 18, 0, 2, 2}, // boar sentry 3 (by doorway) - { 0, 23, 4, 636, 268, 0, 77, 173, 0, 74, 0, 4, 4}, // boar courtier - { 0, 22, 4, 900, 320, 0, 78, 179, 0, 60, 0, 4, 4}, // boar king - { 0, 14, 4, 788, 264, 0, 75, 170, 0, 171, 0, 2, 2}, // boar servant 1 - { 0, 14, 4, 1088, 264, 0, 75, 170, 0, 171, 0, 6, 6}, // boar servant 2 - { 0, 24, 19, 728, 396, 0, 65, 181, 47, 146, 0, 6, 6}, // glass master - { 0, 24, 21, -20, -20, 0, 66, 182, 0, 146, 0, 4, 4}, // glass master (with orb) - { kCycle, 25, 19, 372, 464, 0, 67, 183, 73, 146, 0, 2, 2}, // glass worker - { 0, 26, 5, 564, 476, 27, 53, 149, 1, 5, 0, 4, 4}, // door rat - { kCycle, 27, 31, 868, 344, 0, 81, 180, 0, 171, 0, 4, 4}, // bees - { 0, 28, 73, 568, 380, 0, 83, 176, 30, 120, 0, 4, 4}, // fortune teller - { 0, 14, 7, 808, 480, 0, 82, 174, 9, 73, 0, 0, 0}, // orb messenger - { 0, 29, 10, 508, 432, 0, 84, 186, 6, 112, 0, 4, 4}, // elk king - { 0, 33, 10, 676, 420, 0, 86, 184, 6, 171, 0, 4, 4}, // elk chancellor - { 0, 30, 10, 388, 452, 0, 88, 185, 6, 171, 0, 4, 4}, // elk courtier 1 - { 0, 30, 10, 608, 444, 0, 89, 185, 6, 171, 0, 4, 4}, // elk courtier 2 - { 0, 31, 10, 192, 468, 0, 90, 189, 6, 171, 0, 4, 4}, // elk throne guard 1 - { 0, 31, 10, 772, 432, 0, 90, 189, 6, 171, 0, 4, 4}, // elk throne guard 2 - { 0, 14, 10, 1340, 444, 0, 87, 188, 6, 171, 0, 4, 4}, // elk servant - { 0, 20, 18, 808, 360, 7, 60, 154, 64, 88, 0, 4, 4}, // hardware ferret - { 0, 34, 49, 1128, 1256, 0, 96, 191, 16, 35, 0, 4, 4}, // porcupine - { 0, 34, 49, 1384, 792, 0, 93, 192, 17, 66, 0, 4, 4}, // faire ram - { 0, 24, 21, 0, -40, 0, 65, 181, 50, 146, 0, 6, 6}, // glass master 2 - { 0, 3, 21, 0, -40, 0, 64, 158, 49, 112, 0, 0, 0}, // Sakka - { 0, 17, 21, 0, -40, 0, 62, 157, 74, 48, 0, 0, 0}, // lodge ferret 1 - { 0, 17, 21, 0, -40, 0, 62, 157, 74, 49, 0, 0, 0}, // lodge ferret 2 - { 0, 17, 21, 0, -40, 0, 62, 157, 74, 50, 0, 0, 0}, // lodge ferret 3 - { 0, 12, 244, 1056, 504, 0, 107, 167, 21, 124, 0, 6, 6}, // Elara - { 0, 8, 33, 248, 440, 0, 68, 169, 14, 112, 0, 0, 0}, // Tycho - { 0, 11, 23, 308, 424, 0, 106, 166, 6, 48, 0, 2, 2}, // Alamma - { 0, 17, 2, 1864, 1336, 0, 58, 153, 21, 49, 0, 0, 0}, // worker ferret 5 - { 0, 17, 2, 760, 216, 0, 58, 153, 22, 49, 0, 0, 0}, // worker ferret 6 - { 0, 44, 29, 0, 0, 0, 72, 159, 0, 112, 0, 0, 0}, // Prince - { 0, 45, 29, 0, 0, 0, 71, 163, 0, 146, 0, 6, 6}, // harem girl 1 - { 0, 45, 29, 0, 0, 0, 71, 163, 0, 124, 0, 2, 2}, // harem girl 2 - { 0, 45, 29, 0, 0, 0, 71, 163, 0, 169, 0, 0, 0}, // harem girl 3 - { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // dog sergeant - { 0, 7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0}, // throne dog guard 1 - { 0, 7, 257, 552, 408, 0, 70, 165, 0, 4, 0, 2, 2}, // throne dog guard 2 - { 0, 7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0}, // throne dog guard 3 - { 0, 7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0}, // throne dog guard 4 - { 0, 7, 257, 712, 380, 0, 69, 164, 0, 4, 0, 4, 4}, // throne dog guard 5 - { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 6 - { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 7 - { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 8 - { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 9 - { 0, 7, 0, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 10 - { 0, 7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0}, // throne dog guard 11 - { 0, 47, 30, 0, 0, 0, 102, 199, 1, 186, 0, 0, 0}, // old wolf ferryman - { 0, 48, 69, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0}, // cat village wildcat - { 0, 49, 69, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0}, // cat village attendant - { 0, 50, 69, 0, 0, 0, 111, 203, 16, 67, 0, 0, 0}, // cat village Prowwa - { 0, 51, 20, 0, 0, 0, 112, 204, 15, 26, 0, 0, 0}, // Prowwa hut Mirrhp - { 0, 50, 20, 0, 0, 0, 111, 203, 14, 67, 0, 0, 0}, // Prowwa hut Prowwa - { 0, 49, 20, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0}, // Prowwa hut attendant - { 0, 48, 256, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0}, // wildcat sentry - { 0, 21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0}, // boar warrior 1 - { 0, 21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0}, // boar warrior 2 - { 0, 21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0}, // boar warrior 3 - { 0, 52, 15, 152, 400, 0, 108, 168, 19, 48, 10, 2, 2}, // Alamma's voice - { 0, 47, 251, 640, 360, 0, 113, 205, 5, 186, 10, 2, 2}, // ferry on ocean - { 0, 41, 75, 152, 400, 0, 100, 197, 5, 81, 0, 0, 0}, // Shiala - { 0, 44, 9, 0, 0, 0, 73, 160, 54, 112, 0, 0, 0}, // Prince (asleep) - { 0, 0, 22, -20, -20, 0, 118, 209, 0, 171, 0, 0, 0}, // Rif and Eeah (at rockslide) - { 0, 1, 22, 0, 0, 0, 119, 210, 0, 171, 0, 0, 0}, // Okk (at rockslide) - { 0, 0, 22, -20, -20, 0, 118, 209, 0, 171, 0, 0, 0}, // Rif and Eeah (at rockslide w. rope) - { 0, 1, 22, 0, 0, 0, 119, 210, 0, 171, 0, 0, 0}, // Okk (at rockslide w. rope) - { 0, 53, 42, 640, 400, 0, 104, 201, 8, 141, 0, 0, 0}, // Kylas Honeyfoot - { 0, 54, 21, -20, -20, 0, 120, 211, 48, 238, 0, 0, 0}, // Orb of Hands - { 0, 0, 4, -20, -20, 0, 42, 140, 0, 1, 0, 0, 0}, // Rif (muddy) - { 0, 26, 5, -20, -20, 27, 52, 148, 1, 5, 0, 4, 4}, // door rat (standing) - { 0, 36, 4, -20, -20, 0, 116, 207, 0, 155, 0, 0, 0}, // boar with Rhene 1 - { 0, 36, 0, -20, -20, 0, 117, 208, 0, 155, 0, 0, 0}, // boar with Rhene 2 - { 0, 46, 252, -20, -20, 0, 74, 162, 29, 34, 0, 0, 0}, // dog jailer - { 0, 0, 32, -20, -20, 0, 41, 137, 0, 1, 0, 0, 0}, // Rif (tourney) - { 0, 0, 259, -20, -20, 0, 44, 138, 0, 1, 0, 0, 0}, // cliff rat - { 0, 0, 5, -20, -20, 0, 43, 139, 0, 1, 0, 0, 0}, // Rif (cloaked) - { 0, 0, 31, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (oak tree scene) - { 0, 0, 252, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (jail cell scene) - { 0, 0, 15, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (outside Alamma's) - { 0, 0, 20, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (sick tent) - { 0, 0, 25, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (gem room) - { 0, 0, 272, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0}, // Rif (dragon maze) - { 0, 0, 50, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (boar entry gate) - { 0, 50, 71, -20, -20, 0, 111, 203, 0, 67, 0, 0, 0}, // Prowwa (dog castle back) - { 0, 50, 274, -20, -20, 0, 111, 203, 0, 67, 0, 0, 0}, // Prowwa (cat festival) - { 0, 50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0}, // cat festival dancer 1 - { 0, 50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0}, // cat festival dancer 2 - { 0, 50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0}, // cat festival dancer 3 - { 0, 57, 272, 909, 909, 48, 121, 213, 0, 171, 0, 0, 0}, // komodo dragon - { 0, 58, 15, -20, -20, 0, 122, 214, 0, 171, 0, 0, 0}, // letter from Elara - { 0, 37, 246, -20, -20, 0, 97, 194, 0, 141, 0, 0, 0}, // Gar (wolves' cage) - { 0, 38, 246, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0}, // Wrah (wolves' cage) - { 0, 59, 246, -20, -20, 0, 103, 200, 0, 26, 0, 0, 0}, // Chota (wolves' cage) - { 0, 41, 245, -20, -20, 0, 100, 197, 0, 81, 0, 0, 0}, // Shiala (wolves' cage) - { 0, 47, 250, 640, 360, 0, 114, 205, 0, 186, 10, 2, 2}, // ferry on ocean - { 0, 0, 278, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0}, // Rif (falling in tunnel trap door) - { 0, 0, 272, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0}, // Rif (falling in dragon maze) - { 0, 41, 77, -20, -20, 0, 100, 197, 24, 81, 0, 0, 0}, // Shiala (grotto) - { 0, 37, 261, -20, -20, 0, 97, 194, 0, 141, 0, 0, 0}, // Gar (ambush) - { 0, 38, 261, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0}, // Wrah (ambush) - { 0, 39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0}, // dark claw wolf (ambush) - { 0, 39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0}, // dark claw wolf (ambush) - { 0, 39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0}, // dark claw wolf (ambush) - { 0, 39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0}, // dark claw wolf (ambush) - { 0, 59, 279, -20, -20, 0, 103, 200, 0, 26, 0, 0, 0}, // Chota (top of dam) - { 0, 38, 279, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0}, // Wrah (top of dam) - { 0, 42, 77, -20, -20, 0, 101, 198, 25, 171, 0, 0, 0}, // Shiala's spear - { 0, 59, 281, -20, -20, 0, 103, 200, 26, 26, 0, 0, 0}, // Chota (lab) - { 0, 59, 279, -20, -20, 0, 123, 215, 0, 1, 0, 0, 0}, // Rif (finale) - { 0, 59, 279, -20, -20, 0, 123, 215, 0, 132, 0, 0, 0}, // Okk (finale) - { 0, 59, 279, -20, -20, 0, 123, 215, 0, 161, 0, 0, 0}, // Eeah (finale) - { 0, 54, 279, -20, -20, 0, 120, 211, 0, 133, 0, 6, 6}, // Orb of Storms (top of dam) - { 0, 44, 9, -20, -20, 0, 124, 161, 0, 171, 0, 6, 6}, // Prince's snores - { 0, 7, 255, 588, 252, 0, 70, 165, 0, 3, 0, 2, 2}, // hall dog guard 1 - { 0, 7, 255, 696, 252, 0, 70, 165, 0, 5, 0, 6, 6}, // hall dog guard 2 - { 0, 36, 4, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0}, // Rhene - { 0, 44, 272, 1124, 1124, 120, 72, 159, 0, 112, 0, 0, 0}, // Prince (dragon maze) - { 0, 7, 272, 1124, 1108, 120, 70, 165, 0, 4, 0, 0, 0}, // dog heckler 1 (dragon maze) - { 0, 7, 272, 1108, 1124, 120, 70, 165, 0, 4, 0, 0, 0}, // dog heckler 2 (dragon maze) - { 0, 29, 288, 508, 432, 0, 85, 187, 0, 112, 0, 4, 4}, // elk king (finale) - { 0, 29, 0, 508, 432, 0, 84, 186, 0, 99, 0, 4, 4}, // crowd voice 1 (finale) - { 0, 29, 0, 508, 432, 0, 84, 186, 0, 98, 0, 4, 4}, // crowd voice 2 (finale) - { 0, 29, 0, 508, 432, 0, 84, 186, 0, 104, 0, 4, 4}, // crowd voice 3 (finale) - { 0, 29, 0, 508, 432, 0, 84, 186, 0, 99, 0, 4, 4}, // crowd voice 4 (finale) - { 0, 36, 288, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0}, // Rhene (finale) - { 0, 1, 27, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (temple gate) - { 0, 1, 252, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (jail cell) - { 0, 1, 25, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (gem room) - { 0, 1, 259, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (cliff) - { 0, 1, 279, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (dam top) - { 0, 1, 273, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (human ruins) - { 0, 1, 26, -20, -20, 0, 8, 178, 0, 171, 0, 0, 0}, // puzzle pieces - { 0, 1, 0, -20, -20, 0, 0, 0, 0, 50, 0, 0, 0}, // poker dog 1 - { 0, 1, 0, -20, -20, 0, 0, 0, 0, 82, 0, 0, 0}, // poker dog 2 - { 0, 1, 0, -20, -20, 0, 0, 0, 0, 35, 0, 0, 0}, // poker dog 3 - { 0, 9, 74, -20, -20, 0, 51, 145, 0, 5, 0, 0, 0} // sundial rat + { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 3a + { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 3b + { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 4a + { 0, 19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0}, // faire goer 4b + { 0, 18, 32, 764, 448, 0, 55, 150, 0, 48, 10, 4, 4}, // Scorry + { 0, 35, 32, 0, 0, 0, 56, 151, 0, 112, 0, 0, 0}, // grand puzzler + { 0, 36, 32, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0}, // Rhene + { 0, 32, 32, 0, 0, 0, 91, 190, 0, 98, 0, 0, 0}, // elk captain + { 0, 31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0}, // elk guard 1 + { 0, 31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0}, // elk guard 2 + { 0, 31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0}, // elk guard 3 + { 0, 31, 32, 0, 0, 0, 79, 172, 0, 18, 0, 0, 0}, // boar sergeant + { 0, 21, 50, 664, 400, 0, 76, 171, 2, 74, 0, 4, 4}, // boar sentry 1 + { 0, 21, 50, 892, 428, 0, 76, 171, 2, 74, 0, 4, 4}, // boar sentry 2 + { 0, 9, 51, 904, 936, 0, 51, 145, 35, 5, 0, 0, 0}, // hall rat 1 + { 0, 9, 51, 872, 840, 0, 51, 145, 36, 5, 0, 0, 0}, // hall rat 2 + { 0, 9, 51, 1432, 344, 0, 51, 145, 37, 5, 0, 0, 0}, // hall rat 3 + { 0, 9, 51, 664, 472, 0, 51, 145, 38, 5, 0, 0, 0}, // hall rat 4 + { 0, 10, 51, 1368, 1464, 0, 80, 146, 39, 147, 0, 0, 0}, // book rat 1 + { 0, 10, 51, 1416, 1624, 0, 80, 146, 40, 147, 0, 0, 0}, // book rat 2 + { 0, 10, 51, 1752, 120, 0, 80, 146, 41, 147, 0, 0, 0}, // book rat 3 + { 0, 10, 51, 984, 408, 0, 80, 146, 42, 147, 0, 0, 0}, // book rat 4 + { 0, 14, 52, 856, 376, 0, 82, 174, 8, 73, 0, 0, 0}, // grounds servant 1 + { 0, 14, 52, 808, 664, 0, 82, 174, 9, 73, 0, 0, 0}, // grounds servant 2 + { 0, 14, 52, 440, 568, 0, 82, 174, 10, 73, 0, 0, 0}, // grounds servant 3 + { 0, 14, 52, 392, 776, 0, 82, 174, 11, 73, 0, 0, 0}, // grounds servant 4 + { 0, 21, 4, 240, 384, 0, 79, 172, 0, 18, 0, 2, 2}, // boar sentry 3 (by doorway) + { 0, 23, 4, 636, 268, 0, 77, 173, 0, 74, 0, 4, 4}, // boar courtier + { 0, 22, 4, 900, 320, 0, 78, 179, 0, 60, 0, 4, 4}, // boar king + { 0, 14, 4, 788, 264, 0, 75, 170, 0, 171, 0, 2, 2}, // boar servant 1 + { 0, 14, 4, 1088, 264, 0, 75, 170, 0, 171, 0, 6, 6}, // boar servant 2 + { 0, 24, 19, 728, 396, 0, 65, 181, 47, 146, 0, 6, 6}, // glass master + { 0, 24, 21, -20, -20, 0, 66, 182, 0, 146, 0, 4, 4}, // glass master (with orb) + { kCycle, 25, 19, 372, 464, 0, 67, 183, 73, 146, 0, 2, 2}, // glass worker + { 0, 26, 5, 564, 476, 27, 53, 149, 1, 5, 0, 4, 4}, // door rat + { kCycle, 27, 31, 868, 344, 0, 81, 180, 0, 171, 0, 4, 4}, // bees + { 0, 28, 73, 568, 380, 0, 83, 176, 30, 120, 0, 4, 4}, // fortune teller + { 0, 14, 7, 808, 480, 0, 82, 174, 9, 73, 0, 0, 0}, // orb messenger + { 0, 29, 10, 508, 432, 0, 84, 186, 6, 112, 0, 4, 4}, // elk king + { 0, 33, 10, 676, 420, 0, 86, 184, 6, 171, 0, 4, 4}, // elk chancellor + { 0, 30, 10, 388, 452, 0, 88, 185, 6, 171, 0, 4, 4}, // elk courtier 1 + { 0, 30, 10, 608, 444, 0, 89, 185, 6, 171, 0, 4, 4}, // elk courtier 2 + { 0, 31, 10, 192, 468, 0, 90, 189, 6, 171, 0, 4, 4}, // elk throne guard 1 + { 0, 31, 10, 772, 432, 0, 90, 189, 6, 171, 0, 4, 4}, // elk throne guard 2 + { 0, 14, 10, 1340, 444, 0, 87, 188, 6, 171, 0, 4, 4}, // elk servant + { 0, 20, 18, 808, 360, 7, 60, 154, 64, 88, 0, 4, 4}, // hardware ferret + { 0, 34, 49, 1128, 1256, 0, 96, 191, 16, 35, 0, 4, 4}, // porcupine + { 0, 34, 49, 1384, 792, 0, 93, 192, 17, 66, 0, 4, 4}, // faire ram + { 0, 24, 21, 0, -40, 0, 65, 181, 50, 146, 0, 6, 6}, // glass master 2 + { 0, 3, 21, 0, -40, 0, 64, 158, 49, 112, 0, 0, 0}, // Sakka + { 0, 17, 21, 0, -40, 0, 62, 157, 74, 48, 0, 0, 0}, // lodge ferret 1 + { 0, 17, 21, 0, -40, 0, 62, 157, 74, 49, 0, 0, 0}, // lodge ferret 2 + { 0, 17, 21, 0, -40, 0, 62, 157, 74, 50, 0, 0, 0}, // lodge ferret 3 + { 0, 12, 244, 1056, 504, 0, 107, 167, 21, 124, 0, 6, 6}, // Elara + { 0, 8, 33, 248, 440, 0, 68, 169, 14, 112, 0, 0, 0}, // Tycho + { 0, 11, 23, 308, 424, 0, 106, 166, 6, 48, 0, 2, 2}, // Alamma + { 0, 17, 2, 1864, 1336, 0, 58, 153, 21, 49, 0, 0, 0}, // worker ferret 5 + { 0, 17, 2, 760, 216, 0, 58, 153, 22, 49, 0, 0, 0}, // worker ferret 6 + { 0, 44, 29, 0, 0, 0, 72, 159, 0, 112, 0, 0, 0}, // Prince + { 0, 45, 29, 0, 0, 0, 71, 163, 0, 146, 0, 6, 6}, // harem girl 1 + { 0, 45, 29, 0, 0, 0, 71, 163, 0, 124, 0, 2, 2}, // harem girl 2 + { 0, 45, 29, 0, 0, 0, 71, 163, 0, 169, 0, 0, 0}, // harem girl 3 + { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // dog sergeant + { 0, 7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0}, // throne dog guard 1 + { 0, 7, 257, 552, 408, 0, 70, 165, 0, 4, 0, 2, 2}, // throne dog guard 2 + { 0, 7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0}, // throne dog guard 3 + { 0, 7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0}, // throne dog guard 4 + { 0, 7, 257, 712, 380, 0, 69, 164, 0, 4, 0, 4, 4}, // throne dog guard 5 + { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 6 + { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 7 + { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 8 + { 0, 7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 9 + { 0, 7, 0, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0}, // throne dog guard 10 + { 0, 7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0}, // throne dog guard 11 + { 0, 47, 30, 0, 0, 0, 102, 199, 1, 186, 0, 0, 0}, // old wolf ferryman + { 0, 48, 69, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0}, // cat village wildcat + { 0, 49, 69, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0}, // cat village attendant + { 0, 50, 69, 0, 0, 0, 111, 203, 16, 67, 0, 0, 0}, // cat village Prowwa + { 0, 51, 20, 0, 0, 0, 112, 204, 15, 26, 0, 0, 0}, // Prowwa hut Mirrhp + { 0, 50, 20, 0, 0, 0, 111, 203, 14, 67, 0, 0, 0}, // Prowwa hut Prowwa + { 0, 49, 20, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0}, // Prowwa hut attendant + { 0, 48, 256, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0}, // wildcat sentry + { 0, 21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0}, // boar warrior 1 + { 0, 21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0}, // boar warrior 2 + { 0, 21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0}, // boar warrior 3 + { 0, 52, 15, 152, 400, 0, 108, 168, 19, 48, 10, 2, 2}, // Alamma's voice + { 0, 47, 251, 640, 360, 0, 113, 205, 5, 186, 10, 2, 2}, // ferry on ocean + { 0, 41, 75, 152, 400, 0, 100, 197, 5, 81, 0, 0, 0}, // Shiala + { 0, 44, 9, 0, 0, 0, 73, 160, 54, 112, 0, 0, 0}, // Prince (asleep) + { 0, 0, 22, -20, -20, 0, 118, 209, 0, 171, 0, 0, 0}, // Rif and Eeah (at rockslide) + { 0, 1, 22, 0, 0, 0, 119, 210, 0, 171, 0, 0, 0}, // Okk (at rockslide) + { 0, 0, 22, -20, -20, 0, 118, 209, 0, 171, 0, 0, 0}, // Rif and Eeah (at rockslide w. rope) + { 0, 1, 22, 0, 0, 0, 119, 210, 0, 171, 0, 0, 0}, // Okk (at rockslide w. rope) + { 0, 53, 42, 640, 400, 0, 104, 201, 8, 141, 0, 0, 0}, // Kylas Honeyfoot + { 0, 54, 21, -20, -20, 0, 120, 211, 48, 238, 0, 0, 0}, // Orb of Hands + { 0, 0, 4, -20, -20, 0, 42, 140, 0, 1, 0, 0, 0}, // Rif (muddy) + { 0, 26, 5, -20, -20, 27, 52, 148, 1, 5, 0, 4, 4}, // door rat (standing) + { 0, 36, 4, -20, -20, 0, 116, 207, 0, 155, 0, 0, 0}, // boar with Rhene 1 + { 0, 36, 0, -20, -20, 0, 117, 208, 0, 155, 0, 0, 0}, // boar with Rhene 2 + { 0, 46, 252, -20, -20, 0, 74, 162, 29, 34, 0, 0, 0}, // dog jailer + { 0, 0, 32, -20, -20, 0, 41, 137, 0, 1, 0, 0, 0}, // Rif (tourney) + { 0, 0, 259, -20, -20, 0, 44, 138, 0, 1, 0, 0, 0}, // cliff rat + { 0, 0, 5, -20, -20, 0, 43, 139, 0, 1, 0, 0, 0}, // Rif (cloaked) + { 0, 0, 31, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (oak tree scene) + { 0, 0, 252, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (jail cell scene) + { 0, 0, 15, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (outside Alamma's) + { 0, 0, 20, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (sick tent) + { 0, 0, 25, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (gem room) + { 0, 0, 272, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0}, // Rif (dragon maze) + { 0, 0, 50, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0}, // Rif (boar entry gate) + { 0, 50, 71, -20, -20, 0, 111, 203, 0, 67, 0, 0, 0}, // Prowwa (dog castle back) + { 0, 50, 274, -20, -20, 0, 111, 203, 0, 67, 0, 0, 0}, // Prowwa (cat festival) + { 0, 50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0}, // cat festival dancer 1 + { 0, 50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0}, // cat festival dancer 2 + { 0, 50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0}, // cat festival dancer 3 + { 0, 57, 272, 909, 909, 48, 121, 213, 0, 171, 0, 0, 0}, // komodo dragon + { 0, 58, 15, -20, -20, 0, 122, 214, 0, 171, 0, 0, 0}, // letter from Elara + { 0, 37, 246, -20, -20, 0, 97, 194, 0, 141, 0, 0, 0}, // Gar (wolves' cage) + { 0, 38, 246, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0}, // Wrah (wolves' cage) + { 0, 59, 246, -20, -20, 0, 103, 200, 0, 26, 0, 0, 0}, // Chota (wolves' cage) + { 0, 41, 245, -20, -20, 0, 100, 197, 0, 81, 0, 0, 0}, // Shiala (wolves' cage) + { 0, 47, 250, 640, 360, 0, 114, 205, 0, 186, 10, 2, 2}, // ferry on ocean + { 0, 0, 278, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0}, // Rif (falling in tunnel trap door) + { 0, 0, 272, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0}, // Rif (falling in dragon maze) + { 0, 41, 77, -20, -20, 0, 100, 197, 24, 81, 0, 0, 0}, // Shiala (grotto) + { 0, 37, 261, -20, -20, 0, 97, 194, 0, 141, 0, 0, 0}, // Gar (ambush) + { 0, 38, 261, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0}, // Wrah (ambush) + { 0, 39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0}, // dark claw wolf (ambush) + { 0, 39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0}, // dark claw wolf (ambush) + { 0, 39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0}, // dark claw wolf (ambush) + { 0, 39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0}, // dark claw wolf (ambush) + { 0, 59, 279, -20, -20, 0, 103, 200, 0, 26, 0, 0, 0}, // Chota (top of dam) + { 0, 38, 279, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0}, // Wrah (top of dam) + { 0, 42, 77, -20, -20, 0, 101, 198, 25, 171, 0, 0, 0}, // Shiala's spear + { 0, 59, 281, -20, -20, 0, 103, 200, 26, 26, 0, 0, 0}, // Chota (lab) + { 0, 59, 279, -20, -20, 0, 123, 215, 0, 1, 0, 0, 0}, // Rif (finale) + { 0, 59, 279, -20, -20, 0, 123, 215, 0, 132, 0, 0, 0}, // Okk (finale) + { 0, 59, 279, -20, -20, 0, 123, 215, 0, 161, 0, 0, 0}, // Eeah (finale) + { 0, 54, 279, -20, -20, 0, 120, 211, 0, 133, 0, 6, 6}, // Orb of Storms (top of dam) + { 0, 44, 9, -20, -20, 0, 124, 161, 0, 171, 0, 6, 6}, // Prince's snores + { 0, 7, 255, 588, 252, 0, 70, 165, 0, 3, 0, 2, 2}, // hall dog guard 1 + { 0, 7, 255, 696, 252, 0, 70, 165, 0, 5, 0, 6, 6}, // hall dog guard 2 + { 0, 36, 4, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0}, // Rhene + { 0, 44, 272, 1124, 1124, 120, 72, 159, 0, 112, 0, 0, 0}, // Prince (dragon maze) + { 0, 7, 272, 1124, 1108, 120, 70, 165, 0, 4, 0, 0, 0}, // dog heckler 1 (dragon maze) + { 0, 7, 272, 1108, 1124, 120, 70, 165, 0, 4, 0, 0, 0}, // dog heckler 2 (dragon maze) + { 0, 29, 288, 508, 432, 0, 85, 187, 0, 112, 0, 4, 4}, // elk king (finale) + { 0, 29, 0, 508, 432, 0, 84, 186, 0, 99, 0, 4, 4}, // crowd voice 1 (finale) + { 0, 29, 0, 508, 432, 0, 84, 186, 0, 98, 0, 4, 4}, // crowd voice 2 (finale) + { 0, 29, 0, 508, 432, 0, 84, 186, 0, 104, 0, 4, 4}, // crowd voice 3 (finale) + { 0, 29, 0, 508, 432, 0, 84, 186, 0, 99, 0, 4, 4}, // crowd voice 4 (finale) + { 0, 36, 288, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0}, // Rhene (finale) + { 0, 1, 27, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (temple gate) + { 0, 1, 252, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (jail cell) + { 0, 1, 25, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (gem room) + { 0, 1, 259, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (cliff) + { 0, 1, 279, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (dam top) + { 0, 1, 273, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0}, // Okk (human ruins) + { 0, 1, 26, -20, -20, 0, 8, 178, 0, 171, 0, 0, 0}, // puzzle pieces + { 0, 1, 0, -20, -20, 0, 0, 0, 0, 50, 0, 0, 0}, // poker dog 1 + { 0, 1, 0, -20, -20, 0, 0, 0, 0, 82, 0, 0, 0}, // poker dog 2 + { 0, 1, 0, -20, -20, 0, 0, 0, 0, 35, 0, 0, 0}, // poker dog 3 + { 0, 9, 74, -20, -20, 0, 51, 145, 0, 5, 0, 0, 0} // sundial rat }; diff --git a/engines/saga/scene.h b/engines/saga/scene.h index 03a4ed48a9..0e4c0ed66a 100644 --- a/engines/saga/scene.h +++ b/engines/saga/scene.h @@ -307,7 +307,7 @@ class Scene { int getSceneResourceId(int sceneNumber) { #ifdef SCENE_DEBUG if ((sceneNumber < 0) || (sceneNumber >= _sceneCount)) { - error("getSceneResourceId: wrong sceneNumber %i", sceneNumber); + error("getSceneResourceId: wrong sceneNumber %i", sceneNumber); } #endif return _sceneLUT[sceneNumber]; diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 9f65bfbf94..8882abfeb4 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -2112,7 +2112,7 @@ const byte *Actor::getActorName() { if (_vm->_game.version == 0) { ptr = (const byte *)v0ActorNames[_number - 1]; } else { - ptr = _vm->getResourceAddress(rtActorName, _number); + ptr = _vm->getResourceAddress(rtActorName, _number); } if (ptr == NULL) { diff --git a/engines/scumm/bomp.cpp b/engines/scumm/bomp.cpp index ecd6f16923..ddb6264ccc 100644 --- a/engines/scumm/bomp.cpp +++ b/engines/scumm/bomp.cpp @@ -138,7 +138,7 @@ void bompApplyShadow0(const byte *shadowPalette, const byte *line_buffer, byte * byte tmp = *line_buffer++; if (tmp != transparency) { if (HE7Check) - *dst = shadowPalette[tmp]; + *dst = shadowPalette[tmp]; else *dst = tmp; } diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 207c3a51a4..f427594d54 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -251,7 +251,7 @@ byte *ScummEngine::get2byteCharPtr(int idx) { default: idx = 0; } - return _2byteFontPtr + ((_2byteWidth + 7) / 8) * _2byteHeight * idx; + return _2byteFontPtr + ((_2byteWidth + 7) / 8) * _2byteHeight * idx; } diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 0d0e7b054b..367247544b 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -228,7 +228,7 @@ void ScummEngine_v6::setCursorFromImg(uint img, uint room, uint imgindex) { } else { if (_game.heversion == 0) { setCursorHotspot(READ_LE_UINT16(&imhd->old.hotspot[0].x), - READ_LE_UINT16(&imhd->old.hotspot[0].y)); + READ_LE_UINT16(&imhd->old.hotspot[0].y)); } w = READ_LE_UINT16(&foir.cdhd->v6.w) / 8; h = READ_LE_UINT16(&foir.cdhd->v6.h) / 8; diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index f28cbb3548..e6663af855 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -3174,7 +3174,7 @@ void ScummEngine::fadeIn(int effect) { // // Hopefully it's safe to do it at this point, at least. _virtscr[kMainVirtScreen].setDirtyRange(0, 0); - transitionEffect(effect - 1); + transitionEffect(effect - 1); break; case 128: unkScreenEffect6(); @@ -3206,11 +3206,11 @@ void ScummEngine::fadeOut(int effect) { if (_game.version < 7) camera._last.x = camera._cur.x; - // TheDig can disable fadeIn(), and may call fadeOut() several times - // successively. Disabling the _screenEffectFlag check forces the screen - // to get cleared. This fixes glitches, at least, in the first cutscenes - // when bypassed of FT and TheDig. - if ((_game.version == 7 || _screenEffectFlag) && effect != 0) { + // TheDig can disable fadeIn(), and may call fadeOut() several times + // successively. Disabling the _screenEffectFlag check forces the screen + // to get cleared. This fixes glitches, at least, in the first cutscenes + // when bypassed of FT and TheDig. + if ((_game.version == 7 || _screenEffectFlag) && effect != 0) { // Fill screen 0 with black memset(vs->getPixels(0, 0), 0, vs->pitch * vs->h); @@ -3301,7 +3301,7 @@ void ScummEngine::transitionEffect(int a) { b = bottom; if (t < 0) t = 0; - _virtscr[kMainVirtScreen].tdirty[l] = _screenTop + t * 8; + _virtscr[kMainVirtScreen].tdirty[l] = _screenTop + t * 8; _virtscr[kMainVirtScreen].bdirty[l] = _screenTop + (b + 1) * 8; } updateDirtyScreen(kMainVirtScreen); diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp index 4fdfe139fc..d3578e2189 100644 --- a/engines/scumm/he/floodfill_he.cpp +++ b/engines/scumm/he/floodfill_he.cpp @@ -110,15 +110,15 @@ static void floodFillProcess(int x, int y, FloodFillState *ffs, FloodFillPixelCh Common::Rect r; int x_start; FloodFillLine *fflCur = --(*fillLineCur); - int dy = fflCur->inc; - int x_end = fflCur->x2; - int x1 = fflCur->x1; - int x2 = fflCur->x1 + 1; + int dy = fflCur->inc; + int x_end = fflCur->x2; + int x1 = fflCur->x1; + int x2 = fflCur->x1 + 1; r.bottom = r.top = y = fflCur->y + fflCur->inc; - r.left = x2; - r.right = x1; - x = x1; - while (ffs->srcBox.left <= x) { + r.left = x2; + r.right = x1; + x = x1; + while (ffs->srcBox.left <= x) { if (!(*pixelCheckCallback)(x, y, ffs)) { break; } diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index 0715bf756b..75da8cd04a 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -429,7 +429,7 @@ byte *Win32ResExtractor::extract_group_icon_cursor_resource(WinLibrary *fi, WinR /* get_resource_entry has printed error */ return NULL; } - if (size == 0) { + if (size == 0) { skipped++; continue; } diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index 08f9a8108a..a3237e7b3b 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -46,7 +46,7 @@ namespace Scumm { #define PE_HEADER(module) \ ((Win32ImageNTHeaders*)((byte *)(module) + \ - (((DOSImageHeader*)(module))->lfanew))) + (((DOSImageHeader*)(module))->lfanew))) #define PE_SECTIONS(module) \ ((Win32ImageSectionHeader *)((byte *) &PE_HEADER(module)->optional_header + \ diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 91312a4cfa..836f99b193 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -847,16 +847,16 @@ uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) { ctx->size = a; a = (a >> 1) + 1; } else { - a = ctx->size; + a = ctx->size; } - if (ctx->type == 2) { - ctx->b = *(ctx->ptr)++; - } - ctx->size = a - 1; - if (ctx->size == 0) { - ctx->type = 0; - } - decByte = ctx->b; + if (ctx->type == 2) { + ctx->b = *(ctx->ptr)++; + } + ctx->size = a - 1; + if (ctx->size == 0) { + ctx->type = 0; + } + decByte = ctx->b; } return decByte; } diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index c03be592d6..8cc87d74b6 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -1958,10 +1958,10 @@ void ScummEngine_v72he::redimArray(int arrayId, int newDim2start, int newDim2end void ScummEngine_v72he::checkArrayLimits(int array, int dim2start, int dim2end, int dim1start, int dim1end) { if (dim1end < dim1start) { error("Across max %d smaller than min %d", dim1end, dim1start); - } - if (dim2end < dim2start) { - error("Down max %d smaller than min %d", dim2end, dim2start); - } + } + if (dim2end < dim2start) { + error("Down max %d smaller than min %d", dim2end, dim2start); + } ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array)); assert(ah); if ((int)FROM_LE_32(ah->dim2start) > dim2start || (int)FROM_LE_32(ah->dim2end) < dim2end || (int)FROM_LE_32(ah->dim1start) > dim1start || (int)FROM_LE_32(ah->dim1end) < dim1end) { diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 644fad7883..df472307eb 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -267,8 +267,8 @@ void Wiz::copyAuxImage(uint8 *dst1, uint8 *dst2, const uint8 *src, int dstw, int uint8 *dst2Ptr = dst2 + dstRect.left + dstRect.top * dstw; const uint8 *dataPtr = src; - while (rh--) { - uint16 off = READ_LE_UINT16(dataPtr); dataPtr += 2; + while (rh--) { + uint16 off = READ_LE_UINT16(dataPtr); dataPtr += 2; const uint8 *dataPtrNext = off + dataPtr; uint8 *dst1PtrNext = dst1Ptr + dstw; uint8 *dst2PtrNext = dst2Ptr + dstw; @@ -1302,40 +1302,40 @@ struct PolygonDrawData { int32 tx_acc = tp1->x << 16; int32 sx_acc = sp1->x << 16; int32 sy_acc = sp1->y << 16; - uint16 dy = ABS(tp2->y - tp1->y) + 1; - int32 tx_step = ((tp2->x - tp1->x) << 16) / dy; - int32 sx_step = ((sp2->x - sp1->x) << 16) / dy; - int32 sy_step = ((sp2->y - sp1->y) << 16) / dy; - - int y = tp1->y - mat[0].y; - while (dy--) { - assert(y >= 0 && y < pAreasNum); - PolygonArea *ppa = &pa[y]; - int32 ttx = tx_acc >> 16; - int32 tsx = sx_acc >> 16; - int32 tsy = sy_acc >> 16; - - if (ppa->xmin > ttx) { - ppa->xmin = ttx; - ppa->x1 = tsx; - ppa->y1 = tsy; + uint16 dy = ABS(tp2->y - tp1->y) + 1; + int32 tx_step = ((tp2->x - tp1->x) << 16) / dy; + int32 sx_step = ((sp2->x - sp1->x) << 16) / dy; + int32 sy_step = ((sp2->y - sp1->y) << 16) / dy; + + int y = tp1->y - mat[0].y; + while (dy--) { + assert(y >= 0 && y < pAreasNum); + PolygonArea *ppa = &pa[y]; + int32 ttx = tx_acc >> 16; + int32 tsx = sx_acc >> 16; + int32 tsy = sy_acc >> 16; + + if (ppa->xmin > ttx) { + ppa->xmin = ttx; + ppa->x1 = tsx; + ppa->y1 = tsy; } - if (ppa->xmax < ttx) { - ppa->xmax = ttx; - ppa->x2 = tsx; - ppa->y2 = tsy; + if (ppa->xmax < ttx) { + ppa->xmax = ttx; + ppa->x2 = tsx; + ppa->y2 = tsy; } - tx_acc += tx_step; - sx_acc += sx_step; - sy_acc += sy_step; + tx_acc += tx_step; + sx_acc += sx_step; + sy_acc += sy_step; - if (tp2->y <= tp1->y) { - --y; - } else { - ++y; - } - } + if (tp2->y <= tp1->y) { + --y; + } else { + ++y; + } + } } }; @@ -1411,26 +1411,26 @@ void Wiz::drawWizPolygonTransform(int resNum, int state, Common::Point *wp, int bbox[3].x = 0; bbox[3].y = wizH - 1; - int16 xmin_p, xmax_p, ymin_p, ymax_p; - xmin_p = ymin_p = (int16)0x7FFF; - xmax_p = ymax_p = (int16)0x8000; + int16 xmin_p, xmax_p, ymin_p, ymax_p; + xmin_p = ymin_p = (int16)0x7FFF; + xmax_p = ymax_p = (int16)0x8000; - for (i = 0; i < 4; ++i) { - xmin_p = MIN(wp[i].x, xmin_p); - xmax_p = MAX(wp[i].x, xmax_p); - ymin_p = MIN(wp[i].y, ymin_p); - ymax_p = MAX(wp[i].y, ymax_p); - } + for (i = 0; i < 4; ++i) { + xmin_p = MIN(wp[i].x, xmin_p); + xmax_p = MAX(wp[i].x, xmax_p); + ymin_p = MIN(wp[i].y, ymin_p); + ymax_p = MAX(wp[i].y, ymax_p); + } - int16 xmin_b, xmax_b, ymin_b, ymax_b; - xmin_b = ymin_b = (int16)0x7FFF; - xmax_b = ymax_b = (int16)0x8000; + int16 xmin_b, xmax_b, ymin_b, ymax_b; + xmin_b = ymin_b = (int16)0x7FFF; + xmax_b = ymax_b = (int16)0x8000; for (i = 0; i < 4; ++i) { - xmin_b = MIN(bbox[i].x, xmin_b); - xmax_b = MAX(bbox[i].x, xmax_b); - ymin_b = MIN(bbox[i].y, ymin_b); - ymax_b = MAX(bbox[i].y, ymax_b); + xmin_b = MIN(bbox[i].x, xmin_b); + xmax_b = MAX(bbox[i].x, xmax_b); + ymin_b = MIN(bbox[i].y, ymin_b); + ymax_b = MAX(bbox[i].y, ymax_b); } PolygonDrawData pdd(ymax_p - ymin_p + 1); @@ -1872,7 +1872,7 @@ void Wiz::processWizImage(const WizParameters *params) { displayWizComplexImage(params); break; case 2: - captureWizImage(params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer) != 0, params->compType); + captureWizImage(params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer) != 0, params->compType); break; case 3: if (params->processFlags & kWPFUseFile) { diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp index 4752cfa43a..d9bdf51d19 100644 --- a/engines/scumm/help.cpp +++ b/engines/scumm/help.cpp @@ -46,7 +46,7 @@ int ScummHelp::numPages(byte gameId) { case GID_MONKEY: case GID_MONKEY2: case GID_INDY4: - case GID_TENTACLE: + case GID_TENTACLE: case GID_SAMNMAX: case GID_DIG: case GID_FT: diff --git a/engines/scumm/insane/insane.h b/engines/scumm/insane/insane.h index 6ec5bd4f2a..761ca8b96c 100644 --- a/engines/scumm/insane/insane.h +++ b/engines/scumm/insane/insane.h @@ -81,7 +81,7 @@ class Insane { bool _insaneIsRunning; int32 _numberArray; - int32 _emulTimerId; + int32 _emulTimerId; int32 _emulateInterrupt; int32 _flag1d; int32 _mainTimerId; diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp index 4577512387..6f8bb1f0ca 100644 --- a/engines/scumm/insane/insane_enemy.cpp +++ b/engines/scumm/insane/insane_enemy.cpp @@ -1009,7 +1009,7 @@ int32 Insane::enemy5initializer(int32 actor1, int32 actor2, int32 probability) { int i; for (i = 0; i < 9; i++) - _enemyState[EN_VULTF2][i] = 0; + _enemyState[EN_VULTF2][i] = 0; for (i = 0; i < 9; i++) _enHdlVar[EN_VULTF2][i] = 0; diff --git a/engines/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp index b94dee6678..c7f0c7220b 100644 --- a/engines/scumm/insane/insane_iact.cpp +++ b/engines/scumm/insane/insane_iact.cpp @@ -525,7 +525,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12, void Insane::iactScene21(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 setupsan13, Chunk &b, int32 size, int32 flags, - int16 par1, int16 par2, int16 par3, int16 par4) { + int16 par1, int16 par2, int16 par3, int16 par4) { // void implementation } diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp index c7610da062..95741e145c 100644 --- a/engines/scumm/insane/insane_scenes.cpp +++ b/engines/scumm/insane/insane_scenes.cpp @@ -1257,7 +1257,7 @@ void Insane::postCase8(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } } - } + } _roadBranch = false; _roadStop = false; @@ -1318,7 +1318,7 @@ void Insane::postCase10(byte *renderBitmap, int32 codecparam, int32 setupsan12, break; } } - } + } _roadBranch = false; _roadStop = false; diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index fac3ad9975..bb05859c24 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -945,7 +945,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { if (memcmp(md5Backup, _gameMD5, 16) != 0) { warning("Game was saved with different gamedata - you may encounter problems"); debug(1, "You have %s and save is %s.", md5str2, md5str1); - memcpy(_gameMD5, md5Backup, 16); + memcpy(_gameMD5, md5Backup, 16); } } @@ -1068,16 +1068,16 @@ void ScummEngine::saveOrLoad(Serializer *s) { // Old, fragile resource save/load system. Doesn't save resources // with index 0, and breaks whenever we change the limit on a given // resource type. - for (type = rtFirst; type <= rtLast; type++) - if (_res->mode[type] != 1 && type != rtTemp && type != rtBuffer) { - // For V1-V5 games, there used to be no object name resources. - // At some point this changed. But since old savegames rely on - // unchanged resource counts, we have to hard code the following check - if (_game.version < 6 && type == rtObjectName) - continue; - for (idx = 1; idx < _res->num[type]; idx++) - saveLoadResource(s, type, idx); - } + for (type = rtFirst; type <= rtLast; type++) + if (_res->mode[type] != 1 && type != rtTemp && type != rtBuffer) { + // For V1-V5 games, there used to be no object name resources. + // At some point this changed. But since old savegames rely on + // unchanged resource counts, we have to hard code the following check + if (_game.version < 6 && type == rtObjectName) + continue; + for (idx = 1; idx < _res->num[type]; idx++) + saveLoadResource(s, type, idx); + } } diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 8f4f5e3d97..1506e7b411 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -692,7 +692,7 @@ void ScummEngine_v2::o2_actorOps() { a = derefActor(act, "actorOps"); switch (_opcode) { - case 1: // SO_SOUND + case 1: // SO_SOUND a->_sound[0] = arg; break; case 2: // SO_PALETTE diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index cdd3e94215..d54ec4b45a 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -2529,7 +2529,7 @@ void ScummEngine_v5::o5_verbOps() { vs->curRect.top += 8; break; } - } else if (_game.id == GID_LOOM && _game.version == 4) { + } else if (_game.id == GID_LOOM && _game.version == 4) { // FIXME: hack loom notes into right spot if ((verb >= 90) && (verb <= 97)) { // Notes switch (verb) { @@ -2878,10 +2878,10 @@ void ScummEngine_v5::decodeParseString() { } - // In SCUMM V1-V3, there were no 'default' values for the text slot - // values. Hence to achieve correct behaviour, we have to keep the - // 'default' values in sync with the active values. - // + // In SCUMM V1-V3, there were no 'default' values for the text slot + // values. Hence to achieve correct behaviour, we have to keep the + // 'default' values in sync with the active values. + // // Note: This is needed for Indy3 (Grail Diary). It's also needed // for Loom, or the lines Bobbin speaks during the intro are put // at position 0,0. diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index 2d195026ef..420ee6a739 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -987,7 +987,7 @@ void ScummEngine_v6::o6_cursorCommand() { case 0x97: // SO_USERPUT_SOFT_OFF _userPut--; break; - case 0x99: // SO_CURSOR_IMAGE Set cursor image + case 0x99: // SO_CURSOR_IMAGE Set cursor image { int room, obj; if (_game.heversion >= 70) { @@ -2246,8 +2246,8 @@ void ScummEngine_v6::o6_wait() { // For now, if the value passed in is divisible by 45, assume it is an // angle, and use _curActor as the actor to wait for. offs = fetchScriptWordSigned(); - actnum = pop(); - if (actnum % 45 == 0) { + actnum = pop(); + if (actnum % 45 == 0) { actnum = _curActor; } a = derefActor(actnum, "o6_wait:232b"); diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp index 0fdde28124..b97626d3d9 100644 --- a/engines/scumm/script_v8.cpp +++ b/engines/scumm/script_v8.cpp @@ -726,14 +726,14 @@ void ScummEngine_v8::o8_cursorCommand() { case 0xE6: // SO_CURSOR_TRANSPARENT Set cursor transparent color setCursorTransparency(pop()); break; - case 0xE7: // SO_CHARSET_SET + case 0xE7: // SO_CHARSET_SET _string[0]._default.charset = pop(); break; case 0xE8: // SO_CHARSET_COLOR getStackList(args, ARRAYSIZE(args)); // This opcode does nothing (confirmed with disasm) break; - case 0xE9: // SO_CURSOR_PUT + case 0xE9: // SO_CURSOR_PUT { int y = pop(); int x = pop(); @@ -1388,7 +1388,7 @@ void ScummEngine_v8::o8_kernelGetFunctions() { push(ConfMan.getBool("object_labels")); else if (!strcmp(str, "Saveload Page")) push(14); - else // Use defaults + else // Use defaults push(-1); debugC(DEBUG_GENERAL,"o8_kernelGetFunctions: readRegistryValue(%s)", str); } diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 3a1d04a5a8..50978f817d 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -956,7 +956,7 @@ int ScummEngine::init() { #endif - // The kGenUnchanged method is only used for 'container files', i.e. files + // The kGenUnchanged method is only used for 'container files', i.e. files // that contain the real game files bundled together in an archive format. // This is the case of the NES, C64 and Mac versions of certain games. // Note: All of these can also occur in 'extracted' form, in which case they @@ -1862,7 +1862,7 @@ load_game: else if (_game.version == 4) // 256 color CD version var = 150; else - var = 100; + var = 100; byte restoreScript = (_game.platform == Common::kPlatformFMTowns) ? 17 : 18; // if verbs should be shown restore them if (VAR(var) == 2) diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp index 22ba1b443d..0c1db13a26 100644 --- a/engines/scumm/smush/codec37.cpp +++ b/engines/scumm/smush/codec37.cpp @@ -295,7 +295,7 @@ void Codec37Decoder::maketable(int pitch, int index) { #define LITERAL_4X1(src, dst, pitch) \ do { \ - int x; \ + int x; \ DECLARE_LITERAL_TEMP(t); \ for (x=0; x<4; x++) { \ READ_LITERAL_PIXEL(src, t); \ diff --git a/engines/scumm/smush/codec47ARM.s b/engines/scumm/smush/codec47ARM.s index dd4377bff6..81bfdb2d22 100644 --- a/engines/scumm/smush/codec47ARM.s +++ b/engines/scumm/smush/codec47ARM.s @@ -75,7 +75,7 @@ level1codeFD: LDR r8,[r13,#48] @ r8 = _tableBig (48 = (9+1+2)*4) @ stall ADD r12,r6,r6,LSL #1 @ r12= tmp*3 - ADD r6,r6,r12,LSL #5 @ r6 = tmp*97 + ADD r6,r6,r12,LSL #5 @ r6 = tmp*97 ADD r8,r8,r6,LSL #2 @ r8 = _tableBig + tmp*388 LDRB r9,[r8,#384] @ r9 = l = tmp_ptr[384] LDRB r6,[r1],#1 @ r6 = val = *_d_src++ diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index b8cf665023..6e40b58ae8 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -656,7 +656,7 @@ void ScummEngine_v80he::resetScummVars() { VAR(VAR_PLATFORM_VERSION) = 70; } else { VAR(VAR_PLATFORM) = 1; - VAR(VAR_PLATFORM_VERSION) = 40; // 31 is Windows 3.1, 40 is Windows 95+ + VAR(VAR_PLATFORM_VERSION) = 40; // 31 is Windows 3.1, 40 is Windows 95+ } VAR(VAR_COLOR_DEPTH) = 256; } diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index 0648b7a641..eece5a6d24 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -357,8 +357,8 @@ void ScummEngine_v2::checkV2Inventory(int x, int y) { _inventoryOffset -= 2; redrawV2Inventory(); } - } else if (_mouseOverBoxesV2[kInventoryDownArrow].rect.contains(x, y)) { - if (_inventoryOffset + 4 < getInventoryCount(_scummVars[VAR_EGO])) { + } else if (_mouseOverBoxesV2[kInventoryDownArrow].rect.contains(x, y)) { + if (_inventoryOffset + 4 < getInventoryCount(_scummVars[VAR_EGO])) { _inventoryOffset += 2; redrawV2Inventory(); } diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index 0f38445105..eccca6795b 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -349,7 +349,7 @@ MegaSet *SkyCompact::getMegaSet(Compact *cpt) { /** \brief Returns the turn table for direction \a dir - from Compact \a cpt in \a megaSet. + from Compact \a cpt in \a megaSet. Functionally equivalent to: \verbatim diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index eaea67e918..5b06efd589 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -955,7 +955,7 @@ uint16 Control::saveRestorePanel(bool allowSave) { quitPanel = true; } if (clickRes == RESTORE_FAILED) - refreshAll = true; + refreshAll = true; } } diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index 4f7f1fc774..ed7e419f64 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -1230,8 +1230,8 @@ uint16 Logic::mouseScript(uint32 scrNum, Compact *scriptComp) { * This is the actual script engine. It interprets script \a scriptNo starting at \a offset * * @param scriptNo The script to interpret. - * @arg Bits 0-11 - Script number - * @arg Bits 12-15 - Module number + * @arg Bits 0-11 - Script number + * @arg Bits 12-15 - Module number * @param offset At which offset to start interpreting the script. * * @return 0 if script finished. Else offset where to continue. @@ -1559,7 +1559,7 @@ bool Logic::fnCloseHand(uint32 a, uint32 b, uint32 c) { } bool Logic::fnGetTo(uint32 targetPlaceId, uint32 mode, uint32 c) { - _compact->upFlag = (uint16)mode; // save mode for action script + _compact->upFlag = (uint16)mode; // save mode for action script _compact->mode += 4; // next level up Compact *cpt = _skyCompact->fetchCpt(_compact->place); if (!cpt) { @@ -1702,7 +1702,7 @@ bool Logic::fnQuit(uint32 a, uint32 b, uint32 c) { bool Logic::fnSpeakMe(uint32 targetId, uint32 mesgNum, uint32 animNum) { stdSpeak(_skyCompact->fetchCpt(targetId), mesgNum, animNum, 0); - return false; //drop out of script + return false; //drop out of script } bool Logic::fnSpeakMeDir(uint32 targetId, uint32 mesgNum, uint32 animNum) { @@ -2578,7 +2578,7 @@ void Logic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32 bas } else { //talking off-screen - target->spTextId = 0; //don't kill any text 'cos none was made + target->spTextId = 0; //don't kill any text 'cos none was made textCompact->status = 0; //don't display text } // In CD version, we're doing the timing by checking when the VOC has stopped playing. diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 102d041643..928221a9a5 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -1156,7 +1156,7 @@ void Sound::fnStartFx(uint32 sound, uint8 channel) { if (SkyEngine::_systemVars.systemFlags & SF_SBLASTER) volume = roomList[i].adlibVolume; else if (SkyEngine::_systemVars.systemFlags & SF_ROLAND) - volume = roomList[i].rolandVolume; + volume = roomList[i].rolandVolume; volume = (volume * _mainSfxVolume) >> 8; // Check the flags, the sound may come on after a delay. diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index 2705423225..71e25fc56f 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -453,7 +453,7 @@ uint8 Control::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) { break; case BUTTON_VOLUME_PANEL: return id; - } + } return 0; } diff --git a/engines/sword1/object.h b/engines/sword1/object.h index 513c59ce02..58aefc2775 100644 --- a/engines/sword1/object.h +++ b/engines/sword1/object.h @@ -95,12 +95,12 @@ struct Object { ScriptTree o_tree; // 108 size = 44 bytes ScriptTree o_bookmark; // 152 size = 44 bytes - int32 o_dir; // 196 + int32 o_dir; // 196 int32 o_speech_pen; // 200 int32 o_speech_width; // 204 int32 o_speech_time; // 208 int32 o_text_id; // 212 working back from o_ins1 - int32 o_tag; // 216 + int32 o_tag; // 216 int32 o_anim_pc; // 220 position within an animation structure int32 o_anim_resource; // 224 cdt or anim table diff --git a/engines/sword1/objectman.h b/engines/sword1/objectman.h index c167e33ab3..f0a5f3eb55 100644 --- a/engines/sword1/objectman.h +++ b/engines/sword1/objectman.h @@ -59,7 +59,7 @@ private: ResMan *_resMan; static const uint32 _objectList[TOTAL_SECTIONS]; //a table of pointers to object files static const uint32 _textList[TOTAL_SECTIONS][7]; //a table of pointers to text files - uint16 _liveList[TOTAL_SECTIONS]; //which sections are active + uint16 _liveList[TOTAL_SECTIONS]; //which sections are active uint8 *_cptData[TOTAL_SECTIONS]; static char _errorStr[]; }; diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp index fdb0b14c6a..d5620073a5 100644 --- a/engines/sword1/router.cpp +++ b/engines/sword1/router.cpp @@ -36,12 +36,12 @@ namespace Sword1 { /**************************************************************************** * JROUTER.C polygon router with modular walks - * using a tree of modules - * 21 july 94 + * using a tree of modules + * 21 july 94 * 3 november 94 * System currently works by scanning grid data and coming up with a ROUTE * as a series of way points(nodes), the smoothest eight directional PATH - * through these nodes is then found, and a WALK created to fit the PATH. + * through these nodes is then found, and a WALK created to fit the PATH. * * Two funtions are called by the user, RouteFinder creates a route as a * module list, HardWalk creates an animation list from the module list. @@ -87,7 +87,7 @@ Router::Router(ObjectMan *pObjMan, ResMan *pResMan) { int32 Router::routeFinder(int32 id, Object *megaObject, int32 x, int32 y, int32 dir) { /********************************************************************* * RouteFinder.C polygon router with modular walks - * 21 august 94 + * 21 august 94 * 3 november 94 * routeFinder creates a list of modules that enables HardWalk to * create an animation list. @@ -102,9 +102,9 @@ int32 Router::routeFinder(int32 id, Object *megaObject, int32 x, int32 y, int32 * * return 0 = failed to find a route * - * 1 = found a route + * 1 = found a route * - * 2 = mega already at target + * 2 = mega already at target * *********************************************************************/ @@ -150,7 +150,7 @@ int32 Router::routeFinder(int32 id, Object *megaObject, int32 x, int32 y, int32 // All route data now loaded start finding a route // ************************************************************************** // ************************************************************************** -// check if we can get a route through the floor changed 12 Oct95 JPS +// check if we can get a route through the floor changed 12 Oct95 JPS // ************************************************************************** routeFlag = getRoute(); @@ -234,7 +234,7 @@ int32 Router::getRoute() { * * static routeData _route[O_ROUTE_SIZE]; * - * return 0 = failed to find a route + * return 0 = failed to find a route * * 1 = found a route * @@ -1849,11 +1849,11 @@ int32 Router::checkTarget(int32 x, int32 y) { int32 Router::LoadWalkResources(Object *megaObject, int32 x, int32 y, int32 dir) { WalkGridHeader floorHeader; - int32 i; + int32 i; uint8 *fPolygrid; uint8 *fMegaWalkData; - int32 floorId; + int32 floorId; int32 walkGridResourceId; Object *floorObject; diff --git a/engines/sword1/router.h b/engines/sword1/router.h index f5f57b9f89..0c04562f7f 100644 --- a/engines/sword1/router.h +++ b/engines/sword1/router.h @@ -34,8 +34,8 @@ namespace Sword1 { struct BarData { int16 x1; - int16 y1; - int16 x2; + int16 y1; + int16 x2; int16 y2; int16 xmin; int16 ymin; @@ -125,7 +125,7 @@ private: RouteData _route[O_ROUTE_SIZE]; PathData _smoothPath[O_ROUTE_SIZE]; PathData _modularPath[O_ROUTE_SIZE]; - int32 _routeLength; + int32 _routeLength; int32 _framesPerStep, _framesPerChar; uint8 _nWalkFrames, _nTurnFrames; diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp index 4195e628f6..9c13545880 100644 --- a/engines/sword1/screen.cpp +++ b/engines/sword1/screen.cpp @@ -330,7 +330,7 @@ void Screen::newScreen(uint32 screen) { for (cnt = 0; cnt < _roomDefTable[_currentScreen].totalLayers - 1; cnt++) { // there's no grid for the background layer, so it's totalLayers - 1 _layerGrid[cnt] = (uint16*)_resMan->openFetchRes(_roomDefTable[_currentScreen].grids[cnt]); - _layerGrid[cnt] += 14; + _layerGrid[cnt] += 14; } _parallax[0] = _parallax[1] = NULL; if (_roomDefTable[_currentScreen].parallax[0]) diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp index 96c0d3689a..4d213b6d32 100644 --- a/engines/sword1/staticres.cpp +++ b/engines/sword1/staticres.cpp @@ -72,7 +72,7 @@ const uint8 SwordEngine::_cdList[TOTAL_SECTIONS] = { 1, // 27 PARIS 3 1, // 28 1, // 29 - 1, // 30 - Heart Monitor + 1, // 30 - Heart Monitor 1, // 31 1, // 32 1, // 33 @@ -120,7 +120,7 @@ const uint8 SwordEngine::_cdList[TOTAL_SECTIONS] = { 2, // 71 SCOTLAND 2, // 72 - 2, // 73 + 2, // 73 2, // 74 END SEQUENCE IN SECRET_CRYPT 2, // 75 2, // 76 @@ -1220,7 +1220,7 @@ const uint32 ResMan::_scriptList[TOTAL_SECTIONS] = { //a table of resource tags }; const uint32 ObjectMan::_objectList[TOTAL_SECTIONS] = { //a table of pointers to object files - 0, // 0 + 0, // 0 COMP1, // 1 PARIS 1 COMP2, // 2 @@ -1254,7 +1254,7 @@ const uint32 ObjectMan::_objectList[TOTAL_SECTIONS] = { //a table of pointers to COMP27, // 27 PARIS 3 COMP28, // 28 COMP29, // 29 - COMP30, // 30 - Heart Monitor + COMP30, // 30 - Heart Monitor COMP31, // 31 COMP32, // 32 COMP33, // 33 @@ -1302,7 +1302,7 @@ const uint32 ObjectMan::_objectList[TOTAL_SECTIONS] = { //a table of pointers to COMP71, // 71 SCOTLAND COMP72, // 72 - COMP73, // 73 + COMP73, // 73 COMP74, // 74 END SEQUENCE IN SECRET_CRYPT COMP75, // 75 COMP76, // 76 @@ -1338,7 +1338,7 @@ const uint32 ObjectMan::_objectList[TOTAL_SECTIONS] = { //a table of pointers to 0, // 100 0, // 101 0, // 102 - 0, // 103 + 0, // 103 0, // 104 0, // 105 0, // 106 @@ -1349,7 +1349,7 @@ const uint32 ObjectMan::_objectList[TOTAL_SECTIONS] = { //a table of pointers to 0, // 110 0, // 111 0, // 112 - 0, // 113 + 0, // 113 0, // 114 0, // 115 0, // 116 @@ -1360,7 +1360,7 @@ const uint32 ObjectMan::_objectList[TOTAL_SECTIONS] = { //a table of pointers to 0, // 120 0, // 121 0, // 122 - 0, // 123 + 0, // 123 0, // 124 0, // 125 0, // 126 @@ -1383,7 +1383,7 @@ const uint32 ObjectMan::_objectList[TOTAL_SECTIONS] = { //a table of pointers to 0, // 140 0, // 141 0, // 142 - 0, // 143 + 0, // 143 // jeremy megas 0, // 144 mega_phone @@ -2740,13 +2740,13 @@ const char Music::_tuneList[TOTAL_TUNES][8] = { "5m6", // DONE 132 After "I'm sure it will come in useful" when George leaves. Also, George leaving Nico after, "Keep me informed if you find anything new" (5M20). + "just take care of yourself" "5m8", // DONE 133 Entering the museum for the first time on the fade. "5m9", // DONE 134 George with guard after, "park their cars." Guard saying "No, no, no" - "5m10", // DONE 135 Incidental looking around the museum music. + fading from map to museum street, when lobineau is in museum + "5m10", // DONE 135 Incidental looking around the museum music. + fading from map to museum street, when lobineau is in museum "5m11", // DONE 136 From "In the case was a spindly tripod, blackened with age and pitted with rust...". George answers Tripod ((?)That's what the cue list says). Also 5M15 and 5M16) "5m12", // DONE 137 More looking around music. "5m13", // DONE 138 Opening the mummy case. "5m14", // DONE 139 High above me was a window - "5m17", // DONE 140 "As I reached toward the display case" (5M18 is in slot 165) + "5m17", // DONE 140 "As I reached toward the display case" (5M18 is in slot 165) "5m22", // !SMK 141 From Ireland on the Europe map. "5m23", // !!!! 142 IN front of the pub, searching. "5m24", // DONE 143 Cheeky Maguire, "Wait 'til I get back" @@ -2898,8 +2898,8 @@ const FxDef Sound::_fxList[312] = { // 0 { 0, // sampleId - 0, // type (FX_LOOP, FX_RANDOM or FX_SPOT) - 0, // delay (random chance for FX_RANDOM sound fx) + 0, // type (FX_LOOP, FX_RANDOM or FX_SPOT) + 0, // delay (random chance for FX_RANDOM sound fx) { // roomVolList {0,0,0}, // {roomNo,leftVol,rightVol} }, @@ -5036,7 +5036,7 @@ const FxDef Sound::_fxList[312] = { // 187 Hospital exterior ambience { FX_HOSPEXT, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {31,3,4}, // {roomNo,leftVol,rightVol} @@ -5047,7 +5047,7 @@ const FxDef Sound::_fxList[312] = { // 188 Hospital exterior gravel footstep #1 { FX_GRAVEL1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 0, // delay (or random chance) * { // roomVolList {31,16,16}, // {roomNo,leftVol,rightVol} @@ -5058,7 +5058,7 @@ const FxDef Sound::_fxList[312] = { // 189 Hospital exterior gravel footstep #2 { FX_GRAVEL2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 0, // delay (or random chance) * { // roomVolList {31,16,16}, // {roomNo,leftVol,rightVol} @@ -5070,7 +5070,7 @@ const FxDef Sound::_fxList[312] = { // 190 George opens sarcophagus: GEOSAR { FX_SARCO28A, // sampleId - FX_SPOT, // type + FX_SPOT, // type 26, // delay (or random chance) * { // roomVolList {28,6,6}, // {roomNo,leftVol,rightVol} @@ -5081,7 +5081,7 @@ const FxDef Sound::_fxList[312] = { // 191 George closes sarcophagus: GEOSAR2 { FX_SARCO28B, // sampleId - FX_SPOT, // type + FX_SPOT, // type 24, // delay (or random chance) * { // roomVolList {28,3,3}, // {roomNo,leftVol,rightVol} @@ -5092,7 +5092,7 @@ const FxDef Sound::_fxList[312] = { // 192 Guard opens sarcophagus: MUSOPN { FX_SARCO28C, // sampleId - FX_SPOT, // type + FX_SPOT, // type 14, // delay (or random chance) * { // roomVolList {28,3,3}, // {roomNo,leftVol,rightVol} @@ -5103,7 +5103,7 @@ const FxDef Sound::_fxList[312] = { // 193 George peeks out of sarcophagus: GEOPEEK { FX_SARCO29, // sampleId - FX_SPOT, // type + FX_SPOT, // type 4, // delay (or random chance) * { // roomVolList {29,5,10}, // {roomNo,leftVol,rightVol} @@ -5114,7 +5114,7 @@ const FxDef Sound::_fxList[312] = { // 194 The rope drops into the room: ROPE29 { FX_ROPEDOWN, // sampleId - FX_SPOT, // type + FX_SPOT, // type 3, // delay (or random chance) * { // roomVolList {29,3,3}, // {roomNo,leftVol,rightVol} @@ -5125,7 +5125,7 @@ const FxDef Sound::_fxList[312] = { // 195 George pushes the totem pole: GEOTOT29 { FX_TOTEM29A, // sampleId - FX_SPOT, // type + FX_SPOT, // type 30, // delay (or random chance) * { // roomVolList {29,12,12}, // {roomNo,leftVol,rightVol} @@ -5136,7 +5136,7 @@ const FxDef Sound::_fxList[312] = { // 196 George pushes the totem pole over: GEOTOTB { FX_TOTEM29B, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {29,16,16}, // {roomNo,leftVol,rightVol} @@ -5147,7 +5147,7 @@ const FxDef Sound::_fxList[312] = { // 197 George rocks the totem pole in museum hours: TOTEM28 { FX_TOTEM28A, // sampleId - FX_SPOT, // type + FX_SPOT, // type 8, // delay (or random chance) * { // roomVolList {28,4,4}, // {roomNo,leftVol,rightVol} @@ -5158,7 +5158,7 @@ const FxDef Sound::_fxList[312] = { // 198 Ambient sound for Montfaucon Square { FX_MONTAMB, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {36,6,6}, // {roomNo,leftVol,rightVol} @@ -5170,7 +5170,7 @@ const FxDef Sound::_fxList[312] = { // 199 Ambient sound churchyard. { FX_WIND71, // sampleId - FX_RANDOM, // type + FX_RANDOM, // type 720, // delay (or random chance) * { // roomVolList {71,10,10}, // {roomNo,leftVol,rightVol} @@ -5182,7 +5182,7 @@ const FxDef Sound::_fxList[312] = { // 200 Owl cry #1 in churchyard { FX_OWL71A, // sampleId - FX_RANDOM, // type + FX_RANDOM, // type 720, // delay (or random chance) * { // roomVolList {71,8,8}, // {roomNo,leftVol,rightVol} @@ -5194,7 +5194,7 @@ const FxDef Sound::_fxList[312] = { // 201 Owl cry #2 in churchyard { FX_OWL71B, // sampleId - FX_RANDOM, // type + FX_RANDOM, // type 1080, // delay (or random chance) * { // roomVolList {71,8,8}, // {roomNo,leftVol,rightVol} @@ -5206,7 +5206,7 @@ const FxDef Sound::_fxList[312] = { // 202 Air conditioner in the museum { FX_AIRCON28, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {28,6,6}, // {roomNo,leftVol,rightVol} @@ -5218,7 +5218,7 @@ const FxDef Sound::_fxList[312] = { // 203 George breaks the handle off in the church tower. GEOWND72 { FX_COG72A, // sampleId - FX_SPOT, // type + FX_SPOT, // type 5, // delay (or random chance) * { // roomVolList {72,10,10}, @@ -5229,7 +5229,7 @@ const FxDef Sound::_fxList[312] = { // 204 Countess' room ambience { FX_AMBIEN56, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {56,3,2}, // {roomNo,leftVol,rightVol} @@ -5240,7 +5240,7 @@ const FxDef Sound::_fxList[312] = { // 205 Musical effect for George drinking beer. GEODRN20 { FX_DRINK, // sampleId - FX_SPOT, // type + FX_SPOT, // type 17, // delay (or random chance) * { // roomVolList {20,12,12}, // {roomNo,leftVol,rightVol} @@ -5251,7 +5251,7 @@ const FxDef Sound::_fxList[312] = { // 206 Torch thrown through the air. GEOTHROW { FX_TORCH73, // sampleId - FX_SPOT, // type + FX_SPOT, // type 14, // delay (or random chance) * { // roomVolList {73,16,16}, // {roomNo,leftVol,rightVol} @@ -5262,7 +5262,7 @@ const FxDef Sound::_fxList[312] = { // 207 Internal train ambience. { FX_TRAININT, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {63,3,3}, // {roomNo,leftVol,rightVol} @@ -5277,7 +5277,7 @@ const FxDef Sound::_fxList[312] = { // 208 Countess' clock. PENDULUM. Note: Trigger the sound effect on alternate runs of the pendulum animation. { FX_PENDULUM, // sampleId - FX_SPOT, // type + FX_SPOT, // type 6, // delay (or random chance) * { // roomVolList {56,2,2}, // {roomNo,leftVol,rightVol} @@ -5288,7 +5288,7 @@ const FxDef Sound::_fxList[312] = { // 209 Compartment door. DOOR65 { FX_DOOR65, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {65,3,3}, // {roomNo,leftVol,rightVol} @@ -5300,7 +5300,7 @@ const FxDef Sound::_fxList[312] = { // 210 Opening window. GEOOPN1 { FX_WINDOW66, // sampleId - FX_SPOT, // type + FX_SPOT, // type 8, // delay (or random chance) * { // roomVolList {66,5,5}, // {roomNo,leftVol,rightVol} @@ -5311,7 +5311,7 @@ const FxDef Sound::_fxList[312] = { // 211 Wind rip by the open window. Triggered at the end of effect 210. { FX_WIND66, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {66,5,5}, // {roomNo,leftVol,rightVol} @@ -5322,7 +5322,7 @@ const FxDef Sound::_fxList[312] = { // 212 George electrocutes himself on the pantograph. Fool. GEOSHK64 { FX_SHOCK63, // sampleId - FX_SPOT, // type + FX_SPOT, // type 11, // delay (or random chance) * { // roomVolList {63,12,14}, // {roomNo,leftVol,rightVol} @@ -5333,7 +5333,7 @@ const FxDef Sound::_fxList[312] = { // 213 The train brakes violently. GEOSTP69 { FX_BRAKES, // sampleId - FX_SPOT, // type + FX_SPOT, // type 13, // delay (or random chance) * { // roomVolList {69,16,16}, // {roomNo,leftVol,rightVol} @@ -5344,7 +5344,7 @@ const FxDef Sound::_fxList[312] = { // 214 The train ticks over. From the end of BRAKE. { FX_TICK69, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {69,8,8}, // {roomNo,leftVol,rightVol} @@ -5355,7 +5355,7 @@ const FxDef Sound::_fxList[312] = { // 215 Eklund shoot Khan. FIGHT69 { FX_EKSHOOT, // sampleId - FX_SPOT, // type + FX_SPOT, // type 120, // delay (or random chance) * { // roomVolList {69,12,12}, // {roomNo,leftVol,rightVol} @@ -5366,7 +5366,7 @@ const FxDef Sound::_fxList[312] = { // 216 Eklund shoots George. GEODIE69 { FX_EKSHOOT, // sampleId - FX_SPOT, // type + FX_SPOT, // type 21, // delay (or random chance) * { // roomVolList {69,12,12}, // {roomNo,leftVol,rightVol} @@ -5377,7 +5377,7 @@ const FxDef Sound::_fxList[312] = { // 217 Khan pulls the door open. FIGHT69 { FX_DOOR69, // sampleId - FX_SPOT, // type + FX_SPOT, // type 42, // delay (or random chance) * { // roomVolList {69,8,12}, // {roomNo,leftVol,rightVol} @@ -5388,7 +5388,7 @@ const FxDef Sound::_fxList[312] = { // 218 Wind shriek. Loops from the end of DOOR69 wav to the beginning of BRAKES. { FX_WIND66, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {69,8,12}, // {roomNo,leftVol,rightVol} @@ -5399,7 +5399,7 @@ const FxDef Sound::_fxList[312] = { // 219 Brakes releasing pressure. Only after BRAKE has been run. { FX_PNEUMO69, // sampleId - FX_RANDOM, // type + FX_RANDOM, // type 720, // delay (or random chance) * { // roomVolList {69,8,8}, // {roomNo,leftVol,rightVol} @@ -5410,7 +5410,7 @@ const FxDef Sound::_fxList[312] = { // 220 External train sound. Played while George is on the top of the train. { FX_TRAINEXT, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {63,8,8}, // {roomNo,leftVol,rightVol} @@ -5421,7 +5421,7 @@ const FxDef Sound::_fxList[312] = { // 221 The passing train. FIGHT69 { FX_TRNPASS, // sampleId - FX_SPOT, // type + FX_SPOT, // type 102, // delay (or random chance) * { // roomVolList {69,4,16}, // {roomNo,leftVol,rightVol} @@ -5432,7 +5432,7 @@ const FxDef Sound::_fxList[312] = { // 222 George descends into sewer. GEODESO6 { FX_LADD2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {6,4,4}, // {roomNo,leftVol,rightVol} @@ -5443,7 +5443,7 @@ const FxDef Sound::_fxList[312] = { // 223 George ascends into alley. GEOASC06 { FX_LADD3, // sampleId - FX_SPOT, // type + FX_SPOT, // type 10, // delay (or random chance) * { // roomVolList {6,4,4}, // {roomNo,leftVol,rightVol} @@ -5454,7 +5454,7 @@ const FxDef Sound::_fxList[312] = { // 224 George replaces manhole cover. GEOMAN9 { FX_COVERON2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 19, // delay (or random chance) * { // roomVolList {2,12,11}, // {roomNo,leftVol,rightVol} @@ -5465,7 +5465,7 @@ const FxDef Sound::_fxList[312] = { // 225 Montfaucon sewer ambience. { FX_AMBIEN37, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {37,5,5}, // {roomNo,leftVol,rightVol} @@ -5476,7 +5476,7 @@ const FxDef Sound::_fxList[312] = { // 226 George's winning smile. GEOJMP72. { FX_PING, // sampleId - FX_SPOT, // type + FX_SPOT, // type 26, // delay (or random chance) * { // roomVolList {72,10,14}, // {roomNo,leftVol,rightVol} @@ -5487,7 +5487,7 @@ const FxDef Sound::_fxList[312] = { // 227 George starts to open the manhole. GEO36KNE { FX_MANOP36, // sampleId - FX_SPOT, // type + FX_SPOT, // type 19, // delay (or random chance) * { // roomVolList {36,4,6}, // {roomNo,leftVol,rightVol} @@ -5498,7 +5498,7 @@ const FxDef Sound::_fxList[312] = { // 228 George opens the manhole. GEO36OPE { FX_PULLUP36, // sampleId - FX_SPOT, // type + FX_SPOT, // type 9, // delay (or random chance) * { // roomVolList {36,4,6}, // {roomNo,leftVol,rightVol} @@ -5509,7 +5509,7 @@ const FxDef Sound::_fxList[312] = { // 229 George replaces the manhole cover. GEO36CLO { FX_REPLCE36, // sampleId - FX_SPOT, // type + FX_SPOT, // type 20, // delay (or random chance) * { // roomVolList {36,4,6}, // {roomNo,leftVol,rightVol} @@ -5521,7 +5521,7 @@ const FxDef Sound::_fxList[312] = { // 230 George knocks at righthand arch. GEO37TA3 { FX_KNOCK37, // sampleId - FX_SPOT, // type + FX_SPOT, // type 20, // delay (or random chance) * { // roomVolList {37,6,12}, // {roomNo,leftVol,rightVol} @@ -5532,7 +5532,7 @@ const FxDef Sound::_fxList[312] = { // 231 George knocks at middle or lefthand arch. GEO37TA1 or GEO37TA2. { FX_KNOCK37B, // sampleId - FX_SPOT, // type + FX_SPOT, // type 20, // delay (or random chance) * { // roomVolList {37,4,8}, // {roomNo,leftVol,rightVol} @@ -5543,7 +5543,7 @@ const FxDef Sound::_fxList[312] = { // 232 George winds the chain down HOO37LBO { FX_CHAIN37, // sampleId - FX_SPOT, // type + FX_SPOT, // type 14, // delay (or random chance) * { // roomVolList {37,6,10}, // {roomNo,leftVol,rightVol} @@ -5554,7 +5554,7 @@ const FxDef Sound::_fxList[312] = { // 233 George winds the chain up. HOO37LBO (In reverse) { FX_CHAIN37B, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {37,6,10}, // {roomNo,leftVol,rightVol} @@ -5565,7 +5565,7 @@ const FxDef Sound::_fxList[312] = { // 234 George breaks hole in door. GEO37TA4 { FX_HOLE37, // sampleId - FX_SPOT, // type + FX_SPOT, // type 11, // delay (or random chance) * { // roomVolList {37,6,12}, // {roomNo,leftVol,rightVol} @@ -5576,7 +5576,7 @@ const FxDef Sound::_fxList[312] = { // 235 Plaster door collapses. DOR37COL { FX_DOOR37, // sampleId - FX_SPOT, // type + FX_SPOT, // type 23, // delay (or random chance) * { // roomVolList {37,8,15}, // {roomNo,leftVol,rightVol} @@ -5587,7 +5587,7 @@ const FxDef Sound::_fxList[312] = { // 236 Barge winch. GEO37TUL (If it runs more than once, trigger the effect on frame one. Incidentally, this is a reversible so the effect must launch on frame one of the .cdr version as well. ) { FX_WINCH37, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {37,16,16}, // {roomNo,leftVol,rightVol} @@ -5598,7 +5598,7 @@ const FxDef Sound::_fxList[312] = { // 237 George places chess piece. GEOSPA17 { FX_CHESS, // sampleId - FX_SPOT, // type + FX_SPOT, // type 23, // delay (or random chance) * { // roomVolList {59,4,4}, // {roomNo,leftVol,rightVol} @@ -5609,7 +5609,7 @@ const FxDef Sound::_fxList[312] = { // 238 Piano loop for the upstairs hotel corridor. { FX_PIANO14, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {14,2,2}, // {roomNo,leftVol,rightVol} @@ -5620,7 +5620,7 @@ const FxDef Sound::_fxList[312] = { // 239 Door opens in church tower. PANEL72 { FX_SECDOR72, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {72,8,10}, // {roomNo,leftVol,rightVol} @@ -5632,7 +5632,7 @@ const FxDef Sound::_fxList[312] = { // 240 George rummages through debris. Tied to the end of the whichever crouch is used. Use either this one or RUMMAGE2 alternatively or randomly. Same kind of schtick as the pick axe noises, I suppose. { FX_RUMMAGE1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 9, // delay (or random chance) * { // roomVolList {72,8,6}, // {roomNo,leftVol,rightVol} @@ -5643,7 +5643,7 @@ const FxDef Sound::_fxList[312] = { // 241 George rummages through debris. See above for notes. { FX_RUMMAGE2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 9, // delay (or random chance) * { // roomVolList {72,8,6}, // {roomNo,leftVol,rightVol} @@ -5654,7 +5654,7 @@ const FxDef Sound::_fxList[312] = { // 242 Gust of wind in the graveyard. { FX_GUST71, // sampleId - FX_RANDOM, // type + FX_RANDOM, // type 1080, // delay (or random chance) * { // roomVolList {71,3,3}, // {roomNo,leftVol,rightVol} @@ -5666,7 +5666,7 @@ const FxDef Sound::_fxList[312] = { // 243 Violin ambience for Ireland. { FX_VIOLIN19, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {19,3,3}, // {roomNo,leftVol,rightVol} @@ -5679,7 +5679,7 @@ const FxDef Sound::_fxList[312] = { // 244 Footstep #1 for underground locations. Same schtick as for 188 and 189. { FX_SEWSTEP1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 0, // delay (or random chance) * { // roomVolList {6,8,8}, // {roomNo,leftVol,rightVol} @@ -5691,7 +5691,7 @@ const FxDef Sound::_fxList[312] = { // 245 Footstep #2 for underground locations. Same schtick as for 188 and 189. { FX_SEWSTEP2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 0, // delay (or random chance) * { // roomVolList {6,16,16}, // {roomNo,leftVol,rightVol} @@ -5703,7 +5703,7 @@ const FxDef Sound::_fxList[312] = { // 246 Nico's carabiner as she descends into the museum. NICPUS1 { FX_CARABINE, // sampleId - FX_SPOT, // type + FX_SPOT, // type 4, // delay (or random chance) * { // roomVolList {29,8,8}, // {roomNo,leftVol,rightVol} @@ -5714,7 +5714,7 @@ const FxDef Sound::_fxList[312] = { // 247 Rosso is shot (with a piece of field artillery). ROSSHOT { FX_GUN79, // sampleId - FX_SPOT, // type + FX_SPOT, // type 2, // delay (or random chance) * { // roomVolList {79,16,16}, // {roomNo,leftVol,rightVol} @@ -5725,7 +5725,7 @@ const FxDef Sound::_fxList[312] = { // 248 George is hit by the thrown stilletto. GEODIE1 { FX_DAGGER1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 2, // delay (or random chance) * { // roomVolList {73,12,12}, // {roomNo,leftVol,rightVol} @@ -5736,7 +5736,7 @@ const FxDef Sound::_fxList[312] = { // 249 George is hit by the thrown stilletto after walking forward. GEODIE2 { FX_DAGGER1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 9, // delay (or random chance) * { // roomVolList {73,12,12}, // {roomNo,leftVol,rightVol} @@ -5748,7 +5748,7 @@ const FxDef Sound::_fxList[312] = { // 250 Can hits the well water. The cue is in GAR2SC57.TXT immediately after the line, "over: Lopez threw the can away. It seemed to fall an awfully long way." { FX_CANFALL, // sampleId - FX_SPOT, // type + FX_SPOT, // type 4, // delay (or random chance) * { // roomVolList {57,16,16}, // {roomNo,leftVol,rightVol} @@ -5759,7 +5759,7 @@ const FxDef Sound::_fxList[312] = { // 251 Mad, fizzing damp and ancient gunpowder after the application of a torch. { FX_GUNPOWDR, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {73,12,12}, // {roomNo,leftVol,rightVol} @@ -5770,7 +5770,7 @@ const FxDef Sound::_fxList[312] = { // 252 Maguire whistling. MAGSLK. Plays while Maguire is idling, stops abruptly when he does something else. { FX_WHISTLE, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {19,2,5}, // {roomNo,leftVol,rightVol} @@ -5781,7 +5781,7 @@ const FxDef Sound::_fxList[312] = { // 253 George is hit by the goat. GEOHITR and GEOHITL. { FX_GEOGOAT, // sampleId - FX_SPOT, // type + FX_SPOT, // type 11, // delay (or random chance) * { // roomVolList {24,10,10}, // {roomNo,leftVol,rightVol} @@ -5792,7 +5792,7 @@ const FxDef Sound::_fxList[312] = { // 254 Manager says, "Hello". MAN2 { FX_MANG1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 7, // delay (or random chance) * { // roomVolList {49,6,5}, // {roomNo,leftVol,rightVol} @@ -5803,7 +5803,7 @@ const FxDef Sound::_fxList[312] = { // 255 Manager says, Don't go in there!" MAN3 { FX_MANG2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 11, // delay (or random chance) * { // roomVolList {49,6,5}, // {roomNo,leftVol,rightVol} @@ -5814,7 +5814,7 @@ const FxDef Sound::_fxList[312] = { // 256 Manager says, "Here are the keys." MAN4 { FX_MANG3, // sampleId - FX_SPOT, // type + FX_SPOT, // type 6, // delay (or random chance) * { // roomVolList {49,6,5}, // {roomNo,leftVol,rightVol} @@ -5825,7 +5825,7 @@ const FxDef Sound::_fxList[312] = { // 257 George pulls the lion's tooth. GEOSPA26 { FX_TOOTHPUL, // sampleId - FX_SPOT, // type + FX_SPOT, // type 19, // delay (or random chance) * { // roomVolList {61,8,16}, // {roomNo,leftVol,rightVol} @@ -5836,7 +5836,7 @@ const FxDef Sound::_fxList[312] = { // 258 George escapes the lion. LION1 { FX_LIONFALL, // sampleId - FX_SPOT, // type + FX_SPOT, // type 7, // delay (or random chance) * { // roomVolList {61,8,16}, // {roomNo,leftVol,rightVol} @@ -5847,7 +5847,7 @@ const FxDef Sound::_fxList[312] = { // 259 George gets flattened. LION2 { FX_LIONFAL2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 4, // delay (or random chance) * { // roomVolList {61,8,16}, // {roomNo,leftVol,rightVol} @@ -5858,7 +5858,7 @@ const FxDef Sound::_fxList[312] = { // 260 Rosso dies. ROSSFALL { FX_ROSSODIE, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {74,16,16}, // {roomNo,leftVol,rightVol} @@ -5869,7 +5869,7 @@ const FxDef Sound::_fxList[312] = { // 261 Eklund chokes George. FIGHT79 { FX_CHOKE1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 9, // delay (or random chance) * { // roomVolList {79,16,16}, // {roomNo,leftVol,rightVol} @@ -5880,7 +5880,7 @@ const FxDef Sound::_fxList[312] = { // 262 Eklund chokes George some more. FIGHT79 { FX_CHOKE2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 54, // delay (or random chance) * { // roomVolList {79,16,16}, // {roomNo,leftVol,rightVol} @@ -5891,7 +5891,7 @@ const FxDef Sound::_fxList[312] = { // 263 Eklund dies. FIGHT79 { FX_FIGHT2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 44, // delay (or random chance) * { // roomVolList {79,16,16}, // {roomNo,leftVol,rightVol} @@ -5902,7 +5902,7 @@ const FxDef Sound::_fxList[312] = { // 264 George hears museum break-in. GEOSUR29 { FX_DOOR29, // sampleId - FX_SPOT, // type + FX_SPOT, // type 10, // delay (or random chance) * { // roomVolList {94,14,10}, // {roomNo,leftVol,rightVol} @@ -5913,7 +5913,7 @@ const FxDef Sound::_fxList[312] = { // 265 George hits the floor having been shot. GEODED. { FX_GDROP29, // sampleId - FX_SPOT, // type + FX_SPOT, // type 27, // delay (or random chance) * { // roomVolList {29,10,16}, // {roomNo,leftVol,rightVol} @@ -5924,7 +5924,7 @@ const FxDef Sound::_fxList[312] = { // 266 George hits the floor having been stunned. GEOFISH { FX_GDROP29, // sampleId - FX_SPOT, // type + FX_SPOT, // type 27, // delay (or random chance) * { // roomVolList {29,10,16}, // {roomNo,leftVol,rightVol} @@ -5935,7 +5935,7 @@ const FxDef Sound::_fxList[312] = { // 267 Fitz being knocked down as heard from inside the pub. Triggered from the script, I think. This is just a stopgap until Hackenbacker do the full version for the Smacker, then I'll sample the requisite bit and put it in here. { FX_FITZHIT, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {20,16,10}, // {roomNo,leftVol,rightVol} @@ -5946,7 +5946,7 @@ const FxDef Sound::_fxList[312] = { // 268 Gendarme shoots lock off. GENSHOT { FX_GUN34, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {34,16,16}, // {roomNo,leftVol,rightVol} @@ -5958,7 +5958,7 @@ const FxDef Sound::_fxList[312] = { // Incidentally, James, please switch off Mr Shiney permanently when George first gets into Marquet's room. He gets in the way when they're figuring out that Eklund's an imposter. { FX_PULSE2, // sampleId - FX_LOOP, // type + FX_LOOP, // type 1, // delay (or random chance) * { // roomVolList {30,16,16}, // {roomNo,leftVol,rightVol} @@ -5971,7 +5971,7 @@ const FxDef Sound::_fxList[312] = { // 270 ECG alarm, Marquet dead. Switch off the previous effect and replace with this immediately before the gendarme says, "Stand back, messieurs." { FX_PULSE3, // sampleId - FX_LOOP, // type + FX_LOOP, // type 1, // delay (or random chance) * { // roomVolList {30,16,16}, // {roomNo,leftVol,rightVol} @@ -5984,7 +5984,7 @@ const FxDef Sound::_fxList[312] = { // 271 Door closing. GEOENT15 { FX_DORCLOSE, // sampleId - FX_SPOT, // type + FX_SPOT, // type 4, // delay (or random chance) * { // roomVolList {15,12,12}, // {roomNo,leftVol,rightVol} @@ -5995,7 +5995,7 @@ const FxDef Sound::_fxList[312] = { // 272 Cupboard opening. GEOCOT { FX_CUPBOPEN, // sampleId - FX_SPOT, // type + FX_SPOT, // type 8, // delay (or random chance) * { // roomVolList {33,12,12}, // {roomNo,leftVol,rightVol} @@ -6006,7 +6006,7 @@ const FxDef Sound::_fxList[312] = { // 273 Cupboard closing. GEOCOT { FX_CUPBCLOS, // sampleId - FX_SPOT, // type + FX_SPOT, // type 33, // delay (or random chance) * { // roomVolList {33,12,12}, // {roomNo,leftVol,rightVol} @@ -6017,7 +6017,7 @@ const FxDef Sound::_fxList[312] = { // 274 Closing door when George leaves hotel room. GEOLVS15 and GEODOR17 (they're identical). { FX_DORCLOSE, // sampleId - FX_SPOT, // type + FX_SPOT, // type 44, // delay (or random chance) * { // roomVolList {15,12,12}, // {roomNo,leftVol,rightVol} @@ -6029,7 +6029,7 @@ const FxDef Sound::_fxList[312] = { // 275 Closing door when George leaves the pub. DOROPN20 (Reversed) { FX_DORCLOSE20,// sampleId - FX_SPOT, // type + FX_SPOT, // type 11, // delay (or random chance) * { // roomVolList {20,12,12}, // {roomNo,leftVol,rightVol} @@ -6040,7 +6040,7 @@ const FxDef Sound::_fxList[312] = { // 276 Nico call for a cab. NICPHN10 { FX_PHONICO1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 15, // delay (or random chance) * { // roomVolList {10,12,12}, // {roomNo,leftVol,rightVol} @@ -6051,7 +6051,7 @@ const FxDef Sound::_fxList[312] = { // 277 Nico puts down the phone. NICDWN10 { FX_FONEDN, // sampleId - FX_SPOT, // type + FX_SPOT, // type 6, // delay (or random chance) * { // roomVolList {10,12,12}, // {roomNo,leftVol,rightVol} @@ -6062,7 +6062,7 @@ const FxDef Sound::_fxList[312] = { // 278 Painter puts down the phone. PAI41HAN { FX_FONEDN41, // sampleId - FX_SPOT, // type + FX_SPOT, // type 5, // delay (or random chance) * { // roomVolList {41,12,12}, // {roomNo,leftVol,rightVol} @@ -6073,7 +6073,7 @@ const FxDef Sound::_fxList[312] = { // 279 Mechanical hum of heating system in the dig lobby. { FX_AIRCON41, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {41,6,6}, // {roomNo,leftVol,rightVol} @@ -6086,7 +6086,7 @@ const FxDef Sound::_fxList[312] = { // 280 The Sword is Reforged (Grandmaster gets zapped) GMPOWER { FX_REFORGE1, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {78,16,16}, // {roomNo,leftVol,rightVol} @@ -6097,7 +6097,7 @@ const FxDef Sound::_fxList[312] = { // 281 The Sword is Reforged (G&N gawp at the spectacle) There's no anim I know of to tie it to unless the flickering blue light is one. { FX_REFORGE2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {75,12,12}, // {roomNo,leftVol,rightVol} @@ -6108,7 +6108,7 @@ const FxDef Sound::_fxList[312] = { // 282 The Sword is Reforged (We watch over G&N's heads as the Grandmaster gets zapped) GMWRIT74 { FX_REFORGE2, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {74,14,14}, // {roomNo,leftVol,rightVol} @@ -6119,7 +6119,7 @@ const FxDef Sound::_fxList[312] = { // 283 The Sword is Reforged (Grandmaster finishes being zapped) GMWRITH { FX_REFORGE4, // sampleId - FX_SPOT, // type + FX_SPOT, // type 1, // delay (or random chance) * { // roomVolList {78,16,16}, // {roomNo,leftVol,rightVol} @@ -6130,7 +6130,7 @@ const FxDef Sound::_fxList[312] = { // 284 Baphomet Cavern Ambience { FX_BAPHAMB, // sampleId - FX_LOOP, // type + FX_LOOP, // type 0, // delay (or random chance) * { // roomVolList {74,6,8}, // {roomNo,leftVol,rightVol} @@ -6146,7 +6146,7 @@ const FxDef Sound::_fxList[312] = { // 285 Duane's Happy-Snappy Camera. XDNEPHO3 and XDNEPHO5. { FX_CAMERA45, // sampleId - FX_SPOT, // type + FX_SPOT, // type 30, // delay (or random chance) * { // roomVolList {45,4,4}, // {roomNo,leftVol,rightVol} @@ -6157,7 +6157,7 @@ const FxDef Sound::_fxList[312] = { // 286 Grand Master strikes the floor with his cane. GMENTER { FX_STAFF, // sampleId - FX_SPOT, // type + FX_SPOT, // type 28, // delay (or random chance) * { // roomVolList {73,8,8}, // {roomNo,leftVol,rightVol} @@ -6772,7 +6772,7 @@ const uint8 g_startPos35[] = { // hospital jacques RUN_HELPER_SCRIPT(HELP_WHITECOAT) }; -const uint8 g_startPos36[] = { // montfaucon +const uint8 g_startPos36[] = { // montfaucon GEORGE_POS(300, 480, RIGHT, FLOOR_36), LOGIC_CALL_FN(opcAddObject, LENS), LOGIC_CALL_FN(opcAddObject, RED_NOSE), diff --git a/engines/sword1/swordres.h b/engines/sword1/swordres.h index 60c7a98bd0..7f6a6352ad 100644 --- a/engines/sword1/swordres.h +++ b/engines/sword1/swordres.h @@ -30,5195 +30,5195 @@ namespace Sword1 { // scripts // standard -#define SCRIPT0 0x01000000 +#define SCRIPT0 0x01000000 // 1 entities in TXTs, 1 in datafiles. // megas -#define SCRIPT128 0x01010000 -#define SCRIPT129 0x01010001 -#define SCRIPT130 0x01010002 -#define SCRIPT131 0x01010003 -#define SCRIPT133 0x01010004 -#define SCRIPT134 0x01010005 -#define SCRIPT145 0x01010006 -#define SCRIPT146 0x01010007 +#define SCRIPT128 0x01010000 +#define SCRIPT129 0x01010001 +#define SCRIPT130 0x01010002 +#define SCRIPT131 0x01010003 +#define SCRIPT133 0x01010004 +#define SCRIPT134 0x01010005 +#define SCRIPT145 0x01010006 +#define SCRIPT146 0x01010007 // 8 entities in TXTs, 8 in datafiles. // maps -#define SCRIPT80 0x01020000 -#define SCRIPT86 0x01020001 -#define SCRIPT90 0x01020002 +#define SCRIPT80 0x01020000 +#define SCRIPT86 0x01020001 +#define SCRIPT90 0x01020002 // 3 entities in TXTs, 3 in datafiles. // paris1 -#define SCRIPT1 0x01030000 -#define SCRIPT2 0x01030001 -#define SCRIPT3 0x01030002 -#define SCRIPT4 0x01030003 -#define SCRIPT5 0x01030004 -#define SCRIPT6 0x01030005 -#define SCRIPT7 0x01030006 -#define SCRIPT8 0x01030007 +#define SCRIPT1 0x01030000 +#define SCRIPT2 0x01030001 +#define SCRIPT3 0x01030002 +#define SCRIPT4 0x01030003 +#define SCRIPT5 0x01030004 +#define SCRIPT6 0x01030005 +#define SCRIPT7 0x01030006 +#define SCRIPT8 0x01030007 // 8 entities in TXTs, 8 in datafiles. // paris2 -#define SCRIPT9 0x01040000 -#define SCRIPT10 0x01040001 -#define SCRIPT11 0x01040002 -#define SCRIPT12 0x01040003 -#define SCRIPT13 0x01040004 -#define SCRIPT14 0x01040005 -#define SCRIPT15 0x01040006 -#define SCRIPT16 0x01040007 -#define SCRIPT17 0x01040008 -#define SCRIPT18 0x01040009 -#define SCRIPT46 0x0104000A +#define SCRIPT9 0x01040000 +#define SCRIPT10 0x01040001 +#define SCRIPT11 0x01040002 +#define SCRIPT12 0x01040003 +#define SCRIPT13 0x01040004 +#define SCRIPT14 0x01040005 +#define SCRIPT15 0x01040006 +#define SCRIPT16 0x01040007 +#define SCRIPT17 0x01040008 +#define SCRIPT18 0x01040009 +#define SCRIPT46 0x0104000A // 11 entities in TXTs, 11 in datafiles. // paris3 -#define SCRIPT27 0x01050000 -#define SCRIPT28 0x01050001 -#define SCRIPT29 0x01050002 -#define SCRIPT31 0x01050003 -#define SCRIPT32 0x01050004 -#define SCRIPT33 0x01050005 -#define SCRIPT34 0x01050006 -#define SCRIPT35 0x01050007 +#define SCRIPT27 0x01050000 +#define SCRIPT28 0x01050001 +#define SCRIPT29 0x01050002 +#define SCRIPT31 0x01050003 +#define SCRIPT32 0x01050004 +#define SCRIPT33 0x01050005 +#define SCRIPT34 0x01050006 +#define SCRIPT35 0x01050007 // 8 entities in TXTs, 8 in datafiles. // paris4 -#define SCRIPT36 0x01060000 -#define SCRIPT37 0x01060001 -#define SCRIPT38 0x01060002 -#define SCRIPT39 0x01060003 -#define SCRIPT40 0x01060004 -#define SCRIPT41 0x01060005 -#define SCRIPT42 0x01060006 -#define SCRIPT43 0x01060007 -#define SCRIPT48 0x01060008 +#define SCRIPT36 0x01060000 +#define SCRIPT37 0x01060001 +#define SCRIPT38 0x01060002 +#define SCRIPT39 0x01060003 +#define SCRIPT40 0x01060004 +#define SCRIPT41 0x01060005 +#define SCRIPT42 0x01060006 +#define SCRIPT43 0x01060007 +#define SCRIPT48 0x01060008 // 9 entities in TXTs, 9 in datafiles. // ireland -#define SCRIPT19 0x01070000 -#define SCRIPT20 0x01070001 -#define SCRIPT21 0x01070002 -#define SCRIPT22 0x01070003 -#define SCRIPT23 0x01070004 -#define SCRIPT24 0x01070005 -#define SCRIPT25 0x01070006 -#define SCRIPT26 0x01070007 +#define SCRIPT19 0x01070000 +#define SCRIPT20 0x01070001 +#define SCRIPT21 0x01070002 +#define SCRIPT22 0x01070003 +#define SCRIPT23 0x01070004 +#define SCRIPT24 0x01070005 +#define SCRIPT25 0x01070006 +#define SCRIPT26 0x01070007 // 8 entities in TXTs, 8 in datafiles. // spain -#define SCRIPT56 0x01080000 -#define SCRIPT57 0x01080001 -#define SCRIPT58 0x01080002 -#define SCRIPT59 0x01080003 -#define SCRIPT60 0x01080004 -#define SCRIPT61 0x01080005 -#define SCRIPT62 0x01080006 +#define SCRIPT56 0x01080000 +#define SCRIPT57 0x01080001 +#define SCRIPT58 0x01080002 +#define SCRIPT59 0x01080003 +#define SCRIPT60 0x01080004 +#define SCRIPT61 0x01080005 +#define SCRIPT62 0x01080006 // 7 entities in TXTs, 7 in datafiles. // syria -#define SCRIPT45 0x01090000 -#define SCRIPT47 0x01090001 -#define SCRIPT49 0x01090002 -#define SCRIPT50 0x01090003 -#define SCRIPT54 0x01090004 -#define SCRIPT55 0x01090005 +#define SCRIPT45 0x01090000 +#define SCRIPT47 0x01090001 +#define SCRIPT49 0x01090002 +#define SCRIPT50 0x01090003 +#define SCRIPT54 0x01090004 +#define SCRIPT55 0x01090005 // 6 entities in TXTs, 6 in datafiles. // train -#define SCRIPT63 0x010A0000 -#define SCRIPT65 0x010A0001 -#define SCRIPT66 0x010A0002 -#define SCRIPT67 0x010A0003 -#define SCRIPT69 0x010A0004 +#define SCRIPT63 0x010A0000 +#define SCRIPT65 0x010A0001 +#define SCRIPT66 0x010A0002 +#define SCRIPT67 0x010A0003 +#define SCRIPT69 0x010A0004 // 5 entities in TXTs, 5 in datafiles. // scotland -#define SCRIPT71 0x010B0000 -#define SCRIPT72 0x010B0001 -#define SCRIPT73 0x010B0002 -#define SCRIPT74 0x010B0003 +#define SCRIPT71 0x010B0000 +#define SCRIPT72 0x010B0001 +#define SCRIPT73 0x010B0002 +#define SCRIPT74 0x010B0003 // 4 entities in TXTs, 4 in datafiles. // compacts // standard -#define TEXT_OBS 0x02000000 +#define TEXT_OBS 0x02000000 // 1 entities in TXTs, 1 in datafiles. // megas -#define MEGA_GEO 0x02010000 -#define GEO_TLK_TABLE 0x02010001 -#define WHT_TLK_TABLE 0x02010002 -#define GEO_SHRUG_TABLE 0x02010003 -#define GEO_GIVE_TABLE 0x02010004 -#define GEO_GIVER_TABLE 0x02010005 -#define GEO_CROUCH_TABLE 0x02010006 -#define GEO_CROUCHR_TABLE 0x02010007 -#define GEO_PICKUP_TABLE 0x02010008 -#define GEO_RELAX_TABLE 0x02010009 -#define GEO_RELAXR_TABLE 0x0201000A -#define GEO_HAIR_TABLE 0x0201000B -#define GEO_BLINK_TABLE 0x0201000C -#define GEOPHN_TABLE 0x0201000D -#define GEO_GAUGE_TABLE 0x0201000E -#define GEO_SHOW_TABLE 0x0201000F -#define GEO_SHOWR_TABLE 0x02010010 -#define GEOSTA_TABLE 0x02010011 -#define GEOMON_TABLE 0x02010012 -#define MEGA_DUANE 0x02010013 -#define DUA5_TABLE 0x02010014 -#define DUA6_TABLE 0x02010015 -#define DUA7_TABLE 0x02010016 -#define DUA8_TABLE 0x02010017 -#define DUA9_TABLE 0x02010018 -#define MEGA_NICO 0x02010019 -#define NIC_TLK_TABLE 0x0201001A -#define NIC_PHOTO_TABLE 0x0201001B -#define NICPHN_TABLE 0x0201001C -#define MEGA_MUS 0x0201001D -#define MUS_TLK_TABLE 0x0201001E -#define MEGA_BENOIR 0x0201001F -#define BEN_GAUGE_TABLE 0x02010020 -#define BEN_TLK_TABLE 0x02010021 -#define MEGA_ROSSO 0x02010022 -#define MEGA_MOUE 0x02010023 -#define MEGA_ALBERT 0x02010024 +#define MEGA_GEO 0x02010000 +#define GEO_TLK_TABLE 0x02010001 +#define WHT_TLK_TABLE 0x02010002 +#define GEO_SHRUG_TABLE 0x02010003 +#define GEO_GIVE_TABLE 0x02010004 +#define GEO_GIVER_TABLE 0x02010005 +#define GEO_CROUCH_TABLE 0x02010006 +#define GEO_CROUCHR_TABLE 0x02010007 +#define GEO_PICKUP_TABLE 0x02010008 +#define GEO_RELAX_TABLE 0x02010009 +#define GEO_RELAXR_TABLE 0x0201000A +#define GEO_HAIR_TABLE 0x0201000B +#define GEO_BLINK_TABLE 0x0201000C +#define GEOPHN_TABLE 0x0201000D +#define GEO_GAUGE_TABLE 0x0201000E +#define GEO_SHOW_TABLE 0x0201000F +#define GEO_SHOWR_TABLE 0x02010010 +#define GEOSTA_TABLE 0x02010011 +#define GEOMON_TABLE 0x02010012 +#define MEGA_DUANE 0x02010013 +#define DUA5_TABLE 0x02010014 +#define DUA6_TABLE 0x02010015 +#define DUA7_TABLE 0x02010016 +#define DUA8_TABLE 0x02010017 +#define DUA9_TABLE 0x02010018 +#define MEGA_NICO 0x02010019 +#define NIC_TLK_TABLE 0x0201001A +#define NIC_PHOTO_TABLE 0x0201001B +#define NICPHN_TABLE 0x0201001C +#define MEGA_MUS 0x0201001D +#define MUS_TLK_TABLE 0x0201001E +#define MEGA_BENOIR 0x0201001F +#define BEN_GAUGE_TABLE 0x02010020 +#define BEN_TLK_TABLE 0x02010021 +#define MEGA_ROSSO 0x02010022 +#define MEGA_MOUE 0x02010023 +#define MEGA_ALBERT 0x02010024 // 37 entities in TXTs, 37 in datafiles. // maps -#define COMP80 0x02020000 -#define COMP86 0x02020001 -#define COMP90 0x02020002 -#define COMP91 0x02020003 -#define COMP99 0x02020004 +#define COMP80 0x02020000 +#define COMP86 0x02020001 +#define COMP90 0x02020002 +#define COMP91 0x02020003 +#define COMP99 0x02020004 // 5 entities in TXTs, 5 in datafiles. // paris1 -#define COMP1 0x02030000 -#define COMP2 0x02030001 -#define COMP3 0x02030002 -#define COMP4 0x02030003 -#define COMP5 0x02030004 -#define COMP6 0x02030005 -#define COMP7 0x02030006 -#define COMP8 0x02030007 +#define COMP1 0x02030000 +#define COMP2 0x02030001 +#define COMP3 0x02030002 +#define COMP4 0x02030003 +#define COMP5 0x02030004 +#define COMP6 0x02030005 +#define COMP7 0x02030006 +#define COMP8 0x02030007 // 8 entities in TXTs, 8 in datafiles. // paris2 -#define COMP9 0x02040000 -#define COMP10 0x02040001 -#define COMP11 0x02040002 -#define COMP12 0x02040003 -#define COMP13 0x02040004 -#define COMP14 0x02040005 -#define COMP15 0x02040006 -#define COMP16 0x02040007 -#define COMP17 0x02040008 -#define COMP18 0x02040009 -#define COMP81 0x0204000A -#define COMP46 0x0204000B +#define COMP9 0x02040000 +#define COMP10 0x02040001 +#define COMP11 0x02040002 +#define COMP12 0x02040003 +#define COMP13 0x02040004 +#define COMP14 0x02040005 +#define COMP15 0x02040006 +#define COMP16 0x02040007 +#define COMP17 0x02040008 +#define COMP18 0x02040009 +#define COMP81 0x0204000A +#define COMP46 0x0204000B // 12 entities in TXTs, 12 in datafiles. // paris3 -#define COMP27 0x02050000 -#define COMP28 0x02050001 -#define COMP29 0x02050002 -#define COMP30 0x02050003 -#define COMP31 0x02050004 -#define COMP32 0x02050005 -#define COMP33 0x02050006 -#define COMP34 0x02050007 -#define COMP35 0x02050008 +#define COMP27 0x02050000 +#define COMP28 0x02050001 +#define COMP29 0x02050002 +#define COMP30 0x02050003 +#define COMP31 0x02050004 +#define COMP32 0x02050005 +#define COMP33 0x02050006 +#define COMP34 0x02050007 +#define COMP35 0x02050008 // 9 entities in TXTs, 9 in datafiles. // paris4 -#define COMP36 0x02060000 -#define COMP37 0x02060001 -#define COMP38 0x02060002 -#define COMP39 0x02060003 -#define COMP40 0x02060004 -#define COMP41 0x02060005 -#define COMP42 0x02060006 -#define COMP43 0x02060007 -#define COMP48 0x02060008 +#define COMP36 0x02060000 +#define COMP37 0x02060001 +#define COMP38 0x02060002 +#define COMP39 0x02060003 +#define COMP40 0x02060004 +#define COMP41 0x02060005 +#define COMP42 0x02060006 +#define COMP43 0x02060007 +#define COMP48 0x02060008 // 9 entities in TXTs, 9 in datafiles. // ireland -#define COMP19 0x02070000 -#define COMP20 0x02070001 -#define COMP21 0x02070002 -#define COMP22 0x02070003 -#define COMP23 0x02070004 -#define COMP24 0x02070005 -#define COMP25 0x02070006 -#define COMP26 0x02070007 +#define COMP19 0x02070000 +#define COMP20 0x02070001 +#define COMP21 0x02070002 +#define COMP22 0x02070003 +#define COMP23 0x02070004 +#define COMP24 0x02070005 +#define COMP25 0x02070006 +#define COMP26 0x02070007 // 8 entities in TXTs, 8 in datafiles. // spain -#define COMP56 0x02080000 -#define COMP57 0x02080001 -#define COMP58 0x02080002 -#define COMP59 0x02080003 -#define COMP60 0x02080004 -#define COMP61 0x02080005 -#define COMP62 0x02080006 +#define COMP56 0x02080000 +#define COMP57 0x02080001 +#define COMP58 0x02080002 +#define COMP59 0x02080003 +#define COMP60 0x02080004 +#define COMP61 0x02080005 +#define COMP62 0x02080006 // 7 entities in TXTs, 7 in datafiles. // syria -#define COMP45 0x02090000 -#define COMP47 0x02090001 -#define COMP49 0x02090002 -#define COMP50 0x02090003 -#define COMP53 0x02090004 -#define COMP54 0x02090005 -#define COMP55 0x02090006 +#define COMP45 0x02090000 +#define COMP47 0x02090001 +#define COMP49 0x02090002 +#define COMP50 0x02090003 +#define COMP53 0x02090004 +#define COMP54 0x02090005 +#define COMP55 0x02090006 // 7 entities in TXTs, 7 in datafiles. // train -#define COMP63 0x020A0000 -#define COMP65 0x020A0001 -#define COMP66 0x020A0002 -#define COMP67 0x020A0003 -#define COMP69 0x020A0004 +#define COMP63 0x020A0000 +#define COMP65 0x020A0001 +#define COMP66 0x020A0002 +#define COMP67 0x020A0003 +#define COMP69 0x020A0004 // 5 entities in TXTs, 5 in datafiles. // scotland -#define COMP71 0x020B0000 -#define COMP72 0x020B0001 -#define COMP73 0x020B0002 -#define COMP74 0x020B0003 -#define COMP75 0x020B0004 -#define COMP76 0x020B0005 -#define COMP77 0x020B0006 -#define COMP78 0x020B0007 -#define COMP79 0x020B0008 +#define COMP71 0x020B0000 +#define COMP72 0x020B0001 +#define COMP73 0x020B0002 +#define COMP74 0x020B0003 +#define COMP75 0x020B0004 +#define COMP76 0x020B0005 +#define COMP77 0x020B0006 +#define COMP78 0x020B0007 +#define COMP79 0x020B0008 // 9 entities in TXTs, 9 in datafiles. // text // english -#define ENGLISH0 0x03000000 -#define ENGLISH1 0x03000001 -#define ENGLISH2 0x03000002 -#define ENGLISH3 0x03000003 -#define ENGLISH4 0x03000004 -#define ENGLISH5 0x03000005 -#define ENGLISH6 0x03000006 -#define ENGLISH7 0x03000007 -#define ENGLISH9 0x03000008 -#define ENGLISH11 0x03000009 -#define ENGLISH12 0x0300000A -#define ENGLISH13 0x0300000B -#define ENGLISH14 0x0300000C -#define ENGLISH15 0x0300000D -#define ENGLISH16 0x0300000E -#define ENGLISH17 0x0300000F -#define ENGLISH18 0x03000010 -#define ENGLISH19 0x03000011 -#define ENGLISH20 0x03000012 -#define ENGLISH21 0x03000013 -#define ENGLISH22 0x03000014 -#define ENGLISH23 0x03000015 -#define ENGLISH24 0x03000016 -#define ENGLISH25 0x03000017 -#define ENGLISH27 0x03000018 -#define ENGLISH28 0x03000019 -#define ENGLISH29 0x0300001A -#define ENGLISH31 0x0300001B -#define ENGLISH32 0x0300001C -#define ENGLISH33 0x0300001D -#define ENGLISH34 0x0300001E -#define ENGLISH35 0x0300001F -#define ENGLISH36 0x03000020 -#define ENGLISH37 0x03000021 -#define ENGLISH38 0x03000022 -#define ENGLISH39 0x03000023 -#define ENGLISH40 0x03000024 -#define ENGLISH41 0x03000025 -#define ENGLISH42 0x03000026 -#define ENGLISH43 0x03000027 -#define ENGLISH45 0x03000028 -#define ENGLISH47 0x03000029 -#define ENGLISH48 0x0300002A -#define ENGLISH49 0x0300002B -#define ENGLISH50 0x0300002C -#define ENGLISH54 0x0300002D -#define ENGLISH55 0x0300002E -#define ENGLISH56 0x0300002F -#define ENGLISH57 0x03000030 -#define ENGLISH58 0x03000031 -#define ENGLISH59 0x03000032 -#define ENGLISH60 0x03000033 -#define ENGLISH61 0x03000034 -#define ENGLISH63 0x03000035 -#define ENGLISH65 0x03000036 -#define ENGLISH66 0x03000037 -#define ENGLISH69 0x03000038 -#define ENGLISH71 0x03000039 -#define ENGLISH72 0x0300003A -#define ENGLISH73 0x0300003B -#define ENGLISH74 0x0300003C -#define ENGLISH90 0x0300003D -#define ENGLISH99 0x0300003E -#define ENGLISH129 0x0300003F -#define ENGLISH131 0x03000040 -#define ENGLISH133 0x03000041 -#define ENGLISH145 0x03000042 -#define ENGLISH146 0x03000043 +#define ENGLISH0 0x03000000 +#define ENGLISH1 0x03000001 +#define ENGLISH2 0x03000002 +#define ENGLISH3 0x03000003 +#define ENGLISH4 0x03000004 +#define ENGLISH5 0x03000005 +#define ENGLISH6 0x03000006 +#define ENGLISH7 0x03000007 +#define ENGLISH9 0x03000008 +#define ENGLISH11 0x03000009 +#define ENGLISH12 0x0300000A +#define ENGLISH13 0x0300000B +#define ENGLISH14 0x0300000C +#define ENGLISH15 0x0300000D +#define ENGLISH16 0x0300000E +#define ENGLISH17 0x0300000F +#define ENGLISH18 0x03000010 +#define ENGLISH19 0x03000011 +#define ENGLISH20 0x03000012 +#define ENGLISH21 0x03000013 +#define ENGLISH22 0x03000014 +#define ENGLISH23 0x03000015 +#define ENGLISH24 0x03000016 +#define ENGLISH25 0x03000017 +#define ENGLISH27 0x03000018 +#define ENGLISH28 0x03000019 +#define ENGLISH29 0x0300001A +#define ENGLISH31 0x0300001B +#define ENGLISH32 0x0300001C +#define ENGLISH33 0x0300001D +#define ENGLISH34 0x0300001E +#define ENGLISH35 0x0300001F +#define ENGLISH36 0x03000020 +#define ENGLISH37 0x03000021 +#define ENGLISH38 0x03000022 +#define ENGLISH39 0x03000023 +#define ENGLISH40 0x03000024 +#define ENGLISH41 0x03000025 +#define ENGLISH42 0x03000026 +#define ENGLISH43 0x03000027 +#define ENGLISH45 0x03000028 +#define ENGLISH47 0x03000029 +#define ENGLISH48 0x0300002A +#define ENGLISH49 0x0300002B +#define ENGLISH50 0x0300002C +#define ENGLISH54 0x0300002D +#define ENGLISH55 0x0300002E +#define ENGLISH56 0x0300002F +#define ENGLISH57 0x03000030 +#define ENGLISH58 0x03000031 +#define ENGLISH59 0x03000032 +#define ENGLISH60 0x03000033 +#define ENGLISH61 0x03000034 +#define ENGLISH63 0x03000035 +#define ENGLISH65 0x03000036 +#define ENGLISH66 0x03000037 +#define ENGLISH69 0x03000038 +#define ENGLISH71 0x03000039 +#define ENGLISH72 0x0300003A +#define ENGLISH73 0x0300003B +#define ENGLISH74 0x0300003C +#define ENGLISH90 0x0300003D +#define ENGLISH99 0x0300003E +#define ENGLISH129 0x0300003F +#define ENGLISH131 0x03000040 +#define ENGLISH133 0x03000041 +#define ENGLISH145 0x03000042 +#define ENGLISH146 0x03000043 // 68 entities in TXTs, 68 in datafiles. // french -#define FRENCH0 0x03010000 -#define FRENCH1 0x03010001 -#define FRENCH2 0x03010002 -#define FRENCH3 0x03010003 -#define FRENCH4 0x03010004 -#define FRENCH5 0x03010005 -#define FRENCH6 0x03010006 -#define FRENCH7 0x03010007 -#define FRENCH9 0x03010008 -#define FRENCH11 0x03010009 -#define FRENCH12 0x0301000A -#define FRENCH13 0x0301000B -#define FRENCH14 0x0301000C -#define FRENCH15 0x0301000D -#define FRENCH16 0x0301000E -#define FRENCH17 0x0301000F -#define FRENCH18 0x03010010 -#define FRENCH19 0x03010011 -#define FRENCH20 0x03010012 -#define FRENCH21 0x03010013 -#define FRENCH22 0x03010014 -#define FRENCH23 0x03010015 -#define FRENCH24 0x03010016 -#define FRENCH25 0x03010017 -#define FRENCH27 0x03010018 -#define FRENCH28 0x03010019 -#define FRENCH29 0x0301001A -#define FRENCH31 0x0301001B -#define FRENCH32 0x0301001C -#define FRENCH33 0x0301001D -#define FRENCH34 0x0301001E -#define FRENCH35 0x0301001F -#define FRENCH36 0x03010020 -#define FRENCH37 0x03010021 -#define FRENCH38 0x03010022 -#define FRENCH39 0x03010023 -#define FRENCH40 0x03010024 -#define FRENCH41 0x03010025 -#define FRENCH42 0x03010026 -#define FRENCH43 0x03010027 -#define FRENCH45 0x03010028 -#define FRENCH47 0x03010029 -#define FRENCH48 0x0301002A -#define FRENCH49 0x0301002B -#define FRENCH50 0x0301002C -#define FRENCH54 0x0301002D -#define FRENCH55 0x0301002E -#define FRENCH56 0x0301002F -#define FRENCH57 0x03010030 -#define FRENCH58 0x03010031 -#define FRENCH59 0x03010032 -#define FRENCH60 0x03010033 -#define FRENCH61 0x03010034 -#define FRENCH63 0x03010035 -#define FRENCH65 0x03010036 -#define FRENCH66 0x03010037 -#define FRENCH69 0x03010038 -#define FRENCH71 0x03010039 -#define FRENCH72 0x0301003A -#define FRENCH73 0x0301003B -#define FRENCH74 0x0301003C -#define FRENCH90 0x0301003D -#define FRENCH99 0x0301003E -#define FRENCH129 0x0301003F -#define FRENCH131 0x03010040 -#define FRENCH133 0x03010041 -#define FRENCH145 0x03010042 -#define FRENCH146 0x03010043 +#define FRENCH0 0x03010000 +#define FRENCH1 0x03010001 +#define FRENCH2 0x03010002 +#define FRENCH3 0x03010003 +#define FRENCH4 0x03010004 +#define FRENCH5 0x03010005 +#define FRENCH6 0x03010006 +#define FRENCH7 0x03010007 +#define FRENCH9 0x03010008 +#define FRENCH11 0x03010009 +#define FRENCH12 0x0301000A +#define FRENCH13 0x0301000B +#define FRENCH14 0x0301000C +#define FRENCH15 0x0301000D +#define FRENCH16 0x0301000E +#define FRENCH17 0x0301000F +#define FRENCH18 0x03010010 +#define FRENCH19 0x03010011 +#define FRENCH20 0x03010012 +#define FRENCH21 0x03010013 +#define FRENCH22 0x03010014 +#define FRENCH23 0x03010015 +#define FRENCH24 0x03010016 +#define FRENCH25 0x03010017 +#define FRENCH27 0x03010018 +#define FRENCH28 0x03010019 +#define FRENCH29 0x0301001A +#define FRENCH31 0x0301001B +#define FRENCH32 0x0301001C +#define FRENCH33 0x0301001D +#define FRENCH34 0x0301001E +#define FRENCH35 0x0301001F +#define FRENCH36 0x03010020 +#define FRENCH37 0x03010021 +#define FRENCH38 0x03010022 +#define FRENCH39 0x03010023 +#define FRENCH40 0x03010024 +#define FRENCH41 0x03010025 +#define FRENCH42 0x03010026 +#define FRENCH43 0x03010027 +#define FRENCH45 0x03010028 +#define FRENCH47 0x03010029 +#define FRENCH48 0x0301002A +#define FRENCH49 0x0301002B +#define FRENCH50 0x0301002C +#define FRENCH54 0x0301002D +#define FRENCH55 0x0301002E +#define FRENCH56 0x0301002F +#define FRENCH57 0x03010030 +#define FRENCH58 0x03010031 +#define FRENCH59 0x03010032 +#define FRENCH60 0x03010033 +#define FRENCH61 0x03010034 +#define FRENCH63 0x03010035 +#define FRENCH65 0x03010036 +#define FRENCH66 0x03010037 +#define FRENCH69 0x03010038 +#define FRENCH71 0x03010039 +#define FRENCH72 0x0301003A +#define FRENCH73 0x0301003B +#define FRENCH74 0x0301003C +#define FRENCH90 0x0301003D +#define FRENCH99 0x0301003E +#define FRENCH129 0x0301003F +#define FRENCH131 0x03010040 +#define FRENCH133 0x03010041 +#define FRENCH145 0x03010042 +#define FRENCH146 0x03010043 // 68 entities in TXTs, 68 in datafiles. // german -#define GERMAN0 0x03020000 -#define GERMAN1 0x03020001 -#define GERMAN2 0x03020002 -#define GERMAN3 0x03020003 -#define GERMAN4 0x03020004 -#define GERMAN5 0x03020005 -#define GERMAN6 0x03020006 -#define GERMAN7 0x03020007 -#define GERMAN9 0x03020008 -#define GERMAN11 0x03020009 -#define GERMAN12 0x0302000A -#define GERMAN13 0x0302000B -#define GERMAN14 0x0302000C -#define GERMAN15 0x0302000D -#define GERMAN16 0x0302000E -#define GERMAN17 0x0302000F -#define GERMAN18 0x03020010 -#define GERMAN19 0x03020011 -#define GERMAN20 0x03020012 -#define GERMAN21 0x03020013 -#define GERMAN22 0x03020014 -#define GERMAN23 0x03020015 -#define GERMAN24 0x03020016 -#define GERMAN25 0x03020017 -#define GERMAN27 0x03020018 -#define GERMAN28 0x03020019 -#define GERMAN29 0x0302001A -#define GERMAN31 0x0302001B -#define GERMAN32 0x0302001C -#define GERMAN33 0x0302001D -#define GERMAN34 0x0302001E -#define GERMAN35 0x0302001F -#define GERMAN36 0x03020020 -#define GERMAN37 0x03020021 -#define GERMAN38 0x03020022 -#define GERMAN39 0x03020023 -#define GERMAN40 0x03020024 -#define GERMAN41 0x03020025 -#define GERMAN42 0x03020026 -#define GERMAN43 0x03020027 -#define GERMAN45 0x03020028 -#define GERMAN47 0x03020029 -#define GERMAN48 0x0302002A -#define GERMAN49 0x0302002B -#define GERMAN50 0x0302002C -#define GERMAN54 0x0302002D -#define GERMAN55 0x0302002E -#define GERMAN56 0x0302002F -#define GERMAN57 0x03020030 -#define GERMAN58 0x03020031 -#define GERMAN59 0x03020032 -#define GERMAN60 0x03020033 -#define GERMAN61 0x03020034 -#define GERMAN63 0x03020035 -#define GERMAN65 0x03020036 -#define GERMAN66 0x03020037 -#define GERMAN69 0x03020038 -#define GERMAN71 0x03020039 -#define GERMAN72 0x0302003A -#define GERMAN73 0x0302003B -#define GERMAN74 0x0302003C -#define GERMAN90 0x0302003D -#define GERMAN99 0x0302003E -#define GERMAN129 0x0302003F -#define GERMAN131 0x03020040 -#define GERMAN133 0x03020041 -#define GERMAN145 0x03020042 -#define GERMAN146 0x03020043 +#define GERMAN0 0x03020000 +#define GERMAN1 0x03020001 +#define GERMAN2 0x03020002 +#define GERMAN3 0x03020003 +#define GERMAN4 0x03020004 +#define GERMAN5 0x03020005 +#define GERMAN6 0x03020006 +#define GERMAN7 0x03020007 +#define GERMAN9 0x03020008 +#define GERMAN11 0x03020009 +#define GERMAN12 0x0302000A +#define GERMAN13 0x0302000B +#define GERMAN14 0x0302000C +#define GERMAN15 0x0302000D +#define GERMAN16 0x0302000E +#define GERMAN17 0x0302000F +#define GERMAN18 0x03020010 +#define GERMAN19 0x03020011 +#define GERMAN20 0x03020012 +#define GERMAN21 0x03020013 +#define GERMAN22 0x03020014 +#define GERMAN23 0x03020015 +#define GERMAN24 0x03020016 +#define GERMAN25 0x03020017 +#define GERMAN27 0x03020018 +#define GERMAN28 0x03020019 +#define GERMAN29 0x0302001A +#define GERMAN31 0x0302001B +#define GERMAN32 0x0302001C +#define GERMAN33 0x0302001D +#define GERMAN34 0x0302001E +#define GERMAN35 0x0302001F +#define GERMAN36 0x03020020 +#define GERMAN37 0x03020021 +#define GERMAN38 0x03020022 +#define GERMAN39 0x03020023 +#define GERMAN40 0x03020024 +#define GERMAN41 0x03020025 +#define GERMAN42 0x03020026 +#define GERMAN43 0x03020027 +#define GERMAN45 0x03020028 +#define GERMAN47 0x03020029 +#define GERMAN48 0x0302002A +#define GERMAN49 0x0302002B +#define GERMAN50 0x0302002C +#define GERMAN54 0x0302002D +#define GERMAN55 0x0302002E +#define GERMAN56 0x0302002F +#define GERMAN57 0x03020030 +#define GERMAN58 0x03020031 +#define GERMAN59 0x03020032 +#define GERMAN60 0x03020033 +#define GERMAN61 0x03020034 +#define GERMAN63 0x03020035 +#define GERMAN65 0x03020036 +#define GERMAN66 0x03020037 +#define GERMAN69 0x03020038 +#define GERMAN71 0x03020039 +#define GERMAN72 0x0302003A +#define GERMAN73 0x0302003B +#define GERMAN74 0x0302003C +#define GERMAN90 0x0302003D +#define GERMAN99 0x0302003E +#define GERMAN129 0x0302003F +#define GERMAN131 0x03020040 +#define GERMAN133 0x03020041 +#define GERMAN145 0x03020042 +#define GERMAN146 0x03020043 // 68 entities in TXTs, 68 in datafiles. // italian -#define ITALIAN0 0x03030000 -#define ITALIAN1 0x03030001 -#define ITALIAN2 0x03030002 -#define ITALIAN3 0x03030003 -#define ITALIAN4 0x03030004 -#define ITALIAN5 0x03030005 -#define ITALIAN6 0x03030006 -#define ITALIAN7 0x03030007 -#define ITALIAN9 0x03030008 -#define ITALIAN11 0x03030009 -#define ITALIAN12 0x0303000A -#define ITALIAN13 0x0303000B -#define ITALIAN14 0x0303000C -#define ITALIAN15 0x0303000D -#define ITALIAN16 0x0303000E -#define ITALIAN17 0x0303000F -#define ITALIAN18 0x03030010 -#define ITALIAN19 0x03030011 -#define ITALIAN20 0x03030012 -#define ITALIAN21 0x03030013 -#define ITALIAN22 0x03030014 -#define ITALIAN23 0x03030015 -#define ITALIAN24 0x03030016 -#define ITALIAN25 0x03030017 -#define ITALIAN27 0x03030018 -#define ITALIAN28 0x03030019 -#define ITALIAN29 0x0303001A -#define ITALIAN31 0x0303001B -#define ITALIAN32 0x0303001C -#define ITALIAN33 0x0303001D -#define ITALIAN34 0x0303001E -#define ITALIAN35 0x0303001F -#define ITALIAN36 0x03030020 -#define ITALIAN37 0x03030021 -#define ITALIAN38 0x03030022 -#define ITALIAN39 0x03030023 -#define ITALIAN40 0x03030024 -#define ITALIAN41 0x03030025 -#define ITALIAN42 0x03030026 -#define ITALIAN43 0x03030027 -#define ITALIAN45 0x03030028 -#define ITALIAN47 0x03030029 -#define ITALIAN48 0x0303002A -#define ITALIAN49 0x0303002B -#define ITALIAN50 0x0303002C -#define ITALIAN54 0x0303002D -#define ITALIAN55 0x0303002E -#define ITALIAN56 0x0303002F -#define ITALIAN57 0x03030030 -#define ITALIAN58 0x03030031 -#define ITALIAN59 0x03030032 -#define ITALIAN60 0x03030033 -#define ITALIAN61 0x03030034 -#define ITALIAN63 0x03030035 -#define ITALIAN65 0x03030036 -#define ITALIAN66 0x03030037 -#define ITALIAN69 0x03030038 -#define ITALIAN71 0x03030039 -#define ITALIAN72 0x0303003A -#define ITALIAN73 0x0303003B -#define ITALIAN74 0x0303003C -#define ITALIAN90 0x0303003D -#define ITALIAN99 0x0303003E -#define ITALIAN129 0x0303003F -#define ITALIAN131 0x03030040 -#define ITALIAN133 0x03030041 -#define ITALIAN145 0x03030042 -#define ITALIAN146 0x03030043 +#define ITALIAN0 0x03030000 +#define ITALIAN1 0x03030001 +#define ITALIAN2 0x03030002 +#define ITALIAN3 0x03030003 +#define ITALIAN4 0x03030004 +#define ITALIAN5 0x03030005 +#define ITALIAN6 0x03030006 +#define ITALIAN7 0x03030007 +#define ITALIAN9 0x03030008 +#define ITALIAN11 0x03030009 +#define ITALIAN12 0x0303000A +#define ITALIAN13 0x0303000B +#define ITALIAN14 0x0303000C +#define ITALIAN15 0x0303000D +#define ITALIAN16 0x0303000E +#define ITALIAN17 0x0303000F +#define ITALIAN18 0x03030010 +#define ITALIAN19 0x03030011 +#define ITALIAN20 0x03030012 +#define ITALIAN21 0x03030013 +#define ITALIAN22 0x03030014 +#define ITALIAN23 0x03030015 +#define ITALIAN24 0x03030016 +#define ITALIAN25 0x03030017 +#define ITALIAN27 0x03030018 +#define ITALIAN28 0x03030019 +#define ITALIAN29 0x0303001A +#define ITALIAN31 0x0303001B +#define ITALIAN32 0x0303001C +#define ITALIAN33 0x0303001D +#define ITALIAN34 0x0303001E +#define ITALIAN35 0x0303001F +#define ITALIAN36 0x03030020 +#define ITALIAN37 0x03030021 +#define ITALIAN38 0x03030022 +#define ITALIAN39 0x03030023 +#define ITALIAN40 0x03030024 +#define ITALIAN41 0x03030025 +#define ITALIAN42 0x03030026 +#define ITALIAN43 0x03030027 +#define ITALIAN45 0x03030028 +#define ITALIAN47 0x03030029 +#define ITALIAN48 0x0303002A +#define ITALIAN49 0x0303002B +#define ITALIAN50 0x0303002C +#define ITALIAN54 0x0303002D +#define ITALIAN55 0x0303002E +#define ITALIAN56 0x0303002F +#define ITALIAN57 0x03030030 +#define ITALIAN58 0x03030031 +#define ITALIAN59 0x03030032 +#define ITALIAN60 0x03030033 +#define ITALIAN61 0x03030034 +#define ITALIAN63 0x03030035 +#define ITALIAN65 0x03030036 +#define ITALIAN66 0x03030037 +#define ITALIAN69 0x03030038 +#define ITALIAN71 0x03030039 +#define ITALIAN72 0x0303003A +#define ITALIAN73 0x0303003B +#define ITALIAN74 0x0303003C +#define ITALIAN90 0x0303003D +#define ITALIAN99 0x0303003E +#define ITALIAN129 0x0303003F +#define ITALIAN131 0x03030040 +#define ITALIAN133 0x03030041 +#define ITALIAN145 0x03030042 +#define ITALIAN146 0x03030043 // 68 entities in TXTs, 68 in datafiles. // spanish -#define SPANISH0 0x03040000 -#define SPANISH1 0x03040001 -#define SPANISH2 0x03040002 -#define SPANISH3 0x03040003 -#define SPANISH4 0x03040004 -#define SPANISH5 0x03040005 -#define SPANISH6 0x03040006 -#define SPANISH7 0x03040007 -#define SPANISH9 0x03040008 -#define SPANISH11 0x03040009 -#define SPANISH12 0x0304000A -#define SPANISH13 0x0304000B -#define SPANISH14 0x0304000C -#define SPANISH15 0x0304000D -#define SPANISH16 0x0304000E -#define SPANISH17 0x0304000F -#define SPANISH18 0x03040010 -#define SPANISH19 0x03040011 -#define SPANISH20 0x03040012 -#define SPANISH21 0x03040013 -#define SPANISH22 0x03040014 -#define SPANISH23 0x03040015 -#define SPANISH24 0x03040016 -#define SPANISH25 0x03040017 -#define SPANISH27 0x03040018 -#define SPANISH28 0x03040019 -#define SPANISH29 0x0304001A -#define SPANISH31 0x0304001B -#define SPANISH32 0x0304001C -#define SPANISH33 0x0304001D -#define SPANISH34 0x0304001E -#define SPANISH35 0x0304001F -#define SPANISH36 0x03040020 -#define SPANISH37 0x03040021 -#define SPANISH38 0x03040022 -#define SPANISH39 0x03040023 -#define SPANISH40 0x03040024 -#define SPANISH41 0x03040025 -#define SPANISH42 0x03040026 -#define SPANISH43 0x03040027 -#define SPANISH45 0x03040028 -#define SPANISH47 0x03040029 -#define SPANISH48 0x0304002A -#define SPANISH49 0x0304002B -#define SPANISH50 0x0304002C -#define SPANISH54 0x0304002D -#define SPANISH55 0x0304002E -#define SPANISH56 0x0304002F -#define SPANISH57 0x03040030 -#define SPANISH58 0x03040031 -#define SPANISH59 0x03040032 -#define SPANISH60 0x03040033 -#define SPANISH61 0x03040034 -#define SPANISH63 0x03040035 -#define SPANISH65 0x03040036 -#define SPANISH66 0x03040037 -#define SPANISH69 0x03040038 -#define SPANISH71 0x03040039 -#define SPANISH72 0x0304003A -#define SPANISH73 0x0304003B -#define SPANISH74 0x0304003C -#define SPANISH90 0x0304003D -#define SPANISH99 0x0304003E -#define SPANISH129 0x0304003F -#define SPANISH131 0x03040040 -#define SPANISH133 0x03040041 -#define SPANISH145 0x03040042 -#define SPANISH146 0x03040043 +#define SPANISH0 0x03040000 +#define SPANISH1 0x03040001 +#define SPANISH2 0x03040002 +#define SPANISH3 0x03040003 +#define SPANISH4 0x03040004 +#define SPANISH5 0x03040005 +#define SPANISH6 0x03040006 +#define SPANISH7 0x03040007 +#define SPANISH9 0x03040008 +#define SPANISH11 0x03040009 +#define SPANISH12 0x0304000A +#define SPANISH13 0x0304000B +#define SPANISH14 0x0304000C +#define SPANISH15 0x0304000D +#define SPANISH16 0x0304000E +#define SPANISH17 0x0304000F +#define SPANISH18 0x03040010 +#define SPANISH19 0x03040011 +#define SPANISH20 0x03040012 +#define SPANISH21 0x03040013 +#define SPANISH22 0x03040014 +#define SPANISH23 0x03040015 +#define SPANISH24 0x03040016 +#define SPANISH25 0x03040017 +#define SPANISH27 0x03040018 +#define SPANISH28 0x03040019 +#define SPANISH29 0x0304001A +#define SPANISH31 0x0304001B +#define SPANISH32 0x0304001C +#define SPANISH33 0x0304001D +#define SPANISH34 0x0304001E +#define SPANISH35 0x0304001F +#define SPANISH36 0x03040020 +#define SPANISH37 0x03040021 +#define SPANISH38 0x03040022 +#define SPANISH39 0x03040023 +#define SPANISH40 0x03040024 +#define SPANISH41 0x03040025 +#define SPANISH42 0x03040026 +#define SPANISH43 0x03040027 +#define SPANISH45 0x03040028 +#define SPANISH47 0x03040029 +#define SPANISH48 0x0304002A +#define SPANISH49 0x0304002B +#define SPANISH50 0x0304002C +#define SPANISH54 0x0304002D +#define SPANISH55 0x0304002E +#define SPANISH56 0x0304002F +#define SPANISH57 0x03040030 +#define SPANISH58 0x03040031 +#define SPANISH59 0x03040032 +#define SPANISH60 0x03040033 +#define SPANISH61 0x03040034 +#define SPANISH63 0x03040035 +#define SPANISH65 0x03040036 +#define SPANISH66 0x03040037 +#define SPANISH69 0x03040038 +#define SPANISH71 0x03040039 +#define SPANISH72 0x0304003A +#define SPANISH73 0x0304003B +#define SPANISH74 0x0304003C +#define SPANISH90 0x0304003D +#define SPANISH99 0x0304003E +#define SPANISH129 0x0304003F +#define SPANISH131 0x03040040 +#define SPANISH133 0x03040041 +#define SPANISH145 0x03040042 +#define SPANISH146 0x03040043 // 68 entities in TXTs, 68 in datafiles. // czech -#define CZECH0 0x03050000 -#define CZECH1 0x03050001 -#define CZECH2 0x03050002 -#define CZECH3 0x03050003 -#define CZECH4 0x03050004 -#define CZECH5 0x03050005 -#define CZECH6 0x03050006 -#define CZECH7 0x03050007 -#define CZECH9 0x03050008 -#define CZECH11 0x03050009 -#define CZECH12 0x0305000A -#define CZECH13 0x0305000B -#define CZECH14 0x0305000C -#define CZECH15 0x0305000D -#define CZECH16 0x0305000E -#define CZECH17 0x0305000F -#define CZECH18 0x03050010 -#define CZECH19 0x03050011 -#define CZECH20 0x03050012 -#define CZECH21 0x03050013 -#define CZECH22 0x03050014 -#define CZECH23 0x03050015 -#define CZECH24 0x03050016 -#define CZECH25 0x03050017 -#define CZECH27 0x03050018 -#define CZECH28 0x03050019 -#define CZECH29 0x0305001A -#define CZECH31 0x0305001B -#define CZECH32 0x0305001C -#define CZECH33 0x0305001D -#define CZECH34 0x0305001E -#define CZECH35 0x0305001F -#define CZECH36 0x03050020 -#define CZECH37 0x03050021 -#define CZECH38 0x03050022 -#define CZECH39 0x03050023 -#define CZECH40 0x03050024 -#define CZECH41 0x03050025 -#define CZECH42 0x03050026 -#define CZECH43 0x03050027 -#define CZECH45 0x03050028 -#define CZECH47 0x03050029 -#define CZECH48 0x0305002A -#define CZECH49 0x0305002B -#define CZECH50 0x0305002C -#define CZECH54 0x0305002D -#define CZECH55 0x0305002E -#define CZECH56 0x0305002F -#define CZECH57 0x03050030 -#define CZECH58 0x03050031 -#define CZECH59 0x03050032 -#define CZECH60 0x03050033 -#define CZECH61 0x03050034 -#define CZECH63 0x03050035 -#define CZECH65 0x03050036 -#define CZECH66 0x03050037 -#define CZECH69 0x03050038 -#define CZECH71 0x03050039 -#define CZECH72 0x0305003A -#define CZECH73 0x0305003B -#define CZECH74 0x0305003C -#define CZECH90 0x0305003D -#define CZECH99 0x0305003E -#define CZECH129 0x0305003F -#define CZECH131 0x03050040 -#define CZECH133 0x03050041 -#define CZECH145 0x03050042 -#define CZECH146 0x03050043 +#define CZECH0 0x03050000 +#define CZECH1 0x03050001 +#define CZECH2 0x03050002 +#define CZECH3 0x03050003 +#define CZECH4 0x03050004 +#define CZECH5 0x03050005 +#define CZECH6 0x03050006 +#define CZECH7 0x03050007 +#define CZECH9 0x03050008 +#define CZECH11 0x03050009 +#define CZECH12 0x0305000A +#define CZECH13 0x0305000B +#define CZECH14 0x0305000C +#define CZECH15 0x0305000D +#define CZECH16 0x0305000E +#define CZECH17 0x0305000F +#define CZECH18 0x03050010 +#define CZECH19 0x03050011 +#define CZECH20 0x03050012 +#define CZECH21 0x03050013 +#define CZECH22 0x03050014 +#define CZECH23 0x03050015 +#define CZECH24 0x03050016 +#define CZECH25 0x03050017 +#define CZECH27 0x03050018 +#define CZECH28 0x03050019 +#define CZECH29 0x0305001A +#define CZECH31 0x0305001B +#define CZECH32 0x0305001C +#define CZECH33 0x0305001D +#define CZECH34 0x0305001E +#define CZECH35 0x0305001F +#define CZECH36 0x03050020 +#define CZECH37 0x03050021 +#define CZECH38 0x03050022 +#define CZECH39 0x03050023 +#define CZECH40 0x03050024 +#define CZECH41 0x03050025 +#define CZECH42 0x03050026 +#define CZECH43 0x03050027 +#define CZECH45 0x03050028 +#define CZECH47 0x03050029 +#define CZECH48 0x0305002A +#define CZECH49 0x0305002B +#define CZECH50 0x0305002C +#define CZECH54 0x0305002D +#define CZECH55 0x0305002E +#define CZECH56 0x0305002F +#define CZECH57 0x03050030 +#define CZECH58 0x03050031 +#define CZECH59 0x03050032 +#define CZECH60 0x03050033 +#define CZECH61 0x03050034 +#define CZECH63 0x03050035 +#define CZECH65 0x03050036 +#define CZECH66 0x03050037 +#define CZECH69 0x03050038 +#define CZECH71 0x03050039 +#define CZECH72 0x0305003A +#define CZECH73 0x0305003B +#define CZECH74 0x0305003C +#define CZECH90 0x0305003D +#define CZECH99 0x0305003E +#define CZECH129 0x0305003F +#define CZECH131 0x03050040 +#define CZECH133 0x03050041 +#define CZECH145 0x03050042 +#define CZECH146 0x03050043 // 68 entities in TXTs, ??? in datafiles. // portugese -#define PORT0 0x03060000 -#define PORT1 0x03060001 -#define PORT2 0x03060002 -#define PORT3 0x03060003 -#define PORT4 0x03060004 -#define PORT5 0x03060005 -#define PORT6 0x03060006 -#define PORT7 0x03060007 -#define PORT9 0x03060008 -#define PORT11 0x03060009 -#define PORT12 0x0306000A -#define PORT13 0x0306000B -#define PORT14 0x0306000C -#define PORT15 0x0306000D -#define PORT16 0x0306000E -#define PORT17 0x0306000F -#define PORT18 0x03060010 -#define PORT19 0x03060011 -#define PORT20 0x03060012 -#define PORT21 0x03060013 -#define PORT22 0x03060014 -#define PORT23 0x03060015 -#define PORT24 0x03060016 -#define PORT25 0x03060017 -#define PORT27 0x03060018 -#define PORT28 0x03060019 -#define PORT29 0x0306001A -#define PORT31 0x0306001B -#define PORT32 0x0306001C -#define PORT33 0x0306001D -#define PORT34 0x0306001E -#define PORT35 0x0306001F -#define PORT36 0x03060020 -#define PORT37 0x03060021 -#define PORT38 0x03060022 -#define PORT39 0x03060023 -#define PORT40 0x03060024 -#define PORT41 0x03060025 -#define PORT42 0x03060026 -#define PORT43 0x03060027 -#define PORT45 0x03060028 -#define PORT47 0x03060029 -#define PORT48 0x0306002A -#define PORT49 0x0306002B -#define PORT50 0x0306002C -#define PORT54 0x0306002D -#define PORT55 0x0306002E -#define PORT56 0x0306002F -#define PORT57 0x03060030 -#define PORT58 0x03060031 -#define PORT59 0x03060032 -#define PORT60 0x03060033 -#define PORT61 0x03060034 -#define PORT63 0x03060035 -#define PORT65 0x03060036 -#define PORT66 0x03060037 -#define PORT69 0x03060038 -#define PORT71 0x03060039 -#define PORT72 0x0306003A -#define PORT73 0x0306003B -#define PORT74 0x0306003C -#define PORT90 0x0306003D -#define PORT99 0x0306003E -#define PORT129 0x0306003F -#define PORT131 0x03060040 -#define PORT133 0x03060041 -#define PORT145 0x03060042 -#define PORT146 0x03060043 +#define PORT0 0x03060000 +#define PORT1 0x03060001 +#define PORT2 0x03060002 +#define PORT3 0x03060003 +#define PORT4 0x03060004 +#define PORT5 0x03060005 +#define PORT6 0x03060006 +#define PORT7 0x03060007 +#define PORT9 0x03060008 +#define PORT11 0x03060009 +#define PORT12 0x0306000A +#define PORT13 0x0306000B +#define PORT14 0x0306000C +#define PORT15 0x0306000D +#define PORT16 0x0306000E +#define PORT17 0x0306000F +#define PORT18 0x03060010 +#define PORT19 0x03060011 +#define PORT20 0x03060012 +#define PORT21 0x03060013 +#define PORT22 0x03060014 +#define PORT23 0x03060015 +#define PORT24 0x03060016 +#define PORT25 0x03060017 +#define PORT27 0x03060018 +#define PORT28 0x03060019 +#define PORT29 0x0306001A +#define PORT31 0x0306001B +#define PORT32 0x0306001C +#define PORT33 0x0306001D +#define PORT34 0x0306001E +#define PORT35 0x0306001F +#define PORT36 0x03060020 +#define PORT37 0x03060021 +#define PORT38 0x03060022 +#define PORT39 0x03060023 +#define PORT40 0x03060024 +#define PORT41 0x03060025 +#define PORT42 0x03060026 +#define PORT43 0x03060027 +#define PORT45 0x03060028 +#define PORT47 0x03060029 +#define PORT48 0x0306002A +#define PORT49 0x0306002B +#define PORT50 0x0306002C +#define PORT54 0x0306002D +#define PORT55 0x0306002E +#define PORT56 0x0306002F +#define PORT57 0x03060030 +#define PORT58 0x03060031 +#define PORT59 0x03060032 +#define PORT60 0x03060033 +#define PORT61 0x03060034 +#define PORT63 0x03060035 +#define PORT65 0x03060036 +#define PORT66 0x03060037 +#define PORT69 0x03060038 +#define PORT71 0x03060039 +#define PORT72 0x0306003A +#define PORT73 0x0306003B +#define PORT74 0x0306003C +#define PORT90 0x0306003D +#define PORT99 0x0306003E +#define PORT129 0x0306003F +#define PORT131 0x03060040 +#define PORT133 0x03060041 +#define PORT145 0x03060042 +#define PORT146 0x03060043 // 68 entities in TXTs, ??? in datafiles. // general // fonts -#define GAME_FONT 0x04000000 -#define OTHER_SR_FONT 0x04000001 -#define OTHER_SR_REDFONT 0x04000002 -#define SR_DEATHFONT 0x04000003 -#define CZECH_GAME_FONT 0x04000004 -#define CZECH_SR_FONT 0x04000005 -#define CZECH_SR_REDFONT 0x04000006 -#define CZECH_SR_DEATHFONT 0x04000007 +#define GAME_FONT 0x04000000 +#define OTHER_SR_FONT 0x04000001 +#define OTHER_SR_REDFONT 0x04000002 +#define SR_DEATHFONT 0x04000003 +#define CZECH_GAME_FONT 0x04000004 +#define CZECH_SR_FONT 0x04000005 +#define CZECH_SR_REDFONT 0x04000006 +#define CZECH_SR_DEATHFONT 0x04000007 // 8 entities in TXTs, 1 in datafiles. // pointers -#define MSE_POINTER 0x04010000 -#define MSE_OPERATE 0x04010001 -#define MSE_PICKUP 0x04010002 -#define MSE_EXAMINE 0x04010003 -#define MSE_MOUTH 0x04010004 -#define MSE_BECKON_L 0x04010005 -#define MSE_BECKON_R 0x04010006 -#define MSE_ARROW0 0x04010007 -#define MSE_ARROW1 0x04010008 -#define MSE_ARROW2 0x04010009 -#define MSE_ARROW3 0x0401000A -#define MSE_ARROW4 0x0401000B -#define MSE_ARROW5 0x0401000C -#define MSE_ARROW6 0x0401000D -#define MSE_ARROW7 0x0401000E -#define MSE_ARROW8 0x0401000F -#define MSE_ARROW9 0x04010010 +#define MSE_POINTER 0x04010000 +#define MSE_OPERATE 0x04010001 +#define MSE_PICKUP 0x04010002 +#define MSE_EXAMINE 0x04010003 +#define MSE_MOUTH 0x04010004 +#define MSE_BECKON_L 0x04010005 +#define MSE_BECKON_R 0x04010006 +#define MSE_ARROW0 0x04010007 +#define MSE_ARROW1 0x04010008 +#define MSE_ARROW2 0x04010009 +#define MSE_ARROW3 0x0401000A +#define MSE_ARROW4 0x0401000B +#define MSE_ARROW5 0x0401000C +#define MSE_ARROW6 0x0401000D +#define MSE_ARROW7 0x0401000E +#define MSE_ARROW8 0x0401000F +#define MSE_ARROW9 0x04010010 // 17 entities in TXTs, 17 in datafiles. // luggage -#define LUGG_NEWSPAPER 0x04020000 -#define LUGG_HAZEL_WAND 0x04020001 -#define LUGG_BEER_TOWEL 0x04020002 -#define LUGG_HOTEL_KEY 0x04020003 -#define LUGG_BALL 0x04020004 -#define LUGG_STATUETTE 0x04020005 -#define LUGG_RED_NOSE 0x04020006 -#define LUGG_POLISHED_CHALICE 0x04020007 -#define LUGG_DOLLAR_BILL 0x04020008 -#define LUGG_PHOTOGRAPH 0x04020009 -#define LUGG_FLASHLIGHT 0x0402000A -#define LUGG_FUSE_WIRE 0x0402000B -#define LUGG_GEM 0x0402000C -#define LUGG_STATUETTE_PAINT 0x0402000D -#define LUGG_STICK 0x0402000E -#define LUGG_EXCAV_KEY 0x0402000F -#define LUGG_LAB_PASS 0x04020010 -#define LUGG_LIFTING_KEYS 0x04020011 -#define LUGG_MANUSCRIPT 0x04020012 -#define LUGG_MATCHBOOK 0x04020013 -#define LUGG_SUIT_MATERIAL 0x04020014 -#define LUGG_STICK_TOWEL 0x04020015 -#define LUGG_PLASTER 0x04020016 -#define LUGG_PRESSURE_GAUGE 0x04020017 -#define LUGG_RAILWAY_TICKET 0x04020018 -#define LUGG_BUZZER 0x04020019 -#define LUGG_ROSSO_CARD 0x0402001A -#define LUGG_TOILET_KEY 0x0402001B -#define LUGG_SOAP 0x0402001C -#define LUGG_STONE_KEY 0x0402001D -#define LUGG_CHALICE 0x0402001E -#define LUGG_TISSUE 0x0402001F -#define LUGG_TOILET_BRUSH 0x04020020 -#define LUGG_TOILET_CHAIN 0x04020021 -#define LUGG_TOWEL 0x04020022 -#define LUGG_TRIPOD 0x04020023 -#define LUGG_LENS 0x04020024 -#define LUGG_MIRROR 0x04020025 -#define LUGG_TOWEL_CUT 0x04020026 -#define LUGG_BIBLE 0x04020027 -#define LUGG_TISSUE_CHARRED 0x04020028 -#define LUGG_FALSE_KEY 0x04020029 -#define LUGG_KEYRING 0x0402002A -#define LUGG_SOAP_IMP 0x0402002B -#define LUGG_SOAP_PLAS 0x0402002C -#define LUGG_COG_1 0x0402002D -#define LUGG_COG_2 0x0402002E -#define LUGG_HANDLE 0x0402002F -#define LUGG_COIN 0x04020030 -#define LUGG_BIRO 0x04020031 -#define LUGG_PIPE 0x04020032 -#define LUGG_KING 0x04020033 -#define LUGG_KNIGHT 0x04020034 -#define LUGG_BISHOP 0x04020035 +#define LUGG_NEWSPAPER 0x04020000 +#define LUGG_HAZEL_WAND 0x04020001 +#define LUGG_BEER_TOWEL 0x04020002 +#define LUGG_HOTEL_KEY 0x04020003 +#define LUGG_BALL 0x04020004 +#define LUGG_STATUETTE 0x04020005 +#define LUGG_RED_NOSE 0x04020006 +#define LUGG_POLISHED_CHALICE 0x04020007 +#define LUGG_DOLLAR_BILL 0x04020008 +#define LUGG_PHOTOGRAPH 0x04020009 +#define LUGG_FLASHLIGHT 0x0402000A +#define LUGG_FUSE_WIRE 0x0402000B +#define LUGG_GEM 0x0402000C +#define LUGG_STATUETTE_PAINT 0x0402000D +#define LUGG_STICK 0x0402000E +#define LUGG_EXCAV_KEY 0x0402000F +#define LUGG_LAB_PASS 0x04020010 +#define LUGG_LIFTING_KEYS 0x04020011 +#define LUGG_MANUSCRIPT 0x04020012 +#define LUGG_MATCHBOOK 0x04020013 +#define LUGG_SUIT_MATERIAL 0x04020014 +#define LUGG_STICK_TOWEL 0x04020015 +#define LUGG_PLASTER 0x04020016 +#define LUGG_PRESSURE_GAUGE 0x04020017 +#define LUGG_RAILWAY_TICKET 0x04020018 +#define LUGG_BUZZER 0x04020019 +#define LUGG_ROSSO_CARD 0x0402001A +#define LUGG_TOILET_KEY 0x0402001B +#define LUGG_SOAP 0x0402001C +#define LUGG_STONE_KEY 0x0402001D +#define LUGG_CHALICE 0x0402001E +#define LUGG_TISSUE 0x0402001F +#define LUGG_TOILET_BRUSH 0x04020020 +#define LUGG_TOILET_CHAIN 0x04020021 +#define LUGG_TOWEL 0x04020022 +#define LUGG_TRIPOD 0x04020023 +#define LUGG_LENS 0x04020024 +#define LUGG_MIRROR 0x04020025 +#define LUGG_TOWEL_CUT 0x04020026 +#define LUGG_BIBLE 0x04020027 +#define LUGG_TISSUE_CHARRED 0x04020028 +#define LUGG_FALSE_KEY 0x04020029 +#define LUGG_KEYRING 0x0402002A +#define LUGG_SOAP_IMP 0x0402002B +#define LUGG_SOAP_PLAS 0x0402002C +#define LUGG_COG_1 0x0402002D +#define LUGG_COG_2 0x0402002E +#define LUGG_HANDLE 0x0402002F +#define LUGG_COIN 0x04020030 +#define LUGG_BIRO 0x04020031 +#define LUGG_PIPE 0x04020032 +#define LUGG_KING 0x04020033 +#define LUGG_KNIGHT 0x04020034 +#define LUGG_BISHOP 0x04020035 // 54 entities in TXTs, 54 in datafiles. // object_icons -#define ICON_LEFT_ARROW 0x04030000 -#define ICON_RIGHT_ARROW 0x04030001 -#define ICON_NEWSPAPER 0x04030002 -#define ICON_HAZEL_WAND 0x04030003 -#define ICON_BEER_TOWEL 0x04030004 -#define ICON_HOTEL_KEY 0x04030005 -#define ICON_BALL 0x04030006 -#define ICON_STATUETTE 0x04030007 -#define ICON_RED_NOSE 0x04030008 -#define ICON_POLISHED_CHALICE 0x04030009 -#define ICON_DOLLAR_BILL 0x0403000A -#define ICON_PHOTOGRAPH 0x0403000B -#define ICON_FLASHLIGHT 0x0403000C -#define ICON_FUSE_WIRE 0x0403000D -#define ICON_GEM 0x0403000E -#define ICON_STATUETTE_PAINT 0x0403000F -#define ICON_STICK 0x04030010 -#define ICON_EXCAV_KEY 0x04030011 -#define ICON_LAB_PASS 0x04030012 -#define ICON_LIFTING_KEYS 0x04030013 -#define ICON_MANUSCRIPT 0x04030014 -#define ICON_MATCHBOOK 0x04030015 -#define ICON_SUIT_MATERIAL 0x04030016 -#define ICON_STICK_TOWEL 0x04030017 -#define ICON_PLASTER 0x04030018 -#define ICON_PRESSURE_GAUGE 0x04030019 -#define ICON_RAILWAY_TICKET 0x0403001A -#define ICON_BUZZER 0x0403001B -#define ICON_ROSSO_CARD 0x0403001C -#define ICON_TOILET_KEY 0x0403001D -#define ICON_SOAP 0x0403001E -#define ICON_STONE_KEY 0x0403001F -#define ICON_CHALICE 0x04030020 -#define ICON_TISSUE 0x04030021 -#define ICON_TOILET_BRUSH 0x04030022 -#define ICON_TOILET_CHAIN 0x04030023 -#define ICON_TOWEL 0x04030024 -#define ICON_TRIPOD 0x04030025 -#define ICON_LENS 0x04030026 -#define ICON_MIRROR 0x04030027 -#define ICON_TOWEL_CUT 0x04030028 -#define ICON_BIBLE 0x04030029 -#define ICON_TISSUE_CHARRED 0x0403002A -#define ICON_FALSE_KEY 0x0403002B -#define ICON_KEYRING 0x0403002C -#define ICON_SOAP_IMP 0x0403002D -#define ICON_SOAP_PLAS 0x0403002E -#define ICON_COG_1 0x0403002F -#define ICON_COG_2 0x04030030 -#define ICON_HANDLE 0x04030031 -#define ICON_COIN 0x04030032 -#define ICON_BIRO 0x04030033 -#define ICON_PIPE 0x04030034 +#define ICON_LEFT_ARROW 0x04030000 +#define ICON_RIGHT_ARROW 0x04030001 +#define ICON_NEWSPAPER 0x04030002 +#define ICON_HAZEL_WAND 0x04030003 +#define ICON_BEER_TOWEL 0x04030004 +#define ICON_HOTEL_KEY 0x04030005 +#define ICON_BALL 0x04030006 +#define ICON_STATUETTE 0x04030007 +#define ICON_RED_NOSE 0x04030008 +#define ICON_POLISHED_CHALICE 0x04030009 +#define ICON_DOLLAR_BILL 0x0403000A +#define ICON_PHOTOGRAPH 0x0403000B +#define ICON_FLASHLIGHT 0x0403000C +#define ICON_FUSE_WIRE 0x0403000D +#define ICON_GEM 0x0403000E +#define ICON_STATUETTE_PAINT 0x0403000F +#define ICON_STICK 0x04030010 +#define ICON_EXCAV_KEY 0x04030011 +#define ICON_LAB_PASS 0x04030012 +#define ICON_LIFTING_KEYS 0x04030013 +#define ICON_MANUSCRIPT 0x04030014 +#define ICON_MATCHBOOK 0x04030015 +#define ICON_SUIT_MATERIAL 0x04030016 +#define ICON_STICK_TOWEL 0x04030017 +#define ICON_PLASTER 0x04030018 +#define ICON_PRESSURE_GAUGE 0x04030019 +#define ICON_RAILWAY_TICKET 0x0403001A +#define ICON_BUZZER 0x0403001B +#define ICON_ROSSO_CARD 0x0403001C +#define ICON_TOILET_KEY 0x0403001D +#define ICON_SOAP 0x0403001E +#define ICON_STONE_KEY 0x0403001F +#define ICON_CHALICE 0x04030020 +#define ICON_TISSUE 0x04030021 +#define ICON_TOILET_BRUSH 0x04030022 +#define ICON_TOILET_CHAIN 0x04030023 +#define ICON_TOWEL 0x04030024 +#define ICON_TRIPOD 0x04030025 +#define ICON_LENS 0x04030026 +#define ICON_MIRROR 0x04030027 +#define ICON_TOWEL_CUT 0x04030028 +#define ICON_BIBLE 0x04030029 +#define ICON_TISSUE_CHARRED 0x0403002A +#define ICON_FALSE_KEY 0x0403002B +#define ICON_KEYRING 0x0403002C +#define ICON_SOAP_IMP 0x0403002D +#define ICON_SOAP_PLAS 0x0403002E +#define ICON_COG_1 0x0403002F +#define ICON_COG_2 0x04030030 +#define ICON_HANDLE 0x04030031 +#define ICON_COIN 0x04030032 +#define ICON_BIRO 0x04030033 +#define ICON_PIPE 0x04030034 // 53 entities in TXTs, 53 in datafiles. // subject_icons -#define ICON_ALARM 0x04040000 -#define ICON_ARTO 0x04040001 -#define ICON_ASSASSIN 0x04040002 -#define ICON_AYUB 0x04040003 -#define ICON_BANANA 0x04040004 -#define ICON_BAPHOMET 0x04040005 -#define ICON_BEER 0x04040006 -#define ICON_BOOK 0x04040007 -#define ICON_BRIEFCASE 0x04040008 -#define ICON_BULL 0x04040009 -#define ICON_BULLS_HEAD 0x0404000A -#define ICON_BUST 0x0404000B -#define ICON_CANDLE 0x0404000C -#define ICON_CAR 0x0404000D -#define ICON_CASTLE 0x0404000E -#define ICON_CAT 0x0404000F -#define ICON_CHANTELLE 0x04040010 -#define ICON_CHESSBOARD 0x04040011 -#define ICON_CHESS_SET 0x04040012 -#define ICON_CHURCH 0x04040013 -#define ICON_CLOWN 0x04040014 -#define ICON_CLUB 0x04040015 -#define ICON_COINS 0x04040016 -#define ICON_COUNTESS 0x04040017 -#define ICON_CREST 0x04040018 -#define ICON_DIG 0x04040019 -#define ICON_DOG 0x0404001A -#define ICON_DUANE 0x0404001B -#define ICON_EKLUND 0x0404001C -#define ICON_ERIC 0x0404001D -#define ICON_FISH 0x0404001E -#define ICON_FLOWERS 0x0404001F -#define ICON_FORTUNE 0x04040020 -#define ICON_GEORGE 0x04040021 -#define ICON_GHOST 0x04040022 -#define ICON_GLASS_EYE 0x04040023 -#define ICON_GOAT 0x04040024 -#define ICON_GOODBYE 0x04040025 -#define ICON_GUARD 0x04040026 -#define ICON_HASH 0x04040027 -#define ICON_HENDERSONS 0x04040028 -#define ICON_JACKET 0x04040029 -#define ICON_JUGGLER 0x0404002A -#define ICON_KLAUSNER 0x0404002B -#define ICON_KNIGHT 0x0404002C -#define ICON_LADDER 0x0404002D -#define ICON_LEARY 0x0404002E -#define ICON_LEPRECHAUN 0x0404002F -#define ICON_LIE 0x04040030 -#define ICON_LOBINEAU 0x04040031 -#define ICON_MARQUET 0x04040032 -#define ICON_MARY 0x04040033 -#define ICON_MOB 0x04040034 -#define ICON_MONTFAUCON 0x04040035 -#define ICON_MOUE 0x04040036 -#define ICON_MR_SHINY 0x04040037 -#define ICON_NEJO 0x04040038 -#define ICON_NEJO_STALL 0x04040039 -#define ICON_NICO 0x0404003A -#define ICON_NO 0x0404003B -#define ICON_NURSE 0x0404003C -#define ICON_PACKAGE 0x0404003D -#define ICON_PAINTER 0x0404003E -#define ICON_PEAGRAM 0x0404003F -#define ICON_PEARL 0x04040040 -#define ICON_PHILIPPE 0x04040041 -#define ICON_PHONE 0x04040042 -#define ICON_PHRASE 0x04040043 -#define ICON_PIERMONT 0x04040044 -#define ICON_PLANTARD 0x04040045 -#define ICON_POTS 0x04040046 -#define ICON_PRIEST 0x04040047 -#define ICON_QUEEN 0x04040048 -#define ICON_RENEE 0x04040049 -#define ICON_ROSSO 0x0404004A -#define ICON_ROZZER 0x0404004B -#define ICON_SAFE 0x0404004C -#define ICON_SCROLL 0x0404004D -#define ICON_SEAN 0x0404004E -#define ICON_SIGN 0x0404004F -#define ICON_TAXI 0x04040050 -#define ICON_TEMPLARS 0x04040051 -#define ICON_THERMOSTAT 0x04040052 -#define ICON_TOILET 0x04040053 -#define ICON_TOMB 0x04040054 -#define ICON_TOOLBOX 0x04040055 -#define ICON_TRUTH 0x04040056 -#define ICON_ULTAR 0x04040057 -#define ICON_WEASEL 0x04040058 -#define ICON_WEAVER 0x04040059 -#define ICON_WELL 0x0404005A -#define ICON_WELL2 0x0404005B -#define ICON_WINDOW 0x0404005C -#define ICON_YES 0x0404005D +#define ICON_ALARM 0x04040000 +#define ICON_ARTO 0x04040001 +#define ICON_ASSASSIN 0x04040002 +#define ICON_AYUB 0x04040003 +#define ICON_BANANA 0x04040004 +#define ICON_BAPHOMET 0x04040005 +#define ICON_BEER 0x04040006 +#define ICON_BOOK 0x04040007 +#define ICON_BRIEFCASE 0x04040008 +#define ICON_BULL 0x04040009 +#define ICON_BULLS_HEAD 0x0404000A +#define ICON_BUST 0x0404000B +#define ICON_CANDLE 0x0404000C +#define ICON_CAR 0x0404000D +#define ICON_CASTLE 0x0404000E +#define ICON_CAT 0x0404000F +#define ICON_CHANTELLE 0x04040010 +#define ICON_CHESSBOARD 0x04040011 +#define ICON_CHESS_SET 0x04040012 +#define ICON_CHURCH 0x04040013 +#define ICON_CLOWN 0x04040014 +#define ICON_CLUB 0x04040015 +#define ICON_COINS 0x04040016 +#define ICON_COUNTESS 0x04040017 +#define ICON_CREST 0x04040018 +#define ICON_DIG 0x04040019 +#define ICON_DOG 0x0404001A +#define ICON_DUANE 0x0404001B +#define ICON_EKLUND 0x0404001C +#define ICON_ERIC 0x0404001D +#define ICON_FISH 0x0404001E +#define ICON_FLOWERS 0x0404001F +#define ICON_FORTUNE 0x04040020 +#define ICON_GEORGE 0x04040021 +#define ICON_GHOST 0x04040022 +#define ICON_GLASS_EYE 0x04040023 +#define ICON_GOAT 0x04040024 +#define ICON_GOODBYE 0x04040025 +#define ICON_GUARD 0x04040026 +#define ICON_HASH 0x04040027 +#define ICON_HENDERSONS 0x04040028 +#define ICON_JACKET 0x04040029 +#define ICON_JUGGLER 0x0404002A +#define ICON_KLAUSNER 0x0404002B +#define ICON_KNIGHT 0x0404002C +#define ICON_LADDER 0x0404002D +#define ICON_LEARY 0x0404002E +#define ICON_LEPRECHAUN 0x0404002F +#define ICON_LIE 0x04040030 +#define ICON_LOBINEAU 0x04040031 +#define ICON_MARQUET 0x04040032 +#define ICON_MARY 0x04040033 +#define ICON_MOB 0x04040034 +#define ICON_MONTFAUCON 0x04040035 +#define ICON_MOUE 0x04040036 +#define ICON_MR_SHINY 0x04040037 +#define ICON_NEJO 0x04040038 +#define ICON_NEJO_STALL 0x04040039 +#define ICON_NICO 0x0404003A +#define ICON_NO 0x0404003B +#define ICON_NURSE 0x0404003C +#define ICON_PACKAGE 0x0404003D +#define ICON_PAINTER 0x0404003E +#define ICON_PEAGRAM 0x0404003F +#define ICON_PEARL 0x04040040 +#define ICON_PHILIPPE 0x04040041 +#define ICON_PHONE 0x04040042 +#define ICON_PHRASE 0x04040043 +#define ICON_PIERMONT 0x04040044 +#define ICON_PLANTARD 0x04040045 +#define ICON_POTS 0x04040046 +#define ICON_PRIEST 0x04040047 +#define ICON_QUEEN 0x04040048 +#define ICON_RENEE 0x04040049 +#define ICON_ROSSO 0x0404004A +#define ICON_ROZZER 0x0404004B +#define ICON_SAFE 0x0404004C +#define ICON_SCROLL 0x0404004D +#define ICON_SEAN 0x0404004E +#define ICON_SIGN 0x0404004F +#define ICON_TAXI 0x04040050 +#define ICON_TEMPLARS 0x04040051 +#define ICON_THERMOSTAT 0x04040052 +#define ICON_TOILET 0x04040053 +#define ICON_TOMB 0x04040054 +#define ICON_TOOLBOX 0x04040055 +#define ICON_TRUTH 0x04040056 +#define ICON_ULTAR 0x04040057 +#define ICON_WEASEL 0x04040058 +#define ICON_WEAVER 0x04040059 +#define ICON_WELL 0x0404005A +#define ICON_WELL2 0x0404005B +#define ICON_WINDOW 0x0404005C +#define ICON_YES 0x0404005D // 94 entities in TXTs, 94 in datafiles. // save_menu #define SR_FONT 0x04050000 #define SR_BUTTON 0x04050001 #define SR_REDFONT 0x04050002 -#define SR_PALETTE 0x04050003 -#define SR_PANEL_ENGLISH 0x04050004 -#define SR_PANEL_FRENCH 0x04050005 -#define SR_PANEL_GERMAN 0x04050006 -#define SR_PANEL_ITALIAN 0x04050007 -#define SR_PANEL_SPANISH 0x04050008 -#define SR_PANEL_AMERICAN 0x04050009 -#define SR_TEXT_BUTTON 0x0405000A -#define SR_SPEED 0x0405000B -#define SR_SCROLL1 0x0405000C -#define SR_SCROLL2 0x0405000D -#define SR_CONFIRM 0x0405000E -#define SR_VOLUME 0x0405000F -#define SR_VLIGHT 0x04050010 -#define SR_VKNOB 0x04050011 -#define SR_WINDOW 0x04050012 -#define SR_SLAB1 0x04050013 -#define SR_SLAB2 0x04050014 -#define SR_SLAB3 0x04050015 -#define SR_SLAB4 0x04050016 -#define SR_BUTUF 0x04050017 -#define SR_BUTUS 0x04050018 -#define SR_BUTDS 0x04050019 -#define SR_BUTDF 0x0405001A -#define SR_DEATHPANEL 0x0405001B // 0x04050019 +#define SR_PALETTE 0x04050003 +#define SR_PANEL_ENGLISH 0x04050004 +#define SR_PANEL_FRENCH 0x04050005 +#define SR_PANEL_GERMAN 0x04050006 +#define SR_PANEL_ITALIAN 0x04050007 +#define SR_PANEL_SPANISH 0x04050008 +#define SR_PANEL_AMERICAN 0x04050009 +#define SR_TEXT_BUTTON 0x0405000A +#define SR_SPEED 0x0405000B +#define SR_SCROLL1 0x0405000C +#define SR_SCROLL2 0x0405000D +#define SR_CONFIRM 0x0405000E +#define SR_VOLUME 0x0405000F +#define SR_VLIGHT 0x04050010 +#define SR_VKNOB 0x04050011 +#define SR_WINDOW 0x04050012 +#define SR_SLAB1 0x04050013 +#define SR_SLAB2 0x04050014 +#define SR_SLAB3 0x04050015 +#define SR_SLAB4 0x04050016 +#define SR_BUTUF 0x04050017 +#define SR_BUTUS 0x04050018 +#define SR_BUTDS 0x04050019 +#define SR_BUTDF 0x0405001A +#define SR_DEATHPANEL 0x0405001B // 0x04050019 // 26 entities in TXTs, 29 in datafiles. // george -#define GEORGE_MEGA 0x04060000 -#define GEORGE_WLK 0x04060001 -#define GEOSHO1 0x04060002 -#define GEOSHO1CDT 0x04060003 -#define GEOSHO1CDR 0x04060004 -#define GEOSHO2 0x04060005 -#define GEOSHO2CDT 0x04060006 -#define GEOSHO2CDR 0x04060007 -#define GEOSHO3 0x04060008 -#define GEOSHO3CDT 0x04060009 -#define GEOSHO3CDR 0x0406000A -#define GEOSHO5 0x0406000B -#define GEOSHO5CDT 0x0406000C -#define GEOSHO5CDR 0x0406000D -#define GEOSHO6 0x0406000E -#define GEOSHO6CDT 0x0406000F -#define GEOSHO6CDR 0x04060010 -#define GEOSHO7 0x04060011 -#define GEOSHO7CDT 0x04060012 -#define GEOSHO7CDR 0x04060013 -#define GEOTLK0 0x04060014 -#define GEOTLK0CDT 0x04060015 -#define GEOTLK1 0x04060016 -#define GEOTLK1CDT 0x04060017 -#define GEOTLK2 0x04060018 -#define GEOTLK2CDT 0x04060019 -#define GEOTLK3 0x0406001A -#define GEOTLK3CDT 0x0406001B -#define GEOTLK4 0x0406001C -#define GEOTLK4CDT 0x0406001D -#define GEOTLK5 0x0406001E -#define GEOTLK5CDT 0x0406001F -#define GEOTLK6 0x04060020 -#define GEOTLK6CDT 0x04060021 -#define GEOTLK7 0x04060022 -#define GEOTLK7CDT 0x04060023 -#define XGEOCRW0 0x04060024 -#define XGEOCRW0CDT 0x04060025 -#define XGEOCRW0CDR 0x04060026 -#define XGEOCRW1 0x04060027 -#define XGEOCRW1CDT 0x04060028 -#define XGEOCRW1CDR 0x04060029 -#define XGEOCRW2 0x0406002A -#define XGEOCRW2CDT 0x0406002B -#define XGEOCRW2CDR 0x0406002C -#define XGEOCRW3 0x0406002D -#define XGEOCRW3CDT 0x0406002E -#define XGEOCRW3CDR 0x0406002F -#define XGEOCRW4 0x04060030 -#define XGEOCRW4CDT 0x04060031 -#define XGEOCRW4CDR 0x04060032 -#define XGEOCRW5 0x04060033 -#define XGEOCRW5CDT 0x04060034 -#define XGEOCRW5CDR 0x04060035 -#define XGEOCRW6 0x04060036 -#define XGEOCRW6CDT 0x04060037 -#define XGEOCRW6CDR 0x04060038 -#define XGEOCRW7 0x04060039 -#define XGEOCRW7CDT 0x0406003A -#define XGEOCRW7CDR 0x0406003B -#define XGEOGIV0 0x0406003C -#define XGEOGIV0CDT 0x0406003D -#define XGEOGIV0CDR 0x0406003E -#define XGEOGIV1 0x0406003F -#define XGEOGIV1CDT 0x04060040 -#define XGEOGIV1CDR 0x04060041 -#define XGEOGIV2 0x04060042 -#define XGEOGIV2CDT 0x04060043 -#define XGEOGIV2CDR 0x04060044 -#define XGEOGIV3 0x04060045 -#define XGEOGIV3CDT 0x04060046 -#define XGEOGIV3CDR 0x04060047 -#define XGEOGIV4 0x04060048 -#define XGEOGIV4CDT 0x04060049 -#define XGEOGIV4CDR 0x0406004A -#define XGEOGIV5 0x0406004B -#define XGEOGIV5CDT 0x0406004C -#define XGEOGIV5CDR 0x0406004D -#define XGEOGIV6 0x0406004E -#define XGEOGIV6CDT 0x0406004F -#define XGEOGIV6CDR 0x04060050 -#define XGEOGIV7 0x04060051 -#define XGEOGIV7CDT 0x04060052 -#define XGEOGIV7CDR 0x04060053 -#define XGEOLUK3 0x04060054 -#define XGEOLUK3CDT 0x04060055 -#define XGEOLUK5 0x04060056 -#define XGEOLUK5CDT 0x04060057 -#define XGEOPIC0 0x04060058 -#define XGEOPIC0CDT 0x04060059 -#define XGEOPIC1 0x0406005A -#define XGEOPIC1CDT 0x0406005B -#define XGEOPIC2 0x0406005C -#define XGEOPIC2CDT 0x0406005D -#define XGEOPIC3 0x0406005E -#define XGEOPIC3CDT 0x0406005F -#define XGEOPIC4 0x04060060 -#define XGEOPIC4CDT 0x04060061 -#define XGEOPIC5 0x04060062 -#define XGEOPIC5CDT 0x04060063 -#define XGEOPIC6 0x04060064 -#define XGEOPIC6CDT 0x04060065 -#define XGEOPIC7 0x04060066 -#define XGEOPIC7CDT 0x04060067 -#define XGEOSHG0 0x04060068 -#define XGEOSHG0CDT 0x04060069 -#define XGEOSHG1 0x0406006A -#define XGEOSHG1CDT 0x0406006B -#define XGEOSHG2 0x0406006C -#define XGEOSHG2CDT 0x0406006D -#define XGEOSHG3 0x0406006E -#define XGEOSHG3CDT 0x0406006F -#define XGEOSHG4 0x04060070 -#define XGEOSHG4CDT 0x04060071 -#define XGEOSHG5 0x04060072 -#define XGEOSHG5CDT 0x04060073 -#define XGEOSHG6 0x04060074 -#define XGEOSHG6CDT 0x04060075 -#define XGEOSHG7 0x04060076 -#define XGEOSHG7CDT 0x04060077 -#define XGHAIR2 0x04060078 -#define XGHAIR2CDT 0x04060079 -#define XGHAIR6 0x0406007A -#define XGHAIR6CDT 0x0406007B -#define GEOBLNK2 0x0406007C -#define GEOBLNK2CDT 0x0406007D -#define GEOBLNK3 0x0406007E -#define GEOBLNK3CDT 0x0406007F -#define GEOBLNK4 0x04060080 -#define GEOBLNK4CDT 0x04060081 -#define GEOBLNK5 0x04060082 -#define GEOBLNK5CDT 0x04060083 -#define GEOBLNK6 0x04060084 -#define GEOBLNK6CDT 0x04060085 -#define XGRELAX0 0x04060086 -#define XGRELAX0CDT 0x04060087 -#define XGRELAX0CDR 0x04060088 -#define XGRELAX1 0x04060089 -#define XGRELAX1CDT 0x0406008A -#define XGRELAX1CDR 0x0406008B -#define XGRELAX2 0x0406008C -#define XGRELAX2CDT 0x0406008D -#define XGRELAX2CDR 0x0406008E -#define XGRELAX3 0x0406008F -#define XGRELAX3CDT 0x04060090 -#define XGRELAX3CDR 0x04060091 -#define XGRELAX4 0x04060092 -#define XGRELAX4CDT 0x04060093 -#define XGRELAX4CDR 0x04060094 -#define XGRELAX5 0x04060095 -#define XGRELAX5CDT 0x04060096 -#define XGRELAX5CDR 0x04060097 -#define XGRELAX6 0x04060098 -#define XGRELAX6CDT 0x04060099 -#define XGRELAX6CDR 0x0406009A -#define XGRELAX7 0x0406009B -#define XGRELAX7CDT 0x0406009C -#define XGRELAX7CDR 0x0406009D +#define GEORGE_MEGA 0x04060000 +#define GEORGE_WLK 0x04060001 +#define GEOSHO1 0x04060002 +#define GEOSHO1CDT 0x04060003 +#define GEOSHO1CDR 0x04060004 +#define GEOSHO2 0x04060005 +#define GEOSHO2CDT 0x04060006 +#define GEOSHO2CDR 0x04060007 +#define GEOSHO3 0x04060008 +#define GEOSHO3CDT 0x04060009 +#define GEOSHO3CDR 0x0406000A +#define GEOSHO5 0x0406000B +#define GEOSHO5CDT 0x0406000C +#define GEOSHO5CDR 0x0406000D +#define GEOSHO6 0x0406000E +#define GEOSHO6CDT 0x0406000F +#define GEOSHO6CDR 0x04060010 +#define GEOSHO7 0x04060011 +#define GEOSHO7CDT 0x04060012 +#define GEOSHO7CDR 0x04060013 +#define GEOTLK0 0x04060014 +#define GEOTLK0CDT 0x04060015 +#define GEOTLK1 0x04060016 +#define GEOTLK1CDT 0x04060017 +#define GEOTLK2 0x04060018 +#define GEOTLK2CDT 0x04060019 +#define GEOTLK3 0x0406001A +#define GEOTLK3CDT 0x0406001B +#define GEOTLK4 0x0406001C +#define GEOTLK4CDT 0x0406001D +#define GEOTLK5 0x0406001E +#define GEOTLK5CDT 0x0406001F +#define GEOTLK6 0x04060020 +#define GEOTLK6CDT 0x04060021 +#define GEOTLK7 0x04060022 +#define GEOTLK7CDT 0x04060023 +#define XGEOCRW0 0x04060024 +#define XGEOCRW0CDT 0x04060025 +#define XGEOCRW0CDR 0x04060026 +#define XGEOCRW1 0x04060027 +#define XGEOCRW1CDT 0x04060028 +#define XGEOCRW1CDR 0x04060029 +#define XGEOCRW2 0x0406002A +#define XGEOCRW2CDT 0x0406002B +#define XGEOCRW2CDR 0x0406002C +#define XGEOCRW3 0x0406002D +#define XGEOCRW3CDT 0x0406002E +#define XGEOCRW3CDR 0x0406002F +#define XGEOCRW4 0x04060030 +#define XGEOCRW4CDT 0x04060031 +#define XGEOCRW4CDR 0x04060032 +#define XGEOCRW5 0x04060033 +#define XGEOCRW5CDT 0x04060034 +#define XGEOCRW5CDR 0x04060035 +#define XGEOCRW6 0x04060036 +#define XGEOCRW6CDT 0x04060037 +#define XGEOCRW6CDR 0x04060038 +#define XGEOCRW7 0x04060039 +#define XGEOCRW7CDT 0x0406003A +#define XGEOCRW7CDR 0x0406003B +#define XGEOGIV0 0x0406003C +#define XGEOGIV0CDT 0x0406003D +#define XGEOGIV0CDR 0x0406003E +#define XGEOGIV1 0x0406003F +#define XGEOGIV1CDT 0x04060040 +#define XGEOGIV1CDR 0x04060041 +#define XGEOGIV2 0x04060042 +#define XGEOGIV2CDT 0x04060043 +#define XGEOGIV2CDR 0x04060044 +#define XGEOGIV3 0x04060045 +#define XGEOGIV3CDT 0x04060046 +#define XGEOGIV3CDR 0x04060047 +#define XGEOGIV4 0x04060048 +#define XGEOGIV4CDT 0x04060049 +#define XGEOGIV4CDR 0x0406004A +#define XGEOGIV5 0x0406004B +#define XGEOGIV5CDT 0x0406004C +#define XGEOGIV5CDR 0x0406004D +#define XGEOGIV6 0x0406004E +#define XGEOGIV6CDT 0x0406004F +#define XGEOGIV6CDR 0x04060050 +#define XGEOGIV7 0x04060051 +#define XGEOGIV7CDT 0x04060052 +#define XGEOGIV7CDR 0x04060053 +#define XGEOLUK3 0x04060054 +#define XGEOLUK3CDT 0x04060055 +#define XGEOLUK5 0x04060056 +#define XGEOLUK5CDT 0x04060057 +#define XGEOPIC0 0x04060058 +#define XGEOPIC0CDT 0x04060059 +#define XGEOPIC1 0x0406005A +#define XGEOPIC1CDT 0x0406005B +#define XGEOPIC2 0x0406005C +#define XGEOPIC2CDT 0x0406005D +#define XGEOPIC3 0x0406005E +#define XGEOPIC3CDT 0x0406005F +#define XGEOPIC4 0x04060060 +#define XGEOPIC4CDT 0x04060061 +#define XGEOPIC5 0x04060062 +#define XGEOPIC5CDT 0x04060063 +#define XGEOPIC6 0x04060064 +#define XGEOPIC6CDT 0x04060065 +#define XGEOPIC7 0x04060066 +#define XGEOPIC7CDT 0x04060067 +#define XGEOSHG0 0x04060068 +#define XGEOSHG0CDT 0x04060069 +#define XGEOSHG1 0x0406006A +#define XGEOSHG1CDT 0x0406006B +#define XGEOSHG2 0x0406006C +#define XGEOSHG2CDT 0x0406006D +#define XGEOSHG3 0x0406006E +#define XGEOSHG3CDT 0x0406006F +#define XGEOSHG4 0x04060070 +#define XGEOSHG4CDT 0x04060071 +#define XGEOSHG5 0x04060072 +#define XGEOSHG5CDT 0x04060073 +#define XGEOSHG6 0x04060074 +#define XGEOSHG6CDT 0x04060075 +#define XGEOSHG7 0x04060076 +#define XGEOSHG7CDT 0x04060077 +#define XGHAIR2 0x04060078 +#define XGHAIR2CDT 0x04060079 +#define XGHAIR6 0x0406007A +#define XGHAIR6CDT 0x0406007B +#define GEOBLNK2 0x0406007C +#define GEOBLNK2CDT 0x0406007D +#define GEOBLNK3 0x0406007E +#define GEOBLNK3CDT 0x0406007F +#define GEOBLNK4 0x04060080 +#define GEOBLNK4CDT 0x04060081 +#define GEOBLNK5 0x04060082 +#define GEOBLNK5CDT 0x04060083 +#define GEOBLNK6 0x04060084 +#define GEOBLNK6CDT 0x04060085 +#define XGRELAX0 0x04060086 +#define XGRELAX0CDT 0x04060087 +#define XGRELAX0CDR 0x04060088 +#define XGRELAX1 0x04060089 +#define XGRELAX1CDT 0x0406008A +#define XGRELAX1CDR 0x0406008B +#define XGRELAX2 0x0406008C +#define XGRELAX2CDT 0x0406008D +#define XGRELAX2CDR 0x0406008E +#define XGRELAX3 0x0406008F +#define XGRELAX3CDT 0x04060090 +#define XGRELAX3CDR 0x04060091 +#define XGRELAX4 0x04060092 +#define XGRELAX4CDT 0x04060093 +#define XGRELAX4CDR 0x04060094 +#define XGRELAX5 0x04060095 +#define XGRELAX5CDT 0x04060096 +#define XGRELAX5CDR 0x04060097 +#define XGRELAX6 0x04060098 +#define XGRELAX6CDT 0x04060099 +#define XGRELAX6CDR 0x0406009A +#define XGRELAX7 0x0406009B +#define XGRELAX7CDT 0x0406009C +#define XGRELAX7CDR 0x0406009D // 158 entities in TXTs, 158 in datafiles. // nico -#define MEGANICO 0x04070000 -#define NICO_WLK 0x04070001 -#define NICTLK0 0x04070002 -#define NICTLK0CDT 0x04070003 -#define NICTLK1 0x04070004 -#define NICTLK1CDT 0x04070005 -#define NICTLK2 0x04070006 -#define NICTLK2CDT 0x04070007 -#define NICTLK3 0x04070008 -#define NICTLK3CDT 0x04070009 -#define NICTLK4 0x0407000A -#define NICTLK4CDT 0x0407000B -#define NICTLK5 0x0407000C -#define NICTLK5CDT 0x0407000D -#define NICTLK6 0x0407000E -#define NICTLK6CDT 0x0407000F -#define NICTLK7 0x04070010 -#define NICTLK7CDT 0x04070011 +#define MEGANICO 0x04070000 +#define NICO_WLK 0x04070001 +#define NICTLK0 0x04070002 +#define NICTLK0CDT 0x04070003 +#define NICTLK1 0x04070004 +#define NICTLK1CDT 0x04070005 +#define NICTLK2 0x04070006 +#define NICTLK2CDT 0x04070007 +#define NICTLK3 0x04070008 +#define NICTLK3CDT 0x04070009 +#define NICTLK4 0x0407000A +#define NICTLK4CDT 0x0407000B +#define NICTLK5 0x0407000C +#define NICTLK5CDT 0x0407000D +#define NICTLK6 0x0407000E +#define NICTLK6CDT 0x0407000F +#define NICTLK7 0x04070010 +#define NICTLK7CDT 0x04070011 // 18 entities in TXTs, 18 in datafiles. // maps // room80 -#define room80_PAL 0x05000000 -#define room80_l0 0x05000001 -#define TEST_FLR 0x05000002 -#define SPRITE_PAL 0x05000003 -#define AEROPORTCDT 0x05000004 -#define AEROPORT 0x05000005 -#define APRTSTRTCDT 0x05000006 -#define APRTSTRT 0x05000007 -#define BAPHOMETCDT 0x05000008 -#define BAPHOMET 0x05000009 -#define CAFECDT 0x0500000A -#define CAFE 0x0500000B -#define COSTUMESCDT 0x0500000C -#define COSTUMES 0x0500000D -#define HOSPITALCDT 0x0500000E -#define HOSPITAL 0x0500000F -#define HOTELCDT 0x05000010 -#define HOTEL 0x05000011 -#define MONTFACNCDT 0x05000012 -#define MONTFACN 0x05000013 -#define MUSEUMCDT 0x05000014 -#define MUSEUM 0x05000015 -#define POLICECDT 0x05000016 -#define POLICE 0x05000017 +#define room80_PAL 0x05000000 +#define room80_l0 0x05000001 +#define TEST_FLR 0x05000002 +#define SPRITE_PAL 0x05000003 +#define AEROPORTCDT 0x05000004 +#define AEROPORT 0x05000005 +#define APRTSTRTCDT 0x05000006 +#define APRTSTRT 0x05000007 +#define BAPHOMETCDT 0x05000008 +#define BAPHOMET 0x05000009 +#define CAFECDT 0x0500000A +#define CAFE 0x0500000B +#define COSTUMESCDT 0x0500000C +#define COSTUMES 0x0500000D +#define HOSPITALCDT 0x0500000E +#define HOSPITAL 0x0500000F +#define HOTELCDT 0x05000010 +#define HOTEL 0x05000011 +#define MONTFACNCDT 0x05000012 +#define MONTFACN 0x05000013 +#define MUSEUMCDT 0x05000014 +#define MUSEUM 0x05000015 +#define POLICECDT 0x05000016 +#define POLICE 0x05000017 // 24 entities in TXTs, 24 in datafiles. // room86 -#define room86_PAL 0x05010000 -#define room86_l0 0x05010001 -#define BANNOCKCDT 0x05010002 -#define BANNOCK 0x05010003 -#define MARIBCDT 0x05010004 -#define MARIB 0x05010005 -#define LOCHMARNCDT 0x05010006 -#define LOCHMARN 0x05010007 -#define PARISCDT 0x05010008 -#define PARIS 0x05010009 -#define VILLAVASCDT 0x0501000A -#define VILLAVAS 0x0501000B +#define room86_PAL 0x05010000 +#define room86_l0 0x05010001 +#define BANNOCKCDT 0x05010002 +#define BANNOCK 0x05010003 +#define MARIBCDT 0x05010004 +#define MARIB 0x05010005 +#define LOCHMARNCDT 0x05010006 +#define LOCHMARN 0x05010007 +#define PARISCDT 0x05010008 +#define PARIS 0x05010009 +#define VILLAVASCDT 0x0501000A +#define VILLAVAS 0x0501000B // 12 entities in TXTs, 12 in datafiles. // room90 -#define R90L0 0x05020000 -#define R90PAL 0x05020001 -#define PHONE_PAL 0x05020002 -#define GBLINK 0x05020003 -#define GBLINKCDT 0x05020004 -#define GRISE 0x05020005 -#define GRISECDT 0x05020006 -#define GRISECDR 0x05020007 -#define GTALK 0x05020008 -#define GTALKCDT 0x05020009 -#define NBLINK 0x0502000A -#define NBLINKCDT 0x0502000B -#define NRISE 0x0502000C -#define NRISECDT 0x0502000D -#define NRISECDR 0x0502000E -#define NTALK 0x0502000F -#define NTALKCDT 0x05020010 -#define TODTALK 0x05020011 -#define TODTALKCDT 0x05020012 +#define R90L0 0x05020000 +#define R90PAL 0x05020001 +#define PHONE_PAL 0x05020002 +#define GBLINK 0x05020003 +#define GBLINKCDT 0x05020004 +#define GRISE 0x05020005 +#define GRISECDT 0x05020006 +#define GRISECDR 0x05020007 +#define GTALK 0x05020008 +#define GTALKCDT 0x05020009 +#define NBLINK 0x0502000A +#define NBLINKCDT 0x0502000B +#define NRISE 0x0502000C +#define NRISECDT 0x0502000D +#define NRISECDR 0x0502000E +#define NTALK 0x0502000F +#define NTALKCDT 0x05020010 +#define TODTALK 0x05020011 +#define TODTALKCDT 0x05020012 // 19 entities in TXTs, 19 in datafiles. // room91 -#define R91L0 0x05030000 -#define R91PAL 0x05030001 -#define CLOWN 0x05030002 -#define CLOWNCDT 0x05030003 -#define DESVAS 0x05030004 -#define DESVASCDT 0x05030005 -#define EIFTOWER 0x05030006 -#define EIFTOWERCDT 0x05030007 -#define HORSETIP 0x05030008 -#define HORSETIPCDT 0x05030009 -#define LOBIN91 0x0503000A -#define LOBIN91CDT 0x0503000B -#define MONTFCON 0x0503000C -#define MONTFCONCDT 0x0503000D -#define NICOADD 0x0503000E -#define NICOADDCDT 0x0503000F -#define NICOPHN 0x05030010 -#define NICOPHNCDT 0x05030011 -#define TAILOR 0x05030012 -#define TAILORCDT 0x05030013 +#define R91L0 0x05030000 +#define R91PAL 0x05030001 +#define CLOWN 0x05030002 +#define CLOWNCDT 0x05030003 +#define DESVAS 0x05030004 +#define DESVASCDT 0x05030005 +#define EIFTOWER 0x05030006 +#define EIFTOWERCDT 0x05030007 +#define HORSETIP 0x05030008 +#define HORSETIPCDT 0x05030009 +#define LOBIN91 0x0503000A +#define LOBIN91CDT 0x0503000B +#define MONTFCON 0x0503000C +#define MONTFCONCDT 0x0503000D +#define NICOADD 0x0503000E +#define NICOADDCDT 0x0503000F +#define NICOPHN 0x05030010 +#define NICOPHNCDT 0x05030011 +#define TAILOR 0x05030012 +#define TAILORCDT 0x05030013 // 20 entities in TXTs, 20 in datafiles. // room99 -#define room99_PAL 0x05040000 -#define room99_l0 0x05040001 +#define room99_PAL 0x05040000 +#define room99_l0 0x05040001 // 2 entities in TXTs, 2 in datafiles. // paris_1 // sound_fx -#define FX_CAMERA1 0x06000000 -#define FX_CAMERA2 0x06000001 -#define FX_CAMERA3 0x06000002 -#define FX_CANDO 0x06000003 -#define FX_CANUP 0x06000004 -#define FX_CAW1 0x06000005 -#define FX_DUST 0x06000006 -#define FX_HORN1 0x06000007 -#define FX_HORN2 0x06000008 -#define FX_HORN3 0x06000009 -#define FX_LVSFLY 0x0600000A -#define FX_PAP1 0x0600000B -#define FX_PAP2 0x0600000C -#define FX_PICK1 0x0600000D -#define FX_PICK2 0x0600000E -#define FX_PICK3 0x0600000F -#define FX_PICK4 0x06000010 -#define FX_PICK5 0x06000011 -#define FX_TRAFFIC2 0x06000012 -#define FX_TWEET1 0x06000013 -#define FX_TWEET2 0x06000014 -#define FX_TWEET3 0x06000015 -#define FX_TWEET4 0x06000016 -#define FX_TWEET5 0x06000017 -#define FX_BIN1 0x06000018 -#define FX_BIN2 0x06000019 -#define FX_BIN3 0x0600001A -#define FX_CAT 0x0600001B -#define FX_COVERON2 0x0600001C -#define FX_CRATE 0x0600001D -#define FX_DRAIN 0x0600001E -#define FX_HOLE 0x0600001F -#define FX_BODY 0x06000020 -#define FX_BOTDN 0x06000021 -#define FX_BOTUP 0x06000022 -#define FX_GULP 0x06000023 -#define FX_LIGHT 0x06000024 -#define FX_PIKUP 0x06000025 -#define FX_PAP3 0x06000026 -#define FX_PAP4 0x06000027 -#define FX_PAP5 0x06000028 -#define FX_PISTOL 0x06000029 -#define FX_TBOX 0x0600002A -#define FX_KNOKKNOK 0x0600002B -#define FX_ALBCLO 0x0600002C -#define FX_ALBOP 0x0600002D -#define FX_LADD1 0x0600002E -#define FX_LADD2 0x0600002F -#define FX_LADD3 0x06000030 -#define FX_RAT1 0x06000031 -#define FX_RAT2 0x06000032 -#define FX_SEWSTEP1 0x06000033 -#define FX_SEWSTEP2 0x06000034 -#define FX_SWATER3 0x06000035 -#define FX_DRIP1 0x06000036 -#define FX_DRIP2 0x06000037 -#define FX_DRIP3 0x06000038 -#define FX_SWATER1 0x06000039 -#define FX_SEWLADD7 0x0600003A -#define FX_SEWLADU7 0x0600003B +#define FX_CAMERA1 0x06000000 +#define FX_CAMERA2 0x06000001 +#define FX_CAMERA3 0x06000002 +#define FX_CANDO 0x06000003 +#define FX_CANUP 0x06000004 +#define FX_CAW1 0x06000005 +#define FX_DUST 0x06000006 +#define FX_HORN1 0x06000007 +#define FX_HORN2 0x06000008 +#define FX_HORN3 0x06000009 +#define FX_LVSFLY 0x0600000A +#define FX_PAP1 0x0600000B +#define FX_PAP2 0x0600000C +#define FX_PICK1 0x0600000D +#define FX_PICK2 0x0600000E +#define FX_PICK3 0x0600000F +#define FX_PICK4 0x06000010 +#define FX_PICK5 0x06000011 +#define FX_TRAFFIC2 0x06000012 +#define FX_TWEET1 0x06000013 +#define FX_TWEET2 0x06000014 +#define FX_TWEET3 0x06000015 +#define FX_TWEET4 0x06000016 +#define FX_TWEET5 0x06000017 +#define FX_BIN1 0x06000018 +#define FX_BIN2 0x06000019 +#define FX_BIN3 0x0600001A +#define FX_CAT 0x0600001B +#define FX_COVERON2 0x0600001C +#define FX_CRATE 0x0600001D +#define FX_DRAIN 0x0600001E +#define FX_HOLE 0x0600001F +#define FX_BODY 0x06000020 +#define FX_BOTDN 0x06000021 +#define FX_BOTUP 0x06000022 +#define FX_GULP 0x06000023 +#define FX_LIGHT 0x06000024 +#define FX_PIKUP 0x06000025 +#define FX_PAP3 0x06000026 +#define FX_PAP4 0x06000027 +#define FX_PAP5 0x06000028 +#define FX_PISTOL 0x06000029 +#define FX_TBOX 0x0600002A +#define FX_KNOKKNOK 0x0600002B +#define FX_ALBCLO 0x0600002C +#define FX_ALBOP 0x0600002D +#define FX_LADD1 0x0600002E +#define FX_LADD2 0x0600002F +#define FX_LADD3 0x06000030 +#define FX_RAT1 0x06000031 +#define FX_RAT2 0x06000032 +#define FX_SEWSTEP1 0x06000033 +#define FX_SEWSTEP2 0x06000034 +#define FX_SWATER3 0x06000035 +#define FX_DRIP1 0x06000036 +#define FX_DRIP2 0x06000037 +#define FX_DRIP3 0x06000038 +#define FX_SWATER1 0x06000039 +#define FX_SEWLADD7 0x0600003A +#define FX_SEWLADU7 0x0600003B // 60 entities in TXTs, 60 in datafiles. // room1 -#define PARIS1_PAL 0x06010000 -#define room1_PAL 0x06010001 -#define room1_l0 0x06010002 -#define room1_l1 0x06010003 -#define room1_l2 0x06010004 -#define room1_gd1 0x06010005 -#define room1_gd2 0x06010006 -#define room1_flr 0x06010007 -#define room1_plx 0x06010008 -#define BIRDS 0x06010009 -#define BIRDSCDT 0x0601000A -#define BIRDSA 0x0601000B -#define BIRDSACDT 0x0601000C -#define BIRDSB 0x0601000D -#define BIRDSBCDT 0x0601000E -#define BIRDSC 0x0601000F -#define BIRDSCCDT 0x06010010 -#define BIRDSD 0x06010011 -#define BIRDSDCDT 0x06010012 -#define BIRDSE 0x06010013 -#define BIRDSECDT 0x06010014 -#define BIRDSF 0x06010015 -#define BIRDSFCDT 0x06010016 -#define BIRDSG 0x06010017 -#define BIRDSGCDT 0x06010018 -#define BIRDSH 0x06010019 -#define BIRDSHCDT 0x0601001A -#define BIRDSI 0x0601001B -#define BIRDSICDT 0x0601001C -#define CANOPY 0x0601001D -#define CANOPYCDT 0x0601001E -#define GEOCAN 0x0601001F -#define GEOCANCDT 0x06010020 -#define GEONIC 0x06010021 -#define GEONICCDT 0x06010022 -#define GEOPAP 0x06010023 -#define GEOPAPCDT 0x06010024 -#define GEOPAP2 0x06010025 -#define GEOPAP2CDT 0x06010026 -#define LVSFLY 0x06010027 -#define LVSFLYCDT 0x06010028 -#define MOUGRD 0x06010029 -#define MOUGRDCDT 0x0601002A -#define MOUTLK01 0x0601002B -#define MOUTLK01CDT 0x0601002C -#define MOUWLK01 0x0601002D -#define MOUWLK01CDT 0x0601002E -#define NICPHT1CDT 0x0601002F -#define NICPHT1 0x06010030 -#define NICPHT2CDT 0x06010031 -#define NICPHT2 0x06010032 -#define NICPHT3CDT 0x06010033 -#define NICPHT3 0x06010034 -#define NICPHT5CDT 0x06010035 -#define NICPHT5 0x06010036 -#define NICPHT6CDT 0x06010037 -#define NICPHT6 0x06010038 -#define NICPHT7CDT 0x06010039 -#define NICPHT7 0x0601003A -#define NICWLK01 0x0601003B -#define NICWLK01CDT 0x0601003C -#define NWPAPER 0x0601003D -#define NWPAPERCDT 0x0601003E -#define WRKDIG01 0x0601003F -#define WRKDIG01CDT 0x06010040 -#define XGEOPHN3 0x06010041 -#define XGEOPHN3CDT 0x06010042 -#define XGEOPHN5 0x06010043 -#define XGEOPHN5CDT 0x06010044 -#define XNICPHN3CDT 0x06010045 -#define XNICPHN3 0x06010046 -#define XNICPHN5CDT 0x06010047 -#define XNICPHN5 0x06010048 +#define PARIS1_PAL 0x06010000 +#define room1_PAL 0x06010001 +#define room1_l0 0x06010002 +#define room1_l1 0x06010003 +#define room1_l2 0x06010004 +#define room1_gd1 0x06010005 +#define room1_gd2 0x06010006 +#define room1_flr 0x06010007 +#define room1_plx 0x06010008 +#define BIRDS 0x06010009 +#define BIRDSCDT 0x0601000A +#define BIRDSA 0x0601000B +#define BIRDSACDT 0x0601000C +#define BIRDSB 0x0601000D +#define BIRDSBCDT 0x0601000E +#define BIRDSC 0x0601000F +#define BIRDSCCDT 0x06010010 +#define BIRDSD 0x06010011 +#define BIRDSDCDT 0x06010012 +#define BIRDSE 0x06010013 +#define BIRDSECDT 0x06010014 +#define BIRDSF 0x06010015 +#define BIRDSFCDT 0x06010016 +#define BIRDSG 0x06010017 +#define BIRDSGCDT 0x06010018 +#define BIRDSH 0x06010019 +#define BIRDSHCDT 0x0601001A +#define BIRDSI 0x0601001B +#define BIRDSICDT 0x0601001C +#define CANOPY 0x0601001D +#define CANOPYCDT 0x0601001E +#define GEOCAN 0x0601001F +#define GEOCANCDT 0x06010020 +#define GEONIC 0x06010021 +#define GEONICCDT 0x06010022 +#define GEOPAP 0x06010023 +#define GEOPAPCDT 0x06010024 +#define GEOPAP2 0x06010025 +#define GEOPAP2CDT 0x06010026 +#define LVSFLY 0x06010027 +#define LVSFLYCDT 0x06010028 +#define MOUGRD 0x06010029 +#define MOUGRDCDT 0x0601002A +#define MOUTLK01 0x0601002B +#define MOUTLK01CDT 0x0601002C +#define MOUWLK01 0x0601002D +#define MOUWLK01CDT 0x0601002E +#define NICPHT1CDT 0x0601002F +#define NICPHT1 0x06010030 +#define NICPHT2CDT 0x06010031 +#define NICPHT2 0x06010032 +#define NICPHT3CDT 0x06010033 +#define NICPHT3 0x06010034 +#define NICPHT5CDT 0x06010035 +#define NICPHT5 0x06010036 +#define NICPHT6CDT 0x06010037 +#define NICPHT6 0x06010038 +#define NICPHT7CDT 0x06010039 +#define NICPHT7 0x0601003A +#define NICWLK01 0x0601003B +#define NICWLK01CDT 0x0601003C +#define NWPAPER 0x0601003D +#define NWPAPERCDT 0x0601003E +#define WRKDIG01 0x0601003F +#define WRKDIG01CDT 0x06010040 +#define XGEOPHN3 0x06010041 +#define XGEOPHN3CDT 0x06010042 +#define XGEOPHN5 0x06010043 +#define XGEOPHN5CDT 0x06010044 +#define XNICPHN3CDT 0x06010045 +#define XNICPHN3 0x06010046 +#define XNICPHN5CDT 0x06010047 +#define XNICPHN5 0x06010048 // 73 entities in TXTs, 73 in datafiles. // room2 -#define room2_PAL 0x06020000 -#define room2_l0 0x06020001 -#define room2_l1 0x06020002 -#define room2_l2 0x06020003 -#define room2_gd1 0x06020004 -#define room2_gd2 0x06020005 -#define room2_flr 0x06020006 -#define BIN1 0x06020007 -#define BIN1CDT 0x06020008 -#define BIN2 0x06020009 -#define BIN2CDT 0x0602000A -#define BIN3 0x0602000B -#define BIN3CDT 0x0602000C -#define CATJMP 0x0602000D -#define CATJMPCDT 0x0602000E -#define CRATE 0x0602000F -#define CRATECDT 0x06020010 -#define DRNBRK 0x06020011 -#define DRNBRKCDT 0x06020012 -#define GEOBIN 0x06020013 -#define GEOBINCDT 0x06020014 -#define GEOBOX 0x06020015 -#define GEOBOXCDT 0x06020016 -#define GEOBRS 0x06020017 -#define GEOBRSCDT 0x06020018 -#define GEOCAT 0x06020019 -#define GEOCATCDT 0x0602001A -#define GEOCATE 0x0602001B -#define GEOCATECDT 0x0602001C -#define GEOCLM02 0x0602001D -#define GEOCLM02CDT 0x0602001E -#define GEOCRT 0x0602001F -#define GEOCRTCDT 0x06020020 -#define GEODWN 0x06020021 -#define GEODWNCDT 0x06020022 -#define GEOLID 0x06020023 -#define GEOLIDCDT 0x06020024 -#define GEOLIDCDR 0x06020025 -#define GEOMAN8 0x06020026 -#define GEOMAN8CDT 0x06020027 -#define GEOMAN9 0x06020028 -#define GEOMAN9CDT 0x06020029 -#define GEOOUT 0x0602002A -#define GEOOUTCDT 0x0602002B -#define GEOPLL02 0x0602002C -#define GEOPLL02CDT 0x0602002D -#define GEOTRY02 0x0602002E -#define GEOTRY02CDT 0x0602002F -#define MANCOV 0x06020030 -#define MANCOVCDT 0x06020031 -#define MANCVOFF 0x06020032 -#define MANCVOFFCDT 0x06020033 +#define room2_PAL 0x06020000 +#define room2_l0 0x06020001 +#define room2_l1 0x06020002 +#define room2_l2 0x06020003 +#define room2_gd1 0x06020004 +#define room2_gd2 0x06020005 +#define room2_flr 0x06020006 +#define BIN1 0x06020007 +#define BIN1CDT 0x06020008 +#define BIN2 0x06020009 +#define BIN2CDT 0x0602000A +#define BIN3 0x0602000B +#define BIN3CDT 0x0602000C +#define CATJMP 0x0602000D +#define CATJMPCDT 0x0602000E +#define CRATE 0x0602000F +#define CRATECDT 0x06020010 +#define DRNBRK 0x06020011 +#define DRNBRKCDT 0x06020012 +#define GEOBIN 0x06020013 +#define GEOBINCDT 0x06020014 +#define GEOBOX 0x06020015 +#define GEOBOXCDT 0x06020016 +#define GEOBRS 0x06020017 +#define GEOBRSCDT 0x06020018 +#define GEOCAT 0x06020019 +#define GEOCATCDT 0x0602001A +#define GEOCATE 0x0602001B +#define GEOCATECDT 0x0602001C +#define GEOCLM02 0x0602001D +#define GEOCLM02CDT 0x0602001E +#define GEOCRT 0x0602001F +#define GEOCRTCDT 0x06020020 +#define GEODWN 0x06020021 +#define GEODWNCDT 0x06020022 +#define GEOLID 0x06020023 +#define GEOLIDCDT 0x06020024 +#define GEOLIDCDR 0x06020025 +#define GEOMAN8 0x06020026 +#define GEOMAN8CDT 0x06020027 +#define GEOMAN9 0x06020028 +#define GEOMAN9CDT 0x06020029 +#define GEOOUT 0x0602002A +#define GEOOUTCDT 0x0602002B +#define GEOPLL02 0x0602002C +#define GEOPLL02CDT 0x0602002D +#define GEOTRY02 0x0602002E +#define GEOTRY02CDT 0x0602002F +#define MANCOV 0x06020030 +#define MANCOVCDT 0x06020031 +#define MANCVOFF 0x06020032 +#define MANCVOFFCDT 0x06020033 // 52 entities in TXTs, 52 in datafiles. // room3 -#define room3_PAL 0x06030000 -#define room3_l0 0x06030001 -#define room3_l1 0x06030002 -#define room3_l2 0x06030003 -#define room3_gd1 0x06030004 -#define room3_gd2 0x06030005 -#define room3_flr 0x06030006 -#define BOTTLE 0x06030007 -#define BOTTLECDT 0x06030008 -#define BOTTLE1 0x06030009 -#define BOTTLE1CDT 0x0603000A -#define CHNDRN 0x0603000B -#define CHNDRNCDT 0x0603000C -#define CHNFNT 0x0603000D -#define CHNFNTCDT 0x0603000E -#define CHNSITA 0x0603000F -#define CHNSITACDT 0x06030010 -#define CHNSIT 0x06030011 -#define CHNSITCDT 0x06030012 -#define CHNTLK 0x06030013 -#define CHNTLKCDT 0x06030014 -#define CHNUPP 0x06030015 -#define CHNUPPCDT 0x06030016 -#define CHNUPPCDR 0x06030017 -#define CORPSE 0x06030018 -#define CORPSECDT 0x06030019 -#define FLICKER 0x0603001A -#define FLICKERCDT 0x0603001B -#define GEOBOT3 0x0603001C -#define GEOBOT3CDT 0x0603001D -#define GEOCARD3 0x0603001E -#define GEOCARD3CDT 0x0603001F -#define GEOCHN 0x06030020 -#define GEOCHNCDT 0x06030021 -#define GEOCPS 0x06030022 -#define GEOCPSCDT 0x06030023 -#define GEOCPSCDR 0x06030024 -#define MOUCHN 0x06030025 -#define MOUCHNCDT 0x06030026 -#define MOUCHN8 0x06030027 -#define MOUCHN8CDT 0x06030028 -#define MOUCPS 0x06030029 -#define MOUCPSCDT 0x0603002A -#define MOUCPSTK 0x0603002B -#define MOUCPSTKCDT 0x0603002C -#define MOUDOR03 0x0603002D -#define MOUDOR03CDT 0x0603002E -#define MOUROS 0x0603002F -#define MOUROSCDT 0x06030030 -#define MOUROS1 0x06030031 -#define MOUROS1CDT 0x06030032 -#define MOUROS1CDR 0x06030033 -#define MOUROS2 0x06030034 -#define MOUROS2CDT 0x06030035 -#define MOUSTD 0x06030036 -#define MOUSTDCDT 0x06030037 -#define MOUTALK 0x06030038 -#define MOUTALKCDT 0x06030039 -#define MOUTLK1 0x0603003A -#define MOUTLK1CDT 0x0603003B -#define MOUTRN03 0x0603003C -#define MOUTRN03CDT 0x0603003D -#define MOUTRN03CDR 0x0603003E -#define MOUTRN2 0x0603003F -#define MOUTRN2CDT 0x06030040 -#define MOUTRN2CDR 0x06030041 -#define MOUWLK 0x06030042 -#define MOUWLKCDT 0x06030043 -#define MOUWLK03 0x06030044 -#define MOUWLK03CDT 0x06030045 -#define ROSCARD 0x06030046 -#define ROSCARDCDT 0x06030047 -#define ROSCHN 0x06030048 -#define ROSCHNCDT 0x06030049 -#define ROSCHNCDR 0x0603004A -#define ROSGEO 0x0603004B -#define ROSGEOCDT 0x0603004C -#define ROSGEOA 0x0603004D -#define ROSGEOACDT 0x0603004E -#define ROSGEOB 0x0603004F -#define ROSGEOBCDT 0x06030050 -#define ROSGEOC 0x06030051 -#define ROSGEOCCDT 0x06030052 -#define ROSLIK 0x06030053 -#define ROSLIKCDT 0x06030054 -#define ROSLUK 0x06030055 -#define ROSLUKCDT 0x06030056 -#define ROSMOU 0x06030057 -#define ROSMOUCDT 0x06030058 -#define ROSNBK 0x06030059 -#define ROSNBKCDT 0x0603005A -#define ROSNBK8 0x0603005B -#define ROSNBK8CDT 0x0603005C -#define ROSPKT 0x0603005D -#define ROSPKTCDT 0x0603005E -#define ROSTMP 0x0603005F -#define ROSTMPCDT 0x06030060 -#define ROSTMP8 0x06030061 -#define ROSTMP8CDT 0x06030062 -#define ROSTURNA 0x06030063 -#define ROSTURNACDT 0x06030064 -#define ROSTURNB 0x06030065 -#define ROSTURNBCDT 0x06030066 -#define ROSTRN2 0x06030067 -#define ROSTRN2CDT 0x06030068 -#define ROSWRT 0x06030069 -#define ROSWRTCDT 0x0603006A +#define room3_PAL 0x06030000 +#define room3_l0 0x06030001 +#define room3_l1 0x06030002 +#define room3_l2 0x06030003 +#define room3_gd1 0x06030004 +#define room3_gd2 0x06030005 +#define room3_flr 0x06030006 +#define BOTTLE 0x06030007 +#define BOTTLECDT 0x06030008 +#define BOTTLE1 0x06030009 +#define BOTTLE1CDT 0x0603000A +#define CHNDRN 0x0603000B +#define CHNDRNCDT 0x0603000C +#define CHNFNT 0x0603000D +#define CHNFNTCDT 0x0603000E +#define CHNSITA 0x0603000F +#define CHNSITACDT 0x06030010 +#define CHNSIT 0x06030011 +#define CHNSITCDT 0x06030012 +#define CHNTLK 0x06030013 +#define CHNTLKCDT 0x06030014 +#define CHNUPP 0x06030015 +#define CHNUPPCDT 0x06030016 +#define CHNUPPCDR 0x06030017 +#define CORPSE 0x06030018 +#define CORPSECDT 0x06030019 +#define FLICKER 0x0603001A +#define FLICKERCDT 0x0603001B +#define GEOBOT3 0x0603001C +#define GEOBOT3CDT 0x0603001D +#define GEOCARD3 0x0603001E +#define GEOCARD3CDT 0x0603001F +#define GEOCHN 0x06030020 +#define GEOCHNCDT 0x06030021 +#define GEOCPS 0x06030022 +#define GEOCPSCDT 0x06030023 +#define GEOCPSCDR 0x06030024 +#define MOUCHN 0x06030025 +#define MOUCHNCDT 0x06030026 +#define MOUCHN8 0x06030027 +#define MOUCHN8CDT 0x06030028 +#define MOUCPS 0x06030029 +#define MOUCPSCDT 0x0603002A +#define MOUCPSTK 0x0603002B +#define MOUCPSTKCDT 0x0603002C +#define MOUDOR03 0x0603002D +#define MOUDOR03CDT 0x0603002E +#define MOUROS 0x0603002F +#define MOUROSCDT 0x06030030 +#define MOUROS1 0x06030031 +#define MOUROS1CDT 0x06030032 +#define MOUROS1CDR 0x06030033 +#define MOUROS2 0x06030034 +#define MOUROS2CDT 0x06030035 +#define MOUSTD 0x06030036 +#define MOUSTDCDT 0x06030037 +#define MOUTALK 0x06030038 +#define MOUTALKCDT 0x06030039 +#define MOUTLK1 0x0603003A +#define MOUTLK1CDT 0x0603003B +#define MOUTRN03 0x0603003C +#define MOUTRN03CDT 0x0603003D +#define MOUTRN03CDR 0x0603003E +#define MOUTRN2 0x0603003F +#define MOUTRN2CDT 0x06030040 +#define MOUTRN2CDR 0x06030041 +#define MOUWLK 0x06030042 +#define MOUWLKCDT 0x06030043 +#define MOUWLK03 0x06030044 +#define MOUWLK03CDT 0x06030045 +#define ROSCARD 0x06030046 +#define ROSCARDCDT 0x06030047 +#define ROSCHN 0x06030048 +#define ROSCHNCDT 0x06030049 +#define ROSCHNCDR 0x0603004A +#define ROSGEO 0x0603004B +#define ROSGEOCDT 0x0603004C +#define ROSGEOA 0x0603004D +#define ROSGEOACDT 0x0603004E +#define ROSGEOB 0x0603004F +#define ROSGEOBCDT 0x06030050 +#define ROSGEOC 0x06030051 +#define ROSGEOCCDT 0x06030052 +#define ROSLIK 0x06030053 +#define ROSLIKCDT 0x06030054 +#define ROSLUK 0x06030055 +#define ROSLUKCDT 0x06030056 +#define ROSMOU 0x06030057 +#define ROSMOUCDT 0x06030058 +#define ROSNBK 0x06030059 +#define ROSNBKCDT 0x0603005A +#define ROSNBK8 0x0603005B +#define ROSNBK8CDT 0x0603005C +#define ROSPKT 0x0603005D +#define ROSPKTCDT 0x0603005E +#define ROSTMP 0x0603005F +#define ROSTMPCDT 0x06030060 +#define ROSTMP8 0x06030061 +#define ROSTMP8CDT 0x06030062 +#define ROSTURNA 0x06030063 +#define ROSTURNACDT 0x06030064 +#define ROSTURNB 0x06030065 +#define ROSTURNBCDT 0x06030066 +#define ROSTRN2 0x06030067 +#define ROSTRN2CDT 0x06030068 +#define ROSWRT 0x06030069 +#define ROSWRTCDT 0x0603006A // 107 entities in TXTs, 107 in datafiles. // room4 -#define room4_PAL 0x06040000 -#define room4_l0 0x06040001 -#define room4_l1 0x06040002 -#define room4_l2 0x06040003 -#define room4_gd1 0x06040004 -#define room4_gd2 0x06040005 -#define room4_flr 0x06040006 -#define ALBDOR 0x06040007 -#define ALBDORCDR 0x06040008 -#define ALBDORCDT 0x06040009 -#define ALBDOR8 0x0604000A -#define ALBDOR8CDT 0x0604000B -#define GEONOK 0x0604000C -#define GEONOKCDT 0x0604000D -#define GEONOKCDR 0x0604000E -#define GEOTBX 0x0604000F -#define GEOTBXCDT 0x06040010 -#define GEOWRK 0x06040011 -#define GEOWRKCDT 0x06040012 -#define GEOWRK8 0x06040013 -#define GEOWRK8CDT 0x06040014 -#define MOUENT 0x06040015 -#define MOUENTCDT 0x06040016 -#define MOUSHG 0x06040017 -#define MOUSHGCDT 0x06040018 -#define MOUSTR 0x06040019 -#define MOUSTRCDT 0x0604001A -#define MOUTLK04 0x0604001B -#define MOUTLK04CDT 0x0604001C -#define MOUWLK04 0x0604001D -#define MOUWLK04CDT 0x0604001E -#define ROSENT 0x0604001F -#define ROSENTCDT 0x06040020 -#define ROSTLK04 0x06040021 -#define ROSTLK04CDT 0x06040022 -#define ROSWLK 0x06040023 -#define ROSWLKCDT 0x06040024 -#define PHONE4 0x06040025 -#define PHONE4CDT 0x06040026 -#define WRKAXE 0x06040027 -#define WRKAXECDT 0x06040028 -#define WRKBLINK 0x06040029 -#define WRKBLINKCDT 0x0604002A -#define WRKCLM 0x0604002B -#define WRKCLMCDT 0x0604002C -#define WRKDIG 0x0604002D -#define WRKDIGCDT 0x0604002E -#define WRKPPR 0x0604002F -#define WRKPPRCDT 0x06040030 -#define WRKTLK 0x06040031 -#define WRKTLKCDT 0x06040032 -#define WRKTLK8 0x06040033 -#define WRKTLK8CDT 0x06040034 -#define WRKTLK9 0x06040035 -#define WRKTLK9CDT 0x06040036 -#define WRKTRN 0x06040037 -#define WRKTRNCDR 0x06040038 -#define WRKTRNCDT 0x06040039 -#define WRKXIT 0x0604003A -#define WRKXITCDT 0x0604003B +#define room4_PAL 0x06040000 +#define room4_l0 0x06040001 +#define room4_l1 0x06040002 +#define room4_l2 0x06040003 +#define room4_gd1 0x06040004 +#define room4_gd2 0x06040005 +#define room4_flr 0x06040006 +#define ALBDOR 0x06040007 +#define ALBDORCDR 0x06040008 +#define ALBDORCDT 0x06040009 +#define ALBDOR8 0x0604000A +#define ALBDOR8CDT 0x0604000B +#define GEONOK 0x0604000C +#define GEONOKCDT 0x0604000D +#define GEONOKCDR 0x0604000E +#define GEOTBX 0x0604000F +#define GEOTBXCDT 0x06040010 +#define GEOWRK 0x06040011 +#define GEOWRKCDT 0x06040012 +#define GEOWRK8 0x06040013 +#define GEOWRK8CDT 0x06040014 +#define MOUENT 0x06040015 +#define MOUENTCDT 0x06040016 +#define MOUSHG 0x06040017 +#define MOUSHGCDT 0x06040018 +#define MOUSTR 0x06040019 +#define MOUSTRCDT 0x0604001A +#define MOUTLK04 0x0604001B +#define MOUTLK04CDT 0x0604001C +#define MOUWLK04 0x0604001D +#define MOUWLK04CDT 0x0604001E +#define ROSENT 0x0604001F +#define ROSENTCDT 0x06040020 +#define ROSTLK04 0x06040021 +#define ROSTLK04CDT 0x06040022 +#define ROSWLK 0x06040023 +#define ROSWLKCDT 0x06040024 +#define PHONE4 0x06040025 +#define PHONE4CDT 0x06040026 +#define WRKAXE 0x06040027 +#define WRKAXECDT 0x06040028 +#define WRKBLINK 0x06040029 +#define WRKBLINKCDT 0x0604002A +#define WRKCLM 0x0604002B +#define WRKCLMCDT 0x0604002C +#define WRKDIG 0x0604002D +#define WRKDIGCDT 0x0604002E +#define WRKPPR 0x0604002F +#define WRKPPRCDT 0x06040030 +#define WRKTLK 0x06040031 +#define WRKTLKCDT 0x06040032 +#define WRKTLK8 0x06040033 +#define WRKTLK8CDT 0x06040034 +#define WRKTLK9 0x06040035 +#define WRKTLK9CDT 0x06040036 +#define WRKTRN 0x06040037 +#define WRKTRNCDR 0x06040038 +#define WRKTRNCDT 0x06040039 +#define WRKXIT 0x0604003A +#define WRKXITCDT 0x0604003B // 60 entities in TXTs, 60 in datafiles. // room5 -#define room5_PAL 0x06050000 -#define room5_l0 0x06050001 -#define room5_l1 0x06050002 -#define room5_l2 0x06050003 -#define room5_gd1 0x06050004 -#define room5_gd2 0x06050005 -#define room5_flr 0x06050006 -#define ALBAPT 0x06050007 -#define ALBAPTCDT 0x06050008 -#define ALBAPTCDR 0x06050009 -#define ALBCLOSECDT 0x0605000A -#define ALBCLOSE 0x0605000B -#define ALBCRD8 0x0605000C -#define ALBCRD8CDT 0x0605000D -#define ALBDORTKCDT 0x0605000E -#define ALBDORTK 0x0605000F -#define ALBDRTK2CDT 0x06050010 -#define ALBDRTK2 0x06050011 -#define ALBHND 0x06050012 -#define ALBHNDCDT 0x06050013 -#define ALBOBJ 0x06050014 -#define ALBOBJCDT 0x06050015 -#define ALBOPENCDT 0x06050016 -#define ALBOPEN 0x06050017 -#define ALBPKT 0x06050018 -#define ALBPKTCDT 0x06050019 -#define ALBTLK 0x0605001A -#define ALBTLKCDT 0x0605001B -#define ALBWLK9CDT 0x0605001C -#define ALBWLK9 0x0605001D -#define GEOCRD05 0x0605001E -#define GEOCRD05CDT 0x0605001F -#define GEODOR05CDT 0x06050020 -#define GEODOR05 0x06050021 -#define GEOEMG 0x06050022 -#define GEOEMGCDT 0x06050023 -#define GEOEMGCDR 0x06050024 -#define GEOEMGA 0x06050025 -#define GEOEMGACDT 0x06050026 -#define GEOEMGACDR 0x06050027 -#define GEOEMGB 0x06050028 -#define GEOEMGBCDT 0x06050029 -#define GEOEMGBCDR 0x0605002A -#define GEOEXITCDT 0x0605002B -#define GEOEXIT 0x0605002C -#define GEOHND05 0x0605002D -#define GEOHND05CDT 0x0605002E -#define GEONOK05CDT 0x0605002F -#define GEONOK05 0x06050030 -#define GEOTLK05 0x06050031 -#define GEOTLK05CDT 0x06050032 +#define room5_PAL 0x06050000 +#define room5_l0 0x06050001 +#define room5_l1 0x06050002 +#define room5_l2 0x06050003 +#define room5_gd1 0x06050004 +#define room5_gd2 0x06050005 +#define room5_flr 0x06050006 +#define ALBAPT 0x06050007 +#define ALBAPTCDT 0x06050008 +#define ALBAPTCDR 0x06050009 +#define ALBCLOSECDT 0x0605000A +#define ALBCLOSE 0x0605000B +#define ALBCRD8 0x0605000C +#define ALBCRD8CDT 0x0605000D +#define ALBDORTKCDT 0x0605000E +#define ALBDORTK 0x0605000F +#define ALBDRTK2CDT 0x06050010 +#define ALBDRTK2 0x06050011 +#define ALBHND 0x06050012 +#define ALBHNDCDT 0x06050013 +#define ALBOBJ 0x06050014 +#define ALBOBJCDT 0x06050015 +#define ALBOPENCDT 0x06050016 +#define ALBOPEN 0x06050017 +#define ALBPKT 0x06050018 +#define ALBPKTCDT 0x06050019 +#define ALBTLK 0x0605001A +#define ALBTLKCDT 0x0605001B +#define ALBWLK9CDT 0x0605001C +#define ALBWLK9 0x0605001D +#define GEOCRD05 0x0605001E +#define GEOCRD05CDT 0x0605001F +#define GEODOR05CDT 0x06050020 +#define GEODOR05 0x06050021 +#define GEOEMG 0x06050022 +#define GEOEMGCDT 0x06050023 +#define GEOEMGCDR 0x06050024 +#define GEOEMGA 0x06050025 +#define GEOEMGACDT 0x06050026 +#define GEOEMGACDR 0x06050027 +#define GEOEMGB 0x06050028 +#define GEOEMGBCDT 0x06050029 +#define GEOEMGBCDR 0x0605002A +#define GEOEXITCDT 0x0605002B +#define GEOEXIT 0x0605002C +#define GEOHND05 0x0605002D +#define GEOHND05CDT 0x0605002E +#define GEONOK05CDT 0x0605002F +#define GEONOK05 0x06050030 +#define GEOTLK05 0x06050031 +#define GEOTLK05CDT 0x06050032 // 51 entities in TXTs, 51 in datafiles. // room6 -#define SEWER_PAL 0x06060000 -#define room6_PAL 0x06060001 -#define room6_l0 0x06060002 -#define room6_l1 0x06060003 -#define room6_gd1 0x06060004 -#define room6_flr 0x06060005 -#define GEOASC06 0x06060006 -#define GEOASC06CDT 0x06060007 -#define GEODES06 0x06060008 -#define GEODES06CDT 0x06060009 -#define GEONOSE 0x0606000A -#define GEONOSECDT 0x0606000B -#define REDNOSE 0x0606000C -#define REDNOSECDT 0x0606000D -#define WATER06 0x0606000E -#define WATER06CDT 0x0606000F +#define SEWER_PAL 0x06060000 +#define room6_PAL 0x06060001 +#define room6_l0 0x06060002 +#define room6_l1 0x06060003 +#define room6_gd1 0x06060004 +#define room6_flr 0x06060005 +#define GEOASC06 0x06060006 +#define GEOASC06CDT 0x06060007 +#define GEODES06 0x06060008 +#define GEODES06CDT 0x06060009 +#define GEONOSE 0x0606000A +#define GEONOSECDT 0x0606000B +#define REDNOSE 0x0606000C +#define REDNOSECDT 0x0606000D +#define WATER06 0x0606000E +#define WATER06CDT 0x0606000F // 16 entities in TXTs, 16 in datafiles. // room7 -#define room7_PAL 0x06070000 -#define room7_l0 0x06070001 -#define room7_l1 0x06070002 -#define room7_l2 0x06070003 -#define room7_gd1 0x06070004 -#define room7_gd2 0x06070005 -#define room7_flr 0x06070006 -#define GEOASC07 0x06070007 -#define GEOASC07CDT 0x06070008 -#define GEOASC07CDR 0x06070009 -#define GEOPLL07 0x0607000A -#define GEOPLL07CDT 0x0607000B -#define GEOPLL07CDR 0x0607000C -#define GEOSPK 0x0607000D -#define GEOSPKCDT 0x0607000E -#define GEOTIS 0x0607000F -#define GEOTISCDT 0x06070010 -#define MATERIAL 0x06070011 -#define MATERIALCDT 0x06070012 -#define TISSUE7 0x06070013 -#define TISSUE7CDT 0x06070014 -#define WATER07 0x06070015 -#define WATER07CDT 0x06070016 +#define room7_PAL 0x06070000 +#define room7_l0 0x06070001 +#define room7_l1 0x06070002 +#define room7_l2 0x06070003 +#define room7_gd1 0x06070004 +#define room7_gd2 0x06070005 +#define room7_flr 0x06070006 +#define GEOASC07 0x06070007 +#define GEOASC07CDT 0x06070008 +#define GEOASC07CDR 0x06070009 +#define GEOPLL07 0x0607000A +#define GEOPLL07CDT 0x0607000B +#define GEOPLL07CDR 0x0607000C +#define GEOSPK 0x0607000D +#define GEOSPKCDT 0x0607000E +#define GEOTIS 0x0607000F +#define GEOTISCDT 0x06070010 +#define MATERIAL 0x06070011 +#define MATERIALCDT 0x06070012 +#define TISSUE7 0x06070013 +#define TISSUE7CDT 0x06070014 +#define WATER07 0x06070015 +#define WATER07CDT 0x06070016 // 23 entities in TXTs, 23 in datafiles. // room8 -#define room8_PAL 0x06080000 -#define room8_l0 0x06080001 -#define room8_l1 0x06080002 -#define room8_l2 0x06080003 -#define room8_gd1 0x06080004 -#define room8_gd2 0x06080005 -#define room8_flr 0x06080006 -#define room8_plx 0x06080007 +#define room8_PAL 0x06080000 +#define room8_l0 0x06080001 +#define room8_l1 0x06080002 +#define room8_l2 0x06080003 +#define room8_gd1 0x06080004 +#define room8_gd2 0x06080005 +#define room8_flr 0x06080006 +#define room8_plx 0x06080007 // 8 entities in TXTs, 8 in datafiles. // paris_2 // sound_fx -#define FX_BIRD 0x07000000 -#define FX_BIRD2 0x07000001 -#define FX_CARLTON 0x07000002 -#define FX_CARS 0x07000003 -#define FX_DOORTRY 0x07000004 -#define FX_FIESTA 0x07000005 -#define FX_FLATDOOR 0x07000006 -#define FX_HVYVEHR 0x07000007 -#define FX_HVYVEHL 0x07000008 -#define FX_LITEVEHR 0x07000009 -#define FX_LITEVEHL 0x0700000A -#define FX_FONEUP 0x0700000B -#define FX_FONEDN 0x0700000C -#define FX_GEOCCH 0x0700000D -#define FX_GEOCHAIR 0x0700000E -#define FX_GEOCHR9 0x0700000F -#define FX_NICOPEN 0x07000010 -#define FX_NICLOSE 0x07000011 -#define FX_PHONICO1 0x07000012 -#define FX_GRAMOFON 0x07000013 -#define FX_SHOCK1 0x07000014 -#define FX_WINDUP11 0x07000015 -#define FX_FRISK 0x07000016 -#define FX_TRAFFIC3 0x07000017 -#define FX_DESKBELL 0x07000018 -#define FX_KEY13 0x07000019 -#define FX_PAPER6 0x0700001A -#define FX_PHONEDN2 0x0700001B -#define FX_PHONEUP2 0x0700001C -#define FX_PIANO14 0x0700001D -#define FX_TRYDOR14 0x0700001E -#define FX_CABCLOSE 0x0700001F -#define FX_CABOPEN 0x07000020 -#define FX_DORCLOSE 0x07000021 -#define FX_WINDOPEN 0x07000022 -#define FX_COO 0x07000023 -#define FX_COO2 0x07000024 -#define FX_LEDGE1 0x07000025 -#define FX_LEDGE2 0x07000026 -#define FX_BRIEFOFF 0x07000027 -#define FX_BRIEFON 0x07000028 -#define FX_JUMPIN 0x07000029 -#define FX_WARDIN 0x0700002A -#define FX_WARDOUT 0x0700002B -#define FX_CLIMBIN 0x0700002C -#define FX_CLIMBOUT 0x0700002D +#define FX_BIRD 0x07000000 +#define FX_BIRD2 0x07000001 +#define FX_CARLTON 0x07000002 +#define FX_CARS 0x07000003 +#define FX_DOORTRY 0x07000004 +#define FX_FIESTA 0x07000005 +#define FX_FLATDOOR 0x07000006 +#define FX_HVYVEHR 0x07000007 +#define FX_HVYVEHL 0x07000008 +#define FX_LITEVEHR 0x07000009 +#define FX_LITEVEHL 0x0700000A +#define FX_FONEUP 0x0700000B +#define FX_FONEDN 0x0700000C +#define FX_GEOCCH 0x0700000D +#define FX_GEOCHAIR 0x0700000E +#define FX_GEOCHR9 0x0700000F +#define FX_NICOPEN 0x07000010 +#define FX_NICLOSE 0x07000011 +#define FX_PHONICO1 0x07000012 +#define FX_GRAMOFON 0x07000013 +#define FX_SHOCK1 0x07000014 +#define FX_WINDUP11 0x07000015 +#define FX_FRISK 0x07000016 +#define FX_TRAFFIC3 0x07000017 +#define FX_DESKBELL 0x07000018 +#define FX_KEY13 0x07000019 +#define FX_PAPER6 0x0700001A +#define FX_PHONEDN2 0x0700001B +#define FX_PHONEUP2 0x0700001C +#define FX_PIANO14 0x0700001D +#define FX_TRYDOR14 0x0700001E +#define FX_CABCLOSE 0x0700001F +#define FX_CABOPEN 0x07000020 +#define FX_DORCLOSE 0x07000021 +#define FX_WINDOPEN 0x07000022 +#define FX_COO 0x07000023 +#define FX_COO2 0x07000024 +#define FX_LEDGE1 0x07000025 +#define FX_LEDGE2 0x07000026 +#define FX_BRIEFOFF 0x07000027 +#define FX_BRIEFON 0x07000028 +#define FX_JUMPIN 0x07000029 +#define FX_WARDIN 0x0700002A +#define FX_WARDOUT 0x0700002B +#define FX_CLIMBIN 0x0700002C +#define FX_CLIMBOUT 0x0700002D // 46 entities in TXTs, 46 in datafiles. // room9 -#define PARIS2_PAL 0x07010000 -#define room9_PAL 0x07010001 -#define room9_l0 0x07010002 -#define room9_l1 0x07010003 -#define room9_l2 0x07010004 -#define room9_gd1 0x07010005 -#define room9_gd2 0x07010006 -#define room9_flr 0x07010007 -#define CARA9CDT 0x07010008 -#define CARA9 0x07010009 -#define CARB9CDT 0x0701000A -#define CARB9 0x0701000B -#define CARC9CDT 0x0701000C -#define CARC9 0x0701000D -#define DOROPN09CDR 0x0701000E -#define DOROPN09CDT 0x0701000F -#define DOROPN09 0x07010010 -#define FLWLUKCDR 0x07010011 -#define FLWLUKCDT 0x07010012 -#define FLWLUK 0x07010013 -#define FLWNITCDT 0x07010014 -#define FLWNIT 0x07010015 -#define FLWTLKCDT 0x07010016 -#define FLWTLK 0x07010017 -#define GEODOOR9 0x07010018 -#define GEODOOR9CDT 0x07010019 -#define GEOSTPCDT 0x0701001A -#define GEOSTP 0x0701001B -#define GEOSTP8CDT 0x0701001C -#define GEOSTP8 0x0701001D -#define GEOTRY 0x0701001E -#define GEOTRYCDT 0x0701001F -#define TRUCKA9CDT 0x07010020 -#define TRUCKA9 0x07010021 -#define TRUCKB9CDT 0x07010022 -#define TRUCKB9 0x07010023 -#define TRUCKC9CDT 0x07010024 -#define TRUCKC9 0x07010025 +#define PARIS2_PAL 0x07010000 +#define room9_PAL 0x07010001 +#define room9_l0 0x07010002 +#define room9_l1 0x07010003 +#define room9_l2 0x07010004 +#define room9_gd1 0x07010005 +#define room9_gd2 0x07010006 +#define room9_flr 0x07010007 +#define CARA9CDT 0x07010008 +#define CARA9 0x07010009 +#define CARB9CDT 0x0701000A +#define CARB9 0x0701000B +#define CARC9CDT 0x0701000C +#define CARC9 0x0701000D +#define DOROPN09CDR 0x0701000E +#define DOROPN09CDT 0x0701000F +#define DOROPN09 0x07010010 +#define FLWLUKCDR 0x07010011 +#define FLWLUKCDT 0x07010012 +#define FLWLUK 0x07010013 +#define FLWNITCDT 0x07010014 +#define FLWNIT 0x07010015 +#define FLWTLKCDT 0x07010016 +#define FLWTLK 0x07010017 +#define GEODOOR9 0x07010018 +#define GEODOOR9CDT 0x07010019 +#define GEOSTPCDT 0x0701001A +#define GEOSTP 0x0701001B +#define GEOSTP8CDT 0x0701001C +#define GEOSTP8 0x0701001D +#define GEOTRY 0x0701001E +#define GEOTRYCDT 0x0701001F +#define TRUCKA9CDT 0x07010020 +#define TRUCKA9 0x07010021 +#define TRUCKB9CDT 0x07010022 +#define TRUCKB9 0x07010023 +#define TRUCKC9CDT 0x07010024 +#define TRUCKC9 0x07010025 // 38 entities in TXTs, 38 in datafiles. // room10 -#define R10SPRPAL 0x07020000 -#define room10_PAL 0x07020001 -#define room10_l0 0x07020002 -#define room10_l1 0x07020003 -#define room10_gd1 0x07020004 -#define room10_flr 0x07020005 -#define DOORCDT 0x07020006 -#define DOOR 0x07020007 -#define GEOCCHCDT 0x07020008 -#define GEOCCHCDR 0x07020009 -#define GEOCCH 0x0702000A -#define GEOCCH8CDT 0x0702000B -#define GEOCCH8 0x0702000C -#define GEOCCH9CDT 0x0702000D -#define GEOCCH9 0x0702000E -#define GEOCHRCDT 0x0702000F -#define GEOCHR 0x07020010 -#define GEOCHR8CDT 0x07020011 -#define GEOCHR8 0x07020012 -#define GEOCHR9CDT 0x07020013 -#define GEOCHR9 0x07020014 -#define GEODWN10CDT 0x07020015 -#define GEODWN10 0x07020016 -#define GEOENT10CDT 0x07020017 -#define GEOENT10 0x07020018 -#define GEOGEM10CDT 0x07020019 -#define GEOGEM10 0x0702001A -#define GEOGEMBCDT 0x0702001B -#define GEOGEMB 0x0702001C -#define GEOLUK10CDT 0x0702001D -#define GEOLUK10 0x0702001E -#define GEOLVS10CDT 0x0702001F -#define GEOLVS10 0x07020020 -#define GEOMAGTKCDT 0x07020021 -#define GEOMAGTK 0x07020022 -#define GEOMAT10CDT 0x07020023 -#define GEOMAT10 0x07020024 -#define GEOMATBCDT 0x07020025 -#define GEOMATB 0x07020026 -#define GEOMATCCDT 0x07020027 -#define GEOMATC 0x07020028 -#define GEONIC10CDR 0x07020029 -#define GEONIC10CDT 0x0702002A -#define GEONIC10 0x0702002B -#define GEONOSCDT 0x0702002C -#define GEONOS 0x0702002D -#define GEONOS10CDT 0x0702002E -#define GEONOS10 0x0702002F -#define GEONWPAPCDT 0x07020030 -#define GEONWPAP 0x07020031 -#define GEOPHN10CDT 0x07020032 -#define GEOPHN10 0x07020033 -#define GEOPHTCDT 0x07020034 -#define GEOPHT 0x07020035 -#define GEOPHT10CDT 0x07020036 -#define GEOPHT10 0x07020037 -#define GEOPHTLKCDT 0x07020038 -#define GEOPHTLK 0x07020039 -#define GEOPPR10CDT 0x0702003A -#define GEOPPR10 0x0702003B -#define GEOPRDCDT 0x0702003C -#define GEOPRD 0x0702003D -#define GEOREDCDT 0x0702003E -#define GEORED 0x0702003F -#define GEORELCDR 0x07020040 -#define GEORELCDT 0x07020041 -#define GEOREL 0x07020042 -#define GEORXTCDT 0x07020043 -#define GEORXT 0x07020044 -#define GEOTIS10CDT 0x07020045 -#define GEOTIS10 0x07020046 -#define GEOTISBCDT 0x07020047 -#define GEOTISB 0x07020048 -#define GEOTRIP1CDT 0x07020049 -#define GEOTRIP1 0x0702004A -#define GEOTRIP2CDT 0x0702004B -#define GEOTRIP2 0x0702004C -#define LOBTLK10CDT 0x0702004D -#define LOBTLK10 0x0702004E -#define MANUCDT 0x0702004F -#define MANU 0x07020050 -#define NICCHR9CDR 0x07020051 -#define NICCHR9CDT 0x07020052 -#define NICCHR9 0x07020053 -#define NICDWN10CDT 0x07020054 -#define NICDWN10 0x07020055 -#define NICLUK10CDT 0x07020056 -#define NICLUK10 0x07020057 -#define NICMAGCDR 0x07020058 -#define NICMAGCDT 0x07020059 -#define NICMAG 0x0702005A -#define NICNOSCDT 0x0702005B -#define NICNOS 0x0702005C -#define NICNOS10CDT 0x0702005D -#define NICNOS10 0x0702005E -#define NICNOSBCDT 0x0702005F -#define NICNOSB 0x07020060 -#define NICPHN10CDT 0x07020061 -#define NICPHN10 0x07020062 -#define NICPHT10CDT 0x07020063 -#define NICPHT10 0x07020064 -#define NICPPRCDT 0x07020065 -#define NICPPR 0x07020066 -#define NICPPR2CDT 0x07020067 -#define NICPPR2 0x07020068 -#define NICREDCDT 0x07020069 -#define NICRED 0x0702006A -#define NICRED2CDR 0x0702006B -#define NICRED2CDT 0x0702006C -#define NICRED2 0x0702006D -#define NICSIT 0x0702006E -#define NICSITCDT 0x0702006F -#define NICTLK10CDT 0x07020070 -#define NICTLK10 0x07020071 -#define NICTLKL 0x07020072 -#define NICTLKLCDT 0x07020073 -#define NICTLKR 0x07020074 -#define NICTLKRCDT 0x07020075 -#define NICTLKX 0x07020076 -#define NICTLKXCDT 0x07020077 -#define NICTLKXCDR 0x07020078 -#define NICTRIPCDT 0x07020079 -#define NICTRIP 0x0702007A -#define NICTURN 0x0702007B -#define NICTURNCDT 0x0702007C -#define NICTURNCDR 0x0702007D -#define NICWRT 0x0702007E -#define NICWRTCDT 0x0702007F -#define PHONE10CDT 0x07020080 -#define PHONE10 0x07020081 -#define PEAPAGECDT 0x07020082 -#define PEAPAGE 0x07020083 -#define PEAPAGE_PAL 0x07020084 -#define MANUSCRPCDT 0x07020085 -#define MANUSCRP 0x07020086 -#define MANUSCRP_PAL 0x07020087 -#define TRIPOD10CDT 0x07020088 -#define TRIPOD10 0x07020089 +#define R10SPRPAL 0x07020000 +#define room10_PAL 0x07020001 +#define room10_l0 0x07020002 +#define room10_l1 0x07020003 +#define room10_gd1 0x07020004 +#define room10_flr 0x07020005 +#define DOORCDT 0x07020006 +#define DOOR 0x07020007 +#define GEOCCHCDT 0x07020008 +#define GEOCCHCDR 0x07020009 +#define GEOCCH 0x0702000A +#define GEOCCH8CDT 0x0702000B +#define GEOCCH8 0x0702000C +#define GEOCCH9CDT 0x0702000D +#define GEOCCH9 0x0702000E +#define GEOCHRCDT 0x0702000F +#define GEOCHR 0x07020010 +#define GEOCHR8CDT 0x07020011 +#define GEOCHR8 0x07020012 +#define GEOCHR9CDT 0x07020013 +#define GEOCHR9 0x07020014 +#define GEODWN10CDT 0x07020015 +#define GEODWN10 0x07020016 +#define GEOENT10CDT 0x07020017 +#define GEOENT10 0x07020018 +#define GEOGEM10CDT 0x07020019 +#define GEOGEM10 0x0702001A +#define GEOGEMBCDT 0x0702001B +#define GEOGEMB 0x0702001C +#define GEOLUK10CDT 0x0702001D +#define GEOLUK10 0x0702001E +#define GEOLVS10CDT 0x0702001F +#define GEOLVS10 0x07020020 +#define GEOMAGTKCDT 0x07020021 +#define GEOMAGTK 0x07020022 +#define GEOMAT10CDT 0x07020023 +#define GEOMAT10 0x07020024 +#define GEOMATBCDT 0x07020025 +#define GEOMATB 0x07020026 +#define GEOMATCCDT 0x07020027 +#define GEOMATC 0x07020028 +#define GEONIC10CDR 0x07020029 +#define GEONIC10CDT 0x0702002A +#define GEONIC10 0x0702002B +#define GEONOSCDT 0x0702002C +#define GEONOS 0x0702002D +#define GEONOS10CDT 0x0702002E +#define GEONOS10 0x0702002F +#define GEONWPAPCDT 0x07020030 +#define GEONWPAP 0x07020031 +#define GEOPHN10CDT 0x07020032 +#define GEOPHN10 0x07020033 +#define GEOPHTCDT 0x07020034 +#define GEOPHT 0x07020035 +#define GEOPHT10CDT 0x07020036 +#define GEOPHT10 0x07020037 +#define GEOPHTLKCDT 0x07020038 +#define GEOPHTLK 0x07020039 +#define GEOPPR10CDT 0x0702003A +#define GEOPPR10 0x0702003B +#define GEOPRDCDT 0x0702003C +#define GEOPRD 0x0702003D +#define GEOREDCDT 0x0702003E +#define GEORED 0x0702003F +#define GEORELCDR 0x07020040 +#define GEORELCDT 0x07020041 +#define GEOREL 0x07020042 +#define GEORXTCDT 0x07020043 +#define GEORXT 0x07020044 +#define GEOTIS10CDT 0x07020045 +#define GEOTIS10 0x07020046 +#define GEOTISBCDT 0x07020047 +#define GEOTISB 0x07020048 +#define GEOTRIP1CDT 0x07020049 +#define GEOTRIP1 0x0702004A +#define GEOTRIP2CDT 0x0702004B +#define GEOTRIP2 0x0702004C +#define LOBTLK10CDT 0x0702004D +#define LOBTLK10 0x0702004E +#define MANUCDT 0x0702004F +#define MANU 0x07020050 +#define NICCHR9CDR 0x07020051 +#define NICCHR9CDT 0x07020052 +#define NICCHR9 0x07020053 +#define NICDWN10CDT 0x07020054 +#define NICDWN10 0x07020055 +#define NICLUK10CDT 0x07020056 +#define NICLUK10 0x07020057 +#define NICMAGCDR 0x07020058 +#define NICMAGCDT 0x07020059 +#define NICMAG 0x0702005A +#define NICNOSCDT 0x0702005B +#define NICNOS 0x0702005C +#define NICNOS10CDT 0x0702005D +#define NICNOS10 0x0702005E +#define NICNOSBCDT 0x0702005F +#define NICNOSB 0x07020060 +#define NICPHN10CDT 0x07020061 +#define NICPHN10 0x07020062 +#define NICPHT10CDT 0x07020063 +#define NICPHT10 0x07020064 +#define NICPPRCDT 0x07020065 +#define NICPPR 0x07020066 +#define NICPPR2CDT 0x07020067 +#define NICPPR2 0x07020068 +#define NICREDCDT 0x07020069 +#define NICRED 0x0702006A +#define NICRED2CDR 0x0702006B +#define NICRED2CDT 0x0702006C +#define NICRED2 0x0702006D +#define NICSIT 0x0702006E +#define NICSITCDT 0x0702006F +#define NICTLK10CDT 0x07020070 +#define NICTLK10 0x07020071 +#define NICTLKL 0x07020072 +#define NICTLKLCDT 0x07020073 +#define NICTLKR 0x07020074 +#define NICTLKRCDT 0x07020075 +#define NICTLKX 0x07020076 +#define NICTLKXCDT 0x07020077 +#define NICTLKXCDR 0x07020078 +#define NICTRIPCDT 0x07020079 +#define NICTRIP 0x0702007A +#define NICTURN 0x0702007B +#define NICTURNCDT 0x0702007C +#define NICTURNCDR 0x0702007D +#define NICWRT 0x0702007E +#define NICWRTCDT 0x0702007F +#define PHONE10CDT 0x07020080 +#define PHONE10 0x07020081 +#define PEAPAGECDT 0x07020082 +#define PEAPAGE 0x07020083 +#define PEAPAGE_PAL 0x07020084 +#define MANUSCRPCDT 0x07020085 +#define MANUSCRP 0x07020086 +#define MANUSCRP_PAL 0x07020087 +#define TRIPOD10CDT 0x07020088 +#define TRIPOD10 0x07020089 // 138 entities in TXTs, 138 in datafiles. // room11 -#define room11_PAL 0x07030000 -#define room11_l0 0x07030001 -#define room11_l1 0x07030002 -#define room11_l2 0x07030003 -#define room11_gd1 0x07030004 -#define room11_gd2 0x07030005 -#define room11_flr 0x07030006 -#define COSGIVCDR 0x07030007 -#define COSGIVCDT 0x07030008 -#define COSGIV 0x07030009 -#define COSLOOPCDT 0x0703000A -#define COSLOOP 0x0703000B -#define COSSHKCDT 0x0703000C -#define COSSHK 0x0703000D -#define COSSNFCDT 0x0703000E -#define COSSNF 0x0703000F -#define COSTLKCDT 0x07030010 -#define COSTLK 0x07030011 -#define DISCSPINCDT 0x07030012 -#define DISCSPIN 0x07030013 -#define GEOPIC11CDR 0x07030014 -#define GEOPIC11CDT 0x07030015 -#define GEOPIC11 0x07030016 -#define GEOSHK11CDT 0x07030017 -#define GEOSHK11 0x07030018 -#define GEOTURDCDT 0x07030019 -#define GEOTURD 0x0703001A -#define GEOTIS11CDT 0x0703001B -#define GEOTIS11 0x0703001C -#define GEOWINDCDT 0x0703001D -#define GEOWIND 0x0703001E -#define WINDUPCDT 0x0703001F -#define WINDUP 0x07030020 +#define room11_PAL 0x07030000 +#define room11_l0 0x07030001 +#define room11_l1 0x07030002 +#define room11_l2 0x07030003 +#define room11_gd1 0x07030004 +#define room11_gd2 0x07030005 +#define room11_flr 0x07030006 +#define COSGIVCDR 0x07030007 +#define COSGIVCDT 0x07030008 +#define COSGIV 0x07030009 +#define COSLOOPCDT 0x0703000A +#define COSLOOP 0x0703000B +#define COSSHKCDT 0x0703000C +#define COSSHK 0x0703000D +#define COSSNFCDT 0x0703000E +#define COSSNF 0x0703000F +#define COSTLKCDT 0x07030010 +#define COSTLK 0x07030011 +#define DISCSPINCDT 0x07030012 +#define DISCSPIN 0x07030013 +#define GEOPIC11CDR 0x07030014 +#define GEOPIC11CDT 0x07030015 +#define GEOPIC11 0x07030016 +#define GEOSHK11CDT 0x07030017 +#define GEOSHK11 0x07030018 +#define GEOTURDCDT 0x07030019 +#define GEOTURD 0x0703001A +#define GEOTIS11CDT 0x0703001B +#define GEOTIS11 0x0703001C +#define GEOWINDCDT 0x0703001D +#define GEOWIND 0x0703001E +#define WINDUPCDT 0x0703001F +#define WINDUP 0x07030020 // 33 entities in TXTs, 33 in datafiles. // room12 -#define room12_PAL 0x07040000 -#define room12_l0 0x07040001 -#define room12_l1 0x07040002 -#define room12_gd1 0x07040003 -#define room12_flr 0x07040004 -#define FLAGSCDT 0x07040005 -#define FLAGS 0x07040006 -#define GEOAPPCDT 0x07040007 -#define GEOAPP 0x07040008 -#define GEOARMCDT 0x07040009 -#define GEOARM 0x0704000A -#define GEOASC12CDT 0x0704000B -#define GEOASC12 0x0704000C -#define GEODES12CDT 0x0704000D -#define GEODES12 0x0704000E -#define GORCOINCDT 0x0704000F -#define GORCOIN 0x07040010 -#define GORFRKCDT 0x07040011 -#define GORFRK 0x07040012 -#define GORMANCDT 0x07040013 -#define GORMAN 0x07040014 -#define GORTALKCDT 0x07040015 -#define GORTALK 0x07040016 -#define GORTLKCDT 0x07040017 -#define GORTLK 0x07040018 -#define GORTURNCDR 0x07040019 -#define GORTURNCDT 0x0704001A -#define GORTURN 0x0704001B -#define LATVIAN12CDT 0x0704001C -#define LATVIAN12 0x0704001D -#define WEABAKCDT 0x0704001E -#define WEABAK 0x0704001F -#define WEASMKCDT 0x07040020 -#define WEASMK 0x07040021 -#define WEATLKCDT 0x07040022 -#define WEATLK 0x07040023 -#define WEATLK12CDT 0x07040024 -#define WEATLK12 0x07040025 -#define WEATRNCDR 0x07040026 -#define WEATRNCDT 0x07040027 -#define WEATRN 0x07040028 +#define room12_PAL 0x07040000 +#define room12_l0 0x07040001 +#define room12_l1 0x07040002 +#define room12_gd1 0x07040003 +#define room12_flr 0x07040004 +#define FLAGSCDT 0x07040005 +#define FLAGS 0x07040006 +#define GEOAPPCDT 0x07040007 +#define GEOAPP 0x07040008 +#define GEOARMCDT 0x07040009 +#define GEOARM 0x0704000A +#define GEOASC12CDT 0x0704000B +#define GEOASC12 0x0704000C +#define GEODES12CDT 0x0704000D +#define GEODES12 0x0704000E +#define GORCOINCDT 0x0704000F +#define GORCOIN 0x07040010 +#define GORFRKCDT 0x07040011 +#define GORFRK 0x07040012 +#define GORMANCDT 0x07040013 +#define GORMAN 0x07040014 +#define GORTALKCDT 0x07040015 +#define GORTALK 0x07040016 +#define GORTLKCDT 0x07040017 +#define GORTLK 0x07040018 +#define GORTURNCDR 0x07040019 +#define GORTURNCDT 0x0704001A +#define GORTURN 0x0704001B +#define LATVIAN12CDT 0x0704001C +#define LATVIAN12 0x0704001D +#define WEABAKCDT 0x0704001E +#define WEABAK 0x0704001F +#define WEASMKCDT 0x07040020 +#define WEASMK 0x07040021 +#define WEATLKCDT 0x07040022 +#define WEATLK 0x07040023 +#define WEATLK12CDT 0x07040024 +#define WEATLK12 0x07040025 +#define WEATRNCDR 0x07040026 +#define WEATRNCDT 0x07040027 +#define WEATRN 0x07040028 // 41 entities in TXTs, 41 in datafiles. // room13 -#define R13SPRPAL 0x07050000 -#define room13_PAL 0x07050001 -#define room13_l0 0x07050002 -#define room13_l1 0x07050003 -#define room13_l2 0x07050004 -#define room13_gd1 0x07050005 -#define room13_gd2 0x07050006 -#define room13_flr 0x07050007 -#define CLKIDLCDT 0x07050008 -#define CLKIDL 0x07050009 -#define CLKMANCDT 0x0705000A -#define CLKMAN 0x0705000B -#define CLKTAKCDT 0x0705000C -#define CLKTAK 0x0705000D -#define CLKTLKCDT 0x0705000E -#define CLKTLK 0x0705000F -#define CLKTLK2CDT 0x07050010 -#define CLKTLK2 0x07050011 -#define CLKTLK3CDT 0x07050012 -#define CLKTLK3 0x07050013 -#define CLKTURNCDR 0x07050014 -#define CLKTURNCDT 0x07050015 -#define CLKTURN 0x07050016 -#define CLKWLKCDT 0x07050017 -#define CLKWLK 0x07050018 -#define CLKWLK2CDT 0x07050019 -#define CLKWLK2 0x0705001A -#define CLKWLK3CDT 0x0705001B -#define CLKWLK3 0x0705001C -#define CLKWULCDT 0x0705001D -#define CLKWUL 0x0705001E -#define GEOASC13CDT 0x0705001F -#define GEOASC13 0x07050020 -#define GEODES13CDT 0x07050021 -#define GEODES13 0x07050022 -#define GEOKEYCDT 0x07050023 -#define GEOKEY 0x07050024 -#define GEOKEY13CDT 0x07050025 -#define GEOKEY13 0x07050026 -#define GEOMAN13CDT 0x07050027 -#define GEOMAN13 0x07050028 -#define GEOTELCDT 0x07050029 -#define GEOTEL 0x0705002A -#define GEOTEL9CDT 0x0705002B -#define GEOTEL9 0x0705002C -#define KEY13CDT 0x0705002D -#define KEY13 0x0705002E -#define LATLUKCDR 0x0705002F -#define LATLUKCDT 0x07050030 -#define LATLUK 0x07050031 -#define LATRDSCDT 0x07050032 -#define LATRDS 0x07050033 -#define LATTLKCDT 0x07050034 -#define LATTLK 0x07050035 -#define PMTGIVCDT 0x07050036 -#define PMTGIV 0x07050037 -#define PMTPNOCDT 0x07050038 -#define PMTPNO 0x07050039 -#define PMTSTDCDT 0x0705003A -#define PMTSTD 0x0705003B -#define PMTTLKCDT 0x0705003C -#define PMTTLK 0x0705003D -#define PMTTLK8CDT 0x0705003E -#define PMTTLK8 0x0705003F -#define PMTTLK9CDT 0x07050040 -#define PMTTLK9 0x07050041 -#define PMTTOTLKCDR 0x07050042 -#define PMTTOTLKCDT 0x07050043 -#define PMTTOTLK 0x07050044 -#define PMTTURNCDR 0x07050045 -#define PMTTURNCDT 0x07050046 -#define PMTTURN 0x07050047 -#define PMTWLK1CDT 0x07050048 -#define PMTWLK1 0x07050049 -#define PMTWLK2CDT 0x0705004A -#define PMTWLK2 0x0705004B +#define R13SPRPAL 0x07050000 +#define room13_PAL 0x07050001 +#define room13_l0 0x07050002 +#define room13_l1 0x07050003 +#define room13_l2 0x07050004 +#define room13_gd1 0x07050005 +#define room13_gd2 0x07050006 +#define room13_flr 0x07050007 +#define CLKIDLCDT 0x07050008 +#define CLKIDL 0x07050009 +#define CLKMANCDT 0x0705000A +#define CLKMAN 0x0705000B +#define CLKTAKCDT 0x0705000C +#define CLKTAK 0x0705000D +#define CLKTLKCDT 0x0705000E +#define CLKTLK 0x0705000F +#define CLKTLK2CDT 0x07050010 +#define CLKTLK2 0x07050011 +#define CLKTLK3CDT 0x07050012 +#define CLKTLK3 0x07050013 +#define CLKTURNCDR 0x07050014 +#define CLKTURNCDT 0x07050015 +#define CLKTURN 0x07050016 +#define CLKWLKCDT 0x07050017 +#define CLKWLK 0x07050018 +#define CLKWLK2CDT 0x07050019 +#define CLKWLK2 0x0705001A +#define CLKWLK3CDT 0x0705001B +#define CLKWLK3 0x0705001C +#define CLKWULCDT 0x0705001D +#define CLKWUL 0x0705001E +#define GEOASC13CDT 0x0705001F +#define GEOASC13 0x07050020 +#define GEODES13CDT 0x07050021 +#define GEODES13 0x07050022 +#define GEOKEYCDT 0x07050023 +#define GEOKEY 0x07050024 +#define GEOKEY13CDT 0x07050025 +#define GEOKEY13 0x07050026 +#define GEOMAN13CDT 0x07050027 +#define GEOMAN13 0x07050028 +#define GEOTELCDT 0x07050029 +#define GEOTEL 0x0705002A +#define GEOTEL9CDT 0x0705002B +#define GEOTEL9 0x0705002C +#define KEY13CDT 0x0705002D +#define KEY13 0x0705002E +#define LATLUKCDR 0x0705002F +#define LATLUKCDT 0x07050030 +#define LATLUK 0x07050031 +#define LATRDSCDT 0x07050032 +#define LATRDS 0x07050033 +#define LATTLKCDT 0x07050034 +#define LATTLK 0x07050035 +#define PMTGIVCDT 0x07050036 +#define PMTGIV 0x07050037 +#define PMTPNOCDT 0x07050038 +#define PMTPNO 0x07050039 +#define PMTSTDCDT 0x0705003A +#define PMTSTD 0x0705003B +#define PMTTLKCDT 0x0705003C +#define PMTTLK 0x0705003D +#define PMTTLK8CDT 0x0705003E +#define PMTTLK8 0x0705003F +#define PMTTLK9CDT 0x07050040 +#define PMTTLK9 0x07050041 +#define PMTTOTLKCDR 0x07050042 +#define PMTTOTLKCDT 0x07050043 +#define PMTTOTLK 0x07050044 +#define PMTTURNCDR 0x07050045 +#define PMTTURNCDT 0x07050046 +#define PMTTURN 0x07050047 +#define PMTWLK1CDT 0x07050048 +#define PMTWLK1 0x07050049 +#define PMTWLK2CDT 0x0705004A +#define PMTWLK2 0x0705004B // 76 entities in TXTs, 76 in datafiles. // room14 -#define room14_PAL 0x07060000 -#define room14_l0 0x07060001 -#define room14_l1 0x07060002 -#define room14_gd1 0x07060003 -#define room14_flr 0x07060004 -#define GEOASC14CDT 0x07060005 -#define GEOASC14 0x07060006 -#define GEODES14CDT 0x07060007 -#define GEODES14 0x07060008 -#define GEODORCDR 0x07060009 -#define GEODORCDT 0x0706000A -#define GEODOR 0x0706000B +#define room14_PAL 0x07060000 +#define room14_l0 0x07060001 +#define room14_l1 0x07060002 +#define room14_gd1 0x07060003 +#define room14_flr 0x07060004 +#define GEOASC14CDT 0x07060005 +#define GEOASC14 0x07060006 +#define GEODES14CDT 0x07060007 +#define GEODES14 0x07060008 +#define GEODORCDR 0x07060009 +#define GEODORCDT 0x0706000A +#define GEODOR 0x0706000B // 12 entities in TXTs, 12 in datafiles. // room15 -#define room15_PAL 0x07070000 -#define room15_l0 0x07070001 -#define room15_l1 0x07070002 -#define room15_l2 0x07070003 -#define room15_gd1 0x07070004 -#define room15_gd2 0x07070005 -#define room15_flr 0x07070006 -#define DOROPN15CDT 0x07070007 -#define DOROPN15 0x07070008 -#define GEOBEDCDR 0x07070009 -#define GEOBEDCDT 0x0707000A -#define GEOBED 0x0707000B -#define GEODOR15CDT 0x0707000C -#define GEODOR15 0x0707000D -#define GEOENT15CDT 0x0707000E -#define GEOENT15 0x0707000F -#define GEOWIN1CDT 0x07070010 -#define GEOWIN1 0x07070011 -#define GEOWIN15CDT 0x07070012 -#define GEOWIN15 0x07070013 -#define GEOWIN2CDT 0x07070014 -#define GEOWIN2 0x07070015 -#define GEOWRBCDR 0x07070016 -#define GEOWRBCDT 0x07070017 -#define GEOWRB 0x07070018 -#define WINDOWCDT 0x07070019 -#define WINDOW 0x0707001A +#define room15_PAL 0x07070000 +#define room15_l0 0x07070001 +#define room15_l1 0x07070002 +#define room15_l2 0x07070003 +#define room15_gd1 0x07070004 +#define room15_gd2 0x07070005 +#define room15_flr 0x07070006 +#define DOROPN15CDT 0x07070007 +#define DOROPN15 0x07070008 +#define GEOBEDCDR 0x07070009 +#define GEOBEDCDT 0x0707000A +#define GEOBED 0x0707000B +#define GEODOR15CDT 0x0707000C +#define GEODOR15 0x0707000D +#define GEOENT15CDT 0x0707000E +#define GEOENT15 0x0707000F +#define GEOWIN1CDT 0x07070010 +#define GEOWIN1 0x07070011 +#define GEOWIN15CDT 0x07070012 +#define GEOWIN15 0x07070013 +#define GEOWIN2CDT 0x07070014 +#define GEOWIN2 0x07070015 +#define GEOWRBCDR 0x07070016 +#define GEOWRBCDT 0x07070017 +#define GEOWRB 0x07070018 +#define WINDOWCDT 0x07070019 +#define WINDOW 0x0707001A // 27 entities in TXTs, 27 in datafiles. // room16 -#define room16_PAL 0x07080000 -#define R16L0 0x07080001 -#define R16L1 0x07080002 -#define R16G1 0x07080003 -#define GEOILWCDT 0x07080004 -#define GEOILW 0x07080005 -#define GEOIRWCDT 0x07080006 -#define GEOIRW 0x07080007 -#define GEOMANLCDT 0x07080008 -#define GEOMANL 0x07080009 -#define GEOMANRCDT 0x0708000A -#define GEOMANR 0x0708000B -#define GEOMLWCDT 0x0708000C -#define GEOMLW 0x0708000D -#define GEOMRWCDT 0x0708000E -#define GEOMRW 0x0708000F -#define GEOOLWCDT 0x07080010 -#define GEOOLWCDR 0x07080011 -#define GEOOLW 0x07080012 -#define GEOORWCDT 0x07080013 -#define GEOORWCDR 0x07080014 -#define GEOORW 0x07080015 -#define MANLCDT 0x07080016 -#define MANL 0x07080017 -#define MANRCDT 0x07080018 -#define MANR 0x07080019 +#define room16_PAL 0x07080000 +#define R16L0 0x07080001 +#define R16L1 0x07080002 +#define R16G1 0x07080003 +#define GEOILWCDT 0x07080004 +#define GEOILW 0x07080005 +#define GEOIRWCDT 0x07080006 +#define GEOIRW 0x07080007 +#define GEOMANLCDT 0x07080008 +#define GEOMANL 0x07080009 +#define GEOMANRCDT 0x0708000A +#define GEOMANR 0x0708000B +#define GEOMLWCDT 0x0708000C +#define GEOMLW 0x0708000D +#define GEOMRWCDT 0x0708000E +#define GEOMRW 0x0708000F +#define GEOOLWCDT 0x07080010 +#define GEOOLWCDR 0x07080011 +#define GEOOLW 0x07080012 +#define GEOORWCDT 0x07080013 +#define GEOORWCDR 0x07080014 +#define GEOORW 0x07080015 +#define MANLCDT 0x07080016 +#define MANL 0x07080017 +#define MANRCDT 0x07080018 +#define MANR 0x07080019 // 26 entities in TXTs, 26 in datafiles. // room17 -#define room17_PAL 0x07090000 -#define room17_l0 0x07090001 -#define room17_l1 0x07090002 -#define room17_l2 0x07090003 -#define room17_gd1 0x07090004 -#define room17_gd2 0x07090005 -#define room17_flr 0x07090006 -#define IBACK17 0x07090007 -#define IBACK17PAL 0x07090008 -#define GEOINQ17 0x07090009 -#define GEOINQ17CDT 0x0709000A -#define SBACK17 0x0709000B -#define SBACK17PAL 0x0709000C -#define GEOSUR17 0x0709000D -#define GEOSUR17CDT 0x0709000E -#define ASSTAIR2_PAL 0x0709000F -#define ASSTAIR2 0x07090010 -#define ASSTAIRCDT 0x07090011 -#define ASSTAIR 0x07090012 -#define ASSDORCDT 0x07090013 -#define ASSDOR 0x07090014 -#define ASSDOR2CDT 0x07090015 -#define ASSDOR2 0x07090016 -#define ASSTRWCDT 0x07090017 -#define ASSTRW 0x07090018 -#define ASSWRBCDT 0x07090019 -#define ASSWRB 0x0709001A -#define ASWLK17CDT 0x0709001B -#define ASWLK17 0x0709001C -#define BRFCASECDT 0x0709001D -#define BRFCASE 0x0709001E -#define GEOBCBCDR 0x0709001F -#define GEOBCBCDT 0x07090020 -#define GEOBCB 0x07090021 -#define GEOBED17CDT 0x07090022 -#define GEOBED17 0x07090023 -#define GEOBFCCDR 0x07090024 -#define GEOBFCCDT 0x07090025 -#define GEOBFC 0x07090026 -#define GEODOR17CDT 0x07090027 -#define GEODOR17 0x07090028 -#define GEODOR2CDR 0x07090029 -#define GEODOR2CDT 0x0709002A -#define GEODOR2 0x0709002B -#define GEOPANTSCDT 0x0709002C -#define GEOPANTS 0x0709002D -#define GEOWIN8CDT 0x0709002E -#define GEOWIN8 0x0709002F -#define GEOWIN9CDT 0x07090030 -#define GEOWIN9 0x07090031 -#define GEOWRB1CDR 0x07090032 -#define GEOWRB1CDT 0x07090033 -#define GEOWRB1 0x07090034 -#define GEOWRB2CDT 0x07090035 -#define GEOWRB2 0x07090036 -#define GEOWRB3CDR 0x07090037 -#define GEOWRB3CDT 0x07090038 -#define GEOWRB3 0x07090039 -#define GEOWRB4CDT 0x0709003A -#define GEOWRB4 0x0709003B -#define PANTS2CDT 0x0709003C -#define PANTS2 0x0709003D -#define PANTWRBCDT 0x0709003E -#define PANTWRB 0x0709003F -#define STATDOORCDT 0x07090040 -#define STATDOOR 0x07090041 -#define WRBDOR17CDT 0x07090042 -#define WRBDOR17 0x07090043 +#define room17_PAL 0x07090000 +#define room17_l0 0x07090001 +#define room17_l1 0x07090002 +#define room17_l2 0x07090003 +#define room17_gd1 0x07090004 +#define room17_gd2 0x07090005 +#define room17_flr 0x07090006 +#define IBACK17 0x07090007 +#define IBACK17PAL 0x07090008 +#define GEOINQ17 0x07090009 +#define GEOINQ17CDT 0x0709000A +#define SBACK17 0x0709000B +#define SBACK17PAL 0x0709000C +#define GEOSUR17 0x0709000D +#define GEOSUR17CDT 0x0709000E +#define ASSTAIR2_PAL 0x0709000F +#define ASSTAIR2 0x07090010 +#define ASSTAIRCDT 0x07090011 +#define ASSTAIR 0x07090012 +#define ASSDORCDT 0x07090013 +#define ASSDOR 0x07090014 +#define ASSDOR2CDT 0x07090015 +#define ASSDOR2 0x07090016 +#define ASSTRWCDT 0x07090017 +#define ASSTRW 0x07090018 +#define ASSWRBCDT 0x07090019 +#define ASSWRB 0x0709001A +#define ASWLK17CDT 0x0709001B +#define ASWLK17 0x0709001C +#define BRFCASECDT 0x0709001D +#define BRFCASE 0x0709001E +#define GEOBCBCDR 0x0709001F +#define GEOBCBCDT 0x07090020 +#define GEOBCB 0x07090021 +#define GEOBED17CDT 0x07090022 +#define GEOBED17 0x07090023 +#define GEOBFCCDR 0x07090024 +#define GEOBFCCDT 0x07090025 +#define GEOBFC 0x07090026 +#define GEODOR17CDT 0x07090027 +#define GEODOR17 0x07090028 +#define GEODOR2CDR 0x07090029 +#define GEODOR2CDT 0x0709002A +#define GEODOR2 0x0709002B +#define GEOPANTSCDT 0x0709002C +#define GEOPANTS 0x0709002D +#define GEOWIN8CDT 0x0709002E +#define GEOWIN8 0x0709002F +#define GEOWIN9CDT 0x07090030 +#define GEOWIN9 0x07090031 +#define GEOWRB1CDR 0x07090032 +#define GEOWRB1CDT 0x07090033 +#define GEOWRB1 0x07090034 +#define GEOWRB2CDT 0x07090035 +#define GEOWRB2 0x07090036 +#define GEOWRB3CDR 0x07090037 +#define GEOWRB3CDT 0x07090038 +#define GEOWRB3 0x07090039 +#define GEOWRB4CDT 0x0709003A +#define GEOWRB4 0x0709003B +#define PANTS2CDT 0x0709003C +#define PANTS2 0x0709003D +#define PANTWRBCDT 0x0709003E +#define PANTWRB 0x0709003F +#define STATDOORCDT 0x07090040 +#define STATDOOR 0x07090041 +#define WRBDOR17CDT 0x07090042 +#define WRBDOR17 0x07090043 // 68 entities in TXTs, 68 in datafiles. // room18 -#define R18SPRPAL 0x070A0000 -#define room18_PAL 0x070A0001 -#define room18_l0 0x070A0002 -#define room18_l1 0x070A0003 -#define room18_l2 0x070A0004 -#define room18_gd1 0x070A0005 -#define room18_gd2 0x070A0006 -#define room18_flr 0x070A0007 -#define FAN18CDT 0x070A0008 -#define FAN18 0x070A0009 -#define GENBNDCDT 0x070A000A -#define GENBND 0x070A000B -#define GENSTRCDT 0x070A000C -#define GENSTR 0x070A000D -#define GENTLK18CDT 0x070A000E -#define GENTLK18 0x070A000F -#define GEOLVE18CDT 0x070A0010 -#define GEOLVE18 0x070A0011 -#define MOUBAK18CDT 0x070A0012 -#define MOUBAK18 0x070A0013 -#define MOUBUSYCDT 0x070A0014 -#define MOUBUSY 0x070A0015 -#define MOUTKROSCDT 0x070A0016 -#define MOUTKROS 0x070A0017 -#define MOUTLK18CDT 0x070A0018 -#define MOUTLK18 0x070A0019 -#define MOUWLK18CDT 0x070A001A -#define MOUWLK18 0x070A001B -#define ROSBAK18CDT 0x070A001C -#define ROSBAK18 0x070A001D -#define ROSBUSYCDT 0x070A001E -#define ROSBUSY 0x070A001F -#define ROSSTDCDT 0x070A0020 -#define ROSSTD 0x070A0021 -#define ROSTLK18CDT 0x070A0022 -#define ROSTLK18 0x070A0023 -#define ROSTLKXCDT 0x070A0024 -#define ROSTLKX 0x070A0025 -#define ROSTURNCDR 0x070A0026 -#define ROSTURNCDT 0x070A0027 -#define ROSTURN 0x070A0028 -#define ROSWLK18CDT 0x070A0029 -#define ROSWLK18 0x070A002A +#define R18SPRPAL 0x070A0000 +#define room18_PAL 0x070A0001 +#define room18_l0 0x070A0002 +#define room18_l1 0x070A0003 +#define room18_l2 0x070A0004 +#define room18_gd1 0x070A0005 +#define room18_gd2 0x070A0006 +#define room18_flr 0x070A0007 +#define FAN18CDT 0x070A0008 +#define FAN18 0x070A0009 +#define GENBNDCDT 0x070A000A +#define GENBND 0x070A000B +#define GENSTRCDT 0x070A000C +#define GENSTR 0x070A000D +#define GENTLK18CDT 0x070A000E +#define GENTLK18 0x070A000F +#define GEOLVE18CDT 0x070A0010 +#define GEOLVE18 0x070A0011 +#define MOUBAK18CDT 0x070A0012 +#define MOUBAK18 0x070A0013 +#define MOUBUSYCDT 0x070A0014 +#define MOUBUSY 0x070A0015 +#define MOUTKROSCDT 0x070A0016 +#define MOUTKROS 0x070A0017 +#define MOUTLK18CDT 0x070A0018 +#define MOUTLK18 0x070A0019 +#define MOUWLK18CDT 0x070A001A +#define MOUWLK18 0x070A001B +#define ROSBAK18CDT 0x070A001C +#define ROSBAK18 0x070A001D +#define ROSBUSYCDT 0x070A001E +#define ROSBUSY 0x070A001F +#define ROSSTDCDT 0x070A0020 +#define ROSSTD 0x070A0021 +#define ROSTLK18CDT 0x070A0022 +#define ROSTLK18 0x070A0023 +#define ROSTLKXCDT 0x070A0024 +#define ROSTLKX 0x070A0025 +#define ROSTURNCDR 0x070A0026 +#define ROSTURNCDT 0x070A0027 +#define ROSTURN 0x070A0028 +#define ROSWLK18CDT 0x070A0029 +#define ROSWLK18 0x070A002A // 43 entities in TXTs, 43 in datafiles. // room46 -#define room46_PAL 0x070B0000 -#define room46_l0 0x070B0001 -#define room46_l1 0x070B0002 -#define room46_l2 0x070B0003 -#define room46_gd1 0x070B0004 -#define room46_gd2 0x070B0005 -#define room46_flr 0x070B0006 -#define MANU46CDT 0x070B0007 -#define MANU46 0x070B0008 +#define room46_PAL 0x070B0000 +#define room46_l0 0x070B0001 +#define room46_l1 0x070B0002 +#define room46_l2 0x070B0003 +#define room46_gd1 0x070B0004 +#define room46_gd2 0x070B0005 +#define room46_flr 0x070B0006 +#define MANU46CDT 0x070B0007 +#define MANU46 0x070B0008 // 9 entities in TXTs, 9 in datafiles. // paris_3 // sound_fx -#define FX_MUESEXT 0x08000000 -#define FX_AIRCON28 0x08000001 -#define FX_SARCO28A 0x08000002 -#define FX_SARCO28B 0x08000003 -#define FX_SARCO28C 0x08000004 -#define FX_TOTEM28A 0x08000005 -#define FX_ALARM 0x08000006 -#define FX_CARABINE 0x08000007 -#define FX_DOOR29 0x08000008 -#define FX_FISHFALL 0x08000009 -#define FX_GDROP29 0x0800000A -#define FX_GUI_HIT 0x0800000B -#define FX_GUN1 0x0800000C -#define FX_ROPEDOWN 0x0800000D -#define FX_SARCO29 0x0800000E -#define FX_SMASHGLA 0x0800000F -#define FX_TOTEM29A 0x08000010 -#define FX_TOTEM29B 0x08000011 -#define FX_HOSPEXT 0x08000012 -#define FX_GRAVEL1 0x08000013 -#define FX_GRAVEL2 0x08000014 -#define FX_HOSPNOIS 0x08000015 -#define FX_CUPBOPEN 0x08000016 -#define FX_CUPBCLOS 0x08000017 -#define FX_KIKSHINY 0x08000018 -#define FX_SHINY 0x08000019 -#define FX_SHINYOFF 0x0800001A -#define FX_SHINYON 0x0800001B -#define FX_BLOODPRE 0x0800001C -#define FX_GUN34 0x0800001D -#define FX_PULSE2 0x0800001E -#define FX_PULSE3 0x0800001F +#define FX_MUESEXT 0x08000000 +#define FX_AIRCON28 0x08000001 +#define FX_SARCO28A 0x08000002 +#define FX_SARCO28B 0x08000003 +#define FX_SARCO28C 0x08000004 +#define FX_TOTEM28A 0x08000005 +#define FX_ALARM 0x08000006 +#define FX_CARABINE 0x08000007 +#define FX_DOOR29 0x08000008 +#define FX_FISHFALL 0x08000009 +#define FX_GDROP29 0x0800000A +#define FX_GUI_HIT 0x0800000B +#define FX_GUN1 0x0800000C +#define FX_ROPEDOWN 0x0800000D +#define FX_SARCO29 0x0800000E +#define FX_SMASHGLA 0x0800000F +#define FX_TOTEM29A 0x08000010 +#define FX_TOTEM29B 0x08000011 +#define FX_HOSPEXT 0x08000012 +#define FX_GRAVEL1 0x08000013 +#define FX_GRAVEL2 0x08000014 +#define FX_HOSPNOIS 0x08000015 +#define FX_CUPBOPEN 0x08000016 +#define FX_CUPBCLOS 0x08000017 +#define FX_KIKSHINY 0x08000018 +#define FX_SHINY 0x08000019 +#define FX_SHINYOFF 0x0800001A +#define FX_SHINYON 0x0800001B +#define FX_BLOODPRE 0x0800001C +#define FX_GUN34 0x0800001D +#define FX_PULSE2 0x0800001E +#define FX_PULSE3 0x0800001F // 32 entities in TXTs, 32 in datafiles. // benoir -#define MEGABEN 0x08010000 -#define BEN_WLK 0x08010001 -#define STDTAL1 0x08010002 -#define STDTAL1CDT 0x08010003 -#define STDTAL3 0x08010004 -#define STDTAL3CDT 0x08010005 -#define STDTAL5 0x08010006 -#define STDTAL5CDT 0x08010007 -#define XBENPG3 0x08010008 -#define XBENPG3CDT 0x08010009 -#define XBENPG5 0x0801000A -#define XBENPG5CDT 0x0801000B +#define MEGABEN 0x08010000 +#define BEN_WLK 0x08010001 +#define STDTAL1 0x08010002 +#define STDTAL1CDT 0x08010003 +#define STDTAL3 0x08010004 +#define STDTAL3CDT 0x08010005 +#define STDTAL5 0x08010006 +#define STDTAL5CDT 0x08010007 +#define XBENPG3 0x08010008 +#define XBENPG3CDT 0x08010009 +#define XBENPG5 0x0801000A +#define XBENPG5CDT 0x0801000B // 12 entities in TXTs, 12 in datafiles. // mus -#define MEGAMUS 0x08020000 -#define MUS_WLK 0x08020001 -#define MUSTLK0 0x08020002 -#define MUSTLK0CDT 0x08020003 -#define MUSTLK1 0x08020004 -#define MUSTLK1CDT 0x08020005 -#define MUSTLK2 0x08020006 -#define MUSTLK2CDT 0x08020007 -#define MUSTLK3 0x08020008 -#define MUSTLK3CDT 0x08020009 -#define MUSTLK4 0x0802000A -#define MUSTLK4CDT 0x0802000B -#define MUSTLK5 0x0802000C -#define MUSTLK5CDT 0x0802000D -#define MUSTLK6 0x0802000E -#define MUSTLK6CDT 0x0802000F -#define MUSTLK7 0x08020010 -#define MUSTLK7CDT 0x08020011 +#define MEGAMUS 0x08020000 +#define MUS_WLK 0x08020001 +#define MUSTLK0 0x08020002 +#define MUSTLK0CDT 0x08020003 +#define MUSTLK1 0x08020004 +#define MUSTLK1CDT 0x08020005 +#define MUSTLK2 0x08020006 +#define MUSTLK2CDT 0x08020007 +#define MUSTLK3 0x08020008 +#define MUSTLK3CDT 0x08020009 +#define MUSTLK4 0x0802000A +#define MUSTLK4CDT 0x0802000B +#define MUSTLK5 0x0802000C +#define MUSTLK5CDT 0x0802000D +#define MUSTLK6 0x0802000E +#define MUSTLK6CDT 0x0802000F +#define MUSTLK7 0x08020010 +#define MUSTLK7CDT 0x08020011 // 18 entities in TXTs, 18 in datafiles. // white -#define MEGA_WHITE 0x08030000 -#define WHTTLK0 0x08030001 -#define WHTTLK0CDT 0x08030002 -#define WHTTLK1 0x08030003 -#define WHTTLK1CDT 0x08030004 -#define WHTTLK2 0x08030005 -#define WHTTLK2CDT 0x08030006 -#define WHTTLK3 0x08030007 -#define WHTTLK3CDT 0x08030008 -#define WHTTLK4 0x08030009 -#define WHTTLK4CDT 0x0803000A -#define WHTTLK5 0x0803000B -#define WHTTLK5CDT 0x0803000C -#define WHTTLK6 0x0803000D -#define WHTTLK6CDT 0x0803000E -#define WHTTLK7 0x0803000F -#define WHTTLK7CDT 0x08030010 -#define WHTSHRUG 0x08030011 -#define WHTSHRUGCDT 0x08030012 -#define XGEOPG3 0x08030013 -#define XGEOPG3CDT 0x08030014 -#define XGEOPG5 0x08030015 -#define XGEOPG5CDT 0x08030016 +#define MEGA_WHITE 0x08030000 +#define WHTTLK0 0x08030001 +#define WHTTLK0CDT 0x08030002 +#define WHTTLK1 0x08030003 +#define WHTTLK1CDT 0x08030004 +#define WHTTLK2 0x08030005 +#define WHTTLK2CDT 0x08030006 +#define WHTTLK3 0x08030007 +#define WHTTLK3CDT 0x08030008 +#define WHTTLK4 0x08030009 +#define WHTTLK4CDT 0x0803000A +#define WHTTLK5 0x0803000B +#define WHTTLK5CDT 0x0803000C +#define WHTTLK6 0x0803000D +#define WHTTLK6CDT 0x0803000E +#define WHTTLK7 0x0803000F +#define WHTTLK7CDT 0x08030010 +#define WHTSHRUG 0x08030011 +#define WHTSHRUGCDT 0x08030012 +#define XGEOPG3 0x08030013 +#define XGEOPG3CDT 0x08030014 +#define XGEOPG5 0x08030015 +#define XGEOPG5CDT 0x08030016 // 23 entities in TXTs, 23 in datafiles. // room27 -#define PARIS3_PAL 0x08040000 -#define room27_PAL 0x08040001 -#define R27L0 0x08040002 -#define R27L1 0x08040003 -#define R27L2 0x08040004 -#define R27G1 0x08040005 -#define R27G2 0x08040006 -#define room27_flr 0x08040007 -#define GEOWIN27CDR 0x08040008 -#define GEOWIN27CDT 0x08040009 -#define GEOWIN27 0x0804000A +#define PARIS3_PAL 0x08040000 +#define room27_PAL 0x08040001 +#define R27L0 0x08040002 +#define R27L1 0x08040003 +#define R27L2 0x08040004 +#define R27G1 0x08040005 +#define R27G2 0x08040006 +#define room27_flr 0x08040007 +#define GEOWIN27CDR 0x08040008 +#define GEOWIN27CDT 0x08040009 +#define GEOWIN27 0x0804000A // 11 entities in TXTs, 11 in datafiles. // room28 -#define R28SPRPAL 0x08050000 -#define R28PAL 0x08050001 -#define R28L0 0x08050002 -#define R28L1 0x08050003 -#define R28L2 0x08050004 -#define R28G1 0x08050005 -#define R28G2 0x08050006 -#define room28_flr 0x08050007 -#define GEOALMCDT 0x08050008 -#define GEOALM 0x08050009 -#define GEOSARCDT 0x0805000A -#define GEOSAR 0x0805000B -#define GEOSAR1CDT 0x0805000C -#define GEOSAR1 0x0805000D -#define GEOSAR2CDR 0x0805000E -#define GEOSAR2CDT 0x0805000F -#define GEOSAR2 0x08050010 -#define GEOSHK28CDT 0x08050011 -#define GEOSHK28 0x08050012 -#define GEOTOTCDT 0x08050013 -#define GEOTOT 0x08050014 -#define GEOWINCDT 0x08050015 -#define GEOWIN 0x08050016 -#define GUAWINCDT 0x08050017 -#define GUAWIN 0x08050018 -#define LOBEXITCDT 0x08050019 -#define LOBEXIT 0x0805001A -#define LOBMANCDT 0x0805001B -#define LOBMAN 0x0805001C -#define LOBSTUCDT 0x0805001D -#define LOBSTU 0x0805001E -#define LOBTLKCDT 0x0805001F -#define LOBTLK 0x08050020 -#define LOBTURN1CDT 0x08050021 -#define LOBTURN1 0x08050022 -#define LOBTURN2CDT 0x08050023 -#define LOBTURN2 0x08050024 -#define MUSOPNCDT 0x08050025 -#define MUSOPN 0x08050026 -#define SARDOR28CDT 0x08050027 -#define SARDOR28 0x08050028 -#define TOTEM28CDT 0x08050029 -#define TOTEM28 0x0805002A -#define TRIPOD28CDT 0x0805002B -#define TRIPOD28 0x0805002C -#define WINDO28CDR 0x0805002D -#define WINDO28CDT 0x0805002E -#define WINDO28 0x0805002F -#define WINROD28CDT 0x08050030 -#define WINROD28 0x08050031 +#define R28SPRPAL 0x08050000 +#define R28PAL 0x08050001 +#define R28L0 0x08050002 +#define R28L1 0x08050003 +#define R28L2 0x08050004 +#define R28G1 0x08050005 +#define R28G2 0x08050006 +#define room28_flr 0x08050007 +#define GEOALMCDT 0x08050008 +#define GEOALM 0x08050009 +#define GEOSARCDT 0x0805000A +#define GEOSAR 0x0805000B +#define GEOSAR1CDT 0x0805000C +#define GEOSAR1 0x0805000D +#define GEOSAR2CDR 0x0805000E +#define GEOSAR2CDT 0x0805000F +#define GEOSAR2 0x08050010 +#define GEOSHK28CDT 0x08050011 +#define GEOSHK28 0x08050012 +#define GEOTOTCDT 0x08050013 +#define GEOTOT 0x08050014 +#define GEOWINCDT 0x08050015 +#define GEOWIN 0x08050016 +#define GUAWINCDT 0x08050017 +#define GUAWIN 0x08050018 +#define LOBEXITCDT 0x08050019 +#define LOBEXIT 0x0805001A +#define LOBMANCDT 0x0805001B +#define LOBMAN 0x0805001C +#define LOBSTUCDT 0x0805001D +#define LOBSTU 0x0805001E +#define LOBTLKCDT 0x0805001F +#define LOBTLK 0x08050020 +#define LOBTURN1CDT 0x08050021 +#define LOBTURN1 0x08050022 +#define LOBTURN2CDT 0x08050023 +#define LOBTURN2 0x08050024 +#define MUSOPNCDT 0x08050025 +#define MUSOPN 0x08050026 +#define SARDOR28CDT 0x08050027 +#define SARDOR28 0x08050028 +#define TOTEM28CDT 0x08050029 +#define TOTEM28 0x0805002A +#define TRIPOD28CDT 0x0805002B +#define TRIPOD28 0x0805002C +#define WINDO28CDR 0x0805002D +#define WINDO28CDT 0x0805002E +#define WINDO28 0x0805002F +#define WINROD28CDT 0x08050030 +#define WINROD28 0x08050031 // 50 entities in TXTs, 50 in datafiles. // room29 -#define R29SPRPAL 0x08060000 -#define BBACK29SPRPAL 0x08060001 -#define R29PAL 0x08060002 -#define R29L0 0x08060003 -#define R29L1 0x08060004 -#define R29G1 0x08060005 -#define room29_flr 0x08060006 -#define BBACK29 0x08060007 -#define BBACK29PAL 0x08060008 -#define GEOSUR29CDT 0x08060009 -#define GEOSUR29 0x0806000A -#define CASECDT 0x0806000B -#define CASE 0x0806000C -#define DOOR29CDT 0x0806000D -#define DOOR29 0x0806000E -#define FISH29CDT 0x0806000F -#define FISH29 0x08060010 -#define FLAPENTCDT 0x08060011 -#define FLAPENT 0x08060012 -#define FLAPTLK1CDT 0x08060013 -#define FLAPTLK1 0x08060014 -#define FLAPTLK3CDT 0x08060015 -#define FLAPTLK3 0x08060016 -#define FLAPTOR1CDR 0x08060017 -#define FLAPTOR1CDT 0x08060018 -#define FLAPTOR1 0x08060019 -#define FLAPTOR4CDT 0x0806001A -#define FLAPTOR4 0x0806001B -#define FLAPWLKCDT 0x0806001C -#define FLAPWLK 0x0806001D -#define GEODEDCDT 0x0806001E -#define GEODED 0x0806001F -#define GEOFISHCDT 0x08060020 -#define GEOFISH 0x08060021 -#define GEOFWDCDT 0x08060022 -#define GEOFWD 0x08060023 -#define GEOPEEKCDT 0x08060024 -#define GEOPEEK 0x08060025 -#define GEOSAR6CDT 0x08060026 -#define GEOSAR6 0x08060027 -#define GEOTOT29CDT 0x08060028 -#define GEOTOT29 0x08060029 -#define GEOTOTBCDT 0x0806002A -#define GEOTOTB 0x0806002B -#define GEOTPTOCDT 0x0806002C -#define GEOTPTO 0x0806002D -#define GUIENTCDT 0x0806002E -#define GUIENT 0x0806002F -#define GUIGUNCDT 0x08060030 -#define GUIGUN 0x08060031 -#define GUIKNECDT 0x08060032 -#define GUIKNE 0x08060033 -#define GUIKNE1CDT 0x08060034 -#define GUIKNE1 0x08060035 -#define GUITLK1CDT 0x08060036 -#define GUITLK1 0x08060037 -#define GUITLK3CDT 0x08060038 -#define GUITLK3 0x08060039 -#define GUITLK4CDT 0x0806003A -#define GUITLK4 0x0806003B -#define GUIWLKCDT 0x0806003C -#define GUIWLK 0x0806003D -#define NICPUS1CDT 0x0806003E -#define NICPUS1 0x0806003F -#define ROPE29CDT 0x08060040 -#define ROPE29 0x08060041 -#define SARDOORCDT 0x08060042 -#define SARDOOR 0x08060043 -#define TOR1CDT 0x08060044 -#define TOR1 0x08060045 -#define TOR3CDR 0x08060046 -#define TOR3CDT 0x08060047 -#define TOR3 0x08060048 -#define TOR4CDT 0x08060049 -#define TOR4 0x0806004A -#define TOR6CDT 0x0806004B -#define TOR6 0x0806004C -#define TOR7CDT 0x0806004D -#define TOR7 0x0806004E -#define TOTFALLCDT 0x0806004F -#define TOTFALL 0x08060050 +#define R29SPRPAL 0x08060000 +#define BBACK29SPRPAL 0x08060001 +#define R29PAL 0x08060002 +#define R29L0 0x08060003 +#define R29L1 0x08060004 +#define R29G1 0x08060005 +#define room29_flr 0x08060006 +#define BBACK29 0x08060007 +#define BBACK29PAL 0x08060008 +#define GEOSUR29CDT 0x08060009 +#define GEOSUR29 0x0806000A +#define CASECDT 0x0806000B +#define CASE 0x0806000C +#define DOOR29CDT 0x0806000D +#define DOOR29 0x0806000E +#define FISH29CDT 0x0806000F +#define FISH29 0x08060010 +#define FLAPENTCDT 0x08060011 +#define FLAPENT 0x08060012 +#define FLAPTLK1CDT 0x08060013 +#define FLAPTLK1 0x08060014 +#define FLAPTLK3CDT 0x08060015 +#define FLAPTLK3 0x08060016 +#define FLAPTOR1CDR 0x08060017 +#define FLAPTOR1CDT 0x08060018 +#define FLAPTOR1 0x08060019 +#define FLAPTOR4CDT 0x0806001A +#define FLAPTOR4 0x0806001B +#define FLAPWLKCDT 0x0806001C +#define FLAPWLK 0x0806001D +#define GEODEDCDT 0x0806001E +#define GEODED 0x0806001F +#define GEOFISHCDT 0x08060020 +#define GEOFISH 0x08060021 +#define GEOFWDCDT 0x08060022 +#define GEOFWD 0x08060023 +#define GEOPEEKCDT 0x08060024 +#define GEOPEEK 0x08060025 +#define GEOSAR6CDT 0x08060026 +#define GEOSAR6 0x08060027 +#define GEOTOT29CDT 0x08060028 +#define GEOTOT29 0x08060029 +#define GEOTOTBCDT 0x0806002A +#define GEOTOTB 0x0806002B +#define GEOTPTOCDT 0x0806002C +#define GEOTPTO 0x0806002D +#define GUIENTCDT 0x0806002E +#define GUIENT 0x0806002F +#define GUIGUNCDT 0x08060030 +#define GUIGUN 0x08060031 +#define GUIKNECDT 0x08060032 +#define GUIKNE 0x08060033 +#define GUIKNE1CDT 0x08060034 +#define GUIKNE1 0x08060035 +#define GUITLK1CDT 0x08060036 +#define GUITLK1 0x08060037 +#define GUITLK3CDT 0x08060038 +#define GUITLK3 0x08060039 +#define GUITLK4CDT 0x0806003A +#define GUITLK4 0x0806003B +#define GUIWLKCDT 0x0806003C +#define GUIWLK 0x0806003D +#define NICPUS1CDT 0x0806003E +#define NICPUS1 0x0806003F +#define ROPE29CDT 0x08060040 +#define ROPE29 0x08060041 +#define SARDOORCDT 0x08060042 +#define SARDOOR 0x08060043 +#define TOR1CDT 0x08060044 +#define TOR1 0x08060045 +#define TOR3CDR 0x08060046 +#define TOR3CDT 0x08060047 +#define TOR3 0x08060048 +#define TOR4CDT 0x08060049 +#define TOR4 0x0806004A +#define TOR6CDT 0x0806004B +#define TOR6 0x0806004C +#define TOR7CDT 0x0806004D +#define TOR7 0x0806004E +#define TOTFALLCDT 0x0806004F +#define TOTFALL 0x08060050 // 81 entities in TXTs, 81 in datafiles. // room31 -#define room31_PAL 0x08070000 -#define room31_l0 0x08070001 -#define room31_flr 0x08070002 -#define GEOAMBCDT 0x08070003 -#define GEOAMB 0x08070004 -#define GEODOR31CDT 0x08070005 -#define GEODOR31 0x08070006 +#define room31_PAL 0x08070000 +#define room31_l0 0x08070001 +#define room31_flr 0x08070002 +#define GEOAMBCDT 0x08070003 +#define GEOAMB 0x08070004 +#define GEODOR31CDT 0x08070005 +#define GEODOR31 0x08070006 // 7 entities in TXTs, 7 in datafiles. // room32 -#define room32_PAL 0x08080000 -#define room32_l0 0x08080001 -#define room32_l1 0x08080002 -#define room32_l2 0x08080003 -#define room32_gd1 0x08080004 -#define room32_gd2 0x08080005 -#define room32_flr 0x08080006 -#define CONSTPCDT 0x08080007 -#define CONSTP 0x08080008 -#define CONTLKCDT 0x08080009 -#define CONTLK 0x0808000A -#define CONTLK2CDT 0x0808000B -#define CONTLK2 0x0808000C -#define CONWLKCDT 0x0808000D -#define CONWLK 0x0808000E -#define RECCOMCDT 0x0808000F -#define RECCOM 0x08080010 -#define RECKEYCDT 0x08080011 -#define RECKEY 0x08080012 -#define RECTLKCDT 0x08080013 -#define RECTLK 0x08080014 -#define RECTLK2CDT 0x08080015 -#define RECTLK2 0x08080016 -#define RECTRNCDT 0x08080017 -#define RECTRN 0x08080018 +#define room32_PAL 0x08080000 +#define room32_l0 0x08080001 +#define room32_l1 0x08080002 +#define room32_l2 0x08080003 +#define room32_gd1 0x08080004 +#define room32_gd2 0x08080005 +#define room32_flr 0x08080006 +#define CONSTPCDT 0x08080007 +#define CONSTP 0x08080008 +#define CONTLKCDT 0x08080009 +#define CONTLK 0x0808000A +#define CONTLK2CDT 0x0808000B +#define CONTLK2 0x0808000C +#define CONWLKCDT 0x0808000D +#define CONWLK 0x0808000E +#define RECCOMCDT 0x0808000F +#define RECCOM 0x08080010 +#define RECKEYCDT 0x08080011 +#define RECKEY 0x08080012 +#define RECTLKCDT 0x08080013 +#define RECTLK 0x08080014 +#define RECTLK2CDT 0x08080015 +#define RECTLK2 0x08080016 +#define RECTRNCDT 0x08080017 +#define RECTRN 0x08080018 // 25 entities in TXTs, 25 in datafiles. // room33 -#define room33_PAL 0x08090000 -#define room33_l0 0x08090001 -#define room33_l1 0x08090002 -#define room33_l2 0x08090003 -#define room33_gd1 0x08090004 -#define room33_gd2 0x08090005 -#define room33_flr 0x08090006 -#define DOMDRNCDT 0x08090007 -#define DOMDRN 0x08090008 -#define DOMDUHCDT 0x08090009 -#define DOMDUH 0x0809000A -#define DOMKIKCDT 0x0809000B -#define DOMKIK 0x0809000C -#define DOMPLGCDT 0x0809000D -#define DOMPLG 0x0809000E -#define DOMTLKCDT 0x0809000F -#define DOMTLK 0x08090010 -#define DOMVACCDT 0x08090011 -#define DOMVAC 0x08090012 -#define DOMWLKCDT 0x08090013 -#define DOMWLK 0x08090014 -#define DOMWLK2CDT 0x08090015 -#define DOMWLK2 0x08090016 -#define DOMWLK3CDT 0x08090017 -#define DOMWLK3 0x08090018 -#define DOMWLK4CDT 0x08090019 -#define DOMWLK4 0x0809001A -#define GEOCOTCDT 0x0809001B -#define GEOCOT 0x0809001C -#define GEOPLG33CDT 0x0809001D -#define GEOPLG33 0x0809001E -#define GEOWATCDT 0x0809001F -#define GEOWAT 0x08090020 -#define GEOWWATCDT 0x08090021 -#define GEOWWAT 0x08090022 -#define LEAD1CDT 0x08090023 -#define LEAD1 0x08090024 -#define LEAD2CDT 0x08090025 -#define LEAD2 0x08090026 -#define SHINY33CDT 0x08090027 -#define SHINY33 0x08090028 +#define room33_PAL 0x08090000 +#define room33_l0 0x08090001 +#define room33_l1 0x08090002 +#define room33_l2 0x08090003 +#define room33_gd1 0x08090004 +#define room33_gd2 0x08090005 +#define room33_flr 0x08090006 +#define DOMDRNCDT 0x08090007 +#define DOMDRN 0x08090008 +#define DOMDUHCDT 0x08090009 +#define DOMDUH 0x0809000A +#define DOMKIKCDT 0x0809000B +#define DOMKIK 0x0809000C +#define DOMPLGCDT 0x0809000D +#define DOMPLG 0x0809000E +#define DOMTLKCDT 0x0809000F +#define DOMTLK 0x08090010 +#define DOMVACCDT 0x08090011 +#define DOMVAC 0x08090012 +#define DOMWLKCDT 0x08090013 +#define DOMWLK 0x08090014 +#define DOMWLK2CDT 0x08090015 +#define DOMWLK2 0x08090016 +#define DOMWLK3CDT 0x08090017 +#define DOMWLK3 0x08090018 +#define DOMWLK4CDT 0x08090019 +#define DOMWLK4 0x0809001A +#define GEOCOTCDT 0x0809001B +#define GEOCOT 0x0809001C +#define GEOPLG33CDT 0x0809001D +#define GEOPLG33 0x0809001E +#define GEOWATCDT 0x0809001F +#define GEOWAT 0x08090020 +#define GEOWWATCDT 0x08090021 +#define GEOWWAT 0x08090022 +#define LEAD1CDT 0x08090023 +#define LEAD1 0x08090024 +#define LEAD2CDT 0x08090025 +#define LEAD2 0x08090026 +#define SHINY33CDT 0x08090027 +#define SHINY33 0x08090028 // 41 entities in TXTs, 41 in datafiles. // room34 -#define room34_PAL 0x080A0000 -#define room34_l0 0x080A0001 -#define room34_l1 0x080A0002 -#define room34_l2 0x080A0003 -#define room34_l3 0x080A0004 -#define room34_gd1 0x080A0005 -#define room34_gd2 0x080A0006 -#define room34_gd3 0x080A0007 -#define room34_flr 0x080A0008 -#define R34PLX 0x080A0009 -#define BENBP1CDT 0x080A000A -#define BENBP1 0x080A000B -#define BENBP2CDT 0x080A000C -#define BENBP2 0x080A000D -#define DOOR34CDR 0x080A000E -#define DOOR34CDT 0x080A000F -#define DOOR34 0x080A0010 -#define GENDTLKCDT 0x080A0011 -#define GENDTLK 0x080A0012 -#define GENENTCDT 0x080A0013 -#define GENENT 0x080A0014 -#define GENSHOTCDT 0x080A0015 -#define GENSHOT 0x080A0016 -#define GENSTLKCDT 0x080A0017 -#define GENSTLK 0x080A0018 -#define GENSUPCDT 0x080A0019 -#define GENSUP 0x080A001A -#define GENTRNCDT 0x080A001B -#define GENTRN 0x080A001C -#define GEOBAKCDT 0x080A001D -#define GEOBAK 0x080A001E -#define GEOBP2CDT 0x080A001F -#define GEOBP2 0x080A0020 -#define GEOCH1CDR 0x080A0021 -#define GEOCH1CDT 0x080A0022 -#define GEOCH1 0x080A0023 -#define GEOCH2CDR 0x080A0024 -#define GEOCH2CDT 0x080A0025 -#define GEOCH2 0x080A0026 -#define GEOCH3CDR 0x080A0027 -#define GEOCH3CDT 0x080A0028 -#define GEOCH3 0x080A0029 -#define GEODOR34CDT 0x080A002A -#define GEODOR34 0x080A002B -#define GEOENT34CDT 0x080A002C -#define GEOENT34 0x080A002D -#define GEONURBPCDT 0x080A002E -#define GEONURBP 0x080A002F -#define GEOTAKCDT 0x080A0030 -#define GEOTAK 0x080A0031 -#define GEOTRYDCDT 0x080A0032 -#define GEOTRYD 0x080A0033 -#define GEOTRYTKCDT 0x080A0034 -#define GEOTRYTK 0x080A0035 -#define HATGIVCDT 0x080A0036 -#define HATGIV 0x080A0037 -#define HATSTPCDT 0x080A0038 -#define HATSTP 0x080A0039 -#define HATTLKCDT 0x080A003A -#define HATTLK 0x080A003B -#define HATWLKCDT 0x080A003C -#define HATWLK 0x080A003D -#define HATWLK2CDT 0x080A003E -#define HATWLK2 0x080A003F -#define MONITOR 0x080A0040 -#define MONITOR_PAL 0x080A0041 -#define PULSE1CDT 0x080A0042 -#define PULSE1 0x080A0043 -#define PULSE2CDT 0x080A0044 -#define PULSE2 0x080A0045 -#define PULSE3CDT 0x080A0046 -#define PULSE3 0x080A0047 -#define RENTLKCDT 0x080A0048 -#define RENTLK 0x080A0049 -#define SMARMCDR 0x080A004A -#define SMARMCDT 0x080A004B -#define SMARM 0x080A004C -#define SMSTPCDR 0x080A004D -#define SMSTPCDT 0x080A004E -#define SMSTP 0x080A004F -#define SMTALKCDT 0x080A0050 -#define SMTALK 0x080A0051 -#define SMTALK2CDT 0x080A0052 -#define SMTALK2 0x080A0053 -#define STUDENTCDT 0x080A0054 -#define STUDENT 0x080A0055 -#define STUDGIVCDT 0x080A0056 -#define STUDGIV 0x080A0057 -#define STUDMOVCDT 0x080A0058 -#define STUDMOV 0x080A0059 +#define room34_PAL 0x080A0000 +#define room34_l0 0x080A0001 +#define room34_l1 0x080A0002 +#define room34_l2 0x080A0003 +#define room34_l3 0x080A0004 +#define room34_gd1 0x080A0005 +#define room34_gd2 0x080A0006 +#define room34_gd3 0x080A0007 +#define room34_flr 0x080A0008 +#define R34PLX 0x080A0009 +#define BENBP1CDT 0x080A000A +#define BENBP1 0x080A000B +#define BENBP2CDT 0x080A000C +#define BENBP2 0x080A000D +#define DOOR34CDR 0x080A000E +#define DOOR34CDT 0x080A000F +#define DOOR34 0x080A0010 +#define GENDTLKCDT 0x080A0011 +#define GENDTLK 0x080A0012 +#define GENENTCDT 0x080A0013 +#define GENENT 0x080A0014 +#define GENSHOTCDT 0x080A0015 +#define GENSHOT 0x080A0016 +#define GENSTLKCDT 0x080A0017 +#define GENSTLK 0x080A0018 +#define GENSUPCDT 0x080A0019 +#define GENSUP 0x080A001A +#define GENTRNCDT 0x080A001B +#define GENTRN 0x080A001C +#define GEOBAKCDT 0x080A001D +#define GEOBAK 0x080A001E +#define GEOBP2CDT 0x080A001F +#define GEOBP2 0x080A0020 +#define GEOCH1CDR 0x080A0021 +#define GEOCH1CDT 0x080A0022 +#define GEOCH1 0x080A0023 +#define GEOCH2CDR 0x080A0024 +#define GEOCH2CDT 0x080A0025 +#define GEOCH2 0x080A0026 +#define GEOCH3CDR 0x080A0027 +#define GEOCH3CDT 0x080A0028 +#define GEOCH3 0x080A0029 +#define GEODOR34CDT 0x080A002A +#define GEODOR34 0x080A002B +#define GEOENT34CDT 0x080A002C +#define GEOENT34 0x080A002D +#define GEONURBPCDT 0x080A002E +#define GEONURBP 0x080A002F +#define GEOTAKCDT 0x080A0030 +#define GEOTAK 0x080A0031 +#define GEOTRYDCDT 0x080A0032 +#define GEOTRYD 0x080A0033 +#define GEOTRYTKCDT 0x080A0034 +#define GEOTRYTK 0x080A0035 +#define HATGIVCDT 0x080A0036 +#define HATGIV 0x080A0037 +#define HATSTPCDT 0x080A0038 +#define HATSTP 0x080A0039 +#define HATTLKCDT 0x080A003A +#define HATTLK 0x080A003B +#define HATWLKCDT 0x080A003C +#define HATWLK 0x080A003D +#define HATWLK2CDT 0x080A003E +#define HATWLK2 0x080A003F +#define MONITOR 0x080A0040 +#define MONITOR_PAL 0x080A0041 +#define PULSE1CDT 0x080A0042 +#define PULSE1 0x080A0043 +#define PULSE2CDT 0x080A0044 +#define PULSE2 0x080A0045 +#define PULSE3CDT 0x080A0046 +#define PULSE3 0x080A0047 +#define RENTLKCDT 0x080A0048 +#define RENTLK 0x080A0049 +#define SMARMCDR 0x080A004A +#define SMARMCDT 0x080A004B +#define SMARM 0x080A004C +#define SMSTPCDR 0x080A004D +#define SMSTPCDT 0x080A004E +#define SMSTP 0x080A004F +#define SMTALKCDT 0x080A0050 +#define SMTALK 0x080A0051 +#define SMTALK2CDT 0x080A0052 +#define SMTALK2 0x080A0053 +#define STUDENTCDT 0x080A0054 +#define STUDENT 0x080A0055 +#define STUDGIVCDT 0x080A0056 +#define STUDGIV 0x080A0057 +#define STUDMOVCDT 0x080A0058 +#define STUDMOV 0x080A0059 // 90 entities in TXTs, 90 in datafiles. // room35 -#define room35_PAL 0x080B0000 -#define room35_l0 0x080B0001 -#define room35_l1 0x080B0002 -#define room35_gd1 0x080B0003 -#define room35_flr 0x080B0004 -#define ALSHOCKCDT 0x080B0005 -#define ALSHOCK 0x080B0006 -#define CURFLATCDT 0x080B0007 -#define CURFLAT 0x080B0008 -#define EKLBED35CDT 0x080B0009 -#define EKLBED35 0x080B000A -#define EKLTLK35CDT 0x080B000B -#define EKLTLK35 0x080B000C -#define EKLWLK35CDT 0x080B000D -#define EKLWLK35 0x080B000E -#define GEORCT35CDT 0x080B000F -#define GEORCT35 0x080B0010 -#define GEOSIT35CDR 0x080B0011 -#define GEOSIT35CDT 0x080B0012 -#define GEOSIT35 0x080B0013 -#define GEOTLKCDT 0x080B0014 -#define GEOTLK 0x080B0015 -#define GEOTLK35CDT 0x080B0016 -#define GEOTLK35 0x080B0017 -#define GEOTRN35CDT 0x080B0018 -#define GEOTRN35 0x080B0019 -#define JAQTLK1CDT 0x080B001A -#define JAQTLK1 0x080B001B -#define JAQTLK2CDT 0x080B001C -#define JAQTLK2 0x080B001D +#define room35_PAL 0x080B0000 +#define room35_l0 0x080B0001 +#define room35_l1 0x080B0002 +#define room35_gd1 0x080B0003 +#define room35_flr 0x080B0004 +#define ALSHOCKCDT 0x080B0005 +#define ALSHOCK 0x080B0006 +#define CURFLATCDT 0x080B0007 +#define CURFLAT 0x080B0008 +#define EKLBED35CDT 0x080B0009 +#define EKLBED35 0x080B000A +#define EKLTLK35CDT 0x080B000B +#define EKLTLK35 0x080B000C +#define EKLWLK35CDT 0x080B000D +#define EKLWLK35 0x080B000E +#define GEORCT35CDT 0x080B000F +#define GEORCT35 0x080B0010 +#define GEOSIT35CDR 0x080B0011 +#define GEOSIT35CDT 0x080B0012 +#define GEOSIT35 0x080B0013 +#define GEOTLKCDT 0x080B0014 +#define GEOTLK 0x080B0015 +#define GEOTLK35CDT 0x080B0016 +#define GEOTLK35 0x080B0017 +#define GEOTRN35CDT 0x080B0018 +#define GEOTRN35 0x080B0019 +#define JAQTLK1CDT 0x080B001A +#define JAQTLK1 0x080B001B +#define JAQTLK2CDT 0x080B001C +#define JAQTLK2 0x080B001D // 30 entities in TXTs, 30 in datafiles. // paris_4 // sound_fx -#define FX_COVDWN 0x09000000 -#define FX_KEYIN 0x09000001 -#define FX_MANOP36 0x09000002 -#define FX_MONTAMB 0x09000003 -#define FX_OOH 0x09000004 -#define FX_PULLUP36 0x09000005 -#define FX_REPLCE36 0x09000006 -#define FX_AMBIEN37 0x09000007 -#define FX_CHAIN37 0x09000008 -#define FX_CHAIN37B 0x09000009 -#define FX_DOOR37 0x0900000A -#define FX_HOLE37 0x0900000B -#define FX_KNOCK37 0x0900000C -#define FX_KNOCK37B 0x0900000D -#define FX_WINCH37 0x0900000E -#define FX_AIRCON41 0x0900000F -#define FX_FONEDN41 0x09000010 -#define FX_FONEUP41 0x09000011 -#define FX_PHONCALL 0x09000012 -#define FX_THERMO1 0x09000013 -#define FX_TAPDRIP 0x09000014 -#define FX_DRIER1 0x09000015 -#define FX_CHURCHFX 0x09000016 +#define FX_COVDWN 0x09000000 +#define FX_KEYIN 0x09000001 +#define FX_MANOP36 0x09000002 +#define FX_MONTAMB 0x09000003 +#define FX_OOH 0x09000004 +#define FX_PULLUP36 0x09000005 +#define FX_REPLCE36 0x09000006 +#define FX_AMBIEN37 0x09000007 +#define FX_CHAIN37 0x09000008 +#define FX_CHAIN37B 0x09000009 +#define FX_DOOR37 0x0900000A +#define FX_HOLE37 0x0900000B +#define FX_KNOCK37 0x0900000C +#define FX_KNOCK37B 0x0900000D +#define FX_WINCH37 0x0900000E +#define FX_AIRCON41 0x0900000F +#define FX_FONEDN41 0x09000010 +#define FX_FONEUP41 0x09000011 +#define FX_PHONCALL 0x09000012 +#define FX_THERMO1 0x09000013 +#define FX_TAPDRIP 0x09000014 +#define FX_DRIER1 0x09000015 +#define FX_CHURCHFX 0x09000016 // 23 entities in TXTs, 23 in datafiles. // room36 -#define R36SPRPAL 0x09010000 -#define R36L0 0x09010001 -#define R36L1 0x09010002 -#define R36G1 0x09010003 -#define room36_PAL 0x09010004 -#define room36_flr 0x09010005 -#define R36PLX 0x09010006 -#define BAL36CDT 0x09010007 -#define BAL36 0x09010008 -#define CRO36APPCDT 0x09010009 -#define CRO36APP 0x0901000A -#define CRO36GEOCDT 0x0901000B -#define CRO36GEO 0x0901000C -#define CRO36IDLCDT 0x0901000D -#define CRO36IDL 0x0901000E -#define CRO36JUGCDT 0x0901000F -#define CRO36JUG 0x09010010 -#define CRO36UNICDT 0x09010011 -#define CRO36UNI 0x09010012 -#define GEN36DRICDT 0x09010013 -#define GEN36DRI 0x09010014 -#define GEN36FEHCDT 0x09010015 -#define GEN36FEH 0x09010016 -#define GEN36HURCDT 0x09010017 -#define GEN36HUR 0x09010018 -#define GEN36LEACDT 0x09010019 -#define GEN36LEA 0x0901001A -#define GEN36POICDR 0x0901001B -#define GEN36POICDT 0x0901001C -#define GEN36POI 0x0901001D -#define GEN36SPECDT 0x0901001E -#define GEN36SPE 0x0901001F -#define GEN36TALCDT 0x09010020 -#define GEN36TAL 0x09010021 -#define GEO36CLOCDT 0x09010022 -#define GEO36CLO 0x09010023 -#define GEO36ENTCDT 0x09010024 -#define GEO36ENT 0x09010025 -#define GEO36EXTCDT 0x09010026 -#define GEO36EXT 0x09010027 -#define GEO36JUGCDT 0x09010028 -#define GEO36JUG 0x09010029 -#define GEO36KNECDR 0x0901002A -#define GEO36KNECDT 0x0901002B -#define GEO36KNE 0x0901002C -#define GEO36LUKCDR 0x0901002D -#define GEO36LUKCDT 0x0901002E -#define GEO36LUK 0x0901002F -#define GEO36NOSCDT 0x09010030 -#define GEO36NOS 0x09010031 -#define GEO36OPECDT 0x09010032 -#define GEO36OPE 0x09010033 -#define GEO36POPCDT 0x09010034 -#define GEO36POP 0x09010035 -#define GEO36SHOCDR 0x09010036 -#define GEO36SHOCDT 0x09010037 -#define GEO36SHO 0x09010038 -#define GEO36SNTCDT 0x09010039 -#define GEO36SNT 0x0901003A -#define GEO36STDCDT 0x0901003B -#define GEO36STD 0x0901003C -#define GEO36STUCDT 0x0901003D -#define GEO36STU 0x0901003E -#define GEO36TAKCDT 0x0901003F -#define GEO36TAK 0x09010040 -#define HAT36CDT 0x09010041 -#define HAT36 0x09010042 -#define JUG36FINCDT 0x09010043 -#define JUG36FIN 0x09010044 -#define JUG36FURCDT 0x09010045 -#define JUG36FUR 0x09010046 -#define JUG36GIVCDT 0x09010047 -#define JUG36GIV 0x09010048 -#define JUG36GOCDT 0x09010049 -#define JUG36GO 0x0901004A -#define JUG36JUGCDT 0x0901004B -#define JUG36JUG 0x0901004C -#define JUG36LAFCDT 0x0901004D -#define JUG36LAF 0x0901004E -#define JUG36STACDT 0x0901004F -#define JUG36STA 0x09010050 -#define JUG36TAKCDT 0x09010051 -#define JUG36TAK 0x09010052 -#define JUG36TALCDT 0x09010053 -#define JUG36TAL 0x09010054 -#define MANCOV36CDT 0x09010055 -#define MANCOV36 0x09010056 -#define MANOFF36CDT 0x09010057 -#define MANOFF36 0x09010058 -#define VIN36CDT 0x09010059 -#define VIN36 0x0901005A +#define R36SPRPAL 0x09010000 +#define R36L0 0x09010001 +#define R36L1 0x09010002 +#define R36G1 0x09010003 +#define room36_PAL 0x09010004 +#define room36_flr 0x09010005 +#define R36PLX 0x09010006 +#define BAL36CDT 0x09010007 +#define BAL36 0x09010008 +#define CRO36APPCDT 0x09010009 +#define CRO36APP 0x0901000A +#define CRO36GEOCDT 0x0901000B +#define CRO36GEO 0x0901000C +#define CRO36IDLCDT 0x0901000D +#define CRO36IDL 0x0901000E +#define CRO36JUGCDT 0x0901000F +#define CRO36JUG 0x09010010 +#define CRO36UNICDT 0x09010011 +#define CRO36UNI 0x09010012 +#define GEN36DRICDT 0x09010013 +#define GEN36DRI 0x09010014 +#define GEN36FEHCDT 0x09010015 +#define GEN36FEH 0x09010016 +#define GEN36HURCDT 0x09010017 +#define GEN36HUR 0x09010018 +#define GEN36LEACDT 0x09010019 +#define GEN36LEA 0x0901001A +#define GEN36POICDR 0x0901001B +#define GEN36POICDT 0x0901001C +#define GEN36POI 0x0901001D +#define GEN36SPECDT 0x0901001E +#define GEN36SPE 0x0901001F +#define GEN36TALCDT 0x09010020 +#define GEN36TAL 0x09010021 +#define GEO36CLOCDT 0x09010022 +#define GEO36CLO 0x09010023 +#define GEO36ENTCDT 0x09010024 +#define GEO36ENT 0x09010025 +#define GEO36EXTCDT 0x09010026 +#define GEO36EXT 0x09010027 +#define GEO36JUGCDT 0x09010028 +#define GEO36JUG 0x09010029 +#define GEO36KNECDR 0x0901002A +#define GEO36KNECDT 0x0901002B +#define GEO36KNE 0x0901002C +#define GEO36LUKCDR 0x0901002D +#define GEO36LUKCDT 0x0901002E +#define GEO36LUK 0x0901002F +#define GEO36NOSCDT 0x09010030 +#define GEO36NOS 0x09010031 +#define GEO36OPECDT 0x09010032 +#define GEO36OPE 0x09010033 +#define GEO36POPCDT 0x09010034 +#define GEO36POP 0x09010035 +#define GEO36SHOCDR 0x09010036 +#define GEO36SHOCDT 0x09010037 +#define GEO36SHO 0x09010038 +#define GEO36SNTCDT 0x09010039 +#define GEO36SNT 0x0901003A +#define GEO36STDCDT 0x0901003B +#define GEO36STD 0x0901003C +#define GEO36STUCDT 0x0901003D +#define GEO36STU 0x0901003E +#define GEO36TAKCDT 0x0901003F +#define GEO36TAK 0x09010040 +#define HAT36CDT 0x09010041 +#define HAT36 0x09010042 +#define JUG36FINCDT 0x09010043 +#define JUG36FIN 0x09010044 +#define JUG36FURCDT 0x09010045 +#define JUG36FUR 0x09010046 +#define JUG36GIVCDT 0x09010047 +#define JUG36GIV 0x09010048 +#define JUG36GOCDT 0x09010049 +#define JUG36GO 0x0901004A +#define JUG36JUGCDT 0x0901004B +#define JUG36JUG 0x0901004C +#define JUG36LAFCDT 0x0901004D +#define JUG36LAF 0x0901004E +#define JUG36STACDT 0x0901004F +#define JUG36STA 0x09010050 +#define JUG36TAKCDT 0x09010051 +#define JUG36TAK 0x09010052 +#define JUG36TALCDT 0x09010053 +#define JUG36TAL 0x09010054 +#define MANCOV36CDT 0x09010055 +#define MANCOV36 0x09010056 +#define MANOFF36CDT 0x09010057 +#define MANOFF36 0x09010058 +#define VIN36CDT 0x09010059 +#define VIN36 0x0901005A // 91 entities in TXTs, 91 in datafiles. // room37 -#define room37_PAL 0x09020000 -#define R37L0 0x09020001 -#define R37L1 0x09020002 -#define R37G1 0x09020003 -#define room37_flr 0x09020004 -#define DOR37COLCDT 0x09020005 -#define DOR37COL 0x09020006 -#define GEO37ASCCDT 0x09020007 -#define GEO37ASC 0x09020008 -#define GEO37COGCDT 0x09020009 -#define GEO37COG 0x0902000A -#define GEO37DESCDT 0x0902000B -#define GEO37DES 0x0902000C -#define GEO37HUKCDR 0x0902000D -#define GEO37HUKCDT 0x0902000E -#define GEO37HUK 0x0902000F -#define GEO37INBCDT 0x09020010 -#define GEO37INB 0x09020011 -#define GEO37LEVCDT 0x09020012 -#define GEO37LEV 0x09020013 -#define GEO37OUTCDT 0x09020014 -#define GEO37OUT 0x09020015 -#define GEO37RUNCDT 0x09020016 -#define GEO37RUN 0x09020017 -#define GEO37TA1CDT 0x09020018 -#define GEO37TA1 0x09020019 -#define GEO37TA2CDT 0x0902001A -#define GEO37TA2 0x0902001B -#define GEO37TA3CDT 0x0902001C -#define GEO37TA3 0x0902001D -#define GEO37TA4CDT 0x0902001E -#define GEO37TA4 0x0902001F -#define GEO37TU1CDR 0x09020020 -#define GEO37TU1CDT 0x09020021 -#define GEO37TU1 0x09020022 -#define GEO37TU2CDT 0x09020023 -#define GEO37TU2 0x09020024 -#define GEO37WLCDR 0x09020025 -#define GEO37WLCDT 0x09020026 -#define GEO37WL 0x09020027 -#define HOO37LBOCDR 0x09020028 -#define HOO37LBOCDT 0x09020029 -#define HOO37LBO 0x0902002A -#define HOO37PULCDT 0x0902002B -#define HOO37PUL 0x0902002C -#define ROCKS1CDT 0x0902002D -#define ROCKS1 0x0902002E -#define WAL37BRECDT 0x0902002F -#define WAL37BRE 0x09020030 -#define WAL37SLICDT 0x09020031 -#define WAL37SLI 0x09020032 -#define WATER37CDT 0x09020033 -#define WATER37 0x09020034 -#define WATER37ACDT 0x09020035 -#define WATER37A 0x09020036 -#define WHEEL37CDT 0x09020037 -#define WHEEL37 0x09020038 +#define room37_PAL 0x09020000 +#define R37L0 0x09020001 +#define R37L1 0x09020002 +#define R37G1 0x09020003 +#define room37_flr 0x09020004 +#define DOR37COLCDT 0x09020005 +#define DOR37COL 0x09020006 +#define GEO37ASCCDT 0x09020007 +#define GEO37ASC 0x09020008 +#define GEO37COGCDT 0x09020009 +#define GEO37COG 0x0902000A +#define GEO37DESCDT 0x0902000B +#define GEO37DES 0x0902000C +#define GEO37HUKCDR 0x0902000D +#define GEO37HUKCDT 0x0902000E +#define GEO37HUK 0x0902000F +#define GEO37INBCDT 0x09020010 +#define GEO37INB 0x09020011 +#define GEO37LEVCDT 0x09020012 +#define GEO37LEV 0x09020013 +#define GEO37OUTCDT 0x09020014 +#define GEO37OUT 0x09020015 +#define GEO37RUNCDT 0x09020016 +#define GEO37RUN 0x09020017 +#define GEO37TA1CDT 0x09020018 +#define GEO37TA1 0x09020019 +#define GEO37TA2CDT 0x0902001A +#define GEO37TA2 0x0902001B +#define GEO37TA3CDT 0x0902001C +#define GEO37TA3 0x0902001D +#define GEO37TA4CDT 0x0902001E +#define GEO37TA4 0x0902001F +#define GEO37TU1CDR 0x09020020 +#define GEO37TU1CDT 0x09020021 +#define GEO37TU1 0x09020022 +#define GEO37TU2CDT 0x09020023 +#define GEO37TU2 0x09020024 +#define GEO37WLCDR 0x09020025 +#define GEO37WLCDT 0x09020026 +#define GEO37WL 0x09020027 +#define HOO37LBOCDR 0x09020028 +#define HOO37LBOCDT 0x09020029 +#define HOO37LBO 0x0902002A +#define HOO37PULCDT 0x0902002B +#define HOO37PUL 0x0902002C +#define ROCKS1CDT 0x0902002D +#define ROCKS1 0x0902002E +#define WAL37BRECDT 0x0902002F +#define WAL37BRE 0x09020030 +#define WAL37SLICDT 0x09020031 +#define WAL37SLI 0x09020032 +#define WATER37CDT 0x09020033 +#define WATER37 0x09020034 +#define WATER37ACDT 0x09020035 +#define WATER37A 0x09020036 +#define WHEEL37CDT 0x09020037 +#define WHEEL37 0x09020038 // 57 entities in TXTs, 57 in datafiles. // room38 -#define R38SPRPAL 0x09030000 -#define room38_PAL 0x09030001 -#define R38L0 0x09030002 -#define R38L1 0x09030003 -#define R38G1 0x09030004 -#define room38_flr 0x09030005 -#define BBACK38 0x09030006 -#define BBACK38PAL 0x09030007 -#define GEOINQ38CDT 0x09030008 -#define GEOINQ38 0x09030009 -#define GEO38AS1CDT 0x0903000A -#define GEO38AS1 0x0903000B -#define GEO38AS2CDT 0x0903000C -#define GEO38AS2 0x0903000D -#define GEO38DE1CDT 0x0903000E -#define GEO38DE1 0x0903000F -#define GEO38DE2CDT 0x09030010 -#define GEO38DE2 0x09030011 -#define GEO38LUKCDR 0x09030012 -#define GEO38LUKCDT 0x09030013 -#define GEO38LUK 0x09030014 +#define R38SPRPAL 0x09030000 +#define room38_PAL 0x09030001 +#define R38L0 0x09030002 +#define R38L1 0x09030003 +#define R38G1 0x09030004 +#define room38_flr 0x09030005 +#define BBACK38 0x09030006 +#define BBACK38PAL 0x09030007 +#define GEOINQ38CDT 0x09030008 +#define GEOINQ38 0x09030009 +#define GEO38AS1CDT 0x0903000A +#define GEO38AS1 0x0903000B +#define GEO38AS2CDT 0x0903000C +#define GEO38AS2 0x0903000D +#define GEO38DE1CDT 0x0903000E +#define GEO38DE1 0x0903000F +#define GEO38DE2CDT 0x09030010 +#define GEO38DE2 0x09030011 +#define GEO38LUKCDR 0x09030012 +#define GEO38LUKCDT 0x09030013 +#define GEO38LUK 0x09030014 // 21 entities in TXTs, 21 in datafiles. // room39 -#define R39SPRPAL 0x09040000 -#define R39L0 0x09040001 -#define R39L1 0x09040002 -#define R39G1 0x09040003 -#define room39_PAL 0x09040004 -#define room39_flr 0x09040005 -#define R39PLX 0x09040006 -#define BOA39GOACDT 0x09040007 -#define BOA39GOA 0x09040008 -#define BOA39SPRCDT 0x09040009 -#define BOA39SPR 0x0904000A -#define CIV391T2CDR 0x0904000B -#define CIV391T2CDT 0x0904000C -#define CIV391T2 0x0904000D -#define CIV391T3CDR 0x0904000E -#define CIV391T3CDT 0x0904000F -#define CIV391T3 0x09040010 -#define CIV392T3CDR 0x09040011 -#define CIV392T3CDT 0x09040012 -#define CIV392T3 0x09040013 -#define CIV39T1CDT 0x09040014 -#define CIV39T1 0x09040015 -#define CIV39T2CDT 0x09040016 -#define CIV39T2 0x09040017 -#define CIV39T3CDT 0x09040018 -#define CIV39T3 0x09040019 -#define CIVLIST1CDT 0x0904001A -#define CIVLIST1 0x0904001B -#define CIVLIST2CDT 0x0904001C -#define CIVLIST2 0x0904001D -#define CIVLIST3CDT 0x0904001E -#define CIVLIST3 0x0904001F -#define COL391T2CDR 0x09040020 -#define COL391T2CDT 0x09040021 -#define COL391T2 0x09040022 -#define COL391T3CDR 0x09040023 -#define COL391T3CDT 0x09040024 -#define COL391T3 0x09040025 -#define COL392T3CDR 0x09040026 -#define COL392T3CDT 0x09040027 -#define COL392T3 0x09040028 -#define COL39T1CDT 0x09040029 -#define COL39T1 0x0904002A -#define COL39T2CDT 0x0904002B -#define COL39T2 0x0904002C -#define COL39T3CDT 0x0904002D -#define COL39T3 0x0904002E -#define COLLIST2CDT 0x0904002F -#define COLLIST2 0x09040030 -#define COLLIST3CDT 0x09040031 -#define COLLIST3 0x09040032 -#define CON39TALCDT 0x09040033 -#define CON39TAL 0x09040034 -#define EKL391T2CDR 0x09040035 -#define EKL391T2CDT 0x09040036 -#define EKL391T2 0x09040037 -#define EKL391T3CDR 0x09040038 -#define EKL391T3CDT 0x09040039 -#define EKL391T3 0x0904003A -#define EKL392T3CDR 0x0904003B -#define EKL392T3CDT 0x0904003C -#define EKL392T3 0x0904003D -#define EKL39T1CDT 0x0904003E -#define EKL39T1 0x0904003F -#define EKL39T2CDT 0x09040040 -#define EKL39T2 0x09040041 -#define EKL39T3CDT 0x09040042 -#define EKL39T3 0x09040043 -#define EKLLIST1CDT 0x09040044 -#define EKLLIST1 0x09040045 -#define EKLLIST2CDT 0x09040046 -#define EKLLIST2 0x09040047 -#define EKLLIST3CDT 0x09040048 -#define EKLLIST3 0x09040049 -#define EXE391T2CDR 0x0904004A -#define EXE391T2CDT 0x0904004B -#define EXE391T2 0x0904004C -#define EXE391T3CDR 0x0904004D -#define EXE391T3CDT 0x0904004E -#define EXE391T3 0x0904004F -#define EXE392T3CDR 0x09040050 -#define EXE392T3CDT 0x09040051 -#define EXE392T3 0x09040052 -#define EXE39T1CDT 0x09040053 -#define EXE39T1 0x09040054 -#define EXE39T2CDT 0x09040055 -#define EXE39T2 0x09040056 -#define EXE39T3CDT 0x09040057 -#define EXE39T3 0x09040058 -#define GEO39ENTCDT 0x09040059 -#define GEO39ENT 0x0904005A -#define GEO39EXTCDT 0x0904005B -#define GEO39EXT 0x0904005C -#define GEO39GEMCDR 0x0904005D -#define GEO39GEMCDT 0x0904005E -#define GEO39GEM 0x0904005F -#define GEO39TRICDR 0x09040060 -#define GEO39TRICDT 0x09040061 -#define GEO39TRI 0x09040062 -#define LAT391T2CDR 0x09040063 -#define LAT391T2CDT 0x09040064 -#define LAT391T2 0x09040065 -#define LAT391T3CDR 0x09040066 -#define LAT391T3CDT 0x09040067 -#define LAT391T3 0x09040068 -#define LAT392T3CDR 0x09040069 -#define LAT392T3CDT 0x0904006A -#define LAT392T3 0x0904006B -#define LAT39T1CDT 0x0904006C -#define LAT39T1 0x0904006D -#define LAT39T2CDT 0x0904006E -#define LAT39T2 0x0904006F -#define LAT39T3CDT 0x09040070 -#define LAT39T3 0x09040071 -#define LATLIST1CDT 0x09040072 -#define LATLIST1 0x09040073 -#define LATLIST2CDT 0x09040074 -#define LATLIST2 0x09040075 -#define LATLIST3CDT 0x09040076 -#define LATLIST3 0x09040077 -#define MAS391T2CDR 0x09040078 -#define MAS391T2CDT 0x09040079 -#define MAS391T2 0x0904007A -#define MAS391T3CDR 0x0904007B -#define MAS391T3CDT 0x0904007C -#define MAS391T3 0x0904007D -#define MAS392T3CDR 0x0904007E -#define MAS392T3CDT 0x0904007F -#define MAS392T3 0x09040080 -#define MAS39T1CDT 0x09040081 -#define MAS39T1 0x09040082 -#define MAS39T2CDT 0x09040083 -#define MAS39T2 0x09040084 -#define MAS39T3CDT 0x09040085 -#define MAS39T3 0x09040086 -#define MASLIST1CDT 0x09040087 -#define MASLIST1 0x09040088 -#define MASLIST2CDT 0x09040089 -#define MASLIST2 0x0904008A -#define MASLIST3CDT 0x0904008B -#define MASLIST3 0x0904008C -#define RAYS39CDT 0x0904008D -#define RAYS39 0x0904008E -#define TRI39ALOCDT 0x0904008F -#define TRI39ALO 0x09040090 -#define TRI39GEMCDT 0x09040091 -#define TRI39GEM 0x09040092 +#define R39SPRPAL 0x09040000 +#define R39L0 0x09040001 +#define R39L1 0x09040002 +#define R39G1 0x09040003 +#define room39_PAL 0x09040004 +#define room39_flr 0x09040005 +#define R39PLX 0x09040006 +#define BOA39GOACDT 0x09040007 +#define BOA39GOA 0x09040008 +#define BOA39SPRCDT 0x09040009 +#define BOA39SPR 0x0904000A +#define CIV391T2CDR 0x0904000B +#define CIV391T2CDT 0x0904000C +#define CIV391T2 0x0904000D +#define CIV391T3CDR 0x0904000E +#define CIV391T3CDT 0x0904000F +#define CIV391T3 0x09040010 +#define CIV392T3CDR 0x09040011 +#define CIV392T3CDT 0x09040012 +#define CIV392T3 0x09040013 +#define CIV39T1CDT 0x09040014 +#define CIV39T1 0x09040015 +#define CIV39T2CDT 0x09040016 +#define CIV39T2 0x09040017 +#define CIV39T3CDT 0x09040018 +#define CIV39T3 0x09040019 +#define CIVLIST1CDT 0x0904001A +#define CIVLIST1 0x0904001B +#define CIVLIST2CDT 0x0904001C +#define CIVLIST2 0x0904001D +#define CIVLIST3CDT 0x0904001E +#define CIVLIST3 0x0904001F +#define COL391T2CDR 0x09040020 +#define COL391T2CDT 0x09040021 +#define COL391T2 0x09040022 +#define COL391T3CDR 0x09040023 +#define COL391T3CDT 0x09040024 +#define COL391T3 0x09040025 +#define COL392T3CDR 0x09040026 +#define COL392T3CDT 0x09040027 +#define COL392T3 0x09040028 +#define COL39T1CDT 0x09040029 +#define COL39T1 0x0904002A +#define COL39T2CDT 0x0904002B +#define COL39T2 0x0904002C +#define COL39T3CDT 0x0904002D +#define COL39T3 0x0904002E +#define COLLIST2CDT 0x0904002F +#define COLLIST2 0x09040030 +#define COLLIST3CDT 0x09040031 +#define COLLIST3 0x09040032 +#define CON39TALCDT 0x09040033 +#define CON39TAL 0x09040034 +#define EKL391T2CDR 0x09040035 +#define EKL391T2CDT 0x09040036 +#define EKL391T2 0x09040037 +#define EKL391T3CDR 0x09040038 +#define EKL391T3CDT 0x09040039 +#define EKL391T3 0x0904003A +#define EKL392T3CDR 0x0904003B +#define EKL392T3CDT 0x0904003C +#define EKL392T3 0x0904003D +#define EKL39T1CDT 0x0904003E +#define EKL39T1 0x0904003F +#define EKL39T2CDT 0x09040040 +#define EKL39T2 0x09040041 +#define EKL39T3CDT 0x09040042 +#define EKL39T3 0x09040043 +#define EKLLIST1CDT 0x09040044 +#define EKLLIST1 0x09040045 +#define EKLLIST2CDT 0x09040046 +#define EKLLIST2 0x09040047 +#define EKLLIST3CDT 0x09040048 +#define EKLLIST3 0x09040049 +#define EXE391T2CDR 0x0904004A +#define EXE391T2CDT 0x0904004B +#define EXE391T2 0x0904004C +#define EXE391T3CDR 0x0904004D +#define EXE391T3CDT 0x0904004E +#define EXE391T3 0x0904004F +#define EXE392T3CDR 0x09040050 +#define EXE392T3CDT 0x09040051 +#define EXE392T3 0x09040052 +#define EXE39T1CDT 0x09040053 +#define EXE39T1 0x09040054 +#define EXE39T2CDT 0x09040055 +#define EXE39T2 0x09040056 +#define EXE39T3CDT 0x09040057 +#define EXE39T3 0x09040058 +#define GEO39ENTCDT 0x09040059 +#define GEO39ENT 0x0904005A +#define GEO39EXTCDT 0x0904005B +#define GEO39EXT 0x0904005C +#define GEO39GEMCDR 0x0904005D +#define GEO39GEMCDT 0x0904005E +#define GEO39GEM 0x0904005F +#define GEO39TRICDR 0x09040060 +#define GEO39TRICDT 0x09040061 +#define GEO39TRI 0x09040062 +#define LAT391T2CDR 0x09040063 +#define LAT391T2CDT 0x09040064 +#define LAT391T2 0x09040065 +#define LAT391T3CDR 0x09040066 +#define LAT391T3CDT 0x09040067 +#define LAT391T3 0x09040068 +#define LAT392T3CDR 0x09040069 +#define LAT392T3CDT 0x0904006A +#define LAT392T3 0x0904006B +#define LAT39T1CDT 0x0904006C +#define LAT39T1 0x0904006D +#define LAT39T2CDT 0x0904006E +#define LAT39T2 0x0904006F +#define LAT39T3CDT 0x09040070 +#define LAT39T3 0x09040071 +#define LATLIST1CDT 0x09040072 +#define LATLIST1 0x09040073 +#define LATLIST2CDT 0x09040074 +#define LATLIST2 0x09040075 +#define LATLIST3CDT 0x09040076 +#define LATLIST3 0x09040077 +#define MAS391T2CDR 0x09040078 +#define MAS391T2CDT 0x09040079 +#define MAS391T2 0x0904007A +#define MAS391T3CDR 0x0904007B +#define MAS391T3CDT 0x0904007C +#define MAS391T3 0x0904007D +#define MAS392T3CDR 0x0904007E +#define MAS392T3CDT 0x0904007F +#define MAS392T3 0x09040080 +#define MAS39T1CDT 0x09040081 +#define MAS39T1 0x09040082 +#define MAS39T2CDT 0x09040083 +#define MAS39T2 0x09040084 +#define MAS39T3CDT 0x09040085 +#define MAS39T3 0x09040086 +#define MASLIST1CDT 0x09040087 +#define MASLIST1 0x09040088 +#define MASLIST2CDT 0x09040089 +#define MASLIST2 0x0904008A +#define MASLIST3CDT 0x0904008B +#define MASLIST3 0x0904008C +#define RAYS39CDT 0x0904008D +#define RAYS39 0x0904008E +#define TRI39ALOCDT 0x0904008F +#define TRI39ALO 0x09040090 +#define TRI39GEMCDT 0x09040091 +#define TRI39GEM 0x09040092 // 147 entities in TXTs, 147 in datafiles. // room40 -#define R40L0 0x09050000 -#define room40_PAL 0x09050001 -#define room40_flr 0x09050002 -#define GEO40ASCCDT 0x09050003 -#define GEO40ASC 0x09050004 -#define GEO40DESCDT 0x09050005 -#define GEO40DES 0x09050006 -#define GEO40DIPCDT 0x09050007 -#define GEO40DIP 0x09050008 -#define GUA40ENTCDT 0x09050009 -#define GUA40ENT 0x0905000A -#define GUA40STACDT 0x0905000B -#define GUA40STA 0x0905000C -#define GUA40TALCDT 0x0905000D -#define GUA40TAL 0x0905000E -#define PAI40FAGCDT 0x0905000F -#define PAI40FAG 0x09050010 -#define PAI40IDLCDT 0x09050011 -#define PAI40IDL 0x09050012 -#define PAI40LEACDT 0x09050013 -#define PAI40LEA 0x09050014 -#define PAI40STACDR 0x09050015 -#define PAI40STACDT 0x09050016 -#define PAI40STA 0x09050017 -#define PAI40TALCDT 0x09050018 -#define PAI40TAL 0x09050019 +#define R40L0 0x09050000 +#define room40_PAL 0x09050001 +#define room40_flr 0x09050002 +#define GEO40ASCCDT 0x09050003 +#define GEO40ASC 0x09050004 +#define GEO40DESCDT 0x09050005 +#define GEO40DES 0x09050006 +#define GEO40DIPCDT 0x09050007 +#define GEO40DIP 0x09050008 +#define GUA40ENTCDT 0x09050009 +#define GUA40ENT 0x0905000A +#define GUA40STACDT 0x0905000B +#define GUA40STA 0x0905000C +#define GUA40TALCDT 0x0905000D +#define GUA40TAL 0x0905000E +#define PAI40FAGCDT 0x0905000F +#define PAI40FAG 0x09050010 +#define PAI40IDLCDT 0x09050011 +#define PAI40IDL 0x09050012 +#define PAI40LEACDT 0x09050013 +#define PAI40LEA 0x09050014 +#define PAI40STACDR 0x09050015 +#define PAI40STACDT 0x09050016 +#define PAI40STA 0x09050017 +#define PAI40TALCDT 0x09050018 +#define PAI40TAL 0x09050019 // 26 entities in TXTs, 26 in datafiles. // room41 -#define R41L0 0x09060000 -#define R41L1 0x09060001 -#define R41G1 0x09060002 -#define room41_PAL 0x09060003 -#define room41_flr 0x09060004 -#define GEO41ENTCDT 0x09060005 -#define GEO41ENT 0x09060006 -#define GEO41OP2CDT 0x09060007 -#define GEO41OP2 0x09060008 -#define GEO41OPECDT 0x09060009 -#define GEO41OPE 0x0906000A -#define GEO41THECDR 0x0906000B -#define GEO41THECDT 0x0906000C -#define GEO41THE 0x0906000D -#define GLO41IDLCDT 0x0906000E -#define GLO41IDL 0x0906000F -#define GLO41KEYCDR 0x09060010 -#define GLO41KEYCDT 0x09060011 -#define GLO41KEY 0x09060012 -#define GLO41TALCDT 0x09060013 -#define GLO41TAL 0x09060014 -#define GUA41ANSCDT 0x09060015 -#define GUA41ANS 0x09060016 -#define GUA41GLOCDT 0x09060017 -#define GUA41GLO 0x09060018 -#define GUA41IDLCDT 0x09060019 -#define GUA41IDL 0x0906001A -#define GUA41KEYCDR 0x0906001B -#define GUA41KEYCDT 0x0906001C -#define GUA41KEY 0x0906001D -#define GUA41PHOCDT 0x0906001E -#define GUA41PHO 0x0906001F -#define GUA41TALCDT 0x09060020 -#define GUA41TAL 0x09060021 -#define PAI41HANCDT 0x09060022 -#define PAI41HAN 0x09060023 -#define PAI41LEACDT 0x09060024 -#define PAI41LEA 0x09060025 -#define PAI41TALCDT 0x09060026 -#define PAI41TAL 0x09060027 -#define PHONE41CDT 0x09060028 -#define PHONE41 0x09060029 +#define R41L0 0x09060000 +#define R41L1 0x09060001 +#define R41G1 0x09060002 +#define room41_PAL 0x09060003 +#define room41_flr 0x09060004 +#define GEO41ENTCDT 0x09060005 +#define GEO41ENT 0x09060006 +#define GEO41OP2CDT 0x09060007 +#define GEO41OP2 0x09060008 +#define GEO41OPECDT 0x09060009 +#define GEO41OPE 0x0906000A +#define GEO41THECDR 0x0906000B +#define GEO41THECDT 0x0906000C +#define GEO41THE 0x0906000D +#define GLO41IDLCDT 0x0906000E +#define GLO41IDL 0x0906000F +#define GLO41KEYCDR 0x09060010 +#define GLO41KEYCDT 0x09060011 +#define GLO41KEY 0x09060012 +#define GLO41TALCDT 0x09060013 +#define GLO41TAL 0x09060014 +#define GUA41ANSCDT 0x09060015 +#define GUA41ANS 0x09060016 +#define GUA41GLOCDT 0x09060017 +#define GUA41GLO 0x09060018 +#define GUA41IDLCDT 0x09060019 +#define GUA41IDL 0x0906001A +#define GUA41KEYCDR 0x0906001B +#define GUA41KEYCDT 0x0906001C +#define GUA41KEY 0x0906001D +#define GUA41PHOCDT 0x0906001E +#define GUA41PHO 0x0906001F +#define GUA41TALCDT 0x09060020 +#define GUA41TAL 0x09060021 +#define PAI41HANCDT 0x09060022 +#define PAI41HAN 0x09060023 +#define PAI41LEACDT 0x09060024 +#define PAI41LEA 0x09060025 +#define PAI41TALCDT 0x09060026 +#define PAI41TAL 0x09060027 +#define PHONE41CDT 0x09060028 +#define PHONE41 0x09060029 // 42 entities in TXTs, 42 in datafiles. // room42 -#define room42_PAL 0x09070000 -#define R42L0 0x09070001 -#define R42L1 0x09070002 -#define R42L2 0x09070003 -#define R42G1 0x09070004 -#define R42G2 0x09070005 -#define room42_flr 0x09070006 -#define CHALICE42 0x09070007 -#define CHALICE42_PAL 0x09070008 -#define GEO42CHACDT 0x09070009 -#define GEO42CHA 0x0907000A -#define GEO42DESCDR 0x0907000B -#define GEO42DESCDT 0x0907000C -#define GEO42DES 0x0907000D +#define room42_PAL 0x09070000 +#define R42L0 0x09070001 +#define R42L1 0x09070002 +#define R42L2 0x09070003 +#define R42G1 0x09070004 +#define R42G2 0x09070005 +#define room42_flr 0x09070006 +#define CHALICE42 0x09070007 +#define CHALICE42_PAL 0x09070008 +#define GEO42CHACDT 0x09070009 +#define GEO42CHA 0x0907000A +#define GEO42DESCDR 0x0907000B +#define GEO42DESCDT 0x0907000C +#define GEO42DES 0x0907000D // 14 entities in TXTs, 14 in datafiles. // room43 -#define room43_PAL 0x09080000 -#define R43L0 0x09080001 -#define R43L1 0x09080002 -#define R43G1 0x09080003 -#define room43_flr 0x09080004 -#define GEO43DR2CDT 0x09080005 -#define GEO43DR2 0x09080006 -#define GEO43DRYCDT 0x09080007 -#define GEO43DRY 0x09080008 -#define GEO43HAN 0x09080009 -#define GEO43HANCDT 0x0908000A -#define GEO43KEYCDT 0x0908000B -#define GEO43KEY 0x0908000C -#define GEO43PLACDT 0x0908000D -#define GEO43PLA 0x0908000E -#define GEO43PRECDT 0x0908000F -#define GEO43PRE 0x09080010 -#define GEO43SOACDT 0x09080011 -#define GEO43SOA 0x09080012 -#define GEO43SWPCDT 0x09080013 -#define GEO43SWP 0x09080014 -#define GEO43WATCDT 0x09080015 -#define GEO43WAT 0x09080016 -#define SOAP43CDT 0x09080017 -#define SOAP43 0x09080018 -#define WATER43CDT 0x09080019 -#define WATER43 0x0908001A +#define room43_PAL 0x09080000 +#define R43L0 0x09080001 +#define R43L1 0x09080002 +#define R43G1 0x09080003 +#define room43_flr 0x09080004 +#define GEO43DR2CDT 0x09080005 +#define GEO43DR2 0x09080006 +#define GEO43DRYCDT 0x09080007 +#define GEO43DRY 0x09080008 +#define GEO43HAN 0x09080009 +#define GEO43HANCDT 0x0908000A +#define GEO43KEYCDT 0x0908000B +#define GEO43KEY 0x0908000C +#define GEO43PLACDT 0x0908000D +#define GEO43PLA 0x0908000E +#define GEO43PRECDT 0x0908000F +#define GEO43PRE 0x09080010 +#define GEO43SOACDT 0x09080011 +#define GEO43SOA 0x09080012 +#define GEO43SWPCDT 0x09080013 +#define GEO43SWP 0x09080014 +#define GEO43WATCDT 0x09080015 +#define GEO43WAT 0x09080016 +#define SOAP43CDT 0x09080017 +#define SOAP43 0x09080018 +#define WATER43CDT 0x09080019 +#define WATER43 0x0908001A // 27 entities in TXTs, 27 in datafiles. // room48 -#define R48SPRPAL 0x09090000 -#define R48L0 0x09090001 -#define R48L1 0x09090002 -#define R48L2 0x09090003 -#define R48G1 0x09090004 -#define R48G2 0x09090005 -#define R48PAL 0x09090006 -#define room48_flr 0x09090007 -#define R48PLX 0x09090008 -#define GEO48BENCDR 0x09090009 -#define GEO48BENCDT 0x0909000A -#define GEO48BEN 0x0909000B -#define GEO48GIVCDR 0x0909000C -#define GEO48GIVCDT 0x0909000D -#define GEO48GIV 0x0909000E -#define GEO48LENCDT 0x0909000F -#define GEO48LEN 0x09090010 -#define PRI48CANCDR 0x09090011 -#define PRI48CANCDT 0x09090012 -#define PRI48CAN 0x09090013 -#define PRI48IDLCDT 0x09090014 -#define PRI48IDL 0x09090015 -#define PRI48PO1CDT 0x09090016 -#define PRI48PO1 0x09090017 -#define PRI48PO2CDT 0x09090018 -#define PRI48PO2 0x09090019 -#define PRI48RETCDT 0x0909001A -#define PRI48RET 0x0909001B -#define PRI48TAKCDT 0x0909001C -#define PRI48TAK 0x0909001D -#define PRI48TALCDT 0x0909001E -#define PRI48TAL 0x0909001F -#define PRI48TURCDR 0x09090020 -#define PRI48TURCDT 0x09090021 -#define PRI48TUR 0x09090022 -#define WINDOW1 0x09090023 -#define WINDOW1_PAL 0x09090024 -#define WINDOW2 0x09090025 -#define WINDOW2_PAL 0x09090026 +#define R48SPRPAL 0x09090000 +#define R48L0 0x09090001 +#define R48L1 0x09090002 +#define R48L2 0x09090003 +#define R48G1 0x09090004 +#define R48G2 0x09090005 +#define R48PAL 0x09090006 +#define room48_flr 0x09090007 +#define R48PLX 0x09090008 +#define GEO48BENCDR 0x09090009 +#define GEO48BENCDT 0x0909000A +#define GEO48BEN 0x0909000B +#define GEO48GIVCDR 0x0909000C +#define GEO48GIVCDT 0x0909000D +#define GEO48GIV 0x0909000E +#define GEO48LENCDT 0x0909000F +#define GEO48LEN 0x09090010 +#define PRI48CANCDR 0x09090011 +#define PRI48CANCDT 0x09090012 +#define PRI48CAN 0x09090013 +#define PRI48IDLCDT 0x09090014 +#define PRI48IDL 0x09090015 +#define PRI48PO1CDT 0x09090016 +#define PRI48PO1 0x09090017 +#define PRI48PO2CDT 0x09090018 +#define PRI48PO2 0x09090019 +#define PRI48RETCDT 0x0909001A +#define PRI48RET 0x0909001B +#define PRI48TAKCDT 0x0909001C +#define PRI48TAK 0x0909001D +#define PRI48TALCDT 0x0909001E +#define PRI48TAL 0x0909001F +#define PRI48TURCDR 0x09090020 +#define PRI48TURCDT 0x09090021 +#define PRI48TUR 0x09090022 +#define WINDOW1 0x09090023 +#define WINDOW1_PAL 0x09090024 +#define WINDOW2 0x09090025 +#define WINDOW2_PAL 0x09090026 // 39 entities in TXTs, 39 in datafiles. // ireland // sound_fx -#define FX_EIRBIRD3 0x0A000000 -#define FX_SHOCK2 0x0A000001 -#define FX_EIRBIRD1 0x0A000002 -#define FX_EIRBIRD2 0x0A000003 -#define FX_SWITCH19 0x0A000004 -#define FX_TRAPOPEN 0x0A000005 -#define FX_VIOLIN19 0x0A000006 -#define FX_WHISTLE 0x0A000007 -#define FX_BARFLAP 0x0A000008 -#define FX_DORCLOSE20 0x0A000009 -#define FX_DRINK 0x0A00000A -#define FX_FITZHIT 0x0A00000B -#define FX_FITZRUN 0x0A00000C -#define FX_FITZUP 0x0A00000D -#define FX_FUSE20 0x0A00000E -#define FX_PULLPINT 0x0A00000F -#define FX_SNEEZE1 0x0A000010 -#define FX_SNEEZE2 0x0A000011 -#define FX_WASHER 0x0A000012 -#define FX_CELTAP 0x0A000013 -#define FX_DRIPIRE 0x0A000014 -#define FX_DRIPIRE2 0x0A000015 -#define FX_TAP 0x0A000016 -#define FX_TAP2 0x0A000017 -#define FX_CLIMBHAY 0x0A000018 -#define FX_FARMERGO 0x0A000019 -#define FX_CASTLWAL 0x0A00001A -#define FX_CLIMBFAL 0x0A00001B -#define FX_KEYSTEP 0x0A00001C -#define FX_WIND 0x0A00001D -#define FX_GEOGOAT 0x0A00001E -#define FX_GOATBAA 0x0A00001F -#define FX_GOATCHEW 0x0A000020 -#define FX_GOATDOH 0x0A000021 -#define FX_PLOUGH 0x0A000022 -#define FX_EIRDRIP1 0x0A000023 -#define FX_EIRDRIP2 0x0A000024 -#define FX_LADDWN25 0x0A000025 -#define FX_LADDUP25 0x0A000026 -#define FX_SECDOR25 0x0A000027 -#define FX_SLABFALL 0x0A000028 -#define FX_SLABUP 0x0A000029 -#define FX_TRIGER25 0x0A00002A -#define FX_WRING 0x0A00002B -#define FX_LEVER 0x0A00002C -#define FX_LEVER2 0x0A00002D -#define FX_RAT3A 0x0A00002E -#define FX_RAT3B 0x0A00002F -#define FX_RAT3C 0x0A000030 -#define FX_RAT3D 0x0A000031 +#define FX_EIRBIRD3 0x0A000000 +#define FX_SHOCK2 0x0A000001 +#define FX_EIRBIRD1 0x0A000002 +#define FX_EIRBIRD2 0x0A000003 +#define FX_SWITCH19 0x0A000004 +#define FX_TRAPOPEN 0x0A000005 +#define FX_VIOLIN19 0x0A000006 +#define FX_WHISTLE 0x0A000007 +#define FX_BARFLAP 0x0A000008 +#define FX_DORCLOSE20 0x0A000009 +#define FX_DRINK 0x0A00000A +#define FX_FITZHIT 0x0A00000B +#define FX_FITZRUN 0x0A00000C +#define FX_FITZUP 0x0A00000D +#define FX_FUSE20 0x0A00000E +#define FX_PULLPINT 0x0A00000F +#define FX_SNEEZE1 0x0A000010 +#define FX_SNEEZE2 0x0A000011 +#define FX_WASHER 0x0A000012 +#define FX_CELTAP 0x0A000013 +#define FX_DRIPIRE 0x0A000014 +#define FX_DRIPIRE2 0x0A000015 +#define FX_TAP 0x0A000016 +#define FX_TAP2 0x0A000017 +#define FX_CLIMBHAY 0x0A000018 +#define FX_FARMERGO 0x0A000019 +#define FX_CASTLWAL 0x0A00001A +#define FX_CLIMBFAL 0x0A00001B +#define FX_KEYSTEP 0x0A00001C +#define FX_WIND 0x0A00001D +#define FX_GEOGOAT 0x0A00001E +#define FX_GOATBAA 0x0A00001F +#define FX_GOATCHEW 0x0A000020 +#define FX_GOATDOH 0x0A000021 +#define FX_PLOUGH 0x0A000022 +#define FX_EIRDRIP1 0x0A000023 +#define FX_EIRDRIP2 0x0A000024 +#define FX_LADDWN25 0x0A000025 +#define FX_LADDUP25 0x0A000026 +#define FX_SECDOR25 0x0A000027 +#define FX_SLABFALL 0x0A000028 +#define FX_SLABUP 0x0A000029 +#define FX_TRIGER25 0x0A00002A +#define FX_WRING 0x0A00002B +#define FX_LEVER 0x0A00002C +#define FX_LEVER2 0x0A00002D +#define FX_RAT3A 0x0A00002E +#define FX_RAT3B 0x0A00002F +#define FX_RAT3C 0x0A000030 +#define FX_RAT3D 0x0A000031 // 50 entities in TXTs, 50 in datafiles. // room19 -#define R19SPRPAL 0x0A010000 -#define R19L0 0x0A010001 -#define R19L1 0x0A010002 -#define R19L2 0x0A010003 -#define R19G1 0x0A010004 -#define R19G2 0x0A010005 -#define R19PAL 0x0A010006 -#define R19FLR 0x0A010007 -#define ASSTAP 0x0A010008 -#define ASSTAPCDT 0x0A010009 -#define ASSTLK19 0x0A01000A -#define ASSTLK19CDT 0x0A01000B -#define ASSWLK2 0x0A01000C -#define ASSWLK2CDT 0x0A01000D -#define ASSWLK6 0x0A01000E -#define ASSWLK6CDT 0x0A01000F -#define BOXCVR 0x0A010010 -#define BOXCVRCDT 0x0A010011 -#define GEODRN 0x0A010012 -#define GEODRNCDT 0x0A010013 -#define GEOMAG 0x0A010014 -#define GEOMAGCDT 0x0A010015 -#define GEORCT 0x0A010016 -#define GEORCTCDT 0x0A010017 -#define GEOTRP 0x0A010018 -#define GEOTRPCDT 0x0A010019 -#define GEOTRP8 0x0A01001A -#define GEOTRP8CDT 0x0A01001B -#define GEOWRN 0x0A01001C -#define GEOWRNCDT 0x0A01001D -#define LID19 0x0A01001E -#define LID19CDT 0x0A01001F -#define MAGCON 0x0A010020 -#define MAGCONCDT 0x0A010021 -#define MAGCONCDR 0x0A010022 -#define MAGMOV 0x0A010023 -#define MAGMOVCDT 0x0A010024 -#define MAGMOVCDR 0x0A010025 -#define MAGSHK 0x0A010026 -#define MAGSHKCDT 0x0A010027 -#define MAGSHY 0x0A010028 -#define MAGSHYCDT 0x0A010029 -#define MAGSHYCDR 0x0A01002A -#define MAGSLK 0x0A01002B -#define MAGSLKCDT 0x0A01002C -#define MAGTALK 0x0A01002D -#define MAGTALKCDT 0x0A01002E -#define MAGTLK 0x0A01002F -#define MAGTLKCDT 0x0A010030 -#define MAGTLK8 0x0A010031 -#define MAGTLK8CDT 0x0A010032 -#define TRPOPN 0x0A010033 -#define TRPOPNCDT 0x0A010034 +#define R19SPRPAL 0x0A010000 +#define R19L0 0x0A010001 +#define R19L1 0x0A010002 +#define R19L2 0x0A010003 +#define R19G1 0x0A010004 +#define R19G2 0x0A010005 +#define R19PAL 0x0A010006 +#define R19FLR 0x0A010007 +#define ASSTAP 0x0A010008 +#define ASSTAPCDT 0x0A010009 +#define ASSTLK19 0x0A01000A +#define ASSTLK19CDT 0x0A01000B +#define ASSWLK2 0x0A01000C +#define ASSWLK2CDT 0x0A01000D +#define ASSWLK6 0x0A01000E +#define ASSWLK6CDT 0x0A01000F +#define BOXCVR 0x0A010010 +#define BOXCVRCDT 0x0A010011 +#define GEODRN 0x0A010012 +#define GEODRNCDT 0x0A010013 +#define GEOMAG 0x0A010014 +#define GEOMAGCDT 0x0A010015 +#define GEORCT 0x0A010016 +#define GEORCTCDT 0x0A010017 +#define GEOTRP 0x0A010018 +#define GEOTRPCDT 0x0A010019 +#define GEOTRP8 0x0A01001A +#define GEOTRP8CDT 0x0A01001B +#define GEOWRN 0x0A01001C +#define GEOWRNCDT 0x0A01001D +#define LID19 0x0A01001E +#define LID19CDT 0x0A01001F +#define MAGCON 0x0A010020 +#define MAGCONCDT 0x0A010021 +#define MAGCONCDR 0x0A010022 +#define MAGMOV 0x0A010023 +#define MAGMOVCDT 0x0A010024 +#define MAGMOVCDR 0x0A010025 +#define MAGSHK 0x0A010026 +#define MAGSHKCDT 0x0A010027 +#define MAGSHY 0x0A010028 +#define MAGSHYCDT 0x0A010029 +#define MAGSHYCDR 0x0A01002A +#define MAGSLK 0x0A01002B +#define MAGSLKCDT 0x0A01002C +#define MAGTALK 0x0A01002D +#define MAGTALKCDT 0x0A01002E +#define MAGTLK 0x0A01002F +#define MAGTLKCDT 0x0A010030 +#define MAGTLK8 0x0A010031 +#define MAGTLK8CDT 0x0A010032 +#define TRPOPN 0x0A010033 +#define TRPOPNCDT 0x0A010034 // 53 entities in TXTs, 53 in datafiles. // room20 -#define R20SPRPAL 0x0A020000 -#define R20L0 0x0A020001 -#define R20L1 0x0A020002 -#define R20L2 0x0A020003 -#define R20L3 0x0A020004 -#define R20G1 0x0A020005 -#define R20G2 0x0A020006 -#define R20G3 0x0A020007 -#define R20PAL 0x0A020008 -#define R20FLR 0x0A020009 -#define BARTPS 0x0A02000A -#define BARTPSCDT 0x0A02000B -#define BARTWL 0x0A02000C -#define BARTWLCDT 0x0A02000D -#define BRIDRN 0x0A02000E -#define BRIDRNCDT 0x0A02000F -#define BRIDRNCDR 0x0A020010 -#define BRIFTZ 0x0A020011 -#define BRIFTZCDT 0x0A020012 -#define BRIFTZCDR 0x0A020013 -#define BRITLK 0x0A020014 -#define BRITLKCDT 0x0A020015 -#define BRITLK8 0x0A020016 -#define BRITLK8CDT 0x0A020017 -#define BRITLK9 0x0A020018 -#define BRITLK9CDT 0x0A020019 -#define BRITRN 0x0A02001A -#define BRITRNCDT 0x0A02001B -#define BRITRNCDR 0x0A02001C -#define DOROPN20 0x0A02001D -#define DOROPN20CDT 0x0A02001E -#define DOROPN20CDR 0x0A02001F -#define DOYDRN 0x0A020020 -#define DOYDRNCDT 0x0A020021 -#define DOYDRNCDR 0x0A020022 -#define DOYFTZ 0x0A020023 -#define DOYFTZCDT 0x0A020024 -#define DOYFTZCDR 0x0A020025 -#define DOYTLK 0x0A020026 -#define DOYTLKCDT 0x0A020027 -#define DOYTLK20 0x0A020028 -#define DOYTLK20CDT 0x0A020029 -#define DOYTLK8 0x0A02002A -#define DOYTLK8CDT 0x0A02002B -#define DOYTLK9 0x0A02002C -#define DOYTLK9CDT 0x0A02002D -#define DOYTRN 0x0A02002E -#define DOYTRNCDT 0x0A02002F -#define DOYTRNCDR 0x0A020030 -#define DOYTRN20 0x0A020031 -#define DOYTRN20CDT 0x0A020032 -#define DOYTRN20CDR 0x0A020033 -#define DOYTRN8 0x0A020034 -#define DOYTRN8CDT 0x0A020035 -#define DOYTRN8CDR 0x0A020036 -#define DOYTRN9 0x0A020037 -#define DOYTRN9CDT 0x0A020038 -#define DOYTRN9CDR 0x0A020039 -#define FIDPLY 0x0A02003A -#define FIDPLYCDT 0x0A02003B -#define FLPOPN 0x0A02003C -#define FLPOPNCDT 0x0A02003D -#define FRMTLK20 0x0A02003E -#define FRMTLK20CDT 0x0A02003F -#define FTZAGT 0x0A020040 -#define FTZAGTCDT 0x0A020041 -#define FTZGET 0x0A020042 -#define FTZGETCDT 0x0A020043 -#define FTZGETCDR 0x0A020044 -#define FTZRUN 0x0A020045 -#define FTZRUNCDT 0x0A020046 -#define FTZSTD 0x0A020047 -#define FTZSTDCDT 0x0A020048 -#define FTZTALK 0x0A020049 -#define FTZTALKCDT 0x0A02004A -#define FTZTLK 0x0A02004B -#define FTZTLKCDT 0x0A02004C -#define FTZTLK8 0x0A02004D -#define FTZTLK8CDT 0x0A02004E -#define GEODRN20 0x0A02004F -#define GEODRN20CDT 0x0A020050 -#define GEOPHN20 0x0A020051 -#define GEOPHN20CDT 0x0A020052 -#define GEOPHN20CDR 0x0A020053 -#define GEOPLG 0x0A020054 -#define GEOPLGCDT 0x0A020055 -#define GEOPLG8 0x0A020056 -#define GEOPLG8CDT 0x0A020057 -#define GEOSEE 0x0A020058 -#define GEOSEECDT 0x0A020059 -#define GEOSNR 0x0A02005A -#define GEOSNRCDT 0x0A02005B -#define GEOSNR8 0x0A02005C -#define GEOSNR8CDT 0x0A02005D -#define GEOTWL20 0x0A02005E -#define GEOTWL20CDT 0x0A02005F -#define GEOXIT20 0x0A020060 -#define GEOXIT20CDT 0x0A020061 -#define GLSGEO 0x0A020062 -#define GLSGEOCDT 0x0A020063 -#define GLSWSH 0x0A020064 -#define GLSWSHCDT 0x0A020065 -#define LESDOR 0x0A020066 -#define LESDORCDT 0x0A020067 -#define LESDOY 0x0A020068 -#define LESDOYCDT 0x0A020069 -#define LESFLP 0x0A02006A -#define LESFLPCDT 0x0A02006B -#define LESFTZ 0x0A02006C -#define LESFTZCDT 0x0A02006D -#define LESFTZCDR 0x0A02006E -#define LESGLS 0x0A02006F -#define LESGLSCDT 0x0A020070 -#define LESGLSCDR 0x0A020071 -#define LESLNS 0x0A020072 -#define LESLNSCDT 0x0A020073 -#define LESLNSCDR 0x0A020074 -#define LESMOV 0x0A020075 -#define LESMOVCDT 0x0A020076 -#define LESMOVCDR 0x0A020077 -#define LESPMP 0x0A020078 -#define LESPMPCDT 0x0A020079 -#define LESPNT 0x0A02007A -#define LESPNTCDT 0x0A02007B -#define LESPNT20 0x0A02007C -#define LESPNT20CDT 0x0A02007D -#define LESPNT8 0x0A02007E -#define LESPNT8CDT 0x0A02007F -#define LESPNT8CDR 0x0A020080 -#define LESTALK 0x0A020081 -#define LESTALKCDT 0x0A020082 -#define LESTLK 0x0A020083 -#define LESTLKCDT 0x0A020084 -#define LESTLK20 0x0A020085 -#define LESTLK20CDT 0x0A020086 -#define LESTLK8 0x0A020087 -#define LESTLK8CDT 0x0A020088 -#define LESTLK9 0x0A020089 -#define LESTLK9CDT 0x0A02008A -#define LESTURN 0x0A02008B -#define LESTURNCDT 0x0A02008C -#define LESTURNCDR 0x0A02008D -#define LESWLK 0x0A02008E -#define LESWLKCDT 0x0A02008F -#define LESWLK8 0x0A020090 -#define LESWLK8CDT 0x0A020091 -#define LESWSH 0x0A020092 -#define LESWSHCDT 0x0A020093 -#define LESWSHCDR 0x0A020094 -#define MAGENT 0x0A020095 -#define MAGENTCDT 0x0A020096 -#define MAGEXIT 0x0A020097 -#define MAGEXITCDT 0x0A020098 -#define MAGMOV20 0x0A020099 -#define MAGMOV20CDT 0x0A02009A -#define MAGTEST 0x0A02009B -#define MAGTESTCDT 0x0A02009C -#define MAGTLK20 0x0A02009D -#define MAGTLK20CDT 0x0A02009E -#define PLGWLL 0x0A02009F -#define PLGWLLCDT 0x0A0200A0 -#define RONDRN 0x0A0200A1 -#define RONDRNCDT 0x0A0200A2 -#define RONDRNCDR 0x0A0200A3 -#define RONDRP 0x0A0200A4 -#define RONDRPCDT 0x0A0200A5 -#define RONFTZ 0x0A0200A6 -#define RONFTZCDT 0x0A0200A7 -#define RONFTZCDR 0x0A0200A8 -#define RONGEO 0x0A0200A9 -#define RONGEOCDT 0x0A0200AA -#define RONGEOCDR 0x0A0200AB -#define RONGLS 0x0A0200AC -#define RONGLSCDT 0x0A0200AD -#define RONGLSCDR 0x0A0200AE -#define RONGLS8 0x0A0200AF -#define RONGLS8CDT 0x0A0200B0 -#define RONPIK 0x0A0200B1 -#define RONPIKCDT 0x0A0200B2 -#define RONPKT 0x0A0200B3 -#define RONPKTCDT 0x0A0200B4 -#define RONPKTCDR 0x0A0200B5 -#define RONSNR 0x0A0200B6 -#define RONSNRCDT 0x0A0200B7 -#define RONSNZ 0x0A0200B8 -#define RONSNZCDT 0x0A0200B9 -#define RONSNZ2 0x0A0200BA -#define RONSNZ2CDT 0x0A0200BB -#define RONTLK 0x0A0200BC -#define RONTLKCDT 0x0A0200BD -#define RONTLK2 0x0A0200BE -#define RONTLK2CDT 0x0A0200BF -#define RONWIR 0x0A0200C0 -#define RONWIRCDT 0x0A0200C1 -#define RONWIRCDR 0x0A0200C2 -#define SNRTBL 0x0A0200C3 -#define SNRTBLCDT 0x0A0200C4 +#define R20SPRPAL 0x0A020000 +#define R20L0 0x0A020001 +#define R20L1 0x0A020002 +#define R20L2 0x0A020003 +#define R20L3 0x0A020004 +#define R20G1 0x0A020005 +#define R20G2 0x0A020006 +#define R20G3 0x0A020007 +#define R20PAL 0x0A020008 +#define R20FLR 0x0A020009 +#define BARTPS 0x0A02000A +#define BARTPSCDT 0x0A02000B +#define BARTWL 0x0A02000C +#define BARTWLCDT 0x0A02000D +#define BRIDRN 0x0A02000E +#define BRIDRNCDT 0x0A02000F +#define BRIDRNCDR 0x0A020010 +#define BRIFTZ 0x0A020011 +#define BRIFTZCDT 0x0A020012 +#define BRIFTZCDR 0x0A020013 +#define BRITLK 0x0A020014 +#define BRITLKCDT 0x0A020015 +#define BRITLK8 0x0A020016 +#define BRITLK8CDT 0x0A020017 +#define BRITLK9 0x0A020018 +#define BRITLK9CDT 0x0A020019 +#define BRITRN 0x0A02001A +#define BRITRNCDT 0x0A02001B +#define BRITRNCDR 0x0A02001C +#define DOROPN20 0x0A02001D +#define DOROPN20CDT 0x0A02001E +#define DOROPN20CDR 0x0A02001F +#define DOYDRN 0x0A020020 +#define DOYDRNCDT 0x0A020021 +#define DOYDRNCDR 0x0A020022 +#define DOYFTZ 0x0A020023 +#define DOYFTZCDT 0x0A020024 +#define DOYFTZCDR 0x0A020025 +#define DOYTLK 0x0A020026 +#define DOYTLKCDT 0x0A020027 +#define DOYTLK20 0x0A020028 +#define DOYTLK20CDT 0x0A020029 +#define DOYTLK8 0x0A02002A +#define DOYTLK8CDT 0x0A02002B +#define DOYTLK9 0x0A02002C +#define DOYTLK9CDT 0x0A02002D +#define DOYTRN 0x0A02002E +#define DOYTRNCDT 0x0A02002F +#define DOYTRNCDR 0x0A020030 +#define DOYTRN20 0x0A020031 +#define DOYTRN20CDT 0x0A020032 +#define DOYTRN20CDR 0x0A020033 +#define DOYTRN8 0x0A020034 +#define DOYTRN8CDT 0x0A020035 +#define DOYTRN8CDR 0x0A020036 +#define DOYTRN9 0x0A020037 +#define DOYTRN9CDT 0x0A020038 +#define DOYTRN9CDR 0x0A020039 +#define FIDPLY 0x0A02003A +#define FIDPLYCDT 0x0A02003B +#define FLPOPN 0x0A02003C +#define FLPOPNCDT 0x0A02003D +#define FRMTLK20 0x0A02003E +#define FRMTLK20CDT 0x0A02003F +#define FTZAGT 0x0A020040 +#define FTZAGTCDT 0x0A020041 +#define FTZGET 0x0A020042 +#define FTZGETCDT 0x0A020043 +#define FTZGETCDR 0x0A020044 +#define FTZRUN 0x0A020045 +#define FTZRUNCDT 0x0A020046 +#define FTZSTD 0x0A020047 +#define FTZSTDCDT 0x0A020048 +#define FTZTALK 0x0A020049 +#define FTZTALKCDT 0x0A02004A +#define FTZTLK 0x0A02004B +#define FTZTLKCDT 0x0A02004C +#define FTZTLK8 0x0A02004D +#define FTZTLK8CDT 0x0A02004E +#define GEODRN20 0x0A02004F +#define GEODRN20CDT 0x0A020050 +#define GEOPHN20 0x0A020051 +#define GEOPHN20CDT 0x0A020052 +#define GEOPHN20CDR 0x0A020053 +#define GEOPLG 0x0A020054 +#define GEOPLGCDT 0x0A020055 +#define GEOPLG8 0x0A020056 +#define GEOPLG8CDT 0x0A020057 +#define GEOSEE 0x0A020058 +#define GEOSEECDT 0x0A020059 +#define GEOSNR 0x0A02005A +#define GEOSNRCDT 0x0A02005B +#define GEOSNR8 0x0A02005C +#define GEOSNR8CDT 0x0A02005D +#define GEOTWL20 0x0A02005E +#define GEOTWL20CDT 0x0A02005F +#define GEOXIT20 0x0A020060 +#define GEOXIT20CDT 0x0A020061 +#define GLSGEO 0x0A020062 +#define GLSGEOCDT 0x0A020063 +#define GLSWSH 0x0A020064 +#define GLSWSHCDT 0x0A020065 +#define LESDOR 0x0A020066 +#define LESDORCDT 0x0A020067 +#define LESDOY 0x0A020068 +#define LESDOYCDT 0x0A020069 +#define LESFLP 0x0A02006A +#define LESFLPCDT 0x0A02006B +#define LESFTZ 0x0A02006C +#define LESFTZCDT 0x0A02006D +#define LESFTZCDR 0x0A02006E +#define LESGLS 0x0A02006F +#define LESGLSCDT 0x0A020070 +#define LESGLSCDR 0x0A020071 +#define LESLNS 0x0A020072 +#define LESLNSCDT 0x0A020073 +#define LESLNSCDR 0x0A020074 +#define LESMOV 0x0A020075 +#define LESMOVCDT 0x0A020076 +#define LESMOVCDR 0x0A020077 +#define LESPMP 0x0A020078 +#define LESPMPCDT 0x0A020079 +#define LESPNT 0x0A02007A +#define LESPNTCDT 0x0A02007B +#define LESPNT20 0x0A02007C +#define LESPNT20CDT 0x0A02007D +#define LESPNT8 0x0A02007E +#define LESPNT8CDT 0x0A02007F +#define LESPNT8CDR 0x0A020080 +#define LESTALK 0x0A020081 +#define LESTALKCDT 0x0A020082 +#define LESTLK 0x0A020083 +#define LESTLKCDT 0x0A020084 +#define LESTLK20 0x0A020085 +#define LESTLK20CDT 0x0A020086 +#define LESTLK8 0x0A020087 +#define LESTLK8CDT 0x0A020088 +#define LESTLK9 0x0A020089 +#define LESTLK9CDT 0x0A02008A +#define LESTURN 0x0A02008B +#define LESTURNCDT 0x0A02008C +#define LESTURNCDR 0x0A02008D +#define LESWLK 0x0A02008E +#define LESWLKCDT 0x0A02008F +#define LESWLK8 0x0A020090 +#define LESWLK8CDT 0x0A020091 +#define LESWSH 0x0A020092 +#define LESWSHCDT 0x0A020093 +#define LESWSHCDR 0x0A020094 +#define MAGENT 0x0A020095 +#define MAGENTCDT 0x0A020096 +#define MAGEXIT 0x0A020097 +#define MAGEXITCDT 0x0A020098 +#define MAGMOV20 0x0A020099 +#define MAGMOV20CDT 0x0A02009A +#define MAGTEST 0x0A02009B +#define MAGTESTCDT 0x0A02009C +#define MAGTLK20 0x0A02009D +#define MAGTLK20CDT 0x0A02009E +#define PLGWLL 0x0A02009F +#define PLGWLLCDT 0x0A0200A0 +#define RONDRN 0x0A0200A1 +#define RONDRNCDT 0x0A0200A2 +#define RONDRNCDR 0x0A0200A3 +#define RONDRP 0x0A0200A4 +#define RONDRPCDT 0x0A0200A5 +#define RONFTZ 0x0A0200A6 +#define RONFTZCDT 0x0A0200A7 +#define RONFTZCDR 0x0A0200A8 +#define RONGEO 0x0A0200A9 +#define RONGEOCDT 0x0A0200AA +#define RONGEOCDR 0x0A0200AB +#define RONGLS 0x0A0200AC +#define RONGLSCDT 0x0A0200AD +#define RONGLSCDR 0x0A0200AE +#define RONGLS8 0x0A0200AF +#define RONGLS8CDT 0x0A0200B0 +#define RONPIK 0x0A0200B1 +#define RONPIKCDT 0x0A0200B2 +#define RONPKT 0x0A0200B3 +#define RONPKTCDT 0x0A0200B4 +#define RONPKTCDR 0x0A0200B5 +#define RONSNR 0x0A0200B6 +#define RONSNRCDT 0x0A0200B7 +#define RONSNZ 0x0A0200B8 +#define RONSNZCDT 0x0A0200B9 +#define RONSNZ2 0x0A0200BA +#define RONSNZ2CDT 0x0A0200BB +#define RONTLK 0x0A0200BC +#define RONTLKCDT 0x0A0200BD +#define RONTLK2 0x0A0200BE +#define RONTLK2CDT 0x0A0200BF +#define RONWIR 0x0A0200C0 +#define RONWIRCDT 0x0A0200C1 +#define RONWIRCDR 0x0A0200C2 +#define SNRTBL 0x0A0200C3 +#define SNRTBLCDT 0x0A0200C4 // 197 entities in TXTs, 197 in datafiles. // room21 -#define R21L0 0x0A030000 -#define R21L1 0x0A030001 -#define R21L2 0x0A030002 -#define R21G1 0x0A030003 -#define R21G2 0x0A030004 -#define R21PAL 0x0A030005 -#define R21FLR 0x0A030006 -#define CALBLO 0x0A030007 -#define CALBLOCDT 0x0A030008 -#define GEMSHN 0x0A030009 -#define GEMSHNCDT 0x0A03000A -#define GEOGEM 0x0A03000B -#define GEOGEMCDT 0x0A03000C -#define GEOGEM8 0x0A03000D -#define GEOGEM8CDT 0x0A03000E -#define GEOLVR 0x0A03000F -#define GEOLVRCDT 0x0A030010 -#define GEOLVR21 0x0A030011 -#define GEOLVR21CDT 0x0A030012 -#define GEOLVR8 0x0A030013 -#define GEOLVR8CDT 0x0A030014 -#define GEOTAP 0x0A030015 -#define GEOTAPCDT 0x0A030016 -#define GEOTLK21 0x0A030017 -#define GEOTLK21CDT 0x0A030018 -#define GEOTORCH 0x0A030019 -#define GEOTORCHCDT 0x0A03001A -#define GEOTRN21 0x0A03001B -#define GEOTRN21CDT 0x0A03001C -#define GEOTRN21CDR 0x0A03001D -#define GEOTWL21 0x0A03001E -#define GEOTWL21CDT 0x0A03001F -#define LVRPSH 0x0A030020 -#define LVRPSHCDT 0x0A030021 -#define MAGCEL 0x0A030022 -#define MAGCELCDT 0x0A030023 -#define MAGCELCDR 0x0A030024 -#define MAGTLK21 0x0A030025 -#define MAGTLK21CDT 0x0A030026 -#define TAPDRP 0x0A030027 -#define TAPDRPCDT 0x0A030028 -#define TAPRUN 0x0A030029 -#define TAPRUNCDT 0x0A03002A -#define TORCH21 0x0A03002B -#define TORCH21CDT 0x0A03002C +#define R21L0 0x0A030000 +#define R21L1 0x0A030001 +#define R21L2 0x0A030002 +#define R21G1 0x0A030003 +#define R21G2 0x0A030004 +#define R21PAL 0x0A030005 +#define R21FLR 0x0A030006 +#define CALBLO 0x0A030007 +#define CALBLOCDT 0x0A030008 +#define GEMSHN 0x0A030009 +#define GEMSHNCDT 0x0A03000A +#define GEOGEM 0x0A03000B +#define GEOGEMCDT 0x0A03000C +#define GEOGEM8 0x0A03000D +#define GEOGEM8CDT 0x0A03000E +#define GEOLVR 0x0A03000F +#define GEOLVRCDT 0x0A030010 +#define GEOLVR21 0x0A030011 +#define GEOLVR21CDT 0x0A030012 +#define GEOLVR8 0x0A030013 +#define GEOLVR8CDT 0x0A030014 +#define GEOTAP 0x0A030015 +#define GEOTAPCDT 0x0A030016 +#define GEOTLK21 0x0A030017 +#define GEOTLK21CDT 0x0A030018 +#define GEOTORCH 0x0A030019 +#define GEOTORCHCDT 0x0A03001A +#define GEOTRN21 0x0A03001B +#define GEOTRN21CDT 0x0A03001C +#define GEOTRN21CDR 0x0A03001D +#define GEOTWL21 0x0A03001E +#define GEOTWL21CDT 0x0A03001F +#define LVRPSH 0x0A030020 +#define LVRPSHCDT 0x0A030021 +#define MAGCEL 0x0A030022 +#define MAGCELCDT 0x0A030023 +#define MAGCELCDR 0x0A030024 +#define MAGTLK21 0x0A030025 +#define MAGTLK21CDT 0x0A030026 +#define TAPDRP 0x0A030027 +#define TAPDRPCDT 0x0A030028 +#define TAPRUN 0x0A030029 +#define TAPRUNCDT 0x0A03002A +#define TORCH21 0x0A03002B +#define TORCH21CDT 0x0A03002C // 45 entities in TXTs, 45 in datafiles. // room22 -#define R22SPRPAL 0x0A040000 -#define R22L0 0x0A040001 -#define R22L1 0x0A040002 -#define R22G1 0x0A040003 -#define R22PAL 0x0A040004 -#define R22FLR 0x0A040005 -#define FRMBUK 0x0A040006 -#define FRMBUKCDT 0x0A040007 -#define FRMSTD 0x0A040008 -#define FRMSTDCDT 0x0A040009 -#define FRMTLK 0x0A04000A -#define FRMTLKCDT 0x0A04000B -#define FRMWLK 0x0A04000C -#define FRMWLKCDT 0x0A04000D -#define GEOCLM 0x0A04000E -#define GEOCLMCDT 0x0A04000F -#define GEOCLMCDR 0x0A040010 -#define GEOPSH22 0x0A040011 -#define GEOPSH22CDT 0x0A040012 +#define R22SPRPAL 0x0A040000 +#define R22L0 0x0A040001 +#define R22L1 0x0A040002 +#define R22G1 0x0A040003 +#define R22PAL 0x0A040004 +#define R22FLR 0x0A040005 +#define FRMBUK 0x0A040006 +#define FRMBUKCDT 0x0A040007 +#define FRMSTD 0x0A040008 +#define FRMSTDCDT 0x0A040009 +#define FRMTLK 0x0A04000A +#define FRMTLKCDT 0x0A04000B +#define FRMWLK 0x0A04000C +#define FRMWLKCDT 0x0A04000D +#define GEOCLM 0x0A04000E +#define GEOCLMCDT 0x0A04000F +#define GEOCLMCDR 0x0A040010 +#define GEOPSH22 0x0A040011 +#define GEOPSH22CDT 0x0A040012 // 19 entities in TXTs, 19 in datafiles. // room23 -#define R23L0 0x0A050000 -#define R23PAL 0x0A050001 -#define GEOCLM23 0x0A050002 -#define GEOCLM23CDT 0x0A050003 -#define GEOCLM23CDR 0x0A050004 -#define GEOKEY23 0x0A050005 -#define GEOKEY23CDT 0x0A050006 -#define GEOTOP 0x0A050007 -#define GEOTOPCDT 0x0A050008 -#define GEOTOPCDR 0x0A050009 -#define GEOTRY23 0x0A05000A -#define GEOTRY23CDT 0x0A05000B -#define GEOTUG23 0x0A05000C -#define GEOTUG23CDT 0x0A05000D -#define LFTKEY23 0x0A05000E -#define LFTKEY23CDT 0x0A05000F +#define R23L0 0x0A050000 +#define R23PAL 0x0A050001 +#define GEOCLM23 0x0A050002 +#define GEOCLM23CDT 0x0A050003 +#define GEOCLM23CDR 0x0A050004 +#define GEOKEY23 0x0A050005 +#define GEOKEY23CDT 0x0A050006 +#define GEOTOP 0x0A050007 +#define GEOTOPCDT 0x0A050008 +#define GEOTOPCDR 0x0A050009 +#define GEOTRY23 0x0A05000A +#define GEOTRY23CDT 0x0A05000B +#define GEOTUG23 0x0A05000C +#define GEOTUG23CDT 0x0A05000D +#define LFTKEY23 0x0A05000E +#define LFTKEY23CDT 0x0A05000F // 16 entities in TXTs, 16 in datafiles. // room24 -#define R24L0 0x0A060000 -#define R24L1 0x0A060001 -#define R24G1 0x0A060002 -#define R24PLX 0x0A060003 -#define R24PAL 0x0A060004 -#define R24FLR 0x0A060005 -#define GEOASC24 0x0A060006 -#define GEOASC24CDT 0x0A060007 -#define GEODES24 0x0A060008 -#define GEODES24CDT 0x0A060009 -#define GEOHITL 0x0A06000A -#define GEOHITLCDT 0x0A06000B -#define GEOHITR 0x0A06000C -#define GEOHITRCDT 0x0A06000D -#define GEOLAD 0x0A06000E -#define GEOLADCDT 0x0A06000F -#define GEOLAD8 0x0A060010 -#define GEOLAD8CDT 0x0A060011 -#define GEOPLW 0x0A060012 -#define GEOPLWCDT 0x0A060013 -#define GEORUN 0x0A060014 -#define GEORUNCDT 0x0A060015 -#define GEOUPL24 0x0A060016 -#define GEOUPL24CDT 0x0A060017 -#define GEOUPR24 0x0A060018 -#define GEOUPR24CDT 0x0A060019 -#define GOTBAKL 0x0A06001A -#define GOTBAKLCDT 0x0A06001B -#define GOTBAKR 0x0A06001C -#define GOTBAKRCDT 0x0A06001D -#define GOTCL 0x0A06001E -#define GOTCLCDT 0x0A06001F -#define GOTCR 0x0A060020 -#define GOTCRCDT 0x0A060021 -#define GOTEAT 0x0A060022 -#define GOTEATCDT 0x0A060023 -#define GOTPLW 0x0A060024 -#define GOTPLWCDT 0x0A060025 -#define GOTPLW1 0x0A060026 -#define GOTPLW1CDT 0x0A060027 -#define GOTRIS 0x0A060028 -#define GOTRISCDT 0x0A060029 -#define GOTRISCDR 0x0A06002A -#define PLWMOV 0x0A06002B -#define PLWMOVCDT 0x0A06002C +#define R24L0 0x0A060000 +#define R24L1 0x0A060001 +#define R24G1 0x0A060002 +#define R24PLX 0x0A060003 +#define R24PAL 0x0A060004 +#define R24FLR 0x0A060005 +#define GEOASC24 0x0A060006 +#define GEOASC24CDT 0x0A060007 +#define GEODES24 0x0A060008 +#define GEODES24CDT 0x0A060009 +#define GEOHITL 0x0A06000A +#define GEOHITLCDT 0x0A06000B +#define GEOHITR 0x0A06000C +#define GEOHITRCDT 0x0A06000D +#define GEOLAD 0x0A06000E +#define GEOLADCDT 0x0A06000F +#define GEOLAD8 0x0A060010 +#define GEOLAD8CDT 0x0A060011 +#define GEOPLW 0x0A060012 +#define GEOPLWCDT 0x0A060013 +#define GEORUN 0x0A060014 +#define GEORUNCDT 0x0A060015 +#define GEOUPL24 0x0A060016 +#define GEOUPL24CDT 0x0A060017 +#define GEOUPR24 0x0A060018 +#define GEOUPR24CDT 0x0A060019 +#define GOTBAKL 0x0A06001A +#define GOTBAKLCDT 0x0A06001B +#define GOTBAKR 0x0A06001C +#define GOTBAKRCDT 0x0A06001D +#define GOTCL 0x0A06001E +#define GOTCLCDT 0x0A06001F +#define GOTCR 0x0A060020 +#define GOTCRCDT 0x0A060021 +#define GOTEAT 0x0A060022 +#define GOTEATCDT 0x0A060023 +#define GOTPLW 0x0A060024 +#define GOTPLWCDT 0x0A060025 +#define GOTPLW1 0x0A060026 +#define GOTPLW1CDT 0x0A060027 +#define GOTRIS 0x0A060028 +#define GOTRISCDT 0x0A060029 +#define GOTRISCDR 0x0A06002A +#define PLWMOV 0x0A06002B +#define PLWMOVCDT 0x0A06002C // 45 entities in TXTs, 45 in datafiles. // room25 -#define R25SPRPAL 0x0A070000 -#define R25L0 0x0A070001 -#define R25L1 0x0A070002 -#define R25G1 0x0A070003 -#define R25PAL 0x0A070004 -#define R25FLR 0x0A070005 -#define ALTOPN 0x0A070006 -#define ALTOPNCDT 0x0A070007 -#define GEOASC25 0x0A070008 -#define GEOASC25CDT 0x0A070009 -#define GEOCLM25 0x0A07000A -#define GEOCLM25CDT 0x0A07000B -#define GEODES25 0x0A07000C -#define GEODES25CDT 0x0A07000D -#define GEODRY25 0x0A07000E -#define GEODRY25CDT 0x0A07000F -#define GEOFIN25 0x0A070010 -#define GEOFIN25CDT 0x0A070011 -#define GEOPLAS 0x0A070012 -#define GEOPLASCDT 0x0A070013 -#define GEOPLASCDR 0x0A070014 -#define GEOPLS 0x0A070015 -#define GEOPLSCDT 0x0A070016 -#define GEOPSH25 0x0A070017 -#define GEOPSH25CDT 0x0A070018 -#define GEOPUT 0x0A070019 -#define GEOPUTCDT 0x0A07001A -#define GEOSAC 0x0A07001B -#define GEOSACCDT 0x0A07001C -#define GEOSAC25 0x0A07001D -#define GEOSAC25CDT 0x0A07001E -#define GEOSTD25 0x0A07001F -#define GEOSTD25CDT 0x0A070020 -#define GEOSTN 0x0A070021 -#define GEOSTNCDT 0x0A070022 -#define GEOSTN8 0x0A070023 -#define GEOSTN8CDT 0x0A070024 -#define GEOTWL25 0x0A070025 -#define GEOTWL25CDT 0x0A070026 -#define GEOWALF2 0x0A070027 -#define GEOWALF2CDT 0x0A070028 -#define IMPFLR 0x0A070029 -#define IMPFLRCDT 0x0A07002A -#define IMPPLS 0x0A07002B -#define IMPPLSCDT 0x0A07002C -#define PLASWALL 0x0A07002D -#define PLASWALLCDT 0x0A07002E -#define STNFALL 0x0A07002F -#define STNFALLCDT 0x0A070030 +#define R25SPRPAL 0x0A070000 +#define R25L0 0x0A070001 +#define R25L1 0x0A070002 +#define R25G1 0x0A070003 +#define R25PAL 0x0A070004 +#define R25FLR 0x0A070005 +#define ALTOPN 0x0A070006 +#define ALTOPNCDT 0x0A070007 +#define GEOASC25 0x0A070008 +#define GEOASC25CDT 0x0A070009 +#define GEOCLM25 0x0A07000A +#define GEOCLM25CDT 0x0A07000B +#define GEODES25 0x0A07000C +#define GEODES25CDT 0x0A07000D +#define GEODRY25 0x0A07000E +#define GEODRY25CDT 0x0A07000F +#define GEOFIN25 0x0A070010 +#define GEOFIN25CDT 0x0A070011 +#define GEOPLAS 0x0A070012 +#define GEOPLASCDT 0x0A070013 +#define GEOPLASCDR 0x0A070014 +#define GEOPLS 0x0A070015 +#define GEOPLSCDT 0x0A070016 +#define GEOPSH25 0x0A070017 +#define GEOPSH25CDT 0x0A070018 +#define GEOPUT 0x0A070019 +#define GEOPUTCDT 0x0A07001A +#define GEOSAC 0x0A07001B +#define GEOSACCDT 0x0A07001C +#define GEOSAC25 0x0A07001D +#define GEOSAC25CDT 0x0A07001E +#define GEOSTD25 0x0A07001F +#define GEOSTD25CDT 0x0A070020 +#define GEOSTN 0x0A070021 +#define GEOSTNCDT 0x0A070022 +#define GEOSTN8 0x0A070023 +#define GEOSTN8CDT 0x0A070024 +#define GEOTWL25 0x0A070025 +#define GEOTWL25CDT 0x0A070026 +#define GEOWALF2 0x0A070027 +#define GEOWALF2CDT 0x0A070028 +#define IMPFLR 0x0A070029 +#define IMPFLRCDT 0x0A07002A +#define IMPPLS 0x0A07002B +#define IMPPLSCDT 0x0A07002C +#define PLASWALL 0x0A07002D +#define PLASWALLCDT 0x0A07002E +#define STNFALL 0x0A07002F +#define STNFALLCDT 0x0A070030 // 49 entities in TXTs, 49 in datafiles. // room26 -#define R26SPRPAL 0x0A080000 -#define R26L0 0x0A080001 -#define R26L1 0x0A080002 -#define R26L2 0x0A080003 -#define R26G1 0x0A080004 -#define R26G2 0x0A080005 -#define R26PAL 0x0A080006 -#define R26FLR 0x0A080007 -#define GEOLVR08 0x0A080008 -#define GEOLVR08CDT 0x0A080009 -#define GEOLVR26 0x0A08000A -#define GEOLVR26CDT 0x0A08000B -#define LVRDRK 0x0A08000C -#define LVRDRKCDT 0x0A08000D -#define RATJMP 0x0A08000E -#define RATJMPCDT 0x0A08000F +#define R26SPRPAL 0x0A080000 +#define R26L0 0x0A080001 +#define R26L1 0x0A080002 +#define R26L2 0x0A080003 +#define R26G1 0x0A080004 +#define R26G2 0x0A080005 +#define R26PAL 0x0A080006 +#define R26FLR 0x0A080007 +#define GEOLVR08 0x0A080008 +#define GEOLVR08CDT 0x0A080009 +#define GEOLVR26 0x0A08000A +#define GEOLVR26CDT 0x0A08000B +#define LVRDRK 0x0A08000C +#define LVRDRKCDT 0x0A08000D +#define RATJMP 0x0A08000E +#define RATJMPCDT 0x0A08000F // 16 entities in TXTs, 16 in datafiles. // spain // sound_fx -#define FX_SPNBIRD1 0x0B000000 -#define FX_SPNBIRD2 0x0B000001 -#define FX_AMBIEN56 0x0B000002 -#define FX_DOGS56 0x0B000003 -#define FX_PENDULUM 0x0B000004 -#define FX_CANFALL 0x0B000005 -#define FX_HOSE57 0x0B000006 -#define FX_HOSE57B 0x0B000007 -#define FX_SPAIN 0x0B000008 -#define FX_CHESS 0x0B000009 -#define FX_SECDOR59 0x0B00000A -#define FX_WINDOW59 0x0B00000B -#define FX_LIONFALL 0x0B00000C -#define FX_LIONFAL2 0x0B00000D -#define FX_TOOTHPUL 0x0B00000E -#define FX_SECDOR61 0x0B00000F -#define FX_WELLDRIP 0x0B000010 +#define FX_SPNBIRD1 0x0B000000 +#define FX_SPNBIRD2 0x0B000001 +#define FX_AMBIEN56 0x0B000002 +#define FX_DOGS56 0x0B000003 +#define FX_PENDULUM 0x0B000004 +#define FX_CANFALL 0x0B000005 +#define FX_HOSE57 0x0B000006 +#define FX_HOSE57B 0x0B000007 +#define FX_SPAIN 0x0B000008 +#define FX_CHESS 0x0B000009 +#define FX_SECDOR59 0x0B00000A +#define FX_WINDOW59 0x0B00000B +#define FX_LIONFALL 0x0B00000C +#define FX_LIONFAL2 0x0B00000D +#define FX_TOOTHPUL 0x0B00000E +#define FX_SECDOR61 0x0B00000F +#define FX_WELLDRIP 0x0B000010 // 17 entities in TXTs, 17 in datafiles. // room56 -#define SPAIN_PAL 0x0B010000 -#define R56L0 0x0B010001 -#define R56L1 0x0B010002 -#define R56L2 0x0B010003 -#define R56G1 0x0B010004 -#define R56G2 0x0B010005 -#define R56PAL 0x0B010006 -#define R56FLR 0x0B010007 -#define CHALIC56 0x0B010008 -#define CHALIC56CDT 0x0B010009 -#define GARD20 0x0B01000A -#define GARD20CDT 0x0B01000B -#define GARD21 0x0B01000C -#define GARD21CDT 0x0B01000D -#define GARD22 0x0B01000E -#define GARD22CDT 0x0B01000F -#define GEOSPA10 0x0B010010 -#define GEOSPA10CDT 0x0B010011 -#define GEOSPA10CDR 0x0B010012 -#define GEOSPA11 0x0B010013 -#define GEOSPA11CDT 0x0B010014 -#define GEOSPA13 0x0B010015 -#define GEOSPA13CDT 0x0B010016 -#define GEOSPA13CDR 0x0B010017 -#define GEOSPA19 0x0B010018 -#define GEOSPA19CDT 0x0B010019 -#define GEOSPA44 0x0B01001A -#define GEOSPA44CDT 0x0B01001B -#define GEOSPA48 0x0B01001C -#define GEOSPA48CDT 0x0B01001D -#define PENDULUM 0x0B01001E -#define PENDULUMCDT 0x0B01001F -#define PIECE56 0x0B010020 -#define PIECE56CDT 0x0B010021 -#define VASC01 0x0B010022 -#define VASC01CDT 0x0B010023 -#define VASC02 0x0B010024 -#define VASC02CDT 0x0B010025 -#define VASC04 0x0B010026 -#define VASC04CDT 0x0B010027 -#define VASC05 0x0B010028 -#define VASC05CDT 0x0B010029 -#define VASC05CDR 0x0B01002A -#define VASC06 0x0B01002B -#define VASC06CDT 0x0B01002C -#define VASC26 0x0B01002D -#define VASC26CDT 0x0B01002E -#define VASC26CDR 0x0B01002F -#define VASC27 0x0B010030 -#define VASC27CDT 0x0B010031 -#define VASC28 0x0B010032 -#define VASC28CDT 0x0B010033 -#define VASC29 0x0B010034 -#define VASC29CDT 0x0B010035 -#define VASC29CDR 0x0B010036 -#define VASC30 0x0B010037 -#define VASC30CDT 0x0B010038 -#define VASC30CDR 0x0B010039 -#define VASC32 0x0B01003A -#define VASC32CDT 0x0B01003B +#define SPAIN_PAL 0x0B010000 +#define R56L0 0x0B010001 +#define R56L1 0x0B010002 +#define R56L2 0x0B010003 +#define R56G1 0x0B010004 +#define R56G2 0x0B010005 +#define R56PAL 0x0B010006 +#define R56FLR 0x0B010007 +#define CHALIC56 0x0B010008 +#define CHALIC56CDT 0x0B010009 +#define GARD20 0x0B01000A +#define GARD20CDT 0x0B01000B +#define GARD21 0x0B01000C +#define GARD21CDT 0x0B01000D +#define GARD22 0x0B01000E +#define GARD22CDT 0x0B01000F +#define GEOSPA10 0x0B010010 +#define GEOSPA10CDT 0x0B010011 +#define GEOSPA10CDR 0x0B010012 +#define GEOSPA11 0x0B010013 +#define GEOSPA11CDT 0x0B010014 +#define GEOSPA13 0x0B010015 +#define GEOSPA13CDT 0x0B010016 +#define GEOSPA13CDR 0x0B010017 +#define GEOSPA19 0x0B010018 +#define GEOSPA19CDT 0x0B010019 +#define GEOSPA44 0x0B01001A +#define GEOSPA44CDT 0x0B01001B +#define GEOSPA48 0x0B01001C +#define GEOSPA48CDT 0x0B01001D +#define PENDULUM 0x0B01001E +#define PENDULUMCDT 0x0B01001F +#define PIECE56 0x0B010020 +#define PIECE56CDT 0x0B010021 +#define VASC01 0x0B010022 +#define VASC01CDT 0x0B010023 +#define VASC02 0x0B010024 +#define VASC02CDT 0x0B010025 +#define VASC04 0x0B010026 +#define VASC04CDT 0x0B010027 +#define VASC05 0x0B010028 +#define VASC05CDT 0x0B010029 +#define VASC05CDR 0x0B01002A +#define VASC06 0x0B01002B +#define VASC06CDT 0x0B01002C +#define VASC26 0x0B01002D +#define VASC26CDT 0x0B01002E +#define VASC26CDR 0x0B01002F +#define VASC27 0x0B010030 +#define VASC27CDT 0x0B010031 +#define VASC28 0x0B010032 +#define VASC28CDT 0x0B010033 +#define VASC29 0x0B010034 +#define VASC29CDT 0x0B010035 +#define VASC29CDR 0x0B010036 +#define VASC30 0x0B010037 +#define VASC30CDT 0x0B010038 +#define VASC30CDR 0x0B010039 +#define VASC32 0x0B01003A +#define VASC32CDT 0x0B01003B // 60 entities in TXTs, 60 in datafiles. // room57 -#define R57L0 0x0B020000 -#define R57L1 0x0B020001 -#define R57G1 0x0B020002 -#define R57PAL 0x0B020003 -#define R57FLR 0x0B020004 -#define R57PLX 0x0B020005 -#define MEGA_DOWSE 0x0B020006 -#define GAR57GOB 0x0B020007 -#define GAR57GOBCDT 0x0B020008 -#define GARD01 0x0B020009 -#define GARD01CDT 0x0B02000A -#define GARD02 0x0B02000B -#define GARD02CDT 0x0B02000C -#define GARD03 0x0B02000D -#define GARD03CDT 0x0B02000E -#define GARD04 0x0B02000F -#define GARD04CDT 0x0B020010 -#define GARD04CDR 0x0B020011 -#define GARD05 0x0B020012 -#define GARD05CDT 0x0B020013 -#define GARD06 0x0B020014 -#define GARD06CDT 0x0B020015 -#define GARD07 0x0B020016 -#define GARD07CDT 0x0B020017 -#define GARD07CDR 0x0B020018 -#define GARD08 0x0B020019 -#define GARD08CDT 0x0B02001A -#define GARD09 0x0B02001B -#define GARD09CDT 0x0B02001C -#define GARD17 0x0B02001D -#define GARD17CDT 0x0B02001E -#define GARD17CDR 0x0B02001F -#define GARD18 0x0B020020 -#define GARD18CDT 0x0B020021 -#define GARD31 0x0B020022 -#define GARD31CDT 0x0B020023 -#define GARD31CDR 0x0B020024 -#define GARD32 0x0B020025 -#define GARD32CDT 0x0B020026 -#define GARD34 0x0B020027 -#define GARD34CDT 0x0B020028 -#define GARD35 0x0B020029 -#define GARD35CDT 0x0B02002A -#define GARD36 0x0B02002B -#define GARD36CDT 0x0B02002C -#define GARD37 0x0B02002D -#define GARD37CDT 0x0B02002E -#define GARD38 0x0B02002F -#define GARD38CDT 0x0B020030 -#define GARD39 0x0B020031 -#define GARD39CDT 0x0B020032 -#define GARD40 0x0B020033 -#define GARD40CDT 0x0B020034 -#define GARD40CDR 0x0B020035 -#define GARD41 0x0B020036 -#define GARD41CDT 0x0B020037 -#define GARD42 0x0B020038 -#define GARD42CDT 0x0B020039 -#define GARD43 0x0B02003A -#define GARD43CDT 0x0B02003B -#define GARD44 0x0B02003C -#define GARD44CDT 0x0B02003D -#define GARD44CDR 0x0B02003E -#define GARD45 0x0B02003F -#define GARD45CDT 0x0B020040 -#define GARDKNE 0x0B020041 -#define GARDKNECDT 0x0B020042 -#define GAUGE57 0x0B020043 -#define GAUGE57CDT 0x0B020044 -#define GEOSPA01 0x0B020045 -#define GEOSPA01CDT 0x0B020046 -#define GEOSPA20 0x0B020047 -#define GEOSPA20CDT 0x0B020048 -#define GEOSPA22 0x0B020049 -#define GEOSPA22CDT 0x0B02004A -#define GEOSPA42 0x0B02004B -#define GEOSPA42CDT 0x0B02004C -#define GEOSPA47 0x0B02004D -#define GEOSPA47CDT 0x0B02004E -#define HOLE57 0x0B02004F -#define HOLE57CDT 0x0B020050 -#define HOSE57 0x0B020051 -#define HOSE57CDT 0x0B020052 +#define R57L0 0x0B020000 +#define R57L1 0x0B020001 +#define R57G1 0x0B020002 +#define R57PAL 0x0B020003 +#define R57FLR 0x0B020004 +#define R57PLX 0x0B020005 +#define MEGA_DOWSE 0x0B020006 +#define GAR57GOB 0x0B020007 +#define GAR57GOBCDT 0x0B020008 +#define GARD01 0x0B020009 +#define GARD01CDT 0x0B02000A +#define GARD02 0x0B02000B +#define GARD02CDT 0x0B02000C +#define GARD03 0x0B02000D +#define GARD03CDT 0x0B02000E +#define GARD04 0x0B02000F +#define GARD04CDT 0x0B020010 +#define GARD04CDR 0x0B020011 +#define GARD05 0x0B020012 +#define GARD05CDT 0x0B020013 +#define GARD06 0x0B020014 +#define GARD06CDT 0x0B020015 +#define GARD07 0x0B020016 +#define GARD07CDT 0x0B020017 +#define GARD07CDR 0x0B020018 +#define GARD08 0x0B020019 +#define GARD08CDT 0x0B02001A +#define GARD09 0x0B02001B +#define GARD09CDT 0x0B02001C +#define GARD17 0x0B02001D +#define GARD17CDT 0x0B02001E +#define GARD17CDR 0x0B02001F +#define GARD18 0x0B020020 +#define GARD18CDT 0x0B020021 +#define GARD31 0x0B020022 +#define GARD31CDT 0x0B020023 +#define GARD31CDR 0x0B020024 +#define GARD32 0x0B020025 +#define GARD32CDT 0x0B020026 +#define GARD34 0x0B020027 +#define GARD34CDT 0x0B020028 +#define GARD35 0x0B020029 +#define GARD35CDT 0x0B02002A +#define GARD36 0x0B02002B +#define GARD36CDT 0x0B02002C +#define GARD37 0x0B02002D +#define GARD37CDT 0x0B02002E +#define GARD38 0x0B02002F +#define GARD38CDT 0x0B020030 +#define GARD39 0x0B020031 +#define GARD39CDT 0x0B020032 +#define GARD40 0x0B020033 +#define GARD40CDT 0x0B020034 +#define GARD40CDR 0x0B020035 +#define GARD41 0x0B020036 +#define GARD41CDT 0x0B020037 +#define GARD42 0x0B020038 +#define GARD42CDT 0x0B020039 +#define GARD43 0x0B02003A +#define GARD43CDT 0x0B02003B +#define GARD44 0x0B02003C +#define GARD44CDT 0x0B02003D +#define GARD44CDR 0x0B02003E +#define GARD45 0x0B02003F +#define GARD45CDT 0x0B020040 +#define GARDKNE 0x0B020041 +#define GARDKNECDT 0x0B020042 +#define GAUGE57 0x0B020043 +#define GAUGE57CDT 0x0B020044 +#define GEOSPA01 0x0B020045 +#define GEOSPA01CDT 0x0B020046 +#define GEOSPA20 0x0B020047 +#define GEOSPA20CDT 0x0B020048 +#define GEOSPA22 0x0B020049 +#define GEOSPA22CDT 0x0B02004A +#define GEOSPA42 0x0B02004B +#define GEOSPA42CDT 0x0B02004C +#define GEOSPA47 0x0B02004D +#define GEOSPA47CDT 0x0B02004E +#define HOLE57 0x0B02004F +#define HOLE57CDT 0x0B020050 +#define HOSE57 0x0B020051 +#define HOSE57CDT 0x0B020052 // 83 entities in TXTs, 83 in datafiles. // room58 -#define R58L0 0x0B030000 -#define R58L1 0x0B030001 -#define R58G1 0x0B030002 -#define R58PAL 0x0B030003 -#define R58FLR 0x0B030004 -#define R58PLX 0x0B030005 -#define GARD24 0x0B030006 -#define GARD24CDT 0x0B030007 -#define GARD25 0x0B030008 -#define GARD25CDT 0x0B030009 -#define GARD26 0x0B03000A -#define GARD26CDT 0x0B03000B -#define MAUSDOOR 0x0B03000C -#define MAUSDOORCDT 0x0B03000D -#define VASC07 0x0B03000E -#define VASC07CDT 0x0B03000F -#define VASC08 0x0B030010 -#define VASC08CDT 0x0B030011 -#define VASC09 0x0B030012 -#define VASC09CDT 0x0B030013 -#define VASC10 0x0B030014 -#define VASC10CDT 0x0B030015 -#define VASC11 0x0B030016 -#define VASC11CDT 0x0B030017 -#define VASC12 0x0B030018 -#define VASC12CDT 0x0B030019 +#define R58L0 0x0B030000 +#define R58L1 0x0B030001 +#define R58G1 0x0B030002 +#define R58PAL 0x0B030003 +#define R58FLR 0x0B030004 +#define R58PLX 0x0B030005 +#define GARD24 0x0B030006 +#define GARD24CDT 0x0B030007 +#define GARD25 0x0B030008 +#define GARD25CDT 0x0B030009 +#define GARD26 0x0B03000A +#define GARD26CDT 0x0B03000B +#define MAUSDOOR 0x0B03000C +#define MAUSDOORCDT 0x0B03000D +#define VASC07 0x0B03000E +#define VASC07CDT 0x0B03000F +#define VASC08 0x0B030010 +#define VASC08CDT 0x0B030011 +#define VASC09 0x0B030012 +#define VASC09CDT 0x0B030013 +#define VASC10 0x0B030014 +#define VASC10CDT 0x0B030015 +#define VASC11 0x0B030016 +#define VASC11CDT 0x0B030017 +#define VASC12 0x0B030018 +#define VASC12CDT 0x0B030019 // 26 entities in TXTs, 26 in datafiles. // room59 -#define R59L0 0x0B040000 -#define R59L1 0x0B040001 -#define R59L2 0x0B040002 -#define R59G1 0x0B040003 -#define R59G2 0x0B040004 -#define R59PAL 0x0B040005 -#define R59FLR 0x0B040006 -#define BIBLE59 0x0B040007 -#define BIBLE59CDT 0x0B040008 -#define BLOWOUT 0x0B040009 -#define BLOWOUTCDT 0x0B04000A -#define CANDLE59 0x0B04000B -#define CANDLE59CDT 0x0B04000C -#define CHAL59 0x0B04000D -#define CHAL59CDT 0x0B04000E -#define FLAMEL59 0x0B04000F -#define FLAMEL59CDT 0x0B040010 -#define FLAMER59 0x0B040011 -#define FLAMER59CDT 0x0B040012 -#define FLAMET59 0x0B040013 -#define FLAMET59CDT 0x0B040014 -#define GARD27 0x0B040015 -#define GARD27CDT 0x0B040016 -#define GARD28 0x0B040017 -#define GARD28CDT 0x0B040018 -#define GARD29 0x0B040019 -#define GARD29CDT 0x0B04001A -#define GARD30 0x0B04001B -#define GARD30CDT 0x0B04001C -#define GEOBIBLE 0x0B04001D -#define GEOBIBLECDT 0x0B04001E -#define GEOSPA12 0x0B04001F -#define GEOSPA12CDT 0x0B040020 -#define GEOSPA16 0x0B040021 -#define GEOSPA16CDT 0x0B040022 -#define GEOSPA17 0x0B040023 -#define GEOSPA17CDT 0x0B040024 -#define GEOSPA18 0x0B040025 -#define GEOSPA18CDT 0x0B040026 -#define GEOSPA18CDR 0x0B040027 -#define GEOSPA23 0x0B040028 -#define GEOSPA23CDT 0x0B040029 -#define GEOSPA23CDR 0x0B04002A -#define GEOSPA37 0x0B04002B -#define GEOSPA37CDT 0x0B04002C -#define GEOSPA37CDR 0x0B04002D -#define GEOSPA38 0x0B04002E -#define GEOSPA38CDT 0x0B04002F -#define GEOSPA39 0x0B040030 -#define GEOSPA39CDT 0x0B040031 -#define GEOSPA40 0x0B040032 -#define GEOSPA40CDT 0x0B040033 -#define GEOSPA41 0x0B040034 -#define GEOSPA41CDT 0x0B040035 -#define GEOSPA43 0x0B040036 -#define GEOSPA43CDT 0x0B040037 -#define GEOSPA45 0x0B040038 -#define GEOSPA45CDT 0x0B040039 -#define GEOSPA46 0x0B04003A -#define GEOSPA46CDT 0x0B04003B -#define SECDOR59 0x0B04003C -#define SECDOR59CDT 0x0B04003D -#define SNUFF59 0x0B04003E -#define SNUFF59CDT 0x0B04003F -#define TISSUE59 0x0B040040 -#define TISSUE59CDT 0x0B040041 -#define VASC13 0x0B040042 -#define VASC13CDT 0x0B040043 -#define VASC14 0x0B040044 -#define VASC14CDT 0x0B040045 -#define VASC15 0x0B040046 -#define VASC15CDT 0x0B040047 -#define VASC16 0x0B040048 -#define VASC16CDT 0x0B040049 -#define VASC17 0x0B04004A -#define VASC17CDT 0x0B04004B -#define VASC18 0x0B04004C -#define VASC18CDT 0x0B04004D -#define VASC19 0x0B04004E -#define VASC19CDT 0x0B04004F -#define VASC20 0x0B040050 -#define VASC20CDT 0x0B040051 -#define VASC20CDR 0x0B040052 -#define VASC21 0x0B040053 -#define VASC21CDT 0x0B040054 -#define VASC22 0x0B040055 -#define VASC22CDT 0x0B040056 -#define VASC23 0x0B040057 -#define VASC23CDT 0x0B040058 -#define VASC24 0x0B040059 -#define VASC24CDT 0x0B04005A -#define VASC25 0x0B04005B -#define VASC25CDT 0x0B04005C -#define VASC31 0x0B04005D -#define VASC31CDT 0x0B04005E -#define WINDSHUT 0x0B04005F -#define WINDSHUTCDT 0x0B040060 -#define WINDSHUTCDR 0x0B040061 +#define R59L0 0x0B040000 +#define R59L1 0x0B040001 +#define R59L2 0x0B040002 +#define R59G1 0x0B040003 +#define R59G2 0x0B040004 +#define R59PAL 0x0B040005 +#define R59FLR 0x0B040006 +#define BIBLE59 0x0B040007 +#define BIBLE59CDT 0x0B040008 +#define BLOWOUT 0x0B040009 +#define BLOWOUTCDT 0x0B04000A +#define CANDLE59 0x0B04000B +#define CANDLE59CDT 0x0B04000C +#define CHAL59 0x0B04000D +#define CHAL59CDT 0x0B04000E +#define FLAMEL59 0x0B04000F +#define FLAMEL59CDT 0x0B040010 +#define FLAMER59 0x0B040011 +#define FLAMER59CDT 0x0B040012 +#define FLAMET59 0x0B040013 +#define FLAMET59CDT 0x0B040014 +#define GARD27 0x0B040015 +#define GARD27CDT 0x0B040016 +#define GARD28 0x0B040017 +#define GARD28CDT 0x0B040018 +#define GARD29 0x0B040019 +#define GARD29CDT 0x0B04001A +#define GARD30 0x0B04001B +#define GARD30CDT 0x0B04001C +#define GEOBIBLE 0x0B04001D +#define GEOBIBLECDT 0x0B04001E +#define GEOSPA12 0x0B04001F +#define GEOSPA12CDT 0x0B040020 +#define GEOSPA16 0x0B040021 +#define GEOSPA16CDT 0x0B040022 +#define GEOSPA17 0x0B040023 +#define GEOSPA17CDT 0x0B040024 +#define GEOSPA18 0x0B040025 +#define GEOSPA18CDT 0x0B040026 +#define GEOSPA18CDR 0x0B040027 +#define GEOSPA23 0x0B040028 +#define GEOSPA23CDT 0x0B040029 +#define GEOSPA23CDR 0x0B04002A +#define GEOSPA37 0x0B04002B +#define GEOSPA37CDT 0x0B04002C +#define GEOSPA37CDR 0x0B04002D +#define GEOSPA38 0x0B04002E +#define GEOSPA38CDT 0x0B04002F +#define GEOSPA39 0x0B040030 +#define GEOSPA39CDT 0x0B040031 +#define GEOSPA40 0x0B040032 +#define GEOSPA40CDT 0x0B040033 +#define GEOSPA41 0x0B040034 +#define GEOSPA41CDT 0x0B040035 +#define GEOSPA43 0x0B040036 +#define GEOSPA43CDT 0x0B040037 +#define GEOSPA45 0x0B040038 +#define GEOSPA45CDT 0x0B040039 +#define GEOSPA46 0x0B04003A +#define GEOSPA46CDT 0x0B04003B +#define SECDOR59 0x0B04003C +#define SECDOR59CDT 0x0B04003D +#define SNUFF59 0x0B04003E +#define SNUFF59CDT 0x0B04003F +#define TISSUE59 0x0B040040 +#define TISSUE59CDT 0x0B040041 +#define VASC13 0x0B040042 +#define VASC13CDT 0x0B040043 +#define VASC14 0x0B040044 +#define VASC14CDT 0x0B040045 +#define VASC15 0x0B040046 +#define VASC15CDT 0x0B040047 +#define VASC16 0x0B040048 +#define VASC16CDT 0x0B040049 +#define VASC17 0x0B04004A +#define VASC17CDT 0x0B04004B +#define VASC18 0x0B04004C +#define VASC18CDT 0x0B04004D +#define VASC19 0x0B04004E +#define VASC19CDT 0x0B04004F +#define VASC20 0x0B040050 +#define VASC20CDT 0x0B040051 +#define VASC20CDR 0x0B040052 +#define VASC21 0x0B040053 +#define VASC21CDT 0x0B040054 +#define VASC22 0x0B040055 +#define VASC22CDT 0x0B040056 +#define VASC23 0x0B040057 +#define VASC23CDT 0x0B040058 +#define VASC24 0x0B040059 +#define VASC24CDT 0x0B04005A +#define VASC25 0x0B04005B +#define VASC25CDT 0x0B04005C +#define VASC31 0x0B04005D +#define VASC31CDT 0x0B04005E +#define WINDSHUT 0x0B04005F +#define WINDSHUTCDT 0x0B040060 +#define WINDSHUTCDR 0x0B040061 // 98 entities in TXTs, 98 in datafiles. // room60 -#define R60L0 0x0B050000 -#define R60L1 0x0B050001 -#define R60L2 0x0B050002 -#define R60G1 0x0B050003 -#define R60G2 0x0B050004 -#define R60PAL 0x0B050005 -#define R60FLR 0x0B050006 -#define GARD10 0x0B050007 -#define GARD10CDT 0x0B050008 -#define GARD11 0x0B050009 -#define GARD11CDT 0x0B05000A -#define GARD13 0x0B05000B -#define GARD13CDT 0x0B05000C -#define GARD16 0x0B05000D -#define GARD16CDT 0x0B05000E -#define GARD19 0x0B05000F -#define GARD19CDT 0x0B050010 -#define GEOSPA05 0x0B050011 -#define GEOSPA05CDT 0x0B050012 -#define GEOSPA05CDR 0x0B050013 -#define GEOSPA08 0x0B050014 -#define GEOSPA08CDT 0x0B050015 -#define GEOSPA09 0x0B050016 -#define GEOSPA09CDT 0x0B050017 -#define GEOSPA09CDR 0x0B050018 -#define GEOSPA21 0x0B050019 -#define GEOSPA21CDT 0x0B05001A -#define MIRROR60 0x0B05001B -#define MIRROR60CDT 0x0B05001C +#define R60L0 0x0B050000 +#define R60L1 0x0B050001 +#define R60L2 0x0B050002 +#define R60G1 0x0B050003 +#define R60G2 0x0B050004 +#define R60PAL 0x0B050005 +#define R60FLR 0x0B050006 +#define GARD10 0x0B050007 +#define GARD10CDT 0x0B050008 +#define GARD11 0x0B050009 +#define GARD11CDT 0x0B05000A +#define GARD13 0x0B05000B +#define GARD13CDT 0x0B05000C +#define GARD16 0x0B05000D +#define GARD16CDT 0x0B05000E +#define GARD19 0x0B05000F +#define GARD19CDT 0x0B050010 +#define GEOSPA05 0x0B050011 +#define GEOSPA05CDT 0x0B050012 +#define GEOSPA05CDR 0x0B050013 +#define GEOSPA08 0x0B050014 +#define GEOSPA08CDT 0x0B050015 +#define GEOSPA09 0x0B050016 +#define GEOSPA09CDT 0x0B050017 +#define GEOSPA09CDR 0x0B050018 +#define GEOSPA21 0x0B050019 +#define GEOSPA21CDT 0x0B05001A +#define MIRROR60 0x0B05001B +#define MIRROR60CDT 0x0B05001C // 29 entities in TXTs, 29 in datafiles. // room61 -#define R61L0 0x0B060000 -#define R61L1 0x0B060001 -#define R61G1 0x0B060002 -#define R61PAL 0x0B060003 -#define R61FLR 0x0B060004 -#define DUST 0x0B060005 -#define DUSTCDT 0x0B060006 -#define GEOSPA24 0x0B060007 -#define GEOSPA24CDT 0x0B060008 -#define GEOSPA25 0x0B060009 -#define GEOSPA25CDT 0x0B06000A -#define GEOSPA26 0x0B06000B -#define GEOSPA26CDT 0x0B06000C -#define GEOSPA27 0x0B06000D -#define GEOSPA27CDT 0x0B06000E -#define GEOSPA30 0x0B06000F -#define GEOSPA30CDT 0x0B060010 -#define GEOSPA31 0x0B060011 -#define GEOSPA31CDT 0x0B060012 -#define GEOSPA32 0x0B060013 -#define GEOSPA32CDT 0x0B060014 -#define GEOSPA33 0x0B060015 -#define GEOSPA33CDT 0x0B060016 -#define GEOSPA35 0x0B060017 -#define GEOSPA35CDT 0x0B060018 -#define LION1 0x0B060019 -#define LION1CDT 0x0B06001A -#define LION2 0x0B06001B -#define LION2CDT 0x0B06001C -#define LIONDOOR 0x0B06001D -#define LIONDOORCDT 0x0B06001E -#define LIONFLOR 0x0B06001F -#define LIONFLORCDT 0x0B060020 -#define ROPE61 0x0B060021 -#define ROPE61CDT 0x0B060022 -#define SECDOR61 0x0B060023 -#define SECDOR61CDT 0x0B060024 +#define R61L0 0x0B060000 +#define R61L1 0x0B060001 +#define R61G1 0x0B060002 +#define R61PAL 0x0B060003 +#define R61FLR 0x0B060004 +#define DUST 0x0B060005 +#define DUSTCDT 0x0B060006 +#define GEOSPA24 0x0B060007 +#define GEOSPA24CDT 0x0B060008 +#define GEOSPA25 0x0B060009 +#define GEOSPA25CDT 0x0B06000A +#define GEOSPA26 0x0B06000B +#define GEOSPA26CDT 0x0B06000C +#define GEOSPA27 0x0B06000D +#define GEOSPA27CDT 0x0B06000E +#define GEOSPA30 0x0B06000F +#define GEOSPA30CDT 0x0B060010 +#define GEOSPA31 0x0B060011 +#define GEOSPA31CDT 0x0B060012 +#define GEOSPA32 0x0B060013 +#define GEOSPA32CDT 0x0B060014 +#define GEOSPA33 0x0B060015 +#define GEOSPA33CDT 0x0B060016 +#define GEOSPA35 0x0B060017 +#define GEOSPA35CDT 0x0B060018 +#define LION1 0x0B060019 +#define LION1CDT 0x0B06001A +#define LION2 0x0B06001B +#define LION2CDT 0x0B06001C +#define LIONDOOR 0x0B06001D +#define LIONDOORCDT 0x0B06001E +#define LIONFLOR 0x0B06001F +#define LIONFLORCDT 0x0B060020 +#define ROPE61 0x0B060021 +#define ROPE61CDT 0x0B060022 +#define SECDOR61 0x0B060023 +#define SECDOR61CDT 0x0B060024 // 37 entities in TXTs, 37 in datafiles. // room62 -#define R62L0 0x0B070000 -#define R62PAL 0x0B070001 -#define BISHOP62 0x0B070002 -#define BISHOP62CDT 0x0B070003 -#define KING62 0x0B070004 -#define KING62CDT 0x0B070005 -#define KNIGHT62 0x0B070006 -#define KNIGHT62CDT 0x0B070007 +#define R62L0 0x0B070000 +#define R62PAL 0x0B070001 +#define BISHOP62 0x0B070002 +#define BISHOP62CDT 0x0B070003 +#define KING62 0x0B070004 +#define KING62CDT 0x0B070005 +#define KNIGHT62 0x0B070006 +#define KNIGHT62CDT 0x0B070007 // 8 entities in TXTs, 8 in datafiles. // syria // sound_fx -#define FX_CAMERA45 0x0C000000 -#define FX_SHOCK3 0x0C000001 -#define FX_STALLBEL 0x0C000002 -#define FX_AYUBDOOR 0x0C000003 -#define FX_BALLPLAY 0x0C000004 -#define FX_CATHIT 0x0C000005 -#define FX_MARIB 0x0C000006 -#define FX_NEWTON 0x0C000007 -#define FX_STALLCAT 0x0C000008 -#define FX_STATBREK 0x0C000009 -#define FX_KEYS49 0x0C00000A -#define FX_MANG1 0x0C00000B -#define FX_MANG2 0x0C00000C -#define FX_MANG3 0x0C00000D -#define FX_UNLOCK49 0x0C00000E -#define FX_WCCHAIN 0x0C00000F -#define FX_CUBDOR 0x0C000010 -#define FX_BREKSTIK 0x0C000011 -#define FX_CLIMBDWN 0x0C000012 -#define FX_CRICKET 0x0C000013 -#define FX_GEOFAL54 0x0C000014 -#define FX_KHANDOWN 0x0C000015 -#define FX_RINGPULL 0x0C000016 -#define FX_SECDOR54 0x0C000017 -#define FX_SHOTKHAN 0x0C000018 -#define FX_SYRIWIND 0x0C000019 -#define FX_THUMP1 0x0C00001A -#define FX_SECDOR55 0x0C00001B +#define FX_CAMERA45 0x0C000000 +#define FX_SHOCK3 0x0C000001 +#define FX_STALLBEL 0x0C000002 +#define FX_AYUBDOOR 0x0C000003 +#define FX_BALLPLAY 0x0C000004 +#define FX_CATHIT 0x0C000005 +#define FX_MARIB 0x0C000006 +#define FX_NEWTON 0x0C000007 +#define FX_STALLCAT 0x0C000008 +#define FX_STATBREK 0x0C000009 +#define FX_KEYS49 0x0C00000A +#define FX_MANG1 0x0C00000B +#define FX_MANG2 0x0C00000C +#define FX_MANG3 0x0C00000D +#define FX_UNLOCK49 0x0C00000E +#define FX_WCCHAIN 0x0C00000F +#define FX_CUBDOR 0x0C000010 +#define FX_BREKSTIK 0x0C000011 +#define FX_CLIMBDWN 0x0C000012 +#define FX_CRICKET 0x0C000013 +#define FX_GEOFAL54 0x0C000014 +#define FX_KHANDOWN 0x0C000015 +#define FX_RINGPULL 0x0C000016 +#define FX_SECDOR54 0x0C000017 +#define FX_SHOTKHAN 0x0C000018 +#define FX_SYRIWIND 0x0C000019 +#define FX_THUMP1 0x0C00001A +#define FX_SECDOR55 0x0C00001B // 28 entities in TXTs, 28 in datafiles. // duane -#define DUANE_MEGA 0x0C010000 -#define DUANE_WLK 0x0C010001 -#define DNETLK3 0x0C010002 -#define DNETLK3CDT 0x0C010003 -#define DNETLK5 0x0C010004 -#define DNETLK5CDT 0x0C010005 -#define XDNEMON3 0x0C010006 -#define XDNEMON3CDT 0x0C010007 -#define XDNEMON5 0x0C010008 -#define XDNEMON5CDT 0x0C010009 -#define XDNESTA3 0x0C01000A -#define XDNESTA3CDT 0x0C01000B -#define XDNESTA5 0x0C01000C -#define XDNESTA5CDT 0x0C01000D -#define XDNEPHO3 0x0C01000E -#define XDNEPHO3CDT 0x0C01000F -#define XDNEPHO5 0x0C010010 -#define XDNEPHO5CDT 0x0C010011 +#define DUANE_MEGA 0x0C010000 +#define DUANE_WLK 0x0C010001 +#define DNETLK3 0x0C010002 +#define DNETLK3CDT 0x0C010003 +#define DNETLK5 0x0C010004 +#define DNETLK5CDT 0x0C010005 +#define XDNEMON3 0x0C010006 +#define XDNEMON3CDT 0x0C010007 +#define XDNEMON5 0x0C010008 +#define XDNEMON5CDT 0x0C010009 +#define XDNESTA3 0x0C01000A +#define XDNESTA3CDT 0x0C01000B +#define XDNESTA5 0x0C01000C +#define XDNESTA5CDT 0x0C01000D +#define XDNEPHO3 0x0C01000E +#define XDNEPHO3CDT 0x0C01000F +#define XDNEPHO5 0x0C010010 +#define XDNEPHO5CDT 0x0C010011 // 18 entities in TXTs, 18 in datafiles. // room45 -#define SYRIA_PAL 0x0C020000 -#define R45SPRPAL 0x0C020001 -#define R45L0 0x0C020002 -#define R45L1 0x0C020003 -#define R45G1 0x0C020004 -#define R45PAL 0x0C020005 -#define R45FLR 0x0C020006 -#define R45PLX 0x0C020007 -#define ART1 0x0C020008 -#define ART1CDT 0x0C020009 -#define ART2 0x0C02000A -#define ART2CDT 0x0C02000B -#define ART3A 0x0C02000C -#define ART3ACDT 0x0C02000D -#define ART3ACDR 0x0C02000E -#define ART4 0x0C02000F -#define ART4CDT 0x0C020010 -#define ART5 0x0C020011 -#define ART5CDT 0x0C020012 -#define ART6 0x0C020013 -#define ART6CDT 0x0C020014 -#define ART7 0x0C020015 -#define ART7CDT 0x0C020016 -#define AYU1 0x0C020017 -#define AYU1CDT 0x0C020018 -#define AYU1A 0x0C020019 -#define AYU1ACDT 0x0C02001A -#define AYU1B 0x0C02001B -#define AYU1BCDT 0x0C02001C -#define AYU5 0x0C02001D -#define AYU5CDT 0x0C02001E -#define BRUSH 0x0C02001F -#define BRUSHCDT 0x0C020020 -#define CAT1 0x0C020021 -#define CAT1CDT 0x0C020022 -#define CAT3 0x0C020023 -#define CAT3CDT 0x0C020024 -#define CAT4 0x0C020025 -#define CAT4CDT 0x0C020026 -#define CAT5 0x0C020027 -#define CAT5CDT 0x0C020028 -#define GEOCHA 0x0C020029 -#define GEOCHACDT 0x0C02002A -#define GEOSYR1 0x0C02002B -#define GEOSYR1CDT 0x0C02002C -#define GEOSYR10 0x0C02002D -#define GEOSYR10CDT 0x0C02002E -#define GEOSYR10CDR 0x0C02002F -#define GEOSYR18 0x0C020030 -#define GEOSYR18CDT 0x0C020031 -#define GEOSYR2 0x0C020032 -#define GEOSYR2CDT 0x0C020033 -#define GEOSYR5 0x0C020034 -#define GEOSYR5CDT 0x0C020035 -#define GEOSYR6 0x0C020036 -#define GEOSYR6CDT 0x0C020037 -#define GEOSYR7 0x0C020038 -#define GEOSYR7CDT 0x0C020039 -#define NEJ1 0x0C02003A -#define NEJ1CDT 0x0C02003B -#define NEJ10 0x0C02003C -#define NEJ10CDT 0x0C02003D -#define NEJ12 0x0C02003E -#define NEJ12CDT 0x0C02003F -#define NEJ13 0x0C020040 -#define NEJ13CDT 0x0C020041 -#define NEJ13CDR 0x0C020042 -#define NEJ2 0x0C020043 -#define NEJ2CDT 0x0C020044 -#define NEJ2B 0x0C020045 -#define NEJ2BCDT 0x0C020046 -#define NEJ4 0x0C020047 -#define NEJ4CDT 0x0C020048 -#define NEJ6 0x0C020049 -#define NEJ6CDT 0x0C02004A -#define NEJ7 0x0C02004B -#define NEJ7CDT 0x0C02004C -#define NEJ7B 0x0C02004D -#define NEJ7BCDT 0x0C02004E -#define NEJ8 0x0C02004F -#define NEJ8CDT 0x0C020050 -#define NEJ9 0x0C020051 -#define NEJ9CDT 0x0C020052 -#define NEWTON 0x0C020053 -#define NEWTONCDT 0x0C020054 -#define PRL1 0x0C020055 -#define PRL1CDT 0x0C020056 -#define PRL2 0x0C020057 -#define PRL2CDT 0x0C020058 -#define PRL6 0x0C020059 -#define PRL6CDT 0x0C02005A -#define PRL7 0x0C02005B -#define PRL7CDT 0x0C02005C -#define PRL8 0x0C02005D -#define PRL8CDT 0x0C02005E -#define SHO1 0x0C02005F -#define SHO1CDT 0x0C020060 -#define SHO2 0x0C020061 -#define SHO2CDT 0x0C020062 -#define SHT1 0x0C020063 -#define SHT1CDT 0x0C020064 -#define SHT2 0x0C020065 -#define SHT2CDT 0x0C020066 -#define SHT3 0x0C020067 -#define SHT3CDT 0x0C020068 -#define STA2 0x0C020069 -#define STA2CDT 0x0C02006A -#define STEAM45 0x0C02006B -#define STEAM45CDT 0x0C02006C -#define TRUCK45 0x0C02006D -#define TRUCK45CDT 0x0C02006E -#define TRUCKEMP 0x0C02006F -#define TRUCKEMPCDT 0x0C020070 -#define ULT6 0x0C020071 -#define ULT6CDT 0x0C020072 -#define ULT7 0x0C020073 -#define ULT7CDT 0x0C020074 -#define ULT8 0x0C020075 -#define ULT8CDT 0x0C020076 -#define ULT9 0x0C020077 -#define ULT9CDT 0x0C020078 -#define XGEOMON3 0x0C020079 -#define XGEOMON3CDT 0x0C02007A -#define XGEOMON5 0x0C02007B -#define XGEOMON5CDT 0x0C02007C -#define XGEOSTA3 0x0C02007D -#define XGEOSTA3CDT 0x0C02007E -#define XGEOSTA5 0x0C02007F -#define XGEOSTA5CDT 0x0C020080 -#define XGEOSTAT 0x0C020081 -#define XGEOSTATCDT 0x0C020082 +#define SYRIA_PAL 0x0C020000 +#define R45SPRPAL 0x0C020001 +#define R45L0 0x0C020002 +#define R45L1 0x0C020003 +#define R45G1 0x0C020004 +#define R45PAL 0x0C020005 +#define R45FLR 0x0C020006 +#define R45PLX 0x0C020007 +#define ART1 0x0C020008 +#define ART1CDT 0x0C020009 +#define ART2 0x0C02000A +#define ART2CDT 0x0C02000B +#define ART3A 0x0C02000C +#define ART3ACDT 0x0C02000D +#define ART3ACDR 0x0C02000E +#define ART4 0x0C02000F +#define ART4CDT 0x0C020010 +#define ART5 0x0C020011 +#define ART5CDT 0x0C020012 +#define ART6 0x0C020013 +#define ART6CDT 0x0C020014 +#define ART7 0x0C020015 +#define ART7CDT 0x0C020016 +#define AYU1 0x0C020017 +#define AYU1CDT 0x0C020018 +#define AYU1A 0x0C020019 +#define AYU1ACDT 0x0C02001A +#define AYU1B 0x0C02001B +#define AYU1BCDT 0x0C02001C +#define AYU5 0x0C02001D +#define AYU5CDT 0x0C02001E +#define BRUSH 0x0C02001F +#define BRUSHCDT 0x0C020020 +#define CAT1 0x0C020021 +#define CAT1CDT 0x0C020022 +#define CAT3 0x0C020023 +#define CAT3CDT 0x0C020024 +#define CAT4 0x0C020025 +#define CAT4CDT 0x0C020026 +#define CAT5 0x0C020027 +#define CAT5CDT 0x0C020028 +#define GEOCHA 0x0C020029 +#define GEOCHACDT 0x0C02002A +#define GEOSYR1 0x0C02002B +#define GEOSYR1CDT 0x0C02002C +#define GEOSYR10 0x0C02002D +#define GEOSYR10CDT 0x0C02002E +#define GEOSYR10CDR 0x0C02002F +#define GEOSYR18 0x0C020030 +#define GEOSYR18CDT 0x0C020031 +#define GEOSYR2 0x0C020032 +#define GEOSYR2CDT 0x0C020033 +#define GEOSYR5 0x0C020034 +#define GEOSYR5CDT 0x0C020035 +#define GEOSYR6 0x0C020036 +#define GEOSYR6CDT 0x0C020037 +#define GEOSYR7 0x0C020038 +#define GEOSYR7CDT 0x0C020039 +#define NEJ1 0x0C02003A +#define NEJ1CDT 0x0C02003B +#define NEJ10 0x0C02003C +#define NEJ10CDT 0x0C02003D +#define NEJ12 0x0C02003E +#define NEJ12CDT 0x0C02003F +#define NEJ13 0x0C020040 +#define NEJ13CDT 0x0C020041 +#define NEJ13CDR 0x0C020042 +#define NEJ2 0x0C020043 +#define NEJ2CDT 0x0C020044 +#define NEJ2B 0x0C020045 +#define NEJ2BCDT 0x0C020046 +#define NEJ4 0x0C020047 +#define NEJ4CDT 0x0C020048 +#define NEJ6 0x0C020049 +#define NEJ6CDT 0x0C02004A +#define NEJ7 0x0C02004B +#define NEJ7CDT 0x0C02004C +#define NEJ7B 0x0C02004D +#define NEJ7BCDT 0x0C02004E +#define NEJ8 0x0C02004F +#define NEJ8CDT 0x0C020050 +#define NEJ9 0x0C020051 +#define NEJ9CDT 0x0C020052 +#define NEWTON 0x0C020053 +#define NEWTONCDT 0x0C020054 +#define PRL1 0x0C020055 +#define PRL1CDT 0x0C020056 +#define PRL2 0x0C020057 +#define PRL2CDT 0x0C020058 +#define PRL6 0x0C020059 +#define PRL6CDT 0x0C02005A +#define PRL7 0x0C02005B +#define PRL7CDT 0x0C02005C +#define PRL8 0x0C02005D +#define PRL8CDT 0x0C02005E +#define SHO1 0x0C02005F +#define SHO1CDT 0x0C020060 +#define SHO2 0x0C020061 +#define SHO2CDT 0x0C020062 +#define SHT1 0x0C020063 +#define SHT1CDT 0x0C020064 +#define SHT2 0x0C020065 +#define SHT2CDT 0x0C020066 +#define SHT3 0x0C020067 +#define SHT3CDT 0x0C020068 +#define STA2 0x0C020069 +#define STA2CDT 0x0C02006A +#define STEAM45 0x0C02006B +#define STEAM45CDT 0x0C02006C +#define TRUCK45 0x0C02006D +#define TRUCK45CDT 0x0C02006E +#define TRUCKEMP 0x0C02006F +#define TRUCKEMPCDT 0x0C020070 +#define ULT6 0x0C020071 +#define ULT6CDT 0x0C020072 +#define ULT7 0x0C020073 +#define ULT7CDT 0x0C020074 +#define ULT8 0x0C020075 +#define ULT8CDT 0x0C020076 +#define ULT9 0x0C020077 +#define ULT9CDT 0x0C020078 +#define XGEOMON3 0x0C020079 +#define XGEOMON3CDT 0x0C02007A +#define XGEOMON5 0x0C02007B +#define XGEOMON5CDT 0x0C02007C +#define XGEOSTA3 0x0C02007D +#define XGEOSTA3CDT 0x0C02007E +#define XGEOSTA5 0x0C02007F +#define XGEOSTA5CDT 0x0C020080 +#define XGEOSTAT 0x0C020081 +#define XGEOSTATCDT 0x0C020082 // 131 entities in TXTs, 131 in datafiles. // room47 -#define R47L0 0x0C030000 -#define R47L1 0x0C030001 -#define R47L2 0x0C030002 -#define R47G1 0x0C030003 -#define R47G2 0x0C030004 -#define R47PAL 0x0C030005 -#define R47FLR 0x0C030006 -#define CAR1 0x0C030007 -#define CAR1CDT 0x0C030008 -#define CAR2 0x0C030009 -#define CAR2CDT 0x0C03000A -#define CAR3 0x0C03000B -#define CAR3CDT 0x0C03000C -#define CAR4 0x0C03000D -#define CAR4CDT 0x0C03000E -#define CAR5 0x0C03000F -#define CAR5CDT 0x0C030010 -#define CAR6 0x0C030011 -#define CAR6CDT 0x0C030012 -#define CRPMOV 0x0C030013 -#define CRPMOVCDT 0x0C030014 -#define GEOSYR3 0x0C030015 -#define GEOSYR3CDT 0x0C030016 -#define GEOSYR3A 0x0C030017 -#define GEOSYR3ACDT 0x0C030018 -#define GEOSYR4 0x0C030019 -#define GEOSYR4CDT 0x0C03001A -#define GEOSYR4A 0x0C03001B -#define GEOSYR4ACDT 0x0C03001C +#define R47L0 0x0C030000 +#define R47L1 0x0C030001 +#define R47L2 0x0C030002 +#define R47G1 0x0C030003 +#define R47G2 0x0C030004 +#define R47PAL 0x0C030005 +#define R47FLR 0x0C030006 +#define CAR1 0x0C030007 +#define CAR1CDT 0x0C030008 +#define CAR2 0x0C030009 +#define CAR2CDT 0x0C03000A +#define CAR3 0x0C03000B +#define CAR3CDT 0x0C03000C +#define CAR4 0x0C03000D +#define CAR4CDT 0x0C03000E +#define CAR5 0x0C03000F +#define CAR5CDT 0x0C030010 +#define CAR6 0x0C030011 +#define CAR6CDT 0x0C030012 +#define CRPMOV 0x0C030013 +#define CRPMOVCDT 0x0C030014 +#define GEOSYR3 0x0C030015 +#define GEOSYR3CDT 0x0C030016 +#define GEOSYR3A 0x0C030017 +#define GEOSYR3ACDT 0x0C030018 +#define GEOSYR4 0x0C030019 +#define GEOSYR4CDT 0x0C03001A +#define GEOSYR4A 0x0C03001B +#define GEOSYR4ACDT 0x0C03001C // 29 entities in TXTs, 29 in datafiles. // room49 -#define R49L0 0x0C040000 -#define R49L1 0x0C040001 -#define R49L2 0x0C040002 -#define R49G1 0x0C040003 -#define R49G2 0x0C040004 -#define R49PAL 0x0C040005 -#define R49FLR 0x0C040006 -#define DOOR49 0x0C040007 -#define DOOR49CDT 0x0C040008 -#define DOOR49CDR 0x0C040009 -#define GEOKEYS1 0x0C04000A -#define GEOKEYS1CDT 0x0C04000B -#define GEOSYR43 0x0C04000C -#define GEOSYR43CDT 0x0C04000D -#define KEYS 0x0C04000E -#define KEYSCDT 0x0C04000F -#define MAN1 0x0C040010 -#define MAN1CDT 0x0C040011 -#define MAN2 0x0C040012 -#define MAN2CDT 0x0C040013 -#define MAN3 0x0C040014 -#define MAN3CDT 0x0C040015 -#define MAN4 0x0C040016 -#define MAN4CDT 0x0C040017 -#define MAN4A 0x0C040018 -#define MAN4ACDT 0x0C040019 -#define ULT10 0x0C04001A -#define ULT10CDT 0x0C04001B -#define ULT15 0x0C04001C -#define ULT15CDT 0x0C04001D -#define ULT3 0x0C04001E -#define ULT3CDT 0x0C04001F -#define ULTTAK 0x0C040020 -#define ULTTAKCDT 0x0C040021 +#define R49L0 0x0C040000 +#define R49L1 0x0C040001 +#define R49L2 0x0C040002 +#define R49G1 0x0C040003 +#define R49G2 0x0C040004 +#define R49PAL 0x0C040005 +#define R49FLR 0x0C040006 +#define DOOR49 0x0C040007 +#define DOOR49CDT 0x0C040008 +#define DOOR49CDR 0x0C040009 +#define GEOKEYS1 0x0C04000A +#define GEOKEYS1CDT 0x0C04000B +#define GEOSYR43 0x0C04000C +#define GEOSYR43CDT 0x0C04000D +#define KEYS 0x0C04000E +#define KEYSCDT 0x0C04000F +#define MAN1 0x0C040010 +#define MAN1CDT 0x0C040011 +#define MAN2 0x0C040012 +#define MAN2CDT 0x0C040013 +#define MAN3 0x0C040014 +#define MAN3CDT 0x0C040015 +#define MAN4 0x0C040016 +#define MAN4CDT 0x0C040017 +#define MAN4A 0x0C040018 +#define MAN4ACDT 0x0C040019 +#define ULT10 0x0C04001A +#define ULT10CDT 0x0C04001B +#define ULT15 0x0C04001C +#define ULT15CDT 0x0C04001D +#define ULT3 0x0C04001E +#define ULT3CDT 0x0C04001F +#define ULTTAK 0x0C040020 +#define ULTTAKCDT 0x0C040021 // 34 entities in TXTs, 34 in datafiles. // room50 -#define R50L0 0x0C050000 -#define R50L1 0x0C050001 -#define R50L2 0x0C050002 -#define R50L3 0x0C050003 -#define R50G1 0x0C050004 -#define R50G2 0x0C050005 -#define R50G3 0x0C050006 -#define R50PAL 0x0C050007 -#define R50FLR 0x0C050008 -#define CHAIN50 0x0C050009 -#define CHAIN50CDT 0x0C05000A -#define CUBDOR50 0x0C05000B -#define CUBDOR50CDT 0x0C05000C -#define DOOR50 0x0C05000D -#define DOOR50CDT 0x0C05000E -#define DOOR50CDR 0x0C05000F -#define GEOSYR48 0x0C050010 -#define GEOSYR48CDT 0x0C050011 -#define GEOSYR49 0x0C050012 -#define GEOSYR49CDT 0x0C050013 -#define GEOSYR50 0x0C050014 -#define GEOSYR50CDT 0x0C050015 -#define GEOSYR51 0x0C050016 -#define GEOSYR51CDT 0x0C050017 -#define GEOSYR51CDR 0x0C050018 -#define GEOSYR52 0x0C050019 -#define GEOSYR52CDT 0x0C05001A -#define GEOSYR53 0x0C05001B -#define GEOSYR53CDT 0x0C05001C -#define GEOSYR54 0x0C05001D -#define GEOSYR54CDT 0x0C05001E -#define TOWEL1 0x0C05001F -#define TOWEL1CDT 0x0C050020 -#define TOWEL4 0x0C050021 -#define TOWEL4CDT 0x0C050022 +#define R50L0 0x0C050000 +#define R50L1 0x0C050001 +#define R50L2 0x0C050002 +#define R50L3 0x0C050003 +#define R50G1 0x0C050004 +#define R50G2 0x0C050005 +#define R50G3 0x0C050006 +#define R50PAL 0x0C050007 +#define R50FLR 0x0C050008 +#define CHAIN50 0x0C050009 +#define CHAIN50CDT 0x0C05000A +#define CUBDOR50 0x0C05000B +#define CUBDOR50CDT 0x0C05000C +#define DOOR50 0x0C05000D +#define DOOR50CDT 0x0C05000E +#define DOOR50CDR 0x0C05000F +#define GEOSYR48 0x0C050010 +#define GEOSYR48CDT 0x0C050011 +#define GEOSYR49 0x0C050012 +#define GEOSYR49CDT 0x0C050013 +#define GEOSYR50 0x0C050014 +#define GEOSYR50CDT 0x0C050015 +#define GEOSYR51 0x0C050016 +#define GEOSYR51CDT 0x0C050017 +#define GEOSYR51CDR 0x0C050018 +#define GEOSYR52 0x0C050019 +#define GEOSYR52CDT 0x0C05001A +#define GEOSYR53 0x0C05001B +#define GEOSYR53CDT 0x0C05001C +#define GEOSYR54 0x0C05001D +#define GEOSYR54CDT 0x0C05001E +#define TOWEL1 0x0C05001F +#define TOWEL1CDT 0x0C050020 +#define TOWEL4 0x0C050021 +#define TOWEL4CDT 0x0C050022 // 35 entities in TXTs, 35 in datafiles. // room53 -#define R53L0 0x0C060000 -#define R53PAL 0x0C060001 -#define BACK53PLX 0x0C060002 -#define FRONT53PLX 0x0C060003 -#define R53SPRPAL 0x0C060004 +#define R53L0 0x0C060000 +#define R53PAL 0x0C060001 +#define BACK53PLX 0x0C060002 +#define FRONT53PLX 0x0C060003 +#define R53SPRPAL 0x0C060004 // 5 entities in TXTs, 5 in datafiles. // room54 -#define R54L0 0x0C070000 -#define R54L1 0x0C070001 -#define R54G1 0x0C070002 -#define R54PAL 0x0C070003 -#define R54FLR 0x0C070004 -#define R54PLX 0x0C070005 -#define GEOSYR19 0x0C070006 -#define GEOSYR19CDT 0x0C070007 -#define GEOSYR20 0x0C070008 -#define GEOSYR20CDT 0x0C070009 -#define GEOSYR22 0x0C07000A -#define GEOSYR22CDT 0x0C07000B -#define GEOSYR23 0x0C07000C -#define GEOSYR23CDT 0x0C07000D -#define GEOSYR25 0x0C07000E -#define GEOSYR25CDT 0x0C07000F -#define GEOSYR26 0x0C070010 -#define GEOSYR26CDT 0x0C070011 -#define GEOSYR27 0x0C070012 -#define GEOSYR27CDT 0x0C070013 -#define GEOSYR37 0x0C070014 -#define GEOSYR37CDT 0x0C070015 -#define GEOSYR39 0x0C070016 -#define GEOSYR39CDT 0x0C070017 -#define GEOSYR40 0x0C070018 -#define GEOSYR40CDT 0x0C070019 -#define GEOSYR41 0x0C07001A -#define GEOSYR41CDT 0x0C07001B -#define GEOSYR42 0x0C07001C -#define GEOSYR42CDT 0x0C07001D -#define GEOSYR99 0x0C07001E -#define GEOSYR99CDT 0x0C07001F -#define GUN54 0x0C070020 -#define GUN54CDT 0x0C070021 -#define KHS10 0x0C070022 -#define KHS10CDT 0x0C070023 -#define KHS12 0x0C070024 -#define KHS12CDT 0x0C070025 -#define KHS5 0x0C070026 -#define KHS5CDT 0x0C070027 -#define KHS7 0x0C070028 -#define KHS7CDT 0x0C070029 -#define KHS8 0x0C07002A -#define KHS8CDT 0x0C07002B -#define KHS9 0x0C07002C -#define KHS9CDT 0x0C07002D -#define KHSTLK54 0x0C07002E -#define KHSTLK54CDT 0x0C07002F -#define SECDOR 0x0C070030 -#define SECDORCDT 0x0C070031 -#define STCKTREE 0x0C070032 -#define STCKTREECDT 0x0C070033 -#define STICKIN 0x0C070034 -#define STICKINCDT 0x0C070035 -#define XGEOSY21 0x0C070036 -#define XGEOSY21CDT 0x0C070037 +#define R54L0 0x0C070000 +#define R54L1 0x0C070001 +#define R54G1 0x0C070002 +#define R54PAL 0x0C070003 +#define R54FLR 0x0C070004 +#define R54PLX 0x0C070005 +#define GEOSYR19 0x0C070006 +#define GEOSYR19CDT 0x0C070007 +#define GEOSYR20 0x0C070008 +#define GEOSYR20CDT 0x0C070009 +#define GEOSYR22 0x0C07000A +#define GEOSYR22CDT 0x0C07000B +#define GEOSYR23 0x0C07000C +#define GEOSYR23CDT 0x0C07000D +#define GEOSYR25 0x0C07000E +#define GEOSYR25CDT 0x0C07000F +#define GEOSYR26 0x0C070010 +#define GEOSYR26CDT 0x0C070011 +#define GEOSYR27 0x0C070012 +#define GEOSYR27CDT 0x0C070013 +#define GEOSYR37 0x0C070014 +#define GEOSYR37CDT 0x0C070015 +#define GEOSYR39 0x0C070016 +#define GEOSYR39CDT 0x0C070017 +#define GEOSYR40 0x0C070018 +#define GEOSYR40CDT 0x0C070019 +#define GEOSYR41 0x0C07001A +#define GEOSYR41CDT 0x0C07001B +#define GEOSYR42 0x0C07001C +#define GEOSYR42CDT 0x0C07001D +#define GEOSYR99 0x0C07001E +#define GEOSYR99CDT 0x0C07001F +#define GUN54 0x0C070020 +#define GUN54CDT 0x0C070021 +#define KHS10 0x0C070022 +#define KHS10CDT 0x0C070023 +#define KHS12 0x0C070024 +#define KHS12CDT 0x0C070025 +#define KHS5 0x0C070026 +#define KHS5CDT 0x0C070027 +#define KHS7 0x0C070028 +#define KHS7CDT 0x0C070029 +#define KHS8 0x0C07002A +#define KHS8CDT 0x0C07002B +#define KHS9 0x0C07002C +#define KHS9CDT 0x0C07002D +#define KHSTLK54 0x0C07002E +#define KHSTLK54CDT 0x0C07002F +#define SECDOR 0x0C070030 +#define SECDORCDT 0x0C070031 +#define STCKTREE 0x0C070032 +#define STCKTREECDT 0x0C070033 +#define STICKIN 0x0C070034 +#define STICKINCDT 0x0C070035 +#define XGEOSY21 0x0C070036 +#define XGEOSY21CDT 0x0C070037 // 56 entities in TXTs, 56 in datafiles. // room55 -#define R55SPRPAL 0x0C080000 -#define R55L0 0x0C080001 -#define R55PAL 0x0C080002 -#define R55FLR 0x0C080003 -#define R55PLX 0x0C080004 -#define BODY55 0x0C080005 -#define BODY55CDT 0x0C080006 -#define BRITMAP 0x0C080007 -#define BRITMAP_PAL 0x0C080008 -#define DOOR55 0x0C080009 -#define DOOR55CDT 0x0C08000A -#define DOOR55CDR 0x0C08000B -#define GEOSY30T 0x0C08000C -#define GEOSY30TCDT 0x0C08000D -#define GEOSY30U 0x0C08000E -#define GEOSY30UCDT 0x0C08000F -#define GEOSYR29 0x0C080010 -#define GEOSYR29CDT 0x0C080011 -#define GEOSYR30 0x0C080012 -#define GEOSYR30CDT 0x0C080013 -#define GEOSYR31 0x0C080014 -#define GEOSYR31CDT 0x0C080015 -#define GEOSYR33 0x0C080016 -#define GEOSYR33CDT 0x0C080017 -#define GEOSYR34 0x0C080018 -#define GEOSYR34CDT 0x0C080019 -#define GEOSYR34CDR 0x0C08001A -#define GEOSYR35 0x0C08001B -#define GEOSYR35CDT 0x0C08001C -#define GEOSYR56 0x0C08001D -#define GEOSYR56CDT 0x0C08001E -#define KHS2 0x0C08001F -#define KHS2CDT 0x0C080020 -#define KHS3 0x0C080021 -#define KHS3CDT 0x0C080022 -#define KHS6 0x0C080023 -#define KHS6CDT 0x0C080024 +#define R55SPRPAL 0x0C080000 +#define R55L0 0x0C080001 +#define R55PAL 0x0C080002 +#define R55FLR 0x0C080003 +#define R55PLX 0x0C080004 +#define BODY55 0x0C080005 +#define BODY55CDT 0x0C080006 +#define BRITMAP 0x0C080007 +#define BRITMAP_PAL 0x0C080008 +#define DOOR55 0x0C080009 +#define DOOR55CDT 0x0C08000A +#define DOOR55CDR 0x0C08000B +#define GEOSY30T 0x0C08000C +#define GEOSY30TCDT 0x0C08000D +#define GEOSY30U 0x0C08000E +#define GEOSY30UCDT 0x0C08000F +#define GEOSYR29 0x0C080010 +#define GEOSYR29CDT 0x0C080011 +#define GEOSYR30 0x0C080012 +#define GEOSYR30CDT 0x0C080013 +#define GEOSYR31 0x0C080014 +#define GEOSYR31CDT 0x0C080015 +#define GEOSYR33 0x0C080016 +#define GEOSYR33CDT 0x0C080017 +#define GEOSYR34 0x0C080018 +#define GEOSYR34CDT 0x0C080019 +#define GEOSYR34CDR 0x0C08001A +#define GEOSYR35 0x0C08001B +#define GEOSYR35CDT 0x0C08001C +#define GEOSYR56 0x0C08001D +#define GEOSYR56CDT 0x0C08001E +#define KHS2 0x0C08001F +#define KHS2CDT 0x0C080020 +#define KHS3 0x0C080021 +#define KHS3CDT 0x0C080022 +#define KHS6 0x0C080023 +#define KHS6CDT 0x0C080024 // 37 entities in TXTs, 37 in datafiles. // train // sound_fx -#define FX_SHOCK63 0x0D000000 -#define FX_TRAINEXT 0x0D000001 -#define FX_TRAININT 0x0D000002 -#define FX_DOOR65 0x0D000003 -#define FX_WIND66 0x0D000004 -#define FX_WINDOW66 0x0D000005 -#define FX_BRAKES 0x0D000006 -#define FX_DOOR69 0x0D000007 -#define FX_EKSHOOT 0x0D000008 -#define FX_FIGHT69 0x0D000009 -#define FX_PNEUMO69 0x0D00000A -#define FX_TICK69 0x0D00000B -#define FX_TRNPASS 0x0D00000C +#define FX_SHOCK63 0x0D000000 +#define FX_TRAINEXT 0x0D000001 +#define FX_TRAININT 0x0D000002 +#define FX_DOOR65 0x0D000003 +#define FX_WIND66 0x0D000004 +#define FX_WINDOW66 0x0D000005 +#define FX_BRAKES 0x0D000006 +#define FX_DOOR69 0x0D000007 +#define FX_EKSHOOT 0x0D000008 +#define FX_FIGHT69 0x0D000009 +#define FX_PNEUMO69 0x0D00000A +#define FX_TICK69 0x0D00000B +#define FX_TRNPASS 0x0D00000C // 13 entities in TXTs, 13 in datafiles. // room63 -#define TRAIN_PAL 0x0D010000 -#define R63L0 0x0D010001 -#define R63L1 0x0D010002 -#define R63G1 0x0D010003 -#define R63PAL 0x0D010004 -#define R63FLR 0x0D010005 -#define GEOTRAIN_MEGA 0x0D010006 -#define GEOTRAIN_WLK 0x0D010007 -#define BASHER63 0x0D010008 -#define BASHER63CDT 0x0D010009 -#define BOXDOR64 0x0D01000A -#define BOXDOR64CDT 0x0D01000B -#define BUSHA63 0x0D01000C -#define BUSHA63CDT 0x0D01000D -#define BUSHB63 0x0D01000E -#define BUSHB63CDT 0x0D01000F -#define BUSHC63 0x0D010010 -#define BUSHC63CDT 0x0D010011 -#define DOOR63C1 0x0D010012 -#define DOOR63C1CDT 0x0D010013 -#define DOOR63C1CDR 0x0D010014 -#define DOOR63C2 0x0D010015 -#define DOOR63C2CDT 0x0D010016 -#define DOOR63C2CDR 0x0D010017 -#define DOOR63C3 0x0D010018 -#define DOOR63C3CDT 0x0D010019 -#define DOOR63C3CDR 0x0D01001A -#define GEOCLI64 0x0D01001B -#define GEOCLI64CDT 0x0D01001C -#define GEOJGL64 0x0D01001D -#define GEOJGL64CDT 0x0D01001E -#define GEOJGR64 0x0D01001F -#define GEOJGR64CDT 0x0D010020 -#define GEOLAD64 0x0D010021 -#define GEOLAD64CDT 0x0D010022 -#define GEOSHK64 0x0D010023 -#define GEOSHK64CDT 0x0D010024 -#define GEOSTDL 0x0D010025 -#define GEOSTDLCDT 0x0D010026 -#define GEOSTDR 0x0D010027 -#define GEOSTDRCDT 0x0D010028 -#define GUIDOR63 0x0D010029 -#define GUIDOR63CDT 0x0D01002A -#define GUIDSM63 0x0D01002B -#define GUIDSM63CDT 0x0D01002C -#define LADY63 0x0D01002D -#define LADY63CDT 0x0D01002E -#define LIGHT63A 0x0D01002F -#define LIGHT63ACDT 0x0D010030 -#define LIGHT63B 0x0D010031 -#define LIGHT63BCDT 0x0D010032 -#define LIGHT63C 0x0D010033 -#define LIGHT63CCDT 0x0D010034 -#define LIGHT63D 0x0D010035 -#define LIGHT63DCDT 0x0D010036 -#define LIGHT63E 0x0D010037 -#define LIGHT63ECDT 0x0D010038 -#define NICO63 0x0D010039 -#define NICO63CDT 0x0D01003A -#define POLE63 0x0D01003B -#define POLE63CDT 0x0D01003C -#define WHEELA63 0x0D01003D -#define WHEELA63CDT 0x0D01003E -#define WHEELB63 0x0D01003F -#define WHEELB63CDT 0x0D010040 -#define WHEELC63 0x0D010041 -#define WHEELC63CDT 0x0D010042 -#define WHEELD63 0x0D010043 -#define WHEELD63CDT 0x0D010044 -#define WHEELE63 0x0D010045 -#define WHEELE63CDT 0x0D010046 -#define WHEELF63 0x0D010047 -#define WHEELF63CDT 0x0D010048 +#define TRAIN_PAL 0x0D010000 +#define R63L0 0x0D010001 +#define R63L1 0x0D010002 +#define R63G1 0x0D010003 +#define R63PAL 0x0D010004 +#define R63FLR 0x0D010005 +#define GEOTRAIN_MEGA 0x0D010006 +#define GEOTRAIN_WLK 0x0D010007 +#define BASHER63 0x0D010008 +#define BASHER63CDT 0x0D010009 +#define BOXDOR64 0x0D01000A +#define BOXDOR64CDT 0x0D01000B +#define BUSHA63 0x0D01000C +#define BUSHA63CDT 0x0D01000D +#define BUSHB63 0x0D01000E +#define BUSHB63CDT 0x0D01000F +#define BUSHC63 0x0D010010 +#define BUSHC63CDT 0x0D010011 +#define DOOR63C1 0x0D010012 +#define DOOR63C1CDT 0x0D010013 +#define DOOR63C1CDR 0x0D010014 +#define DOOR63C2 0x0D010015 +#define DOOR63C2CDT 0x0D010016 +#define DOOR63C2CDR 0x0D010017 +#define DOOR63C3 0x0D010018 +#define DOOR63C3CDT 0x0D010019 +#define DOOR63C3CDR 0x0D01001A +#define GEOCLI64 0x0D01001B +#define GEOCLI64CDT 0x0D01001C +#define GEOJGL64 0x0D01001D +#define GEOJGL64CDT 0x0D01001E +#define GEOJGR64 0x0D01001F +#define GEOJGR64CDT 0x0D010020 +#define GEOLAD64 0x0D010021 +#define GEOLAD64CDT 0x0D010022 +#define GEOSHK64 0x0D010023 +#define GEOSHK64CDT 0x0D010024 +#define GEOSTDL 0x0D010025 +#define GEOSTDLCDT 0x0D010026 +#define GEOSTDR 0x0D010027 +#define GEOSTDRCDT 0x0D010028 +#define GUIDOR63 0x0D010029 +#define GUIDOR63CDT 0x0D01002A +#define GUIDSM63 0x0D01002B +#define GUIDSM63CDT 0x0D01002C +#define LADY63 0x0D01002D +#define LADY63CDT 0x0D01002E +#define LIGHT63A 0x0D01002F +#define LIGHT63ACDT 0x0D010030 +#define LIGHT63B 0x0D010031 +#define LIGHT63BCDT 0x0D010032 +#define LIGHT63C 0x0D010033 +#define LIGHT63CCDT 0x0D010034 +#define LIGHT63D 0x0D010035 +#define LIGHT63DCDT 0x0D010036 +#define LIGHT63E 0x0D010037 +#define LIGHT63ECDT 0x0D010038 +#define NICO63 0x0D010039 +#define NICO63CDT 0x0D01003A +#define POLE63 0x0D01003B +#define POLE63CDT 0x0D01003C +#define WHEELA63 0x0D01003D +#define WHEELA63CDT 0x0D01003E +#define WHEELB63 0x0D01003F +#define WHEELB63CDT 0x0D010040 +#define WHEELC63 0x0D010041 +#define WHEELC63CDT 0x0D010042 +#define WHEELD63 0x0D010043 +#define WHEELD63CDT 0x0D010044 +#define WHEELE63 0x0D010045 +#define WHEELE63CDT 0x0D010046 +#define WHEELF63 0x0D010047 +#define WHEELF63CDT 0x0D010048 // 73 entities in TXTs, 73 in datafiles. // room65 -#define R65L0 0x0D020000 -#define R65L1 0x0D020001 -#define R65G1 0x0D020002 -#define R65PAL 0x0D020003 -#define R65FLR 0x0D020004 -#define DOOR65 0x0D020005 -#define DOOR65CDT 0x0D020006 -#define DOOR65CDR 0x0D020007 -#define GEOGUA 0x0D020008 -#define GEOGUACDT 0x0D020009 -#define GEOLNK3 0x0D02000A -#define GEOLNK3CDT 0x0D02000B -#define GEONIC65 0x0D02000C -#define GEONIC65CDT 0x0D02000D -#define GEOSIT 0x0D02000E -#define GEOSITCDT 0x0D02000F -#define GEOSIT65 0x0D020010 -#define GEOSIT65CDT 0x0D020011 -#define GEOSTD65 0x0D020012 -#define GEOSTD65CDT 0x0D020013 -#define GEOSTD65CDR 0x0D020014 -#define GEOTIK 0x0D020015 -#define GEOTIKCDT 0x0D020016 -#define GEOTN652 0x0D020017 -#define GEOTN652CDT 0x0D020018 -#define GEOTN652CDR 0x0D020019 -#define GEOTRN65 0x0D02001A -#define GEOTRN65CDT 0x0D02001B -#define GEOTRN65CDR 0x0D02001C -#define GUADOR65 0x0D02001D -#define GUADOR65CDT 0x0D02001E -#define GUALEA65 0x0D02001F -#define GUALEA65CDT 0x0D020020 -#define GUATGN 0x0D020021 -#define GUATGNCDT 0x0D020022 -#define GUATGNCDR 0x0D020023 -#define GUATIK1 0x0D020024 -#define GUATIK1CDT 0x0D020025 -#define GUATIK2 0x0D020026 -#define GUATIK2CDT 0x0D020027 -#define GUATLK1 0x0D020028 -#define GUATLK1CDT 0x0D020029 -#define GUATLK2 0x0D02002A -#define GUATLK2CDT 0x0D02002B -#define NICGEO65 0x0D02002C -#define NICGEO65CDT 0x0D02002D -#define NICSIT65 0x0D02002E -#define NICSIT65CDT 0x0D02002F -#define NICTRN65 0x0D020030 -#define NICTRN65CDT 0x0D020031 -#define NICTRN65CDR 0x0D020032 -#define OLDREAD 0x0D020033 -#define OLDREADCDT 0x0D020034 -#define OLDREADCDR 0x0D020035 -#define OLDTIK1 0x0D020036 -#define OLDTIK1CDT 0x0D020037 -#define OLDTLK1 0x0D020038 -#define OLDTLK1CDT 0x0D020039 +#define R65L0 0x0D020000 +#define R65L1 0x0D020001 +#define R65G1 0x0D020002 +#define R65PAL 0x0D020003 +#define R65FLR 0x0D020004 +#define DOOR65 0x0D020005 +#define DOOR65CDT 0x0D020006 +#define DOOR65CDR 0x0D020007 +#define GEOGUA 0x0D020008 +#define GEOGUACDT 0x0D020009 +#define GEOLNK3 0x0D02000A +#define GEOLNK3CDT 0x0D02000B +#define GEONIC65 0x0D02000C +#define GEONIC65CDT 0x0D02000D +#define GEOSIT 0x0D02000E +#define GEOSITCDT 0x0D02000F +#define GEOSIT65 0x0D020010 +#define GEOSIT65CDT 0x0D020011 +#define GEOSTD65 0x0D020012 +#define GEOSTD65CDT 0x0D020013 +#define GEOSTD65CDR 0x0D020014 +#define GEOTIK 0x0D020015 +#define GEOTIKCDT 0x0D020016 +#define GEOTN652 0x0D020017 +#define GEOTN652CDT 0x0D020018 +#define GEOTN652CDR 0x0D020019 +#define GEOTRN65 0x0D02001A +#define GEOTRN65CDT 0x0D02001B +#define GEOTRN65CDR 0x0D02001C +#define GUADOR65 0x0D02001D +#define GUADOR65CDT 0x0D02001E +#define GUALEA65 0x0D02001F +#define GUALEA65CDT 0x0D020020 +#define GUATGN 0x0D020021 +#define GUATGNCDT 0x0D020022 +#define GUATGNCDR 0x0D020023 +#define GUATIK1 0x0D020024 +#define GUATIK1CDT 0x0D020025 +#define GUATIK2 0x0D020026 +#define GUATIK2CDT 0x0D020027 +#define GUATLK1 0x0D020028 +#define GUATLK1CDT 0x0D020029 +#define GUATLK2 0x0D02002A +#define GUATLK2CDT 0x0D02002B +#define NICGEO65 0x0D02002C +#define NICGEO65CDT 0x0D02002D +#define NICSIT65 0x0D02002E +#define NICSIT65CDT 0x0D02002F +#define NICTRN65 0x0D020030 +#define NICTRN65CDT 0x0D020031 +#define NICTRN65CDR 0x0D020032 +#define OLDREAD 0x0D020033 +#define OLDREADCDT 0x0D020034 +#define OLDREADCDR 0x0D020035 +#define OLDTIK1 0x0D020036 +#define OLDTIK1CDT 0x0D020037 +#define OLDTLK1 0x0D020038 +#define OLDTLK1CDT 0x0D020039 // 58 entities in TXTs, 58 in datafiles. // room66 -#define R66L0 0x0D030000 -#define R66PAL 0x0D030001 -#define R66FLR 0x0D030002 -#define BASHBURP 0x0D030003 -#define BASHBURPCDT 0x0D030004 -#define BASHCAN 0x0D030005 -#define BASHCANCDT 0x0D030006 -#define BASHCLA 0x0D030007 -#define BASHCLACDT 0x0D030008 -#define BASHDRI 0x0D030009 -#define BASHDRICDT 0x0D03000A -#define BASHSTD 0x0D03000B -#define BASHSTDCDT 0x0D03000C -#define BASHTLK1 0x0D03000D -#define BASHTLK1CDT 0x0D03000E -#define CAN66 0x0D03000F -#define CAN66CDT 0x0D030010 -#define GEOLEA 0x0D030011 -#define GEOLEACDT 0x0D030012 -#define GEOOPN1 0x0D030013 -#define GEOOPN1CDT 0x0D030014 -#define GEOOUT66 0x0D030015 -#define GEOOUT66CDT 0x0D030016 -#define SLEEPY1 0x0D030017 -#define SLEEPY1CDT 0x0D030018 -#define SLEEPY1CDR 0x0D030019 -#define SLEEPY2 0x0D03001A -#define SLEEPY2CDT 0x0D03001B +#define R66L0 0x0D030000 +#define R66PAL 0x0D030001 +#define R66FLR 0x0D030002 +#define BASHBURP 0x0D030003 +#define BASHBURPCDT 0x0D030004 +#define BASHCAN 0x0D030005 +#define BASHCANCDT 0x0D030006 +#define BASHCLA 0x0D030007 +#define BASHCLACDT 0x0D030008 +#define BASHDRI 0x0D030009 +#define BASHDRICDT 0x0D03000A +#define BASHSTD 0x0D03000B +#define BASHSTDCDT 0x0D03000C +#define BASHTLK1 0x0D03000D +#define BASHTLK1CDT 0x0D03000E +#define CAN66 0x0D03000F +#define CAN66CDT 0x0D030010 +#define GEOLEA 0x0D030011 +#define GEOLEACDT 0x0D030012 +#define GEOOPN1 0x0D030013 +#define GEOOPN1CDT 0x0D030014 +#define GEOOUT66 0x0D030015 +#define GEOOUT66CDT 0x0D030016 +#define SLEEPY1 0x0D030017 +#define SLEEPY1CDT 0x0D030018 +#define SLEEPY1CDR 0x0D030019 +#define SLEEPY2 0x0D03001A +#define SLEEPY2CDT 0x0D03001B // 28 entities in TXTs, 28 in datafiles. // room67 -#define R67L0 0x0D040000 -#define R67L1 0x0D040001 -#define R67G1 0x0D040002 -#define R67PAL 0x0D040003 -#define R67FLR 0x0D040004 -#define DOOR67 0x0D040005 -#define DOOR67CDT 0x0D040006 -#define DOOR67CDR 0x0D040007 +#define R67L0 0x0D040000 +#define R67L1 0x0D040001 +#define R67G1 0x0D040002 +#define R67PAL 0x0D040003 +#define R67FLR 0x0D040004 +#define DOOR67 0x0D040005 +#define DOOR67CDT 0x0D040006 +#define DOOR67CDR 0x0D040007 // 8 entities in TXTs, 8 in datafiles. // room69 -#define R69SPRPAL 0x0D050000 -#define R69L0 0x0D050001 -#define R69L1 0x0D050002 -#define R69G1 0x0D050003 -#define R69PAL 0x0D050004 -#define R69FLR 0x0D050005 -#define ASSDIE69 0x0D050006 -#define ASSDIE69CDT 0x0D050007 -#define ASSDWN69 0x0D050008 -#define ASSDWN69CDT 0x0D050009 -#define ASSLIFT 0x0D05000A -#define ASSLIFTCDT 0x0D05000B -#define ASSTLK69 0x0D05000C -#define ASSTLK69CDT 0x0D05000D -#define BOXES69 0x0D05000E -#define BOXES69CDT 0x0D05000F -#define EKLBOX69 0x0D050010 -#define EKLBOX69CDT 0x0D050011 -#define EKLGUN 0x0D050012 -#define EKLGUNCDT 0x0D050013 -#define EKLGUN69 0x0D050014 -#define EKLGUN69CDT 0x0D050015 -#define EKLTLK69 0x0D050016 -#define EKLTLK69CDT 0x0D050017 -#define EKLFIGHT 0x0D050018 -#define EKLFIGHTCDT 0x0D050019 -#define FIGHT69 0x0D05001A -#define FIGHT69CDT 0x0D05001B -#define GEODIE69 0x0D05001C -#define GEODIE69CDT 0x0D05001D -#define GEOENT69 0x0D05001E -#define GEOENT69CDT 0x0D05001F -#define GEOSTD69 0x0D050020 -#define GEOSTD69CDT 0x0D050021 -#define GEOSTP69 0x0D050022 -#define GEOSTP69CDT 0x0D050023 -#define GEOTLK69 0x0D050024 -#define GEOTLK69CDT 0x0D050025 -#define GEOUNTIE 0x0D050026 -#define GEOUNTIECDT 0x0D050027 -#define GEOXIT69 0x0D050028 -#define GEOXIT69CDT 0x0D050029 -#define NICTKB69 0x0D05002A -#define NICTKB69CDT 0x0D05002B -#define NICTLK69 0x0D05002C -#define NICTLK69CDT 0x0D05002D -#define NICTRN69 0x0D05002E -#define NICTRN69CDT 0x0D05002F -#define NICTRN69CDR 0x0D050030 -#define NICTUG69 0x0D050031 -#define NICTUG69CDT 0x0D050032 -#define NICWLK69 0x0D050033 -#define NICWLK69CDT 0x0D050034 -#define NICXIT69 0x0D050035 -#define NICXIT69CDT 0x0D050036 -#define RGTDOR69 0x0D050037 -#define RGTDOR69CDT 0x0D050038 +#define R69SPRPAL 0x0D050000 +#define R69L0 0x0D050001 +#define R69L1 0x0D050002 +#define R69G1 0x0D050003 +#define R69PAL 0x0D050004 +#define R69FLR 0x0D050005 +#define ASSDIE69 0x0D050006 +#define ASSDIE69CDT 0x0D050007 +#define ASSDWN69 0x0D050008 +#define ASSDWN69CDT 0x0D050009 +#define ASSLIFT 0x0D05000A +#define ASSLIFTCDT 0x0D05000B +#define ASSTLK69 0x0D05000C +#define ASSTLK69CDT 0x0D05000D +#define BOXES69 0x0D05000E +#define BOXES69CDT 0x0D05000F +#define EKLBOX69 0x0D050010 +#define EKLBOX69CDT 0x0D050011 +#define EKLGUN 0x0D050012 +#define EKLGUNCDT 0x0D050013 +#define EKLGUN69 0x0D050014 +#define EKLGUN69CDT 0x0D050015 +#define EKLTLK69 0x0D050016 +#define EKLTLK69CDT 0x0D050017 +#define EKLFIGHT 0x0D050018 +#define EKLFIGHTCDT 0x0D050019 +#define FIGHT69 0x0D05001A +#define FIGHT69CDT 0x0D05001B +#define GEODIE69 0x0D05001C +#define GEODIE69CDT 0x0D05001D +#define GEOENT69 0x0D05001E +#define GEOENT69CDT 0x0D05001F +#define GEOSTD69 0x0D050020 +#define GEOSTD69CDT 0x0D050021 +#define GEOSTP69 0x0D050022 +#define GEOSTP69CDT 0x0D050023 +#define GEOTLK69 0x0D050024 +#define GEOTLK69CDT 0x0D050025 +#define GEOUNTIE 0x0D050026 +#define GEOUNTIECDT 0x0D050027 +#define GEOXIT69 0x0D050028 +#define GEOXIT69CDT 0x0D050029 +#define NICTKB69 0x0D05002A +#define NICTKB69CDT 0x0D05002B +#define NICTLK69 0x0D05002C +#define NICTLK69CDT 0x0D05002D +#define NICTRN69 0x0D05002E +#define NICTRN69CDT 0x0D05002F +#define NICTRN69CDR 0x0D050030 +#define NICTUG69 0x0D050031 +#define NICTUG69CDT 0x0D050032 +#define NICWLK69 0x0D050033 +#define NICWLK69CDT 0x0D050034 +#define NICXIT69 0x0D050035 +#define NICXIT69CDT 0x0D050036 +#define RGTDOR69 0x0D050037 +#define RGTDOR69CDT 0x0D050038 // 57 entities in TXTs, 57 in datafiles. // scotland // sound_fx -#define FX_WIND71 0x0E000000 -#define FX_GUST71 0x0E000001 -#define FX_OWL71A 0x0E000002 -#define FX_OWL71B 0x0E000003 -#define FX_COG72A 0x0E000004 -#define FX_PING 0x0E000005 -#define FX_RUMMAGE1 0x0E000006 -#define FX_RUMMAGE2 0x0E000007 -#define FX_SECDOR72 0x0E000008 -#define FX_CHANT 0x0E000009 -#define FX_DAGGER1 0x0E00000A -#define FX_GDROP73 0x0E00000B -#define FX_GUNPOWDR 0x0E00000C -#define FX_STAFF 0x0E00000D -#define FX_TORCH73 0x0E00000E -#define FX_BAPHAMB 0x0E00000F -#define FX_FIGHT1 0x0E000010 -#define FX_REFORGE2 0x0E000011 -#define FX_ROSSODIE 0x0E000012 -#define FX_GKSWORD 0x0E000013 -#define FX_REFORGE1 0x0E000014 -#define FX_REFORGE4 0x0E000015 -#define FX_CHOKE1 0x0E000016 -#define FX_CHOKE2 0x0E000017 -#define FX_EKDIES 0x0E000018 -#define FX_FIGHT2 0x0E000019 -#define FX_GUN79 0x0E00001A +#define FX_WIND71 0x0E000000 +#define FX_GUST71 0x0E000001 +#define FX_OWL71A 0x0E000002 +#define FX_OWL71B 0x0E000003 +#define FX_COG72A 0x0E000004 +#define FX_PING 0x0E000005 +#define FX_RUMMAGE1 0x0E000006 +#define FX_RUMMAGE2 0x0E000007 +#define FX_SECDOR72 0x0E000008 +#define FX_CHANT 0x0E000009 +#define FX_DAGGER1 0x0E00000A +#define FX_GDROP73 0x0E00000B +#define FX_GUNPOWDR 0x0E00000C +#define FX_STAFF 0x0E00000D +#define FX_TORCH73 0x0E00000E +#define FX_BAPHAMB 0x0E00000F +#define FX_FIGHT1 0x0E000010 +#define FX_REFORGE2 0x0E000011 +#define FX_ROSSODIE 0x0E000012 +#define FX_GKSWORD 0x0E000013 +#define FX_REFORGE1 0x0E000014 +#define FX_REFORGE4 0x0E000015 +#define FX_CHOKE1 0x0E000016 +#define FX_CHOKE2 0x0E000017 +#define FX_EKDIES 0x0E000018 +#define FX_FIGHT2 0x0E000019 +#define FX_GUN79 0x0E00001A // 27 entities in TXTs, 27 in datafiles. // room71 -#define R71L0 0x0E010000 -#define R71L1 0x0E010001 -#define R71G1 0x0E010002 -#define R71PAL 0x0E010003 -#define R71FLR 0x0E010004 -#define R71PLX 0x0E010005 +#define R71L0 0x0E010000 +#define R71L1 0x0E010001 +#define R71G1 0x0E010002 +#define R71PAL 0x0E010003 +#define R71FLR 0x0E010004 +#define R71PLX 0x0E010005 // 6 entities in TXTs, 6 in datafiles. // room72 -#define R72L0 0x0E020000 -#define R72L1 0x0E020001 -#define R72G1 0x0E020002 -#define R72PAL 0x0E020003 -#define R72FLR 0x0E020004 -#define COGL72 0x0E020005 -#define COGL72CDT 0x0E020006 -#define COGR72 0x0E020007 -#define COGR72CDT 0x0E020008 -#define GEOJMP72 0x0E020009 -#define GEOJMP72CDT 0x0E02000A -#define GEOPIPE 0x0E02000B -#define GEOPIPECDT 0x0E02000C -#define GEOPIPECDR 0x0E02000D -#define GEOPSH72 0x0E02000E -#define GEOPSH72CDT 0x0E02000F -#define GEOPUT72 0x0E020010 -#define GEOPUT72CDT 0x0E020011 -#define GEOTAK72 0x0E020012 -#define GEOTAK72CDT 0x0E020013 -#define GEOTAK72CDR 0x0E020014 -#define GEOTRY72 0x0E020015 -#define GEOTRY72CDT 0x0E020016 -#define GEOWIND2 0x0E020017 -#define GEOWIND2CDT 0x0E020018 -#define GEOWIND3 0x0E020019 -#define GEOWIND3CDT 0x0E02001A -#define GEOWIND4 0x0E02001B -#define GEOWIND4CDT 0x0E02001C -#define GEOWND72 0x0E02001D -#define GEOWND72CDT 0x0E02001E -#define HANDLE72 0x0E02001F -#define HANDLE72CDT 0x0E020020 -#define NICGEO72 0x0E020021 -#define NICGEO72CDT 0x0E020022 -#define NICJMP72 0x0E020023 -#define NICJMP72CDT 0x0E020024 -#define NICLNK72 0x0E020025 -#define NICLNK72CDT 0x0E020026 -#define NICLNK72CDR 0x0E020027 -#define NICOPY72 0x0E020028 -#define NICOPY72CDT 0x0E020029 -#define NICOPY72CDR 0x0E02002A -#define NICTLK72 0x0E02002B -#define NICTLK72CDT 0x0E02002C -#define NOSE72 0x0E02002D -#define NOSE72CDT 0x0E02002E -#define PANEL72 0x0E02002F -#define PANEL72CDT 0x0E020030 -#define PIPE72 0x0E020031 -#define PIPE72CDT 0x0E020032 -#define SPINDL72 0x0E020033 -#define SPINDL72CDT 0x0E020034 -#define WHEEL72 0x0E020035 -#define WHEEL72CDT 0x0E020036 +#define R72L0 0x0E020000 +#define R72L1 0x0E020001 +#define R72G1 0x0E020002 +#define R72PAL 0x0E020003 +#define R72FLR 0x0E020004 +#define COGL72 0x0E020005 +#define COGL72CDT 0x0E020006 +#define COGR72 0x0E020007 +#define COGR72CDT 0x0E020008 +#define GEOJMP72 0x0E020009 +#define GEOJMP72CDT 0x0E02000A +#define GEOPIPE 0x0E02000B +#define GEOPIPECDT 0x0E02000C +#define GEOPIPECDR 0x0E02000D +#define GEOPSH72 0x0E02000E +#define GEOPSH72CDT 0x0E02000F +#define GEOPUT72 0x0E020010 +#define GEOPUT72CDT 0x0E020011 +#define GEOTAK72 0x0E020012 +#define GEOTAK72CDT 0x0E020013 +#define GEOTAK72CDR 0x0E020014 +#define GEOTRY72 0x0E020015 +#define GEOTRY72CDT 0x0E020016 +#define GEOWIND2 0x0E020017 +#define GEOWIND2CDT 0x0E020018 +#define GEOWIND3 0x0E020019 +#define GEOWIND3CDT 0x0E02001A +#define GEOWIND4 0x0E02001B +#define GEOWIND4CDT 0x0E02001C +#define GEOWND72 0x0E02001D +#define GEOWND72CDT 0x0E02001E +#define HANDLE72 0x0E02001F +#define HANDLE72CDT 0x0E020020 +#define NICGEO72 0x0E020021 +#define NICGEO72CDT 0x0E020022 +#define NICJMP72 0x0E020023 +#define NICJMP72CDT 0x0E020024 +#define NICLNK72 0x0E020025 +#define NICLNK72CDT 0x0E020026 +#define NICLNK72CDR 0x0E020027 +#define NICOPY72 0x0E020028 +#define NICOPY72CDT 0x0E020029 +#define NICOPY72CDR 0x0E02002A +#define NICTLK72 0x0E02002B +#define NICTLK72CDT 0x0E02002C +#define NOSE72 0x0E02002D +#define NOSE72CDT 0x0E02002E +#define PANEL72 0x0E02002F +#define PANEL72CDT 0x0E020030 +#define PIPE72 0x0E020031 +#define PIPE72CDT 0x0E020032 +#define SPINDL72 0x0E020033 +#define SPINDL72CDT 0x0E020034 +#define WHEEL72 0x0E020035 +#define WHEEL72CDT 0x0E020036 // 55 entities in TXTs, 55 in datafiles. // room73 -#define R73SPRPAL 0x0E030000 -#define R73L0 0x0E030001 -#define R73L1 0x0E030002 -#define R73L2 0x0E030003 -#define R73G1 0x0E030004 -#define R73G2 0x0E030005 -#define R73PAL 0x0E030006 -#define R73FLR 0x0E030007 -#define DAGGER1 0x0E030008 -#define DAGGER1CDT 0x0E030009 -#define DAGGER2 0x0E03000A -#define DAGGER2CDT 0x0E03000B -#define DARKWALL 0x0E03000C -#define DARKWALLCDT 0x0E03000D -#define FLAME73 0x0E03000E -#define FLAME73CDT 0x0E03000F -#define GEOCRCH 0x0E030010 -#define GEOCRCHCDT 0x0E030011 -#define GEOCREEP 0x0E030012 -#define GEOCREEPCDT 0x0E030013 -#define GEODIE1 0x0E030014 -#define GEODIE1CDT 0x0E030015 -#define GEODIE2 0x0E030016 -#define GEODIE2CDT 0x0E030017 -#define GEOTHROW 0x0E030018 -#define GEOTHROWCDT 0x0E030019 -#define GEOTLK73 0x0E03001A -#define GEOTLK73CDT 0x0E03001B -#define GEOTN73 0x0E03001C -#define GEOTN73CDT 0x0E03001D -#define GEOTN73CDR 0x0E03001E -#define GMENTER 0x0E03001F -#define GMENTERCDT 0x0E030020 -#define GMSPEAK 0x0E030021 -#define GMSPEAKCDT 0x0E030022 -#define GUIDLE 0x0E030023 -#define GUIDLECDT 0x0E030024 -#define GUITALK 0x0E030025 -#define GUITALKCDT 0x0E030026 -#define GUITHROW 0x0E030027 -#define GUITHROWCDT 0x0E030028 -#define GUITURN7 0x0E030029 -#define GUITURN7CDT 0x0E03002A -#define GUITURN7CDR 0x0E03002B -#define NICENT73 0x0E03002C -#define NICENT73CDT 0x0E03002D -#define NICEX73 0x0E03002E -#define NICEX73CDT 0x0E03002F -#define NICOTHRO 0x0E030030 -#define NICOTHROCDT 0x0E030031 -#define NICPANIC 0x0E030032 -#define NICPANICCDT 0x0E030033 -#define NICTLK73 0x0E030034 -#define NICTLK73CDT 0x0E030035 -#define NICTRN73 0x0E030036 -#define NICTRN73CDT 0x0E030037 -#define NICTRN73CDR 0x0E030038 -#define NITALK73 0x0E030039 -#define NITALK73CDT 0x0E03003A -#define SPARKING 0x0E03003B -#define SPARKINGCDT 0x0E03003C -#define TORCH1 0x0E03003D -#define TORCH1CDT 0x0E03003E -#define TORCH2 0x0E03003F -#define TORCH2CDT 0x0E030040 -#define TORCH3 0x0E030041 -#define TORCH3CDT 0x0E030042 +#define R73SPRPAL 0x0E030000 +#define R73L0 0x0E030001 +#define R73L1 0x0E030002 +#define R73L2 0x0E030003 +#define R73G1 0x0E030004 +#define R73G2 0x0E030005 +#define R73PAL 0x0E030006 +#define R73FLR 0x0E030007 +#define DAGGER1 0x0E030008 +#define DAGGER1CDT 0x0E030009 +#define DAGGER2 0x0E03000A +#define DAGGER2CDT 0x0E03000B +#define DARKWALL 0x0E03000C +#define DARKWALLCDT 0x0E03000D +#define FLAME73 0x0E03000E +#define FLAME73CDT 0x0E03000F +#define GEOCRCH 0x0E030010 +#define GEOCRCHCDT 0x0E030011 +#define GEOCREEP 0x0E030012 +#define GEOCREEPCDT 0x0E030013 +#define GEODIE1 0x0E030014 +#define GEODIE1CDT 0x0E030015 +#define GEODIE2 0x0E030016 +#define GEODIE2CDT 0x0E030017 +#define GEOTHROW 0x0E030018 +#define GEOTHROWCDT 0x0E030019 +#define GEOTLK73 0x0E03001A +#define GEOTLK73CDT 0x0E03001B +#define GEOTN73 0x0E03001C +#define GEOTN73CDT 0x0E03001D +#define GEOTN73CDR 0x0E03001E +#define GMENTER 0x0E03001F +#define GMENTERCDT 0x0E030020 +#define GMSPEAK 0x0E030021 +#define GMSPEAKCDT 0x0E030022 +#define GUIDLE 0x0E030023 +#define GUIDLECDT 0x0E030024 +#define GUITALK 0x0E030025 +#define GUITALKCDT 0x0E030026 +#define GUITHROW 0x0E030027 +#define GUITHROWCDT 0x0E030028 +#define GUITURN7 0x0E030029 +#define GUITURN7CDT 0x0E03002A +#define GUITURN7CDR 0x0E03002B +#define NICENT73 0x0E03002C +#define NICENT73CDT 0x0E03002D +#define NICEX73 0x0E03002E +#define NICEX73CDT 0x0E03002F +#define NICOTHRO 0x0E030030 +#define NICOTHROCDT 0x0E030031 +#define NICPANIC 0x0E030032 +#define NICPANICCDT 0x0E030033 +#define NICTLK73 0x0E030034 +#define NICTLK73CDT 0x0E030035 +#define NICTRN73 0x0E030036 +#define NICTRN73CDT 0x0E030037 +#define NICTRN73CDR 0x0E030038 +#define NITALK73 0x0E030039 +#define NITALK73CDT 0x0E03003A +#define SPARKING 0x0E03003B +#define SPARKINGCDT 0x0E03003C +#define TORCH1 0x0E03003D +#define TORCH1CDT 0x0E03003E +#define TORCH2 0x0E03003F +#define TORCH2CDT 0x0E030040 +#define TORCH3 0x0E030041 +#define TORCH3CDT 0x0E030042 // 67 entities in TXTs, 67 in datafiles. // room74 -#define ENDSPRPAL 0x0E040000 -#define R74L0 0x0E040001 -#define R74L1 0x0E040002 -#define R74G1 0x0E040003 -#define R74PAL 0x0E040004 -#define R74APAL 0x0E040005 -#define R74BPAL 0x0E040006 -#define R74CPAL 0x0E040007 -#define R74DPAL 0x0E040008 -#define CHANT74 0x0E040009 -#define CHANT74CDT 0x0E04000A -#define EKFIGHT 0x0E04000B -#define EKFIGHTCDT 0x0E04000C -#define EKGUN74 0x0E04000D -#define EKGUN74CDT 0x0E04000E -#define GEOFIGHT 0x0E04000F -#define GEOFIGHTCDT 0x0E040010 -#define GEOLUK74 0x0E040011 -#define GEOLUK74CDT 0x0E040012 -#define GEOLUK74CDR 0x0E040013 -#define GEORCT74 0x0E040014 -#define GEORCT74CDT 0x0E040015 -#define GEORUN74 0x0E040016 -#define GEORUN74CDT 0x0E040017 -#define GEOSTND 0x0E040018 -#define GEOSTNDCDT 0x0E040019 -#define GEOTLK74 0x0E04001A -#define GEOTLK74CDT 0x0E04001B -#define GKKNEE 0x0E04001C -#define GKKNEECDT 0x0E04001D -#define GMGUN 0x0E04001E -#define GMGUNCDT 0x0E04001F -#define GMMOV1 0x0E040020 -#define GMMOV1CDT 0x0E040021 -#define GMMOV2 0x0E040022 -#define GMMOV2CDT 0x0E040023 -#define GMMOV3 0x0E040024 -#define GMMOV3CDT 0x0E040025 -#define GMMOV4 0x0E040026 -#define GMMOV4CDT 0x0E040027 -#define GMMOV5 0x0E040028 -#define GMMOV5CDT 0x0E040029 -#define GMMOV6 0x0E04002A -#define GMMOV6CDT 0x0E04002B -#define GMTLK1 0x0E04002C -#define GMTLK1CDT 0x0E04002D -#define GMTLK2 0x0E04002E -#define GMTLK2CDT 0x0E04002F -#define GMTLK3 0x0E040030 -#define GMTLK3CDT 0x0E040031 -#define GMTLK4 0x0E040032 -#define GMTLK4CDT 0x0E040033 -#define GMTLK5 0x0E040034 -#define GMTLK5CDT 0x0E040035 -#define GMTLK6 0x0E040036 -#define GMTLK6CDT 0x0E040037 -#define GMTLK7 0x0E040038 -#define GMTLK7CDT 0x0E040039 -#define GMTLK74 0x0E04003A -#define GMTLK74CDT 0x0E04003B -#define GMWLK 0x0E04003C -#define GMWLKCDT 0x0E04003D -#define GMWRIT74 0x0E04003E -#define GMWRIT74CDT 0x0E04003F -#define MONKFALL 0x0E040040 -#define MONKFALLCDT 0x0E040041 -#define MONKRISE 0x0E040042 -#define MONKRISECDT 0x0E040043 -#define MONKSTRS 0x0E040044 -#define MONKSTRSCDT 0x0E040045 -#define MONKTURN 0x0E040046 -#define MONKTURNCDT 0x0E040047 -#define NICFIGHT 0x0E040048 -#define NICFIGHTCDT 0x0E040049 -#define NICLUK74 0x0E04004A -#define NICLUK74CDT 0x0E04004B -#define NICLUK74CDR 0x0E04004C -#define NICRCVR 0x0E04004D -#define NICRCVRCDT 0x0E04004E -#define NICRUN74 0x0E04004F -#define NICRUN74CDT 0x0E040050 -#define NICSTND 0x0E040051 -#define NICSTNDCDT 0x0E040052 -#define NICTLK74 0x0E040053 -#define NICTLK74CDT 0x0E040054 -#define ROSSFALL 0x0E040055 -#define ROSSFALLCDT 0x0E040056 -#define ROSSTAIR 0x0E040057 -#define ROSSTAIRCDT 0x0E040058 -#define ROSSTND 0x0E040059 -#define ROSSTNDCDT 0x0E04005A -#define ROSSWLK 0x0E04005B -#define ROSSWLKCDT 0x0E04005C -#define RUBBLE 0x0E04005D -#define RUBBLECDT 0x0E04005E -#define STONLIT1 0x0E04005F -#define STONLIT1CDT 0x0E040060 -#define STONLIT2 0x0E040061 -#define STONLIT2CDT 0x0E040062 -#define STONWHT1 0x0E040063 -#define STONWHT1CDT 0x0E040064 -#define STONWHT2 0x0E040065 -#define STONWHT2CDT 0x0E040066 +#define ENDSPRPAL 0x0E040000 +#define R74L0 0x0E040001 +#define R74L1 0x0E040002 +#define R74G1 0x0E040003 +#define R74PAL 0x0E040004 +#define R74APAL 0x0E040005 +#define R74BPAL 0x0E040006 +#define R74CPAL 0x0E040007 +#define R74DPAL 0x0E040008 +#define CHANT74 0x0E040009 +#define CHANT74CDT 0x0E04000A +#define EKFIGHT 0x0E04000B +#define EKFIGHTCDT 0x0E04000C +#define EKGUN74 0x0E04000D +#define EKGUN74CDT 0x0E04000E +#define GEOFIGHT 0x0E04000F +#define GEOFIGHTCDT 0x0E040010 +#define GEOLUK74 0x0E040011 +#define GEOLUK74CDT 0x0E040012 +#define GEOLUK74CDR 0x0E040013 +#define GEORCT74 0x0E040014 +#define GEORCT74CDT 0x0E040015 +#define GEORUN74 0x0E040016 +#define GEORUN74CDT 0x0E040017 +#define GEOSTND 0x0E040018 +#define GEOSTNDCDT 0x0E040019 +#define GEOTLK74 0x0E04001A +#define GEOTLK74CDT 0x0E04001B +#define GKKNEE 0x0E04001C +#define GKKNEECDT 0x0E04001D +#define GMGUN 0x0E04001E +#define GMGUNCDT 0x0E04001F +#define GMMOV1 0x0E040020 +#define GMMOV1CDT 0x0E040021 +#define GMMOV2 0x0E040022 +#define GMMOV2CDT 0x0E040023 +#define GMMOV3 0x0E040024 +#define GMMOV3CDT 0x0E040025 +#define GMMOV4 0x0E040026 +#define GMMOV4CDT 0x0E040027 +#define GMMOV5 0x0E040028 +#define GMMOV5CDT 0x0E040029 +#define GMMOV6 0x0E04002A +#define GMMOV6CDT 0x0E04002B +#define GMTLK1 0x0E04002C +#define GMTLK1CDT 0x0E04002D +#define GMTLK2 0x0E04002E +#define GMTLK2CDT 0x0E04002F +#define GMTLK3 0x0E040030 +#define GMTLK3CDT 0x0E040031 +#define GMTLK4 0x0E040032 +#define GMTLK4CDT 0x0E040033 +#define GMTLK5 0x0E040034 +#define GMTLK5CDT 0x0E040035 +#define GMTLK6 0x0E040036 +#define GMTLK6CDT 0x0E040037 +#define GMTLK7 0x0E040038 +#define GMTLK7CDT 0x0E040039 +#define GMTLK74 0x0E04003A +#define GMTLK74CDT 0x0E04003B +#define GMWLK 0x0E04003C +#define GMWLKCDT 0x0E04003D +#define GMWRIT74 0x0E04003E +#define GMWRIT74CDT 0x0E04003F +#define MONKFALL 0x0E040040 +#define MONKFALLCDT 0x0E040041 +#define MONKRISE 0x0E040042 +#define MONKRISECDT 0x0E040043 +#define MONKSTRS 0x0E040044 +#define MONKSTRSCDT 0x0E040045 +#define MONKTURN 0x0E040046 +#define MONKTURNCDT 0x0E040047 +#define NICFIGHT 0x0E040048 +#define NICFIGHTCDT 0x0E040049 +#define NICLUK74 0x0E04004A +#define NICLUK74CDT 0x0E04004B +#define NICLUK74CDR 0x0E04004C +#define NICRCVR 0x0E04004D +#define NICRCVRCDT 0x0E04004E +#define NICRUN74 0x0E04004F +#define NICRUN74CDT 0x0E040050 +#define NICSTND 0x0E040051 +#define NICSTNDCDT 0x0E040052 +#define NICTLK74 0x0E040053 +#define NICTLK74CDT 0x0E040054 +#define ROSSFALL 0x0E040055 +#define ROSSFALLCDT 0x0E040056 +#define ROSSTAIR 0x0E040057 +#define ROSSTAIRCDT 0x0E040058 +#define ROSSTND 0x0E040059 +#define ROSSTNDCDT 0x0E04005A +#define ROSSWLK 0x0E04005B +#define ROSSWLKCDT 0x0E04005C +#define RUBBLE 0x0E04005D +#define RUBBLECDT 0x0E04005E +#define STONLIT1 0x0E04005F +#define STONLIT1CDT 0x0E040060 +#define STONLIT2 0x0E040061 +#define STONLIT2CDT 0x0E040062 +#define STONWHT1 0x0E040063 +#define STONWHT1CDT 0x0E040064 +#define STONWHT2 0x0E040065 +#define STONWHT2CDT 0x0E040066 // 103 entities in TXTs, 103 in datafiles. // room75 -#define R75L0 0x0E050000 -#define R75PAL 0x0E050001 -#define R75APAL 0x0E050002 -#define R75BPAL 0x0E050003 -#define R75CPAL 0x0E050004 -#define R75DPAL 0x0E050005 -#define EKGUN 0x0E050006 -#define EKGUNCDT 0x0E050007 -#define EKGUN2 0x0E050008 -#define EKGUN2CDT 0x0E050009 -#define EKLITE 0x0E05000A -#define EKLITECDT 0x0E05000B -#define EKRELAX 0x0E05000C -#define EKRELAXCDT 0x0E05000D -#define EKTLK75 0x0E05000E -#define EKTLK75CDT 0x0E05000F -#define GEOLUK75 0x0E050010 -#define GEOLUK75CDT 0x0E050011 -#define GEOLUK75CDR 0x0E050012 -#define GTMP 0x0E050013 -#define GTMPCDT 0x0E050014 -#define NICLUK75 0x0E050015 -#define NICLUK75CDT 0x0E050016 -#define NICLUK75CDR 0x0E050017 -#define NTMP 0x0E050018 -#define NTMPCDT 0x0E050019 -#define TORCH75 0x0E05001A -#define TORCH75CDT 0x0E05001B +#define R75L0 0x0E050000 +#define R75PAL 0x0E050001 +#define R75APAL 0x0E050002 +#define R75BPAL 0x0E050003 +#define R75CPAL 0x0E050004 +#define R75DPAL 0x0E050005 +#define EKGUN 0x0E050006 +#define EKGUNCDT 0x0E050007 +#define EKGUN2 0x0E050008 +#define EKGUN2CDT 0x0E050009 +#define EKLITE 0x0E05000A +#define EKLITECDT 0x0E05000B +#define EKRELAX 0x0E05000C +#define EKRELAXCDT 0x0E05000D +#define EKTLK75 0x0E05000E +#define EKTLK75CDT 0x0E05000F +#define GEOLUK75 0x0E050010 +#define GEOLUK75CDT 0x0E050011 +#define GEOLUK75CDR 0x0E050012 +#define GTMP 0x0E050013 +#define GTMPCDT 0x0E050014 +#define NICLUK75 0x0E050015 +#define NICLUK75CDT 0x0E050016 +#define NICLUK75CDR 0x0E050017 +#define NTMP 0x0E050018 +#define NTMPCDT 0x0E050019 +#define TORCH75 0x0E05001A +#define TORCH75CDT 0x0E05001B // 28 entities in TXTs, 28 in datafiles. // room76 -#define R76L0 0x0E060000 -#define R76PAL 0x0E060001 -#define CHANT76 0x0E060002 -#define CHANT76CDT 0x0E060003 -#define EKGUN76 0x0E060004 -#define EKGUN76CDT 0x0E060005 -#define GKBAK 0x0E060006 -#define GKBAKCDT 0x0E060007 -#define GKKNEE76 0x0E060008 -#define GKKNEE76CDT 0x0E060009 -#define GKLOWER 0x0E06000A -#define GKLOWERCDT 0x0E06000B -#define GKSWORD 0x0E06000C -#define GKSWORDCDT 0x0E06000D -#define GKTLK 0x0E06000E -#define GKTLKCDT 0x0E06000F -#define GKTLK2 0x0E060010 -#define GKTLK2CDT 0x0E060011 -#define GMARMS 0x0E060012 -#define GMARMSCDT 0x0E060013 -#define GMSTONES 0x0E060014 -#define GMSTONESCDT 0x0E060015 -#define GMTLK76 0x0E060016 -#define GMTLK76CDT 0x0E060017 -#define GMTRN76 0x0E060018 -#define GMTRN76CDT 0x0E060019 -#define LSTONE76 0x0E06001A -#define LSTONE76CDT 0x0E06001B -#define MONKNEE 0x0E06001C -#define MONKNEECDT 0x0E06001D -#define ROSSTND76 0x0E06001E -#define ROSSTND76CDT 0x0E06001F -#define RSTONE76 0x0E060020 -#define RSTONE76CDT 0x0E060021 +#define R76L0 0x0E060000 +#define R76PAL 0x0E060001 +#define CHANT76 0x0E060002 +#define CHANT76CDT 0x0E060003 +#define EKGUN76 0x0E060004 +#define EKGUN76CDT 0x0E060005 +#define GKBAK 0x0E060006 +#define GKBAKCDT 0x0E060007 +#define GKKNEE76 0x0E060008 +#define GKKNEE76CDT 0x0E060009 +#define GKLOWER 0x0E06000A +#define GKLOWERCDT 0x0E06000B +#define GKSWORD 0x0E06000C +#define GKSWORDCDT 0x0E06000D +#define GKTLK 0x0E06000E +#define GKTLKCDT 0x0E06000F +#define GKTLK2 0x0E060010 +#define GKTLK2CDT 0x0E060011 +#define GMARMS 0x0E060012 +#define GMARMSCDT 0x0E060013 +#define GMSTONES 0x0E060014 +#define GMSTONESCDT 0x0E060015 +#define GMTLK76 0x0E060016 +#define GMTLK76CDT 0x0E060017 +#define GMTRN76 0x0E060018 +#define GMTRN76CDT 0x0E060019 +#define LSTONE76 0x0E06001A +#define LSTONE76CDT 0x0E06001B +#define MONKNEE 0x0E06001C +#define MONKNEECDT 0x0E06001D +#define ROSSTND76 0x0E06001E +#define ROSSTND76CDT 0x0E06001F +#define RSTONE76 0x0E060020 +#define RSTONE76CDT 0x0E060021 // 34 entities in TXTs, 34 in datafiles. // room77 -#define R77L0 0x0E070000 -#define R77PAL 0x0E070001 -#define CHANT77 0x0E070002 -#define CHANT77CDT 0x0E070003 -#define GEOPEER 0x0E070004 -#define GEOPEERCDT 0x0E070005 -#define GMHEAD 0x0E070006 -#define GMHEADCDT 0x0E070007 -#define NICPEER 0x0E070008 -#define NICPEERCDT 0x0E070009 -#define NICTLK77 0x0E07000A -#define NICTLK77CDT 0x0E07000B -#define ROSLUK77 0x0E07000C -#define ROSLUK77CDT 0x0E07000D +#define R77L0 0x0E070000 +#define R77PAL 0x0E070001 +#define CHANT77 0x0E070002 +#define CHANT77CDT 0x0E070003 +#define GEOPEER 0x0E070004 +#define GEOPEERCDT 0x0E070005 +#define GMHEAD 0x0E070006 +#define GMHEADCDT 0x0E070007 +#define NICPEER 0x0E070008 +#define NICPEERCDT 0x0E070009 +#define NICTLK77 0x0E07000A +#define NICTLK77CDT 0x0E07000B +#define ROSLUK77 0x0E07000C +#define ROSLUK77CDT 0x0E07000D // 14 entities in TXTs, 14 in datafiles. // room78 -#define R78L0 0x0E080000 -#define R78PAL 0x0E080001 -#define R78APAL 0x0E080002 -#define R78BPAL 0x0E080003 -#define R78CPAL 0x0E080004 -#define R78DPAL 0x0E080005 -#define R78EPAL 0x0E080006 -#define R78FPAL 0x0E080007 -#define LSTONE78 0x0E080008 -#define LSTONE78CDT 0x0E080009 -#define LSTONE78CDR 0x0E08000A -#define GMPOWER 0x0E08000B -#define GMPOWERCDT 0x0E08000C -#define GMWRITH 0x0E08000D -#define GMWRITHCDT 0x0E08000E -#define RSTONE78 0x0E08000F -#define RSTONE78CDT 0x0E080010 -#define RSTONE78CDR 0x0E080011 +#define R78L0 0x0E080000 +#define R78PAL 0x0E080001 +#define R78APAL 0x0E080002 +#define R78BPAL 0x0E080003 +#define R78CPAL 0x0E080004 +#define R78DPAL 0x0E080005 +#define R78EPAL 0x0E080006 +#define R78FPAL 0x0E080007 +#define LSTONE78 0x0E080008 +#define LSTONE78CDT 0x0E080009 +#define LSTONE78CDR 0x0E08000A +#define GMPOWER 0x0E08000B +#define GMPOWERCDT 0x0E08000C +#define GMWRITH 0x0E08000D +#define GMWRITHCDT 0x0E08000E +#define RSTONE78 0x0E08000F +#define RSTONE78CDT 0x0E080010 +#define RSTONE78CDR 0x0E080011 // 18 entities in TXTs, 18 in datafiles. // room79 -#define R79L0 0x0E090000 -#define R79PAL 0x0E090001 -#define EKSTD79 0x0E090002 -#define EKSTD79CDT 0x0E090003 -#define FIGHT79 0x0E090004 -#define FIGHT79CDT 0x0E090005 -#define GEOANG79 0x0E090006 -#define GEOANG79CDT 0x0E090007 -#define GEOTLK79 0x0E090008 -#define GEOTLK79CDT 0x0E090009 -#define NICSTD79 0x0E09000A -#define NICSTD79CDT 0x0E09000B -#define ROSENT79 0x0E09000C -#define ROSENT79CDT 0x0E09000D -#define ROSSHOT 0x0E09000E -#define ROSSHOTCDT 0x0E09000F -#define ROSTLK79 0x0E090010 -#define ROSTLK79CDT 0x0E090011 +#define R79L0 0x0E090000 +#define R79PAL 0x0E090001 +#define EKSTD79 0x0E090002 +#define EKSTD79CDT 0x0E090003 +#define FIGHT79 0x0E090004 +#define FIGHT79CDT 0x0E090005 +#define GEOANG79 0x0E090006 +#define GEOANG79CDT 0x0E090007 +#define GEOTLK79 0x0E090008 +#define GEOTLK79CDT 0x0E090009 +#define NICSTD79 0x0E09000A +#define NICSTD79CDT 0x0E09000B +#define ROSENT79 0x0E09000C +#define ROSENT79CDT 0x0E09000D +#define ROSSHOT 0x0E09000E +#define ROSSHOTCDT 0x0E09000F +#define ROSTLK79 0x0E090010 +#define ROSTLK79CDT 0x0E090011 // 18 entities in TXTs, 18 in datafiles. } // End of namespace Sword1 diff --git a/engines/sword2/debug.cpp b/engines/sword2/debug.cpp index e6662a4ef7..8f9f54ad5c 100644 --- a/engines/sword2/debug.cpp +++ b/engines/sword2/debug.cpp @@ -144,7 +144,7 @@ void Debugger::buildDebugText() { makeDebugTextBlock(buf, 500, 380); } - // current text number & speech-sample resource id + // current text number & speech-sample resource id if (_displayTextNumbers) { if (_textNumber) { @@ -152,7 +152,7 @@ void Debugger::buildDebugText() { if (_vm->_logic->readVar(SYSTEM_WANT_PREVIOUS_LINE)) sprintf(buf, "backwards"); else - sprintf(buf, "forwards"); + sprintf(buf, "forwards"); makeDebugTextBlock(buf, 0, 340); } @@ -163,7 +163,7 @@ void Debugger::buildDebugText() { sprintf(buf, "pos: %d", _textNumber & 0xffff); makeDebugTextBlock(buf, 0, 370); - sprintf(buf, "TEXT: %d", _vm->_logic->_officialTextNumber); + sprintf(buf, "TEXT: %d", _vm->_logic->_officialTextNumber); makeDebugTextBlock(buf, 0, 385); } } @@ -197,7 +197,7 @@ void Debugger::buildDebugText() { _vm->_logic->readVar(MOUSE_X), _vm->_logic->readVar(MOUSE_Y)); - makeDebugTextBlock(buf, 0, 15); + makeDebugTextBlock(buf, 0, 15); uint32 mouseTouching = _vm->_mouse->getMouseTouching(); @@ -218,7 +218,7 @@ void Debugger::buildDebugText() { makeDebugTextBlock(buf, 0, 30); - // player coords & graphic info + // player coords & graphic info // if player objct has a graphic if (_graphAnimRes) @@ -237,22 +237,22 @@ void Debugger::buildDebugText() { makeDebugTextBlock(buf, 0, 45); - // frames-per-second counter + // frames-per-second counter sprintf(buf, "fps %d", _vm->_screen->getFps()); makeDebugTextBlock(buf, 440, 0); - // location number + // location number sprintf(buf, "location=%d", _vm->_logic->readVar(LOCATION)); makeDebugTextBlock(buf, 440, 15); - // "result" variable + // "result" variable sprintf(buf, "result=%d", _vm->_logic->readVar(RESULT)); makeDebugTextBlock(buf, 440, 30); - // no. of events in event list + // no. of events in event list sprintf(buf, "events=%d", _vm->_logic->countEvents()); makeDebugTextBlock(buf, 440, 45); @@ -352,7 +352,7 @@ void Debugger::drawDebugGraphics() { plotCrossHair(mouseX + screenInfo->scroll_offset_x, mouseY + screenInfo->scroll_offset_y, 215); } - // mouse area rectangle / sprite box rectangle when testing anims + // mouse area rectangle / sprite box rectangle when testing anims if (_vm->_logic->readVar(SYSTEM_TESTING_ANIMS)) { // draw box around current frame diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp index 99211c3ece..84a5b5af76 100644 --- a/engines/sword2/function.cpp +++ b/engines/sword2/function.cpp @@ -57,7 +57,7 @@ int32 Logic::fnTestFlags(int32 *params) { int32 Logic::fnRegisterStartPoint(int32 *params) { // params: 0 id of startup script to call - key - // 1 pointer to ascii message + // 1 pointer to ascii message int32 key = params[0]; char *name = (char *)decodePtr(params[1]); @@ -521,7 +521,7 @@ int32 Logic::fnPassMega(int32 *params) { // remember, we cannot simply read a compact any longer but instead // must request it from the object itself - // params: 0 pointer to a mega structure + // params: 0 pointer to a mega structure memcpy(_engineMega, decodePtr(params[0]), ObjectMega::size()); return IR_CONT; @@ -1118,7 +1118,7 @@ int32 Logic::fnISpeak(int32 *params) { if (_leftClickDelay) _leftClickDelay--; - if (_rightClickDelay) + if (_rightClickDelay) _rightClickDelay--; return IR_REPEAT; @@ -1770,9 +1770,9 @@ int32 Logic::fnSetPlayerActionEvent(int32 *params) { int32 Logic::fnSetScrollCoordinate(int32 *params) { // params: 0 feet_x value - // 1 feet_y value + // 1 feet_y value - // Called feet_x and feet_y to retain intellectual compatibility with + // Called feet_x and feet_y to retain intellectual compatibility with // Sword1! // // feet_x & feet_y refer to the physical screen coords where the @@ -1806,7 +1806,7 @@ int32 Logic::fnStandAtAnim(int32 *params) { int32 Logic::fnSetScrollLeftMouse(int32 *params) { // params: 0 pointer to object's mouse structure - byte *ob_mouse = decodePtr(params[0]); + byte *ob_mouse = decodePtr(params[0]); ScreenInfo *screenInfo = _vm->_screen->getScreenInfo(); // Highest priority @@ -1966,7 +1966,7 @@ int32 Logic::fnGetPlayerSaveData(int32 *params) { memcpy(ob_graph, _saveGraphic, ObjectGraphic::size()); memcpy(ob_mega, _saveMega, ObjectMega::size()); - // Any walk-data must be cleared - the player will be set to stand if + // Any walk-data must be cleared - the player will be set to stand if // he was walking when saved. ObjectMega obMega(ob_mega); @@ -2115,7 +2115,7 @@ int32 Logic::fnFaceMega(int32 *params) { int32 Logic::fnPlaySequence(int32 *params) { // params: 0 pointer to null-terminated ascii filename - // 1 number of frames in the sequence, used for PSX. + // 1 number of frames in the sequence, used for PSX. char filename[30]; @@ -2131,7 +2131,7 @@ int32 Logic::fnPlaySequence(int32 *params) { strcpy(filename, (const char *)decodePtr(params[0])); // Write to walkthrough file (zebug0.txt) - debug(5, "PLAYING SEQUENCE \"%s\"", filename); + debug(5, "PLAYING SEQUENCE \"%s\"", filename); // don't want to carry on streaming game music when cutscene starts! fnStopMusic(NULL); diff --git a/engines/sword2/layers.cpp b/engines/sword2/layers.cpp index 6f8ed2f0b7..ba59889acb 100644 --- a/engines/sword2/layers.cpp +++ b/engines/sword2/layers.cpp @@ -154,7 +154,7 @@ void Screen::initBackground(int32 res, int32 new_palette) { screenLayerTable.read(file + ResHeader::size()); if (screenLayerTable.maskOffset) { - SpriteInfo spriteInfo; + SpriteInfo spriteInfo; spriteInfo.x = 0; spriteInfo.y = 0; diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp index a754f9810c..44d2383f78 100644 --- a/engines/sword2/mouse.cpp +++ b/engines/sword2/mouse.cpp @@ -1078,7 +1078,7 @@ void Mouse::setMouse(uint32 res) { if (res == NORMAL_MOUSE_ID) setMouseAnim(icon, len, RDMOUSE_NOFLASH); else - setMouseAnim(icon, len, RDMOUSE_FLASH); + setMouseAnim(icon, len, RDMOUSE_FLASH); _vm->_resman->closeResource(res); } else { diff --git a/engines/sword2/object.h b/engines/sword2/object.h index 7ee8766105..57f020eb63 100644 --- a/engines/sword2/object.h +++ b/engines/sword2/object.h @@ -110,7 +110,7 @@ public: // in low word: -#define NO_SPRITE 0x00000000 // don't print +#define NO_SPRITE 0x00000000 // don't print #define BGP0_SPRITE 0x00000001 // fixed to background parallax[0] #define BGP1_SPRITE 0x00000002 // fixed to background parallax[1] #define BACK_SPRITE 0x00000004 // 'background' sprite, fixed to main background diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp index 127340ea89..1b9cd28d25 100644 --- a/engines/sword2/palette.cpp +++ b/engines/sword2/palette.cpp @@ -56,7 +56,7 @@ void Screen::startNewPalette() { _vm->_resman->closeResource(_thisScreen.background_layer_id); fadeUp(); - _thisScreen.new_palette = 0; + _thisScreen.new_palette = 0; } void Screen::setFullPalette(int32 palRes) { @@ -83,7 +83,7 @@ void Screen::setFullPalette(int32 palRes) { // file anyway eg. for pausing & unpausing during the eclipse // unpausing (fudged for location 13) - if (palRes == -1) { + if (palRes == -1) { // we really meant '0' palRes = 0; } diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp index 46637dd4ef..88a1f6251a 100644 --- a/engines/sword2/resman.cpp +++ b/engines/sword2/resman.cpp @@ -539,7 +539,7 @@ void ResourceManager::remove(int res) { void ResourceManager::removeAll() { // We need to clear the FX queue, because otherwise the sound system // will still believe that the sound resources are in memory. We also - // need to kill the movie lead-in/out. + // need to kill the movie lead-in/out. _vm->_sound->clearFxQueue(true); diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp index 6be155dd85..2fc5c9efd5 100644 --- a/engines/sword2/router.cpp +++ b/engines/sword2/router.cpp @@ -58,12 +58,12 @@ namespace Sword2 { /**************************************************************************** * JROUTER.C polygon router with modular walks - * using a tree of modules - * 21 july 94 + * using a tree of modules + * 21 july 94 * 3 november 94 * System currently works by scanning grid data and coming up with a ROUTE * as a series of way points(nodes), the smoothest eight directional PATH - * through these nodes is then found, and a WALK created to fit the PATH. + * through these nodes is then found, and a WALK created to fit the PATH. * * Two funtions are called by the user, RouteFinder creates a route as a * module list, HardWalk creates an animation list from the module list. @@ -175,7 +175,7 @@ void Router::freeAllRouteMem() { int32 Router::routeFinder(byte *ob_mega, byte *ob_walkdata, int32 x, int32 y, int32 dir) { /********************************************************************* * RouteFinder.C polygon router with modular walks - * 21 august 94 + * 21 august 94 * 3 november 94 * routeFinder creates a list of modules that enables HardWalk to * create an animation list. @@ -190,9 +190,9 @@ int32 Router::routeFinder(byte *ob_mega, byte *ob_walkdata, int32 x, int32 y, in * * return 0 = failed to find a route * - * 1 = found a route + * 1 = found a route * - * 2 = mega already at target + * 2 = mega already at target * *********************************************************************/ @@ -294,7 +294,7 @@ int32 Router::getRoute() { * * static routeData _route[O_ROUTE_SIZE]; * - * return 0 = failed to find a route + * return 0 = failed to find a route * * 1 = found a route * diff --git a/engines/sword2/router.h b/engines/sword2/router.h index f5d7f65efe..c75bea6131 100644 --- a/engines/sword2/router.h +++ b/engines/sword2/router.h @@ -50,8 +50,8 @@ struct WalkData { struct BarData { int16 x1; - int16 y1; - int16 x2; + int16 y1; + int16 x2; int16 y2; int16 xmin; int16 ymin; diff --git a/engines/sword2/saveload.cpp b/engines/sword2/saveload.cpp index c08ef99996..73da5dd98b 100644 --- a/engines/sword2/saveload.cpp +++ b/engines/sword2/saveload.cpp @@ -312,7 +312,7 @@ uint32 Sword2Engine::restoreFromBuffer(byte *buffer, uint32 size) { readS.read(globalVars, _resman->fetchLen(1)); _resman->closeResource(CUR_PLAYER_ID); - _resman->closeResource(1); + _resman->closeResource(1); free(buffer); diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp index d4d286c018..1f6eb1b22d 100644 --- a/engines/sword2/screen.cpp +++ b/engines/sword2/screen.cpp @@ -479,7 +479,7 @@ void Screen::processLayer(byte *file, uint32 layer_number) { layer_head.read(_vm->fetchLayerHeader(file, layer_number)); - SpriteInfo spriteInfo; + SpriteInfo spriteInfo; spriteInfo.x = layer_head.x; spriteInfo.y = layer_head.y; @@ -679,7 +679,7 @@ void Screen::registerFrame(byte *ob_mouse, byte *ob_graph, byte *ob_mega, BuildU // fill in the BuildUnit structure for this frame - build_unit->anim_resource = obGraph.getAnimResource(); + build_unit->anim_resource = obGraph.getAnimResource(); build_unit->anim_pc = obGraph.getAnimPc(); build_unit->layer_number = 0; diff --git a/engines/sword2/speech.cpp b/engines/sword2/speech.cpp index b6f77dde74..a0ddc333c2 100644 --- a/engines/sword2/speech.cpp +++ b/engines/sword2/speech.cpp @@ -146,7 +146,7 @@ void Logic::locateTalker(int32 *params) { void Logic::formText(int32 *params) { // params 0 pointer to ob_graphic - // 1 pointer to ob_speech + // 1 pointer to ob_speech // 2 pointer to ob_logic // 3 pointer to ob_mega // 4 encoded text number @@ -213,7 +213,7 @@ bool Logic::wantSpeechForLine(uint32 wavId) { // SFX (4214); // 4214FXMeow! case 4568: // trapdoor_13 - // SFX (4568); + // SFX (4568); // 4568fx<door slamming> case 4913: // LobineauSpeech // SFX (tone2); diff --git a/engines/sword2/sprite.cpp b/engines/sword2/sprite.cpp index e6f17a1af1..bd452049aa 100644 --- a/engines/sword2/sprite.cpp +++ b/engines/sword2/sprite.cpp @@ -63,7 +63,7 @@ int32 Screen::decompressRLE256(byte *dst, byte *src, int32 decompSize) { // source points to the start of the sprite data for input // decompSize gives size of decompressed data in bytes // dest points to start of destination buffer for decompressed - // data + // data byte headerByte; // block header byte byte *endDest = dst + decompSize; // pointer to byte after end of decomp buffer diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index 935a528e70..6520fb5e4a 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -377,7 +377,7 @@ void ToucheEngine::runCycle() { updateSpeech(); handleConversation(); if (scrollRoom(_currentKeyCharNum)) { - _fullRedrawCounter |= 1; + _fullRedrawCounter |= 1; } redrawRoom(); clearDirtyRects(); diff --git a/graphics/font.h b/graphics/font.h index 5e72e9d4b3..3911e6d32c 100644 --- a/graphics/font.h +++ b/graphics/font.h @@ -104,7 +104,7 @@ struct BBX { struct FontDesc { const char * name; /* font name*/ int maxwidth; /* max width in pixels*/ - int height; /* height in pixels*/ + int height; /* height in pixels*/ int fbbw, fbbh, fbbx, fbby; /* max bounding box */ int ascent; /* ascent (baseline) height*/ int firstchar; /* first character in bitmap*/ diff --git a/graphics/iff.h b/graphics/iff.h index 148a145a1d..1bda15c9d7 100644 --- a/graphics/iff.h +++ b/graphics/iff.h @@ -59,8 +59,8 @@ protected: void readCMAP(Common::IFFChunk &chunk); void readBODY(Common::IFFChunk &chunk); - BMHD _bitmapHeader; - uint32 _colorCount; + BMHD _bitmapHeader; + uint32 _colorCount; Surface *_surface; byte **_colors; @@ -83,8 +83,8 @@ protected: void readCMAP(Common::IFFChunk &chunk); void readBODY(Common::IFFChunk &chunk); - BMHD _bitmapHeader; - uint32 _colorCount; + BMHD _bitmapHeader; + uint32 _colorCount; Surface *_surface; byte **_colors; diff --git a/graphics/surface.cpp b/graphics/surface.cpp index bc815c360f..a9f3e75886 100644 --- a/graphics/surface.cpp +++ b/graphics/surface.cpp @@ -60,10 +60,10 @@ void Surface::create(uint16 width, uint16 height, uint8 bytesPP) { } void Surface::free() { - ::free(pixels); - pixels = 0; - w = h = pitch = 0; - bytesPerPixel = 0; + ::free(pixels); + pixels = 0; + w = h = pitch = 0; + bytesPerPixel = 0; } void Surface::hLine(int x, int y, int x2, uint32 color) { diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp index 7d98da0428..7ad4edbd88 100644 --- a/gui/TabWidget.cpp +++ b/gui/TabWidget.cpp @@ -51,7 +51,7 @@ void TabWidget::init() { _tabPadding = g_gui.theme()->getTabPadding(); setFlags(WIDGET_ENABLED); - _type = kTabWidget; + _type = kTabWidget; _activeTab = -1; _firstVisibleTab = 0; diff --git a/gui/console.h b/gui/console.h index d347112862..298662a40f 100644 --- a/gui/console.h +++ b/gui/console.h @@ -91,7 +91,7 @@ protected: int _firstLineInBuffer; int _promptStartPos; - int _promptEndPos; + int _promptEndPos; bool _caretVisible; uint32 _caretTime; diff --git a/gui/dialog.h b/gui/dialog.h index 418e3b8e63..d17d3a5ad1 100644 --- a/gui/dialog.h +++ b/gui/dialog.h @@ -60,7 +60,7 @@ public: virtual int runModal(); - bool isVisible() const { return _visible; } + bool isVisible() const { return _visible; } void releaseFocus(); diff --git a/gui/object.h b/gui/object.h index 7a8d626db5..01046bd668 100644 --- a/gui/object.h +++ b/gui/object.h @@ -78,7 +78,7 @@ public: virtual uint16 getWidth() const { return _w; } virtual uint16 getHeight() const { return _h; } - virtual bool isVisible() const = 0; + virtual bool isVisible() const = 0; virtual void draw() = 0; diff --git a/sound/iff.h b/sound/iff.h index 539064162d..d7cddc80fc 100644 --- a/sound/iff.h +++ b/sound/iff.h @@ -53,8 +53,8 @@ struct Voice8Header { class A8SVXDecoder : public Common::IFFParser { protected: - Voice8Header &_header; - int8* &_data; + Voice8Header &_header; + int8* &_data; uint32 &_dataSize; protected: diff --git a/tools/create_lure/create_lure_dat.cpp b/tools/create_lure/create_lure_dat.cpp index 445a65fb80..09744fef1f 100644 --- a/tools/create_lure/create_lure_dat.cpp +++ b/tools/create_lure/create_lure_dat.cpp @@ -1357,10 +1357,10 @@ const char *spanishTextStrings[NUM_TEXT_ENTRIES] = { "Dale", "Habla con", "Dile a", "Compra", "Obsevar", "Observe", "Mirar por", "P\x97" "dele", NULL, "Bebe", "Estado", "Ve a", "Regresa", "Sobornar", "Examinar", "Cr\x7f" "ditos", "Reiniciar", "Salvar juego", "Recuperar jue", "Abandonar", "Texto r\x98pido\x8b", - "Texto lento \x8b", "Sonido activado ", "Sonido desactivado ", "(nada)", " con ", " a ", " con ", - "y luego", "eso es todo", "\x94" "Est\x98s seguro? (S/N)", + "Texto lento \x8b", "Sonido activado ", "Sonido desactivado ", "(nada)", " con ", " a ", " con ", + "y luego", "eso es todo", "\x94" "Est\x98s seguro? (S/N)", "Llevas ", "nada", "y tienes ", "moneda", "monedas" - "el ", "la ", "los ", "las ", "este ", "esta ", "estos ", "estas ", NULL, NULL + "el ", "la ", "los ", "las ", "este ", "esta ", "estos ", "estas ", NULL, NULL }; void save_text_strings(byte *&data, uint16 &totalSize) { diff --git a/tools/credits.pl b/tools/credits.pl index 48cd200667..a0d29904c0 100755 --- a/tools/credits.pl +++ b/tools/credits.pl @@ -647,7 +647,7 @@ begin_credits("Credits"); begin_persons(); add_person("Joachim Eberhard", "joachimeberhard", "Documentation manager"); add_person("Matthew Hoops", "clone2727", "Wiki editor"); - end_persons(); + end_persons(); end_section(); begin_section("Retired Team Members"); diff --git a/tools/md5table.c b/tools/md5table.c index 342e60986c..3f85ac338b 100644 --- a/tools/md5table.c +++ b/tools/md5table.c @@ -111,7 +111,7 @@ static const StringMap langMap[] = { { "cz", "CZ_CZE" }, { "nl", "NL_NLD" }, { "nb", "NB_NOR" }, - { "pl", "PL_POL" }, + { "pl", "PL_POL" }, { "All", "UNK_LANG" }, { "All?", "UNK_LANG" }, diff --git a/tools/scumm-md5.txt b/tools/scumm-md5.txt index 6dfc2d39c6..20bd7e874b 100644 --- a/tools/scumm-md5.txt +++ b/tools/scumm-md5.txt @@ -46,9 +46,9 @@ # IFS=" # " # for i in `find -name 00.*` `find -name 000.*` `find -name *.??0` `find -name *Data*` ; do -# m=`head -c 1048576 "$i" | md5sum | cut -f1 -d' '` ; -# s=`du -b "$i" | cut -f1` ; -# sed -i -e "s/$m\t-1/$m\t$s/" /PATH/TO/scumm-md5.txt ; +# m=`head -c 1048576 "$i" | md5sum | cut -f1 -d' '` ; +# s=`du -b "$i" | cut -f1` ; +# sed -i -e "s/$m\t-1/$m\t$s/" /PATH/TO/scumm-md5.txt ; # done # IFS=$OIFS # @@ -127,7 +127,7 @@ indy3 Indiana Jones and the Last Crusade 6b3ec67da214f558dc5ceaa2acd47453 -1 en DOS EGA EGA v1.3, 14 Aug 89 tsuteiuQ, Andrea Petrucci, Peter Eckerlein 6508fd55530e6915507e1cc37f7f045d -1 en DOS EGA EGA v1.3, 8/14/89 (5.25\") Zer02 66236cd1aec24e1d4aff4c4cc93b7e18 -1 fr DOS EGA EGA ?? v1.3, 25 Aug 89 Andrea Petrucci, Peter Eckerlein - 89cfc425566003ff74b7dc7b3e6fd469 -1 fr DOS EGA EGA ?? v1.3, 25 Aug 89 Jorpho + 89cfc425566003ff74b7dc7b3e6fd469 -1 fr DOS EGA EGA ?? v1.3, 25 Aug 89 Jorpho 69d70269fafc4445adbb0d223e4f9a3f 5361 en DOS EGA EGA v1.4, 11/07/89 (5.25\") Petr Maruska 6f6ef668c608c7f534fea6e6d3878dde -1 de DOS EGA EGA v1.4 from 19 Oct 89 dhewg, Peter Eckerlein d62d248c3df6ec177405e2cb23d923b2 -1 it DOS EGA EGA v1.4 from 25 Nov 89 Andrea Petrucci, Peter Eckerlein diff --git a/tools/skycpt/cptcompiler.cpp b/tools/skycpt/cptcompiler.cpp index 0572bc1537..cac009a662 100644 --- a/tools/skycpt/cptcompiler.cpp +++ b/tools/skycpt/cptcompiler.cpp @@ -247,7 +247,7 @@ void processSymlinks(FILE *inf, CptObj *destArr, uint16 *baseLists) { dofgets(line, 1024, inf); assert((line[0] == '\t') && (line[1] == '\t') && (line[2] == '-') && (line[3] == '>')); - char *stopCh; + char *stopCh; uint16 destId = (uint16)strtoul(line + 4, &stopCh, 16); assert(stopCh == (line + 8)); assert((stopCh[0] == ':') && (stopCh[1] == ':')); |