-
Notifications
You must be signed in to change notification settings - Fork 148
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added team color synchronization #185
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
511540e
Initial commit
BaerMitUmlaut 6e94057
Added functions to CfgFunctions
BaerMitUmlaut 9fede0a
Macro bug fixes, minor perf. improvement
BaerMitUmlaut d57b1cc
JIP compatibility
BaerMitUmlaut f44bbe3
Fixed event loop, delayed PFH
BaerMitUmlaut 5a396cc
Updated code comments
BaerMitUmlaut 2210b67
Updated function headers
BaerMitUmlaut File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/* ---------------------------------------------------------------------------- | ||
Internal Function: CBA_fnc_onTeamColorChanged | ||
|
||
Description: | ||
Assigns the units team color if it changed on the squad leaders machine. | ||
|
||
Parameters: | ||
_unit - unit [OBJECT] | ||
_team - team the unit got assigned to [STRING] | ||
|
||
Returns: | ||
Nothing | ||
|
||
Author: | ||
BaerMitUmlaut | ||
---------------------------------------------------------------------------- */ | ||
|
||
#include "script_component.hpp" | ||
params ["_unit", "_team"]; | ||
|
||
_unit assignTeam _team; | ||
if (local (leader _unit)) then { | ||
_unit setVariable [QGVAR(synchedTeam), _team, true]; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* ---------------------------------------------------------------------------- | ||
Internal Function: CBA_fnc_synchTeamColors | ||
|
||
Description: | ||
Synchs the team colors. Does not need to be called manually. | ||
|
||
Parameters: | ||
None | ||
|
||
Returns: | ||
Nothing | ||
|
||
Author: | ||
BaerMitUmlaut | ||
---------------------------------------------------------------------------- */ | ||
|
||
#include "script_component.hpp" | ||
|
||
if (leader player == player) then { | ||
{ | ||
if ((assignedTeam _x) != (_x getVariable [QGVAR(synchedTeam), "MAIN"])) then { | ||
//Local team != currently synched team, so we need to synchronize them again | ||
["CBA_teamColorChanged", [_x, assignedTeam _x]] call CBA_fnc_globalEvent; | ||
}; | ||
true | ||
} count units player; | ||
}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why a
globalEvent
and not atargetEvent
? Is this color necessary to be synced on all clients?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, in case another player joins the squad he needs to know the assigned colors as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't that mean you want to sync them up upon joining the team instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's possible too, but would require extension of the PFH (unless there's a CBA event for it? there's no doc for default events and I didn't see any either) and it would ofc have a delay. Without that delay it would be great for triggering a CBA event though.
Either options aren't perfect in my opinion. Choose your poison...