diff options
| author | Travis Howell | 2003-05-20 16:24:31 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-05-20 16:24:31 +0000 |
| commit | d60c78c4eb5d28d062618abd93e93ffedde2dedf (patch) | |
| tree | cd47416ed3fa55376a86176a0e3bec4ebd0bbe16 | |
| parent | 3e3d6f1360332d9bed9fc28a1930b1d033f58138 (diff) | |
| download | scummvm-rg350-d60c78c4eb5d28d062618abd93e93ffedde2dedf.tar.gz scummvm-rg350-d60c78c4eb5d28d062618abd93e93ffedde2dedf.tar.bz2 scummvm-rg350-d60c78c4eb5d28d062618abd93e93ffedde2dedf.zip | |
Switch to ints
svn-id: r7740
| -rw-r--r-- | simon/items.cpp | 4 | ||||
| -rw-r--r-- | simon/simon.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index 975879e56f..98c83b43c9 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -1432,8 +1432,8 @@ void SimonState::o_unk_132_helper_2(FillOrCopyStruct *fcs, int x) { } void SimonState::o_unk_127() { - uint a = getVarOrWord(); - uint b = getVarOrWord(); + int a = getVarOrWord(); + int b = getVarOrWord(); if (_game & GF_SIMON2) { uint c = getVarOrByte(); diff --git a/simon/simon.h b/simon/simon.h index 5b39103838..0a4cea0df3 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -198,8 +198,8 @@ public: int _x_scroll, _vga_var1, _vga_var2, _vga_var3, _vga_var5; byte _vga_var8; - uint16 _vc72_var1, _vc72_var2, _vc72_var3; - uint16 _vc70_var1, _vc70_var2; + int16 _vc72_var1, _vc72_var2, _vc72_var3; + int16 _vc70_var1, _vc70_var2; byte *_vga_var7; int16 _script_cond_a, _script_cond_b, _script_cond_c; @@ -257,8 +257,8 @@ public: byte _video_var_9; uint _midi_sfx; - uint16 _last_music_played; - uint16 _next_music_to_play; + int16 _last_music_played; + int16 _next_music_to_play; bool _show_preposition; bool _showmessage_flag; |