[Scummvm-git-logs] scummvm master -> c083403ed7729a422747e466965be6f8a256ffd1

[athrxx]

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

Summary:
c083403ed7 KYRA: remove dead code


Commit: c083403ed7729a422747e466965be6f8a256ffd1
    https://github.com/scummvm/scummvm/commit/c083403ed7729a422747e466965be6f8a256ffd1
Author: athrxx (athrxx at scummvm.org)
Date: 2022-09-19T22:23:29+02:00

Commit Message:
KYRA: remove dead code

Changed paths:
    engines/kyra/engine/scene_hof.cpp
    engines/kyra/sound/drivers/halestorm.cpp
    engines/kyra/sound/drivers/pcspeaker_v2.cpp


diff --git a/engines/kyra/engine/scene_hof.cpp b/engines/kyra/engine/scene_hof.cpp
index 57e830f11ec..906817f4d6d 100644
--- a/engines/kyra/engine/scene_hof.cpp
+++ b/engines/kyra/engine/scene_hof.cpp
@@ -626,12 +626,7 @@ void KyraEngine_HoF::initSceneAnims(int unk1) {
 			animState->needRefresh = 1;
 			animState->specialRefresh = 1;
 
-			if (animInit) {
-				_animList = addToAnimListSorted(_animList, animState);
-			} else {
-				_animList = initAnimList(_animList, animState);
-				animInit = true;
-			}
+			_animList = addToAnimListSorted(_animList, animState);
 		}
 	}
 
diff --git a/engines/kyra/sound/drivers/halestorm.cpp b/engines/kyra/sound/drivers/halestorm.cpp
index 39983f7a18e..8f15083b399 100644
--- a/engines/kyra/sound/drivers/halestorm.cpp
+++ b/engines/kyra/sound/drivers/halestorm.cpp
@@ -1820,7 +1820,7 @@ void HSLowLevelDriver::noteOn(uint8 part, uint8 prg, uint8 note, uint8 velo, uin
 		}
 	}
 
-	uint16 type = snd ? READ_BE_UINT16(snd) : 0;
+	uint16 type = READ_BE_UINT16(snd);
 	uint16 n = 0;
 	if (type == 1 || type == 2) {
 		uint16 numTypes = (type == 1) ? READ_BE_UINT16(snd + 2) : 0;
diff --git a/engines/kyra/sound/drivers/pcspeaker_v2.cpp b/engines/kyra/sound/drivers/pcspeaker_v2.cpp
index 9d171a52545..afe2a54625b 100644
--- a/engines/kyra/sound/drivers/pcspeaker_v2.cpp
+++ b/engines/kyra/sound/drivers/pcspeaker_v2.cpp
@@ -68,9 +68,6 @@ void MidiDriver_PCSpeaker::send(uint32 data) {
 		return;
 
 	case 0x90:	// note on
-		if (channel > 1)
-			return;
-
 		if (param2)
 			noteOn(channel, param1);
 		else