diff --git a/Sources/epoch_code/System/player_login.fsm b/Sources/epoch_code/System/player_login.fsm index fecfacc7..ab8b8db5 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,8 +183,8 @@ 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,-291.956604,552.579529,1648.745117,354.863007,577,884,1}; -window[] = {2,-1,-1,-1,-1,923,156,1140,156,3,595}; +globals[] = {0.000000,0,0,0,0,640,480,1,247,6316128,1,-279.414825,540.037537,1629.530029,374.077881,577,884,1}; +window[] = {2,-1,-1,-1,-1,819,52,1036,52,3,595}; *//*%FSM*/ class FSM { @@ -231,7 +231,7 @@ class FSM { name = "FINISH"; itemno = 1; - init = /*%FSM*/"[_animationState] spawn EPOCH_masterLoop;" \n + init = /*%FSM*/"[] spawn EPOCH_masterLoop;" \n "" \n "// fade in sound and screen" \n "3 fadeSound 1;" \n @@ -1397,7 +1397,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 + "" \n "_extraPayload = _C_SET deleteAt 0;" \n "" \n ""/*%FSM*/; diff --git a/Sources/epoch_code/compile/setup/EPOCH_masterLoop.sqf b/Sources/epoch_code/compile/setup/EPOCH_masterLoop.sqf index c7df0a34..88fb13c6 100644 --- a/Sources/epoch_code/compile/setup/EPOCH_masterLoop.sqf +++ b/Sources/epoch_code/compile/setup/EPOCH_masterLoop.sqf @@ -22,7 +22,6 @@ NOTHING */ disableSerialization; -params [["_currentAnimationState",""]]; _config = 'CfgMasterLoop' call EPOCH_returnConfig; _build_sqf = preprocessFile getText (_config >> "Init" >> "file"); _configs = "true" configClasses (_config >> "Events"); diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf index de9673ae..2687dafe 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf @@ -1,12 +1,6 @@ // make sure we wait for Display #46 -// waitUntil {!(isNull (findDisplay 46))}; waitUntil {!isNull (findDisplay 46) && (!isNil "EPOCH_loadingScreenDone")}; -// test to set last animation state -if (["CfgEpochClient", "setAnimStateEnabled", false] call EPOCH_fnc_returnConfigEntryV2) then { - player playMoveNow _currentAnimationState; -}; - // load favBar 'load' spawn epoch_favBar_draw; 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 d59beb27..d8f6adc6 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -203,14 +203,10 @@ if (!isNull _player) then { _newPlyr setDir _dir; _newPlyr setPosATL _location; - //init anim state - _currentAnimationState = ""; - // set player loadout if (_schemaVersion >= 1.0) then { _playerData params ["","","_appearance","","","_loadout"]; // get current weapon to send to param for selectWeapon - _currentAnimationState = _appearance param [3,""]; _currentWeapon = _appearance param [4,""]; // _newPlyr setUnitLoadout [_loadout, false]; @@ -366,7 +362,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, _currentAnimationState], _fsmHandle, _player] call EPOCH_server_pushPlayer; + [_playerNetID, _playerUID, [_newPlyr, _vars, _currentWeapon, loadAbs _newPlyr, _playerGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken,_playerGroupArray, _communityStats, _hitpoints], _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 diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf index f9a56215..165db39a 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf @@ -87,7 +87,7 @@ if (_allowSave) then{ _medical = [getBleedingRemaining _player, 0, getOxygenRemaining _player, damage _player, _hitpoints]; // appearance now handled with getUnitLoadout, typeof is still needed to determine players class. - _appearance = ["", "", "", animationState _player, currentWeapon _player, typeOf _player]; + _appearance = ["", "", "", "", currentWeapon _player, typeOf _player]; // new save format _loadout = getUnitLoadout _player;