diff --git a/addons/slideshow/functions/fnc_createSlideshow.sqf b/addons/slideshow/functions/fnc_createSlideshow.sqf index e9ae254d38..586eb60f67 100644 --- a/addons/slideshow/functions/fnc_createSlideshow.sqf +++ b/addons/slideshow/functions/fnc_createSlideshow.sqf @@ -17,11 +17,16 @@ * * Public: Yes */ -//#define DEBUG_MODE_FULL +#define DEBUG_MODE_FULL #include "script_component.hpp" PARAMS_5(_objects,_controllers,_images,_names,_duration); +// Verify data +if (count _images != count _names || {count _images == 0} || {count _names == 0}) exitWith { + diag_log "[ACE] ERROR: Slideshow Images or Names fields can NOT be empty and must have equal number of items!" +}; + // Add controllers to objects if they support it { if (typeOf _x in [CLASSNAMES_OBJECTS, CLASSNAMES_BOTH]) then { @@ -66,7 +71,8 @@ GVAR(slideshows) = GVAR(slideshows) + 1; // Formatted GVAR string (multiple modules support) private ["_varString"]; -_varString = str format [QGVAR(currentSlide%1), GVAR(slideshows)]; +_varString = format [QGVAR(currentSlide%1), GVAR(slideshows)]; +TRACE_1("Current Slide",_varString); // Set formatted GVAR to first slide missionNamespace setVariable [_varString, 0]; diff --git a/addons/slideshow/functions/fnc_moduleInit.sqf b/addons/slideshow/functions/fnc_moduleInit.sqf index 722544064c..50de48693e 100644 --- a/addons/slideshow/functions/fnc_moduleInit.sqf +++ b/addons/slideshow/functions/fnc_moduleInit.sqf @@ -33,9 +33,6 @@ _images = [_logic getVariable ["Images", ""], true, false] call FUNC(makeList); _names = [_logic getVariable ["Names", ""], true, false] call FUNC(makeList); _duration = _logic getVariable ["Duration", 0]; -// Exit if Images or Names fields are empty -if (_images == [] || {_names == []} || {count _images != count _names}) exitWith {diag_log "[ACE] ERROR: Slideshow Module NOT Initialized: Images or Names fields can NOT be empty and must have equal number of items!"}; - // Prepare with actions [_objects, _controllers, _images, _names, _duration] call FUNC(createSlideshow);