From e90096c30cc0adc27e66b82060e789175b0540fb Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 23 Oct 2017 11:29:01 -0500 Subject: [PATCH] Revert "let server handle playMoveNow" This reverts commit 06d6a642d1f90da4e58e3caf7dabe4a7198f41d7. --- Sources/epoch_code/System/player_login.fsm | 11 +++++++---- .../compile/epoch_player/EPOCH_server_loadPlayer.sqf | 5 ++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Sources/epoch_code/System/player_login.fsm b/Sources/epoch_code/System/player_login.fsm index a0c1804a..ddaca1c3 100644 --- a/Sources/epoch_code/System/player_login.fsm +++ b/Sources/epoch_code/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* 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"}; 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"}; @@ -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"}; 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"}; -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"}; 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"}; @@ -183,7 +183,7 @@ link93[] = {82,76}; link94[] = {83,16}; link95[] = {83,22}; 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}; *//*%FSM*/ class FSM @@ -231,7 +231,9 @@ class FSM { name = "FINISH"; itemno = 1; - init = /*%FSM*/"[] spawn EPOCH_masterLoop;" \n + init = /*%FSM*/"player playMoveNow _animationState;" \n + "" \n + "[] spawn EPOCH_masterLoop;" \n "" \n "// fade in sound and screen" \n "3 fadeSound 1;" \n @@ -1397,6 +1399,7 @@ class FSM "Epoch_my_Group = _C_SET deleteAt 0;" \n "_communityStats = _C_SET deleteAt 0;" \n "_hitpoints = _C_SET deleteAt 0;" \n + "_animationState = _C_SET deleteAt 0;" \n "_extraPayload = _C_SET deleteAt 0;" \n "" \n ""/*%FSM*/; diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index 35077975..d1483845 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -209,9 +209,8 @@ if (!isNull _player) then { // set player loadout if (_schemaVersion >= 1.0) then { _playerData params ["","","_appearance","","","_loadout"]; - // animate to last known state. - _newPlyr playMoveNow (_appearance param [3,""]); // get current weapon to send to param for selectWeapon + _currentAnimationState = _appearance param [3,""]; _currentWeapon = _appearance param [4,""]; // _newPlyr setUnitLoadout [_loadout, false]; @@ -367,7 +366,7 @@ if (!isNull _player) then { _newPlyr setVariable["SETUP", true, true]; // 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]); // revive test