Merge pull request #7135 from acemod/slideshow-improv

Fix slide order in slideshow
acemod · Aug 21, 2019 · be09fd1 · be09fd1
2 parents 100ac0f + 6abe054
commit be09fd1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/addons/slideshow/functions/fnc_createSlideshow.sqf b/addons/slideshow/functions/fnc_createSlideshow.sqf
@@ -64,6 +64,11 @@ if !(["ace_interact_menu"] call EFUNC(common,isModLoaded)) then {
 
 // Add interactions if automatic transitions are disabled, else setup automatic transitions
 if (_duration == 0) then {
+
+    // Reverse the arrays so that the interactions will be added in the right order
+    reverse _images;
+    reverse _names;
+
     {
         if (_setName == "") then {
             _setName = localize LSTRING(Interaction);

diff --git a/addons/slideshow/functions/fnc_moduleInit.sqf b/addons/slideshow/functions/fnc_moduleInit.sqf
@@ -42,4 +42,4 @@ private _duration = _logic getVariable ["Duration", 0];
 // Prepare with actions
 [_objects, _controllers, _images, _names, _duration, _setName] call FUNC(createSlideshow);
 
-INFO_1("Slideshow Module Initialized on %1 Objects", count _objects);
+INFO_1("Slideshow Module Initialized on %1 Objects",(count _objects));
diff --git a/addons/slideshow/stringtable.xml b/addons/slideshow/stringtable.xml
@@ -161,7 +161,7 @@
         </Key>
         <Key ID="STR_ACE_Slideshow_SetName_DisplayName">
             <English>Set Name</English>
-            <German>Setze Namen</German>
+            <German>Name der Diavorführung</German>
             <Polish>Ustaw nazwę</Polish>
             <Japanese>名前設定</Japanese>
             <French>Définir le nom</French>