diff options
author | Travis Howell | 2003-12-21 06:36:29 +0000 |
---|---|---|
committer | Travis Howell | 2003-12-21 06:36:29 +0000 |
commit | a7201f0dac9aaf763b95cba343b4b4f6e2bc63d3 (patch) | |
tree | e5d969c94ac30b08a79a54f93b79142dd5012de4 /simon | |
parent | 7fbb3e05597e88d0421af2f720ec7d136605836e (diff) | |
download | scummvm-rg350-a7201f0dac9aaf763b95cba343b4b4f6e2bc63d3.tar.gz scummvm-rg350-a7201f0dac9aaf763b95cba343b4b4f6e2bc63d3.tar.bz2 scummvm-rg350-a7201f0dac9aaf763b95cba343b4b4f6e2bc63d3.zip |
Might as well merge, not need for larger sizes.
svn-id: r11804
Diffstat (limited to 'simon')
-rw-r--r-- | simon/intern.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/simon/intern.h b/simon/intern.h index 955bf331f2..66d9c485e5 100644 --- a/simon/intern.h +++ b/simon/intern.h @@ -56,17 +56,17 @@ struct Item { uint16 sibling; int16 unk1; int16 unk2; - int16 unk3; /* signed int */ + int16 unk3; /* signed int */ uint16 unk4; - uint16 xxx_1; /* unused? */ + uint16 xxx_1; /* unused? */ Child *children; Item() { memset(this, 0, sizeof(*this)); } }; struct Subroutine { - uint16 id; /* subroutine ID */ - uint16 first; /* offset from subroutine start to first subroutine line */ + uint16 id; /* subroutine ID */ + uint16 first; /* offset from subroutine start to first subroutine line */ Subroutine *next; /* next subroutine in linked list */ }; @@ -91,7 +91,7 @@ struct FillOrCopyStruct { uint16 width, height; uint16 textColumn, textRow; uint8 textColumnOffset, textLength, textMaxLength; - uint8 fill_color, text_color, unk5; + uint8 fill_color, text_color, unk5; FillOrCopyData *fcs_data; FillOrCopyStruct() { memset(this, 0, sizeof(*this)); } }; @@ -119,15 +119,6 @@ struct TimeEvent { }; struct GameSpecificSettings { -#ifndef __PALM_OS__ - const char *gme_filename; - const char *wav_filename; - const char *voc_filename; - const char *mp3_filename; - const char *voc_effects_filename; - const char *mp3_effects_filename; - const char *gamepc_filename; - #else const char gme_filename[12]; const char wav_filename[12]; const char voc_filename[12]; @@ -135,7 +126,6 @@ struct GameSpecificSettings { const char voc_effects_filename[12]; const char mp3_effects_filename[12]; const char gamepc_filename[12]; - #endif }; } // End of namespace Simon |