[Scummvm-git-logs] scummvm master -> 3f6ca96c5b4d7c083e6d60db617bb4b13c90e1b4

sev- sev at scummvm.org
Sun Oct 2 23:39:09 CEST 2016


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:
3f6ca96c5b FULLPIPE: Scene11: Fix non-swinging swing


Commit: 3f6ca96c5b4d7c083e6d60db617bb4b13c90e1b4
    https://github.com/scummvm/scummvm/commit/3f6ca96c5b4d7c083e6d60db617bb4b13c90e1b4
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-10-02T23:31:01+02:00

Commit Message:
FULLPIPE: Scene11: Fix non-swinging swing

Changed paths:
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes/scene11.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 71e9126..5ac25c8 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -199,7 +199,7 @@ Vars::Vars() {
 	scene11_swingOldAngle = 1.0;
 	scene11_swingSpeed = 1.0;
 	scene11_swingAngleDiff = 1.0;
-	scene11_swingInertia = 0.0;
+	scene11_swingInertia = 0.01;
 	scene11_swingCounter = 0;
 	scene11_swingCounterPrevTurn = 0;
 	scene11_swingDirection = 0;
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index a3d8042..8c3de9e 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -114,7 +114,7 @@ void scene11_initScene(Scene *sc) {
 	g_vars->scene11_swingOldAngle = 0.0;
 	g_vars->scene11_swingSpeed = 0.0;
 	g_vars->scene11_swingAngleDiff = 0.0;
-	g_vars->scene11_swingInertia = 1.28; //1.9849218750000000;
+	g_vars->scene11_swingInertia = 0.01; //1.9849218750000000;
 	g_vars->scene11_swingCounter = 0;
 	g_vars->scene11_swingCounterPrevTurn = 0;
 	g_vars->scene11_swingDirection = 0;
@@ -242,7 +242,7 @@ void sceneHandler11_manToSwing() {
 	g_fp->_aniMan2->hide();
 
 	g_vars->scene11_swingCounter = 0;
-	g_vars->scene11_swingInertia = 1.28; //1.9849218;
+	g_vars->scene11_swingInertia = 0.01; //1.9849218;
 
 	g_vars->scene11_dudeOnSwing->_flags &= 0xFFFB;
 	g_vars->scene11_dudeOnSwing = g_fp->_currentScene->getStaticANIObject1ById(ANI_MAN11, -1);





More information about the Scummvm-git-logs mailing list