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/core | |
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/core')
-rw-r--r-- | engines/titanic/core/game_object.cpp | 12 | ||||
-rw-r--r-- | engines/titanic/core/link_item.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/core/project_item.cpp | 8 | ||||
-rw-r--r-- | engines/titanic/core/room_item.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/core/view_item.cpp | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index c4467c1e6a..870e9d420d 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -141,27 +141,27 @@ void CGameObject::load(SimpleFile *file) { case 7: _movieRangeInfoList.load(file); _frameNumber = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 6: _cursorId = (CursorId)file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 5: _movieClips.load(file); - // Deliberate fall-through + // Intentional fall-through case 4: _handleMouseFlag = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 3: _nonvisual = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 2: _resource = file->readString(); - // Deliberate fall-through + // Intentional fall-through case 1: _bounds = file->readBounds(); diff --git a/engines/titanic/core/link_item.cpp b/engines/titanic/core/link_item.cpp index 559191efc9..977d2f170b 100644 --- a/engines/titanic/core/link_item.cpp +++ b/engines/titanic/core/link_item.cpp @@ -96,11 +96,11 @@ void CLinkItem::load(SimpleFile *file) { switch (val) { case 2: _cursorId = (CursorId)file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 1: _linkMode = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 0: _roomNumber = file->readNumber(); diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp index 5a530a82b8..a3ac284af8 100644 --- a/engines/titanic/core/project_item.cpp +++ b/engines/titanic/core/project_item.cpp @@ -102,7 +102,7 @@ void CProjectItem::load(SimpleFile *file) { case 1: file->readBuffer(); _nextRoomNumber = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 0: // Load the list of files @@ -116,16 +116,16 @@ void CProjectItem::load(SimpleFile *file) { case 6: file->readBuffer(); _nextObjectNumber = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 5: file->readBuffer(); _nextMessageNumber = file->readNumber(); - // Deliberate fall-through + // Intentional fall-through case 4: file->readBuffer(); - // Deliberate fall-through + // Intentional fall-through case 2: case 3: diff --git a/engines/titanic/core/room_item.cpp b/engines/titanic/core/room_item.cpp index afac3ec5d4..534fa5cd2f 100644 --- a/engines/titanic/core/room_item.cpp +++ b/engines/titanic/core/room_item.cpp @@ -65,14 +65,14 @@ void CRoomItem::load(SimpleFile *file) { // Read exit movie file->readBuffer(); _exitMovieKey.load(file); - // Deliberate fall-through + // Intentional fall-through case 2: // Read room dimensions file->readBuffer(); _roomDimensionX = (double)file->readNumber() / 1000.0; _roomDimensionY = (double)file->readNumber() / 1000.0; - // Deliberate fall-through + // Intentional fall-through case 1: // Read transition movie key and clip list @@ -82,7 +82,7 @@ void CRoomItem::load(SimpleFile *file) { file->readBuffer(); _clipList.load(file); postLoad(); - // Deliberate fall-through + // Intentional fall-through case 0: // Read room rect diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp index d0f5c8a549..4e37fd23be 100644 --- a/engines/titanic/core/view_item.cpp +++ b/engines/titanic/core/view_item.cpp @@ -67,7 +67,7 @@ void CViewItem::load(SimpleFile *file) { switch (val) { case 1: _resourceKey.load(file); - // Deliberate fall-through + // Intentional fall-through default: file->readBuffer(); |