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

[a-yyg]

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:
e31b998a01 SAGA2: Put warnings on kill task check


Commit: e31b998a01697467ddf19e057730abad9db6ae22
    https://github.com/scummvm/scummvm/commit/e31b998a01697467ddf19e057730abad9db6ae22
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-27T04:06:35+09:00

Commit Message:
SAGA2: Put warnings on kill task check

Changed paths:
    engines/saga2/task.cpp


diff --git a/engines/saga2/task.cpp b/engines/saga2/task.cpp
index 20be181cce..7ff03df673 100644
--- a/engines/saga2/task.cpp
+++ b/engines/saga2/task.cpp
@@ -3248,7 +3248,12 @@ void HuntToKillTask::evaluateWeapon(void) {
 		                                ? (WeaponProto *)currentWeapon->proto()
 		                                :   NULL;
 
-		if (currentWeapon == NULL || currentTarget == NULL
+		if (currentTarget == NULL) {
+			warning("%s: currentTarget = NULL (return)", a->objName());
+			return;
+		}
+
+		if (currentWeapon == NULL
 		        ||      weaponProto->weaponRating(
 		            a->thisID(),
 		            actorID,
@@ -3273,6 +3278,7 @@ void HuntToKillTask::evaluateWeapon(void) {
 			int             weaponRating;
 
 			if (currentTarget) {
+				warning("%s: currentTarget = NULL (weaponRating = 0)", a->objName());
 				weaponRating =  weaponProto->weaponRating(obj->thisID(),
 				                                          actorID,
 				                                          currentTarget->thisID());