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

animation state

Browse Source 
added missing var init server side
moved playMoveNow to master loop init and after display checks.
added config switch setAnimStateEnabled to test this, set
setAnimStateEnabled = true in CfgEpochClient to enable. Disabled by
default.
This commit is contained in:
vbawol 2017-10-23 13:43:22 -05:00
parent 31401b5b39
commit 258d6c82d9
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
/*%FSM<HEAD>*/
/*
item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"};
item1[] = {"FINISH",1,250,-149.463196,1518.792480,-49.463196,1568.792480,0.000000,"FINISH"};
item1[] = {"FINISH",1,4346,-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,4314,-150.000000,825.000000,-50.000000,875.000000,0.000000,"Response"};
item16[] = {"Response",4,218,-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,-186.944763,447.567810,1487.860596,515.747681,577,884,1};
window[] = {2,-1,-1,-1,-1,871,104,1088,104,3,595};
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};
*//*%FSM</HEAD>*/
class FSM
{
@ -231,9 +231,7 @@ class FSM
{
name = "FINISH";
itemno = 1;
init = /*%FSM<STATEINIT""">*/"player playMoveNow _animationState;" \n
"" \n
"[] spawn EPOCH_masterLoop;" \n
init = /*%FSM<STATEINIT""">*/"[_animationState] spawn EPOCH_masterLoop;" \n
"" \n
"// fade in sound and screen" \n
"3 fadeSound 1;" \n

2
Sources/epoch_code/compile/functions/EPOCH_giveAttributes.sqf
View File

@ -13,7 +13,7 @@
https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_code/epoch_code/compile/functions/EPOCH_giveAttributes.sqf
Example:
_color = _x call EPOCH_giveAttributes
_text = _x call EPOCH_giveAttributes
Parameter(s):
_this select 0: STRING - Player Stat Name

7
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -2,6 +2,12 @@
// waitUntil {!(isNull (findDisplay 46))};
waitUntil {!isNull (findDisplay 46) && (!isNil "EPOCH_loadingScreenDone")};
// test to set last animation state
params [["_currentAnimationState",""]];
if (["CfgEpochClient", "setAnimStateEnabled", false] call EPOCH_fnc_returnConfigEntryV2) then {
player playMoveNow _currentAnimationState;
};
// load favBar
'load' spawn epoch_favBar_draw;
@ -335,4 +341,3 @@ _EPOCH_BuildTraderMisson = {
_epoch_tradermissionarray = [];
EPOCH_ActiveTraderMission = [];
_LastMissionTrigger = 0;

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

@ -203,8 +203,8 @@ if (!isNull _player) then {
_newPlyr setDir _dir;
_newPlyr setPosATL _location;
//
//init anim state
_currentAnimationState = "";
// set player loadout
if (_schemaVersion >= 1.0) then {