[Scummvm-cvs-logs] scummvm master -> 8cdca523ea265d67c7f95604a88e03aa40d66cf0

[sev-]

This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7ae3386090 SAGA: Fix CID 1002507. Unused pointer value.
b1c886334d INSANE: Fix CID 1003733. Missing break in switch.
e0e6b95384 INSANE: Fix CID 1003734. Missing break in switch
059fa15d14 DEVTOOLS: Fix CID 1022207. Missing break in switch
ce057f896f AGI: Fix CID 1003769. Missing break in switch
e809ebb904 AGI: Fix CID 1003768. Missing break in switch
8cdca523ea AGI: Mark fall-through. Detected by CID 1003771


Commit: 7ae3386090429015fa7bbc887d11d026e2b46579
    https://github.com/scummvm/scummvm/commit/7ae3386090429015fa7bbc887d11d026e2b46579
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-15T01:29:46-07:00

Commit Message:
SAGA: Fix CID 1002507. Unused pointer value.

Changed paths:
    engines/saga/animation.cpp



diff --git a/engines/saga/animation.cpp b/engines/saga/animation.cpp
index fd602ff..a99bd66 100644
--- a/engines/saga/animation.cpp
+++ b/engines/saga/animation.cpp
@@ -185,7 +185,7 @@ int Anim::playCutaway(int cut, bool fade) {
 		event.time = (40 / 3) * 1000 / _cutawayList[cut].frameRate;
 
 		if (fade)
-			eventColumns = _vm->_events->chain(eventColumns, event);
+			_vm->_events->chain(eventColumns, event);
 		else
 			_vm->_events->queue(event);
 	}


Commit: b1c886334dadd206db29a51b7b6922ef6d1f95a3
    https://github.com/scummvm/scummvm/commit/b1c886334dadd206db29a51b7b6922ef6d1f95a3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-15T01:47:51-07:00

Commit Message:
INSANE: Fix CID 1003733. Missing break in switch.

In fact the code was wrong there due to copy-paste error

Changed paths:
    engines/scumm/insane/insane_enemy.cpp



diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index fa6d426..c192d2f 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -1519,8 +1519,6 @@ void Insane::chooseEnemyWeaponAnim(int32 buttons) {
 		case INV_BOOT:
 		case INV_HAND:
 		case INV_DUST:
-			_actor[1].act[2].state = 0;
-			switchEnemyWeapon();
 		default:
 			switchEnemyWeapon();
 		}


Commit: e0e6b9538422a1129a06c5b38a56092d3ca1e583
    https://github.com/scummvm/scummvm/commit/e0e6b9538422a1129a06c5b38a56092d3ca1e583
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-15T01:48:05-07:00

Commit Message:
INSANE: Fix CID 1003734. Missing break in switch

Changed paths:
    engines/scumm/insane/insane_enemy.cpp



diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index c192d2f..3876966 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -2435,6 +2435,7 @@ void Insane::actor12Reaction(int32 buttons) {
 		smlayer_setActorFacing(1, 2, 6, 180);
 		smlayer_setActorLayer(1, 2, 25);
 		_actor[1].act[2].state = 103;
+		break;
 	case 103:
 		_actor[1].kicking = false;
 


Commit: 059fa15d148018a01721205f824116a905a73ff1
    https://github.com/scummvm/scummvm/commit/059fa15d148018a01721205f824116a905a73ff1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-15T01:51:57-07:00

Commit Message:
DEVTOOLS: Fix CID 1022207. Missing break in switch

Changed paths:
    devtools/create_lure/process_actions.cpp



diff --git a/devtools/create_lure/process_actions.cpp b/devtools/create_lure/process_actions.cpp
index db96573..d1ddbf0 100644
--- a/devtools/create_lure/process_actions.cpp
+++ b/devtools/create_lure/process_actions.cpp
@@ -149,6 +149,7 @@ uint16 process_action_sequence_entry(int supportIndex, byte *data, uint16 remain
 		if (startOffset == 0x7328) { startOffset = 0x72ae; maxOffset = 0x7382; }
 		if (startOffset == 0x702f) { startOffset = 0x6f3d; maxOffset = 0x70a3; }
 		if (startOffset == 0x7886) { startOffset = 0x742a; maxOffset = 0x7896; }
+		break;
 	case DE_DEU:
 		if (startOffset == 0x7edb) { startOffset = 0x7ead; maxOffset = 0x7f05; }
 		if (startOffset == 0x7ab8) { startOffset = 0x796c; maxOffset = 0x7ae2; }


Commit: ce057f896f70bab50d73abd4dc3f9a880490d6ca
    https://github.com/scummvm/scummvm/commit/ce057f896f70bab50d73abd4dc3f9a880490d6ca
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-15T01:54:26-07:00

Commit Message:
AGI: Fix CID 1003769. Missing break in switch

Changed paths:
    engines/agi/preagi_troll.cpp



diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp
index b7d2801..fc29577 100644
--- a/engines/agi/preagi_troll.cpp
+++ b/engines/agi/preagi_troll.cpp
@@ -190,6 +190,7 @@ void TrollEngine::inventory() {
 		break;
 	case IDI_TRO_MAX_TREASURE:
 		drawStr(3, 17, kColorDefault, IDS_TRO_TREASURE_2);
+		break;
 	default:
 		sprintf(tmp, IDS_TRO_TREASURE_4, _treasuresLeft);
 		drawStr(20, 10, kColorDefault, tmp);


Commit: e809ebb90442662b40881d95c4ae6530d0db888e
    https://github.com/scummvm/scummvm/commit/e809ebb90442662b40881d95c4ae6530d0db888e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-15T01:59:59-07:00

Commit Message:
AGI: Fix CID 1003768. Missing break in switch

Changed paths:
    engines/agi/preagi_winnie.cpp



diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index bbe9ddd..1be385b 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -985,6 +985,7 @@ void WinnieEngine::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
 						}
 						break;
 					}
+					break;
 				default:
 					if (!event.kbd.flags) {	// if the control/alt/shift keys are not pressed
 						keyHelp();


Commit: 8cdca523ea265d67c7f95604a88e03aa40d66cf0
    https://github.com/scummvm/scummvm/commit/8cdca523ea265d67c7f95604a88e03aa40d66cf0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-15T02:00:10-07:00

Commit Message:
AGI: Mark fall-through. Detected by CID 1003771

Changed paths:
    engines/agi/preagi_troll.cpp



diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp
index fc29577..17d980d 100644
--- a/engines/agi/preagi_troll.cpp
+++ b/engines/agi/preagi_troll.cpp
@@ -220,6 +220,7 @@ void TrollEngine::waitAnyKeyIntro() {
 		switch (iMsg) {
 		case 200:
 			iMsg = 0;
+			// fall through
 		case 0:
 			drawStr(22, 3, kColorDefault, IDS_TRO_INTRO_2);
 			_gfx->doUpdate();