Skip to content

Commit

Permalink
Merge pull request #138 from formtapez/fix_teleport
Browse files Browse the repository at this point in the history
fixed teleporting on water
  • Loading branch information
formtapez authored Apr 2, 2021
2 parents 6e63b98 + 908298d commit 2faea96
Show file tree
Hide file tree
Showing 136 changed files with 5 additions and 6 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ if !(isNull _Basis) then
{
(["Basis"] call BIS_fnc_rscLayer) cutText ["Teleport...", "BLACK OUT", 3]; // fade out in black
// beam player
private _TempLogic = "Land_HelipadEmpty_F" createvehicle [(getPos _Basis select 0)-20*sin(random 360),(getPos _Basis select 1)-20*cos(random 360)];
private _TempLogic = "Land_HelipadEmpty_F" createvehicle [(getPos _Basis select 0) - 20 * sin(random 360), (getPos _Basis select 1) - 20 * cos(random 360)];
vehicle player setPosASL (getPosASL _TempLogic vectorAdd [0, 0, 10]);
vehicle player setVectorUp surfaceNormal position _TempLogic;
vehicle player setPosASL (getPosASL _TempLogic vectorAdd [0, 0, 0.2]);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#define MODULE REVIVE
#include "\opt\opt\addons\opt\macros.hpp"

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ openMap true;
// Teleport für Boote auf Wasserhöhe + 0,2m
if (surfaceIsWater _pos) then
{
vehicle player setPosASL [(random 100) - 50, (random 100) - 50, 1000 + random 100];
vehicle player setVectorUp [0,0,1];
vehicle player setPosASL [_pos vectorAdd [0, 0, 0.2]];
vehicle player setPosASL [(random 100) + 1000, (random 100) + 1000, (random 100) + 1000];
vehicle player setVectorUp [0, 0, 1];
vehicle player setPosASL (_pos vectorAdd [0, 0, 0.2]);
}
else
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/OPT/macros.hpp → addons/opt/macros.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define MAJOR 1
#define MINOR 8
#define PATCHLVL 9
#define BUILD 123
#define BUILD 124

#ifdef VERSION
#undef VERSION
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 2faea96

Please sign in to comment.