[Scummvm-git-logs] scummvm master -> 23f6dc66ed4798f4fa9a1d47752ff51e7b0c027d

[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:
23f6dc66ed SAGA2: Add onAcceptDrop method constant


Commit: 23f6dc66ed4798f4fa9a1d47752ff51e7b0c027d
    https://github.com/scummvm/scummvm/commit/23f6dc66ed4798f4fa9a1d47752ff51e7b0c027d
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-09T23:47:24+09:00

Commit Message:
SAGA2: Add onAcceptDrop method constant

Changed paths:
    engines/saga2/methods.r
    engines/saga2/objproto.cpp


diff --git a/engines/saga2/methods.r b/engines/saga2/methods.r
index 2d2acd2caf..e8dfbd0646 100644
--- a/engines/saga2/methods.r
+++ b/engines/saga2/methods.r
@@ -63,10 +63,10 @@ enum {
 	Method_GameObject_onEat,
 	Method_GameObject_onInsert,
 	Method_GameObject_onRemove,
-	Method_GameObject_onAcceptDamage = 36,
 	Method_GameObject_onAcceptLockToggle,
 	Method_GameObject_onAcceptMix,
-	Method_GameObject_onAcceptDrop,
+	Method_GameObject_onAcceptDrop = 35,
+	Method_GameObject_onAcceptDamage = 36,
 	Method_GameObject_onAcceptStrike = 37,
 	Method_GameObject_onAcceptInsertion = 40,
 	Method_GameObject_onTrigger = 41,
diff --git a/engines/saga2/objproto.cpp b/engines/saga2/objproto.cpp
index a9d177808c..f05082122c 100644
--- a/engines/saga2/objproto.cpp
+++ b/engines/saga2/objproto.cpp
@@ -550,7 +550,6 @@ bool ProtoObj::acceptDrop(
 	int16   scriptResult;
 
 	//  Handle object script in a standard fashion
-	warning("ProtoObj::acceptDrop: Method_GameObject_onAcceptDrop undefined");
 	if ((scriptResult = stdActionScript(
 	                        Method_GameObject_onAcceptDrop,
 	                        dObj, enactor, droppedObj, count))