Skip to content

Commit

Permalink
Merge pull request #743 from CBATeam/fixArsenalDebugConsole
Browse files Browse the repository at this point in the history
reenable debug console in Arsenal
  • Loading branch information
Killswitch00 authored Sep 8, 2017
2 parents 7acde6a + 24bc576 commit 2184c69
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 31 deletions.
7 changes: 7 additions & 0 deletions addons/diagnostic/CfgFunctions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,11 @@ class CfgFunctions
};
};
};
class A3 {
class Debug {
class isDebugConsoleAllowed {
file = PATHTOF(fnc_isDebugConsoleAllowed.sqf);
};
};
};
};
3 changes: 0 additions & 3 deletions addons/diagnostic/Scenarios/Arsenal.VR/description.ext

This file was deleted.

1 change: 0 additions & 1 deletion addons/diagnostic/Scenarios/Arsenal.VR/fn_closed.sqf

This file was deleted.

1 change: 0 additions & 1 deletion addons/diagnostic/Scenarios/Arsenal.VR/fn_createTarget.sqf

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion addons/diagnostic/Scenarios/Arsenal.VR/fn_opened.sqf

This file was deleted.

1 change: 0 additions & 1 deletion addons/diagnostic/Scenarios/Arsenal.VR/init.sqf

This file was deleted.

1 change: 0 additions & 1 deletion addons/diagnostic/Scenarios/Arsenal.VR/mission.sqm

This file was deleted.

2 changes: 1 addition & 1 deletion addons/diagnostic/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class CfgPatches {
url = "$STR_CBA_URL";
units[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"CBA_common","CBA_events","3DEN","A3_Missions_F"};
requiredAddons[] = {"CBA_common","CBA_events","3DEN","A3_Functions_F"};
version = VERSION;
authors[] = {"Spooner","Sickboy"};
};
Expand Down
8 changes: 8 additions & 0 deletions addons/diagnostic/fnc_isDebugConsoleAllowed.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "script_component.hpp"

// enable debug console in virtual arsenal
if (str missionConfigFile == "A3\Missions_F_Bootcamp\Scenarios\Arsenal.VR\description.ext") exitWith {true};

call {
#include "\a3\functions_f\Debug\fn_isDebugConsoleAllowed.sqf";
};
21 changes: 0 additions & 21 deletions addons/diagnostic/gui.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,6 @@ class RscTitles {
};
};

// debug console in virtual arsenal
class RscControlsGroupNoScrollbars;

class RscStandardDisplay;
class RscDisplayMain: RscStandardDisplay {
class controls {
class GroupSingleplayer: RscControlsGroupNoScrollbars {
class Controls;
};

class GroupTutorials: GroupSingleplayer {
class Controls: Controls {
class Bootcamp;
class Arsenal: Bootcamp {
onButtonClick = QUOTE(playMission [ARR_2('','PATHTOF(Scenarios\Arsenal.VR)')]);
};
};
};
};
};

class RscEdit;
class GVAR(watchInput): RscEdit {
autocomplete = "scripting";
Expand Down

0 comments on commit 2184c69

Please sign in to comment.