Skip to content

Commit eba630a

Browse files
committed
Merge branch 'development-bugfix-issue1' into development
2 parents 3371b6d + 14eabbb commit eba630a

19 files changed

+1126
-661
lines changed

source/description.ext

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ disabledAI = 1;
3030
#include "duws_revive\gui\duws_revive.hpp"
3131

3232
// TAW INIT BEGIN --
33-
#include "taw_vd\dialog.hpp"
33+
#include "taw_vd\GUI.h"
3434
class CfgFunctions
3535
{
36-
#include "taw_vd\CfgFunctions.hpp"
36+
#include "taw_vd\CfgFunctions.hpp"
3737
};
3838
// TAW INIT END --

source/duws_revive/reviveInit.sqf

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ DUWS_revive_addaction = {
55
if (!DUWS_player_injured) then {
66
_this addaction ["<t color='#ff00ff'>Revive</t>","duws_revive\playerRevived.sqf", "", 0, true, true, "", "((_target distance _this) < 3"];
77
};
8-
};
8+
};
99

1010
DUWS_revive_respawned = {
1111
if (!DUWS_player_injured) then {
12-
removeAllActions _this;
12+
//removeAllActions _this;
1313
};
14-
};
14+
};
1515

1616
DUWS_revive_revived = {
1717
if (_this == player) then {
@@ -38,18 +38,17 @@ DUWS_sync_animhealing = {
3838
_this switchmove "AinvPknlMstpSlayWpstDnon_medic";
3939
};
4040

41-
41+
4242
// Compile scripts
4343
getLoadout = compile preprocessFileLineNumbers 'duws_revive\get_loadout.sqf';
4444
setLoadout = compile preprocessFileLineNumbers 'duws_revive\set_loadout.sqf';
45-
45+
4646
// Save loadout every 5 seconds
4747
[] spawn {
4848
while{true} do {
4949
if(alive player) then {
5050
saved_loadout = [player] call getLoadout;
5151
};
52-
sleep 5;
52+
sleep 5;
5353
};
5454
};
55-

source/taw_vd/CfgFunctions.hpp

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1-
class TAWVD
2-
{
1+
class TAW_VD {
32
tag = "TAWVD";
4-
class TAW_VD
5-
{
3+
4+
class Initialize {
65
file = "taw_vd";
7-
class onSliderChange {};
8-
class onTerrainChange {};
6+
class stateTracker {
7+
ext = ".fsm";
8+
postInit = 1;
9+
headerType = -1;
10+
};
11+
12+
class onSliderChanged {};
13+
class onTerrainChanged {};
914
class updateViewDistance {};
10-
class openTAWVD {};
11-
class trackViewDistance {};
12-
class tawvdInit {postInit = 1;};
15+
class openMenu {};
16+
class onChar {};
17+
class openSaveManager {};
18+
class onSavePressed {};
19+
class onSaveSelectionChanged {};
1320
};
1421
};

0 commit comments

Comments
 (0)