Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "let server handle playMoveNow"

Browse Source 
This reverts commit 06d6a642d1.
This commit is contained in:
vbawol 2017-10-23 11:29:01 -05:00
parent 06d6a642d1
commit e90096c30c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/epoch_code/System/player_login.fsm
View File

@ -2,7 +2,7 @@
/*%FSM<HEAD>*/ /*%FSM<HEAD>*/
/* /*
item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"};
item1[] = {"FINISH",1,4346,-149.463196,1518.792480,-49.463196,1568.792480,0.000000,"FINISH"}; item1[] = {"FINISH",1,250,-149.463196,1518.792480,-49.463196,1568.792480,0.000000,"FINISH"};
item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"};
item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"};
item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"};
@ -17,7 +17,7 @@ item12[] = {"Empty_PlayerUID",4,218,125.000000,125.000000,225.000000,175.000000,
item13[] = {"ERROR_PlayerUID",2,250,275.000000,125.000000,375.000000,175.000000,0.000000,"ERROR" \n "PlayerUID Empty"}; item13[] = {"ERROR_PlayerUID",2,250,275.000000,125.000000,375.000000,175.000000,0.000000,"ERROR" \n "PlayerUID Empty"};
item14[] = {"",7,210,471.000061,145.999908,478.999939,154.000092,0.000000,""}; item14[] = {"",7,210,471.000061,145.999908,478.999939,154.000092,0.000000,""};
item15[] = {"Timeout_No_Respo",4,218,125.000000,875.000000,225.000000,925.000000,0.000000,"Timeout" \n "No Response"}; item15[] = {"Timeout_No_Respo",4,218,125.000000,875.000000,225.000000,925.000000,0.000000,"Timeout" \n "No Response"};
item16[] = {"Response",4,218,-150.000000,825.000000,-50.000000,875.000000,0.000000,"Response"}; item16[] = {"Response",4,4314,-150.000000,825.000000,-50.000000,875.000000,0.000000,"Response"};
item17[] = {"Setup_Player_Var",2,250,-25.000000,1075.000000,75.000000,1125.000000,0.000000,"Setup Player" \n "Variables"}; item17[] = {"Setup_Player_Var",2,250,-25.000000,1075.000000,75.000000,1125.000000,0.000000,"Setup Player" \n "Variables"};
item18[] = {"Request_Hive",2,250,-25.000000,575.000000,75.000000,625.000000,0.000000,"Request Hive"}; item18[] = {"Request_Hive",2,250,-25.000000,575.000000,75.000000,625.000000,0.000000,"Request Hive"};
item19[] = {"Timeout_No_Respo",4,218,125.000000,575.000000,225.000000,625.000000,0.000000,"Timeout" \n "No Response"}; item19[] = {"Timeout_No_Respo",4,218,125.000000,575.000000,225.000000,625.000000,0.000000,"Timeout" \n "No Response"};
@ -183,7 +183,7 @@ link93[] = {82,76};
link94[] = {83,16}; link94[] = {83,16};
link95[] = {83,22}; link95[] = {83,22};
link96[] = {84,31}; link96[] = {84,31};
globals[] = {0.000000,0,0,0,0,640,480,1,247,6316128,1,-186.944763,447.567810,2037.698242,1065.585327,577,884,1}; globals[] = {0.000000,0,0,0,0,640,480,1,247,6316128,1,-186.944763,447.567810,1487.860596,515.747681,577,884,1};
window[] = {2,-1,-1,-1,-1,871,104,1088,104,3,595}; window[] = {2,-1,-1,-1,-1,871,104,1088,104,3,595};
*//*%FSM</HEAD>*/ *//*%FSM</HEAD>*/
class FSM class FSM
@ -231,7 +231,9 @@ class FSM
{ {
name = "FINISH"; name = "FINISH";
itemno = 1; itemno = 1;
init = /*%FSM<STATEINIT""">*/"[] spawn EPOCH_masterLoop;" \n init = /*%FSM<STATEINIT""">*/"player playMoveNow _animationState;" \n
"" \n
"[] spawn EPOCH_masterLoop;" \n
"" \n "" \n
"// fade in sound and screen" \n "// fade in sound and screen" \n
"3 fadeSound 1;" \n "3 fadeSound 1;" \n
@ -1397,6 +1399,7 @@ class FSM
"Epoch_my_Group = _C_SET deleteAt 0;" \n "Epoch_my_Group = _C_SET deleteAt 0;" \n
"_communityStats = _C_SET deleteAt 0;" \n "_communityStats = _C_SET deleteAt 0;" \n
"_hitpoints = _C_SET deleteAt 0;" \n "_hitpoints = _C_SET deleteAt 0;" \n
"_animationState = _C_SET deleteAt 0;" \n
"_extraPayload = _C_SET deleteAt 0;" \n "_extraPayload = _C_SET deleteAt 0;" \n
"" \n "" \n
""/*%FSM</ACTION""">*/; ""/*%FSM</ACTION""">*/;

5
Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
View File

@ -209,9 +209,8 @@ if (!isNull _player) then {
// set player loadout // set player loadout
if (_schemaVersion >= 1.0) then { if (_schemaVersion >= 1.0) then {
_playerData params ["","","_appearance","","","_loadout"]; _playerData params ["","","_appearance","","","_loadout"];
// animate to last known state.
_newPlyr playMoveNow (_appearance param [3,""]);
// get current weapon to send to param for selectWeapon // get current weapon to send to param for selectWeapon
_currentAnimationState = _appearance param [3,""];
_currentWeapon = _appearance param [4,""]; _currentWeapon = _appearance param [4,""];
// _newPlyr setUnitLoadout [_loadout, false]; // _newPlyr setUnitLoadout [_loadout, false];
@ -367,7 +366,7 @@ if (!isNull _player) then {
_newPlyr setVariable["SETUP", true, true]; _newPlyr setVariable["SETUP", true, true];
// Send message to player so they can take over the new body. // Send message to player so they can take over the new body.
[_playerNetID, _playerUID, [_newPlyr, _vars, _currentWeapon, loadAbs _newPlyr, _playerGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken,_playerGroupArray, _communityStats, _hitpoints], _fsmHandle, _player] call EPOCH_server_pushPlayer; [_playerNetID, _playerUID, [_newPlyr, _vars, _currentWeapon, loadAbs _newPlyr, _playerGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken,_playerGroupArray, _communityStats, _hitpoints, _currentAnimationState], _fsmHandle, _player] call EPOCH_server_pushPlayer;
// diag_log str([_playerNetID, _playerUID, _player, [_newPlyr, (_player isEqualTo _newPlyr), _vars, _currentWeapon, loadAbs _newPlyr, _playerGroup, _canBeRevived, [],_playerGroupArray, _communityStats, _hitpoints], _fsmHandle]); // diag_log str([_playerNetID, _playerUID, _player, [_newPlyr, (_player isEqualTo _newPlyr), _vars, _currentWeapon, loadAbs _newPlyr, _playerGroup, _canBeRevived, [],_playerGroupArray, _communityStats, _hitpoints], _fsmHandle]);
// revive test // revive test