Skip to content

Commit

Permalink
localization, buy menu, story
Browse files Browse the repository at this point in the history
  • Loading branch information
nomisum committed Oct 13, 2015
1 parent d2d7921 commit 7893d9f
Show file tree
Hide file tree
Showing 8 changed files with 253 additions and 197 deletions.
2 changes: 1 addition & 1 deletion init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ if (hasInterface) then {
checkSpawnButton = {

if (player != opfor_teamlead) then {
0 = [[worldSize/2,worldSize/2,0],"Breaking Contact - Waiting for Spawn."] execVM "helpers\establishingShot.sqf";
0 = [[worldSize/2,worldSize/2,0],""] execVM "helpers\establishingShot.sqf";
} else {
disableSerialization;
waitUntil {!(isNull ([] call BIS_fnc_displayMission))};
Expand Down
3 changes: 2 additions & 1 deletion mission_setup/teleport.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

checkWater = {
if (surfaceIsWater _this) then {
throw ((str _pos) + " is covered in water :("); // localize "str_GRAD_spawn_on_water" // [] call EFUNC(common,displayTextStructured);
_string = localize "str_GRAD_spawn_on_water";
[_string] call EFUNC(common,displayTextStructured); //
};
};

Expand Down
25 changes: 1 addition & 24 deletions player/bluforOpforTeleportListener.sqf
Original file line number Diff line number Diff line change
@@ -1,29 +1,6 @@
createBluforSpawnLimitsMarkers = {
_pos = _this;
/*_inner_marker = createMarkerLocal ["inner_marker", _pos];
_inner_marker setMarkerTypeLocal "mil_unknown";
_inner_marker setMarkerColorLocal "ColorEast";
_inner_marker setMarkerShapeLocal "ELLIPSE";
_inner_marker setMarkerSizeLocal [BLUFOR_SPAWN_DISTANCE, BLUFOR_SPAWN_DISTANCE];
_inner_marker setMarkerBrushLocal "SolidBorder";
_outer_marker = createMarkerLocal ["outer_marker", _pos];
_outer_marker setMarkerTypeLocal "mil_unknown";
_outer_marker setMarkerColorLocal "ColorEast";
_outer_marker setMarkerShapeLocal "ELLIPSE";
_outer_marker setMarkerSizeLocal [BLUFOR_SPAWN_DISTANCE, BLUFOR_SPAWN_DISTANCE];
_outer_marker setMarkerBrushLocal "Border";*/
};

_OPFOR_TELEPORT_TARGET_listener = {
_pos = _this select 1;


_pos call createBluforSpawnLimitsMarkers;
if (player == blufor_teamlead) then {
hintSilent "Jetzt Spawnpunkt aussuchen!";
};

// do nothing at all : TODO CLEANUP
};

"OPFOR_TELEPORT_TARGET" addPublicVariableEventHandler _OPFOR_TELEPORT_TARGET_listener;
Expand Down
Loading

0 comments on commit 7893d9f

Please sign in to comment.