diff options
| author | Ludvig Strigeus | 2002-04-13 19:02:55 +0000 |
|---|---|---|
| committer | Ludvig Strigeus | 2002-04-13 19:02:55 +0000 |
| commit | 65a98de8b97fe4d31e5686dbccdf34c0993778ab (patch) | |
| tree | 86b07b158646e4a1e1b54783d8b1afc0fa3ceb06 | |
| parent | 9f191ea9c5882f59cd23adbcbaa4a1c704909573 (diff) | |
| download | scummvm-rg350-65a98de8b97fe4d31e5686dbccdf34c0993778ab.tar.gz scummvm-rg350-65a98de8b97fe4d31e5686dbccdf34c0993778ab.tar.bz2 scummvm-rg350-65a98de8b97fe4d31e5686dbccdf34c0993778ab.zip | |
removed anonymous struct
svn-id: r3926
| -rw-r--r-- | simon/midi.cpp | 4 | ||||
| -rw-r--r-- | simon/simon.h | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp index 13459208b1..fbcc0e45bc 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -309,7 +309,9 @@ void MidiPlayer::read_next_note(Track *t, NoteRec *nr) { uint i; nr->delay = 0; - nr->big_cmd = 0; + nr->cmd = 0; + nr->param_1 = 0; + nr->param_2 = 0; nr->cmd_length = 0; nr->sysex_data = NULL; diff --git a/simon/simon.h b/simon/simon.h index ffaf9938e7..cfd62a83b4 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -262,14 +262,9 @@ private: struct NoteRec { uint32 delay; - union { - struct { - byte cmd; - byte param_1; - byte param_2; - }; - uint32 big_cmd; - }; + byte cmd; + byte param_1; + byte param_2; uint cmd_length; byte *sysex_data; }; |