Merge lp:~widelands-dev/widelands/bug1480928 into lp:widelands

[Jens Beyer]

Animation seems to loop to the first picture again.

Easy fix - remove 1ms of the animation ;-)

I believe it would not be good to remove the looping from animation in general. Other way would probably be tinkering with the fps, but I don't know if it takes fraction values like 10.001 or something.

[GunChleoc (gunchleoc)]

I just tested it, and the oak is still getting up. Maybe we do need a switch in the animation after all to make sure that this is always clean (loop = true/false). I think we will need a second version of NumberGlob in graphics/animation.cc for this.

[SirVer (sirver)]

or a better timing information: "animate=falling once" or so.

[Jens Beyer (qcumber-some)]

Or, by cutting the animation one whole picture (=0.1s) earlier and making the lumberjacks idle more the same amount of time to prevent changing balancing.

Please test again if this is feasible approach. I have tested with different game FPS settings (99, 60, 25, 8) and I don't see the issue anymore.

I guess setting the animation duration just as long as there are images would be a practical approach of "once".

[Jens Beyer (qcumber-some)]

review: Needs Resubmitting

[GunChleoc (gunchleoc)]

The trees are still getting up for me :(

[TiborB (tiborb95)]

Hey, I have created new branch https://code.launchpad.net/~widelands-dev/widelands/animation_loop , I am trying to address this from within C++ code, see there

=== modified file 'tribes/atlanteans/woodcutter/conf'
--- tribes/atlanteans/woodcutter/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/woodcutter/conf	2015-09-10 13:51:19 +0000
@@ -11,7 +11,7 @@
 2=playFX ../../../sound/sawmill/sawmill 230
 3=animation sawing 10000
 4=object fall
-5=animation idle 2000
+5=animation idle 2100
 6=createware log
 7=return
 

=== modified file 'tribes/barbarians/lumberjack/conf'
--- tribes/barbarians/lumberjack/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/lumberjack/conf	2015-09-10 13:51:19 +0000
@@ -12,7 +12,7 @@
 3=animation hacking 10000
 4=playFX ../../../sound/spoken/timber 192
 5=object fall
-6=animation idle 2000
+6=animation idle 2100
 7=createware log
 8=return
 

=== modified file 'tribes/empire/lumberjack/conf'
--- tribes/empire/lumberjack/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/lumberjack/conf	2015-09-10 13:51:19 +0000
@@ -12,7 +12,7 @@
 3=animation hacking 10000
 4=playFX ../../../sound/spoken/timber 156
 5=object fall
-6=animation idle 2000
+6=animation idle 2100
 7=createware log
 8=return
 

=== modified file 'world/immovables/trees/aspen/init.lua'
--- world/immovables/trees/aspen/init.lua	2015-08-13 18:30:36 +0000
+++ world/immovables/trees/aspen/init.lua	2015-09-10 13:51:19 +0000
@@ -93,7 +93,7 @@
          "seed=aspen_summer_sapling",
       },
       fall = {
-         "animate=falling 1200",
+         "animate=falling 1100",
          "transform=fallentree",
       },
    },

=== modified file 'world/immovables/trees/oak/init.lua'
--- world/immovables/trees/oak/init.lua	2015-08-13 18:30:36 +0000
+++ world/immovables/trees/oak/init.lua	2015-09-10 13:51:19 +0000
@@ -90,7 +90,7 @@
          "seed=oak_summer_sapling",
       },
       fall = {
-         "animate=falling 1200",
+         "animate=falling 1100",
          "transform=fallentree",
       },
    },