Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/initial-veh…
Browse files Browse the repository at this point in the history
…icle-markers-for-killers
  • Loading branch information
3Mydlo3 committed Jan 26, 2024
2 parents 2ac1b6e + da7baec commit 9c2ee81
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 43 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
addons/*.pbo

# Releases
.hemttout/*
releases/*
hemtt
hemtt.exe
Expand Down
18 changes: 18 additions & 0 deletions .hemtt/project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name = "ArmaForces SerialKillers"
mainprefix = "z"
prefix = "afsk"

[files]
include = [
"LICENSE",
"mod.cpp",
"README.md",
]

exclude = ["*.psd", "*.png", "*.tga"]

[properties]
author = "ArmaForces"

[version]
path = "addons/main/script_version.hpp"
10 changes: 6 additions & 4 deletions addons/markers/functions/fnc_loop.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,14 @@ if (playerSide isEqualTo WEST) then {
_marker = [_killer, _hidden] call FUNC(createKillerMarker);
} else {
_marker setMarkerPosLocal (position _killer);
};
if (_hidden) then {
_marker setMarkerColorLocal "ColorGreen";
if (_hidden) then {
_marker setMarkerColorLocal "ColorGreen";
} else {
_marker setMarkerColorLocal "ColorRed";
};
};
} else {
if !(playerSide isEqualTo EAST && {!(_marker isEqualTo "")}) then {
if !(_marker isEqualTo "") then {
[_killer] call FUNC(deleteUnitMarker);
};
};
Expand Down
39 changes: 0 additions & 39 deletions hemtt.toml

This file was deleted.

0 comments on commit 9c2ee81

Please sign in to comment.