Skip to content

Commit 13fc4da

Browse files
committedDec 7, 2018
Fixed all open issues
1 parent a746708 commit 13fc4da

File tree

4 files changed

+14
-19
lines changed

4 files changed

+14
-19
lines changed
 

‎addons/trenches/functions/fnc_getSurfaceTexturePath.sqf

-5
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,4 @@ private _result = if !(isNil QGVAR(automaticFileSetup)) then {
5858
[_surfaceType, _basePath, getText(configFile >> "CfgWorlds" >> worldName >> "filePrefix")] call _getTexturePath;
5959
};
6060

61-
if !(_result isEqualType "") then {
62-
diag_log format ["GRAD_Trenches: Type: %1, Position: %2, WorldName: %3, SurfaceType: %4, Texture: %5", (typeof _object), (position _object), worldName, _surfaceType, _result];
63-
_result = DEFAULT_TEXTURE;
64-
};
65-
6661
_result;

‎addons/trenches/functions/fnc_initTrench.sqf

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
*/
1717

1818
params [
19-
["_object", objNull, [objNull]]
19+
["_object", objNull, [objNull]]
2020
];
2121
if (isServer) then {
2222
_object setVariable [QGVAR(progress), 1, true];
2323
};
2424

2525
if (is3DEN) exitWith {
26-
[_object] call FUNC(initTrench3DEN);
26+
[_object] call FUNC(initTrench3DEN);
2727
};
2828

2929
if (local _object) then {
30-
// Has to be spawned to ensure MP compatibility
31-
_object spawn {
32-
private _texture = [_this] call FUNC(getSurfaceTexturePath);
33-
_this setObjectTextureGlobal [0, _texture];
34-
};
30+
// Has to be spawned to ensure MP compatibility
31+
[{
32+
private _texture = [_this select 0] call FUNC(getSurfaceTexturePath);
33+
(_this select 0) setObjectTextureGlobal [0, _texture];
34+
}, [_this]] call CBA_fnc_execNextFrame;
3535
};

‎addons/trenches/functions/fnc_placeConfirm.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ _lbfc params ["", "", "_lbfcZ"];
4949
_rtbc params ["", "", "_rtbcZ"];
5050

5151
private _boundingBoxOffset = missionNamespace getVariable [getText (configFile >> "CfgVehicles" >> _trenchClass >> QGVAR(boundingBoxOffset)),0];
52-
private _posDiff = (abs(_lbfcZ) + abs(_rtbcZ)) - _boundingBoxOffset;
52+
private _posDiff = abs _lbfcZ + abs _rtbcZ - _boundingBoxOffset;
5353
private _newPos = _trench modelToWorldWorld [0,0, -_posDiff];
5454
_trench setPosWorld _newPos;
5555

‎addons/trenches/stringtable.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@
247247
<Russian>Убираю камуфляж окопа...</Russian>
248248
</Key>
249249
<Key ID="STR_ACE_Trenches_EnvelopeGiantName">
250-
<English>Envelope - Giant</English>
251-
<German>Rund - Sehr groß</German>
250+
<English>Trench (Envelope - Giant)</English>
251+
<German>Schützengraben (Rund - Sehr groß)</German>
252252
<Russian>Огромный окоп</Russian>
253253
</Key>
254254
<Key ID="STR_ACE_Trenches_EnvelopeGigantDescription">
@@ -272,8 +272,8 @@
272272
<Russian>Применить камуфляж к этому окопу</Russian>
273273
</Key>
274274
<Key ID="STR_ACE_Trenches_EnvelopeVehicleName">
275-
<English>Envelope - Vehicle</English>
276-
<German>Rund - Fahrzeug</German>
275+
<English>Trench (Envelope - Vehicle)</English>
276+
<German>Schützengraben (Rund - Fahrzeug)</German>
277277
<Russian>Окоп для техники</Russian>
278278
</Key>
279279
<Key ID="STR_ACE_Trenches_EnvelopeVehicleDescription">
@@ -287,8 +287,8 @@
287287
<Russian>Выкопать окоп для техники</Russian>
288288
</Key>
289289
<Key ID="STR_ACE_Trenches_EnvelopeShortName">
290-
<English>Envelope - Short</English>
291-
<German>Rund - Kurz</German>
290+
<English>Trench (Envelope - Short)</English>
291+
<German>Schützengraben (Rund - Kurz)</German>
292292
<Russian>Короткий окоп</Russian>
293293
</Key>
294294
<Key ID="STR_ACE_Trenches_EnvelopeShortDescription">

0 commit comments

Comments
 (0)