Skip to content

Commit

Permalink
try fix spawn, jip,try fix spectator
Browse files Browse the repository at this point in the history
  • Loading branch information
nomisum committed Oct 3, 2015
1 parent 6006304 commit 9ba0feb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
12 changes: 11 additions & 1 deletion init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,24 @@ diag_log format ["setup: clientandserver done"];

if (hasInterface) then {

checkJIP = {
if ((OPFOR_TELEPORT_TARGET select 0 != 0) && didJIP) then {
[player, true] call ace_spectator_fnc_stageSpectator;
} else {
[] spawn checkSpawnButton;
};
};



checkSpawnButton = {
waitUntil {!dialog && !visibleMap};
if (BLUFOR_TELEPORTED) exitWith {};
0 = [playerside] execVM "spawn\checkIfSpawned.sqf";
};

createStartHints = {
[] spawn checkSpawnButton;
[] call checkJIP;
};

enableSentences false;
Expand Down
8 changes: 4 additions & 4 deletions mission.sqm
Original file line number Diff line number Diff line change
Expand Up @@ -1155,8 +1155,9 @@ class Mission
id=23;
side="EAST";
vehicle="O_officer_F";
player="PLAY CDG";
rank="SERGEANT";
player="PLAYER COMMANDER";
leader=1;
rank="MAJOR";
skill=0.5;
text="opfor_teamlead";
init="this setVariable [""canBuy"", true];";
Expand All @@ -1171,7 +1172,6 @@ class Mission
side="EAST";
vehicle="O_Soldier_SL_F";
player="PLAY CDG";
leader=1;
rank="CAPTAIN";
skill=0.5;
text="opfor_assistant";
Expand Down Expand Up @@ -2157,7 +2157,7 @@ class Mission
id=82;
side="WEST";
vehicle="B_officer_F";
player="PLAYER COMMANDER";
player="PLAY CDG";
leader=1;
rank="MAJOR";
skill=0.5;
Expand Down
1 change: 0 additions & 1 deletion server/teleportListener.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ _OPFOR_TELEPORT_TARGET_listener = {

_BLUFOR_TELEPORT_TARGET_listener = {
_pos = _this select 1;
_pos spawn createBluforStuff;
publicVariable "BLUFOR_TELEPORT_TARGET";
};

Expand Down

0 comments on commit 9ba0feb

Please sign in to comment.