diff options
author | Bastien Bouclet | 2017-07-23 11:12:12 +0200 |
---|---|---|
committer | Bastien Bouclet | 2017-07-23 11:12:12 +0200 |
commit | bc952807ecc73cf827a779adf1704bffe8a1db2f (patch) | |
tree | 857ff0290f7f176492edbac2001d2acd84498603 /engines/titanic/game | |
parent | 96a1b7070088ce2a9fdcb85f124fd0a2d7ef8d60 (diff) | |
download | scummvm-rg350-bc952807ecc73cf827a779adf1704bffe8a1db2f.tar.gz scummvm-rg350-bc952807ecc73cf827a779adf1704bffe8a1db2f.tar.bz2 scummvm-rg350-bc952807ecc73cf827a779adf1704bffe8a1db2f.zip |
TITANIC: Adjust the switch/case fall-through comments
This way, GCC 7 does not generate a warning for those cases when
-Wimplicit-fallthrough=3 is enabled, which is now the default.
Diffstat (limited to 'engines/titanic/game')
-rw-r--r-- | engines/titanic/game/place_holder_item.cpp | 14 | ||||
-rw-r--r-- | engines/titanic/game/variable_list.cpp | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/titanic/game/place_holder_item.cpp b/engines/titanic/game/place_holder_item.cpp index 108c25ced8..dcde956390 100644 --- a/engines/titanic/game/place_holder_item.cpp +++ b/engines/titanic/game/place_holder_item.cpp @@ -52,35 +52,35 @@ void CPlaceHolderItem::load(SimpleFile *file) { switch (file->readNumber()) { case 7: _field7C = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 6: file->readString(); _clips.load(file); - // Deliberate fall-through + // Intentional fall-through case 5: _field68 = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 4: _field64 = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 3: _field60 = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 2: _list.load(file); - // Deliberate fall-through + // Intentional fall-through case 1: _string2 = file->readString(); _field4C = file->readNumber(); _pos1 = file->readPoint(); _pos2 = file->readPoint(); - // Deliberate fall-through + // Intentional fall-through case 0: _string1 = file->readString(); diff --git a/engines/titanic/game/variable_list.cpp b/engines/titanic/game/variable_list.cpp index 2a4a7df961..9c73bbc834 100644 --- a/engines/titanic/game/variable_list.cpp +++ b/engines/titanic/game/variable_list.cpp @@ -43,16 +43,16 @@ void CVariableListItem::load(SimpleFile *file) { switch (file->readNumber()) { case 3: field44 = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 2: _string1 = file->readString(); _field18 = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 1: field40 = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 0: _string2 = file->readString(); |