diff options
author | Filippos Karapetis | 2008-05-26 11:10:46 +0000 |
---|---|---|
committer | Filippos Karapetis | 2008-05-26 11:10:46 +0000 |
commit | 966239fc52146826e5096cbf41412b035de8c1fe (patch) | |
tree | d89e7faa8fc468d3ddd3096263c87bb0024ed56b /engines/saga/saga.h | |
parent | 23da4c5fa24270622edca0fbdc1153fa1cc069f6 (diff) | |
download | scummvm-rg350-966239fc52146826e5096cbf41412b035de8c1fe.tar.gz scummvm-rg350-966239fc52146826e5096cbf41412b035de8c1fe.tar.bz2 scummvm-rg350-966239fc52146826e5096cbf41412b035de8c1fe.zip |
Code cleanup:
- Removed sagaresnames.h
- Moved all special scenes to scene.h, and named them consistently (e.g. RID_ITE_OVERMAP_SCENE -> ITE_SCENE_OVERMAP)
- Moved all resources which were used by the ITE intro into ite_introproc.cpp
- Removed several defines which were only used once (e.g. the SFX names)
- Reordered the GameResourceDescription resources so that ITE and IHNM specific resources are placed in the end
- Updated the comment about the IHNM Mac music
- Changed the callocs in loadPalAnim to mallocs, like in the rest of the code
- Removed the MEM error
svn-id: r32282
Diffstat (limited to 'engines/saga/saga.h')
-rw-r--r-- | engines/saga/saga.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 35c3736b31..4fd789cb4e 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -82,11 +82,11 @@ using Common::MemoryReadStreamEndian; #define OBJECT_TYPE_MASK ((1 << OBJECT_TYPE_SHIFT) - 1) #define OBJ_SPRITE_BASE 9 +#define IHNM_OBJ_PROFILE 0x4000 #define memoryError(Place) error("%s Memory allocation error.", Place) enum ERRORCODE { - MEM = -2,//todo: remove FAILURE = -1, SUCCESS = 0 }; @@ -303,15 +303,17 @@ struct GameResourceDescription { uint32 mainPanelResourceId; uint32 conversePanelResourceId; uint32 optionPanelResourceId; - uint32 warningPanelResourceId; - uint32 warningPanelSpritesResourceId; uint32 mainSpritesResourceId; uint32 mainPanelSpritesResourceId; - uint32 optionPanelSpritesResourceId; - uint32 defaultPortraitsResourceId; - uint32 psychicProfileResourceId; uint32 mainStringsResourceId; + // ITE specific resources uint32 actorsStringsResourceId; + uint32 defaultPortraitsResourceId; + // IHNM specific resources + uint32 optionPanelSpritesResourceId; + uint32 warningPanelResourceId; + uint32 warningPanelSpritesResourceId; + uint32 psychicProfileResourceId; }; struct GameFontDescription { @@ -322,9 +324,7 @@ struct GameDisplayInfo; struct GameSoundInfo { GameSoundTypes resourceType; - long frequency; int sampleBits; - bool stereo; bool isBigEndian; bool isSigned; }; |