Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7135 from acemod/slideshow-improv

Browse Source 
Fix slide order in slideshow
This commit is contained in:
commy2 2019-08-21 23:07:15 +02:00 committed by GitHub
commit be09fd10a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/slideshow/functions/fnc_createSlideshow.sqf
View File

@ -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);

2
addons/slideshow/functions/fnc_moduleInit.sqf
View File

@ -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));

2
addons/slideshow/stringtable.xml
View File

@ -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>