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

[mgerhardy]

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:
ee77e845e4 TWINE: renamed and commented to match original sources


Commit: ee77e845e4ef22fb89b3b229c4ebc0fac4c7532f
    https://github.com/scummvm/scummvm/commit/ee77e845e4ef22fb89b3b229c4ebc0fac4c7532f
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2023-11-16T16:58:04+01:00

Commit Message:
TWINE: renamed and commented to match original sources

Changed paths:
    engines/twine/menu/menu.h
    engines/twine/scene/animations.cpp
    engines/twine/scene/animations.h


diff --git a/engines/twine/menu/menu.h b/engines/twine/menu/menu.h
index e9809a0fec0..43caae572e3 100644
--- a/engines/twine/menu/menu.h
+++ b/engines/twine/menu/menu.h
@@ -189,8 +189,8 @@ private:
 	bool isBehaviourHovered(int32 left, int32 top, HeroBehaviourType behaviour) const;
 	void drawBehaviour(int32 left, int32 top, HeroBehaviourType behaviour, int32 angle, bool cantDrawBox);
 	void drawInventoryItems(int32 left, int32 top);
-	void prepareAndDrawBehaviour(int32 left, int32 top, int32 angle, HeroBehaviourType behaviour);
-	void drawBehaviourMenu(int32 left, int32 top, int32 angle);
+	void prepareAndDrawBehaviour(int32 left, int32 top, int32 angle, HeroBehaviourType behaviour); // DrawComportement
+	void drawBehaviourMenu(int32 left, int32 top, int32 angle); // DrawMenuComportement
 	void drawItem(int32 left, int32 top, int32 item);
 
 	void drawSpriteAndString(int32 left, int32 top, const SpriteData &spriteData, const Common::String &str, int32 color = COLOR_GOLD);
@@ -241,7 +241,7 @@ public:
 	int32 optionsMenu();
 
 	/** Process hero behaviour menu */
-	void processBehaviourMenu(bool behaviourMenu);
+	void processBehaviourMenu(bool behaviourMenu); // MenuComportement
 
 	int32 newGameClassicMenu();
 
diff --git a/engines/twine/scene/animations.cpp b/engines/twine/scene/animations.cpp
index e243a86c19a..9c4cfcd9308 100644
--- a/engines/twine/scene/animations.cpp
+++ b/engines/twine/scene/animations.cpp
@@ -229,7 +229,7 @@ void Animations::copyKeyFrameToState(const KeyFrame *keyframe, BodyData &bodyDat
 	}
 }
 
-bool Animations::verifyAnimAtKeyframe(int32 keyframeIdx, const AnimData &animData, AnimTimerDataStruct *animTimerDataPtr) {
+bool Animations::setInterDepObjet(int32 keyframeIdx, const AnimData &animData, AnimTimerDataStruct *animTimerDataPtr) {
 	const KeyFrame *keyFrame = animData.getKeyframe(keyframeIdx);
 	const int32 keyFrameLength = keyFrame->length;
 
@@ -250,7 +250,7 @@ bool Animations::verifyAnimAtKeyframe(int32 keyframeIdx, const AnimData &animDat
 	if (deltaTime >= keyFrameLength) {
 		animTimerDataPtr->ptr = animData.getKeyframe(keyframeIdx);
 		animTimerDataPtr->time = _engine->timerRef;
-		return true;
+		return true; // finished animation
 	}
 
 	_animStepBeta = (_animStepBeta * deltaTime) / keyFrameLength;
@@ -563,7 +563,7 @@ void Animations::doAnim(int32 actorIdx) {
 
 			bool keyFramePassed = false;
 			if (_engine->_resources->_bodyData[actor->_body].isAnimated()) {
-				keyFramePassed = verifyAnimAtKeyframe(actor->_frame, animData, &actor->_animTimerData);
+				keyFramePassed = setInterDepObjet(actor->_frame, animData, &actor->_animTimerData);
 			}
 
 			if (_animMasterRot) {
diff --git a/engines/twine/scene/animations.h b/engines/twine/scene/animations.h
index 17cc49a2e87..0e3aac7ab5b 100644
--- a/engines/twine/scene/animations.h
+++ b/engines/twine/scene/animations.h
@@ -43,7 +43,7 @@ private:
 	 * @param animData Animation data
 	 * @param animTimerDataPtr Animation time data
 	 */
-	bool verifyAnimAtKeyframe(int32 keyframeIdx, const AnimData &animData, AnimTimerDataStruct *animTimerDataPtr);
+	bool setInterDepObjet(int32 keyframeIdx, const AnimData &animData, AnimTimerDataStruct *animTimerDataPtr);
 
 	void copyKeyFrameToState(const KeyFrame *keyframe, BodyData &bodyData, int32 numBones) const;
 	void copyStateToKeyFrame(KeyFrame *keyframe, const BodyData &bodyData) const;