From 1af58ace5064fdc9ad59f386236df7f1fe911dc5 Mon Sep 17 00:00:00 2001 From: SchnitzelPommes <41128311+SchnitzelPommes@users.noreply.github.com> Date: Tue, 22 Jan 2019 22:45:30 +0100 Subject: [PATCH] Possible Fix for 2. Open of the menu --- DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo | Bin 303872 -> 303962 bytes .../DayZ-SA-Tomato.pbo.SchnitzelPommes.bisign | Bin 568 -> 568 bytes .../FileHandeling/Player/FPPermission.c | 32 ++++++------ .../4_World/FileHandeling/Player/FPPlayer.c | 4 +- .../FileHandeling/Player/PermissionType.c | 2 +- .../scripts/4_World/Modules/FileHandler.c | 4 +- .../5_Mission/core/modules/AdminMenu.c | 46 +++++++++--------- .../5_Mission/core/modules/ChatModule.c | 2 +- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo index bac08975d2653bf19194fc9971b237a18278fe59..b989092c2dfd941a5c9ff551e38962e7e89186cf 100644 GIT binary patch delta 775 zcmYk3e@GKy7{_~`+tz-t>D;EZq-_})%{DiP2rI0{Y<9g8gSL@it43pJ45^6(Q4)ki z{qqWE5LgoHFG+UPOBl=j&-3? z8$VkH8ensD7mL&L2y1jF>pa)YEVPSIxkj((@Np?#5YYRP?2|o-k^0!7l#k6NBMQ8R ziJ{bC1MVoKhi|Y-w^Pcyh@RChgyglMoF4swOq&J6KH7?PMr@a-^CNcT`U&Yiq5QFx z{KlB(v*~;{-*k|@?}T8`D^>myCqMX=r1hGd{Z2gAy5#82YR1bkmtA??+ReIqA z3(tBXq%n>xytT3ejx-jzcyJ#S)pKL7OG0Vkn|}D&=-pz*0DQ!cF0BP2q8;RTH#{Tw z^Q3P<=xtyLv5iN=@W#|&yzMBw?jiKv@)+PP@Z~XGyWe@S@N460b@6)c*rSb=oGw{9 HReJglSYqs% delta 676 zcmYL@QD{<87{@!GUYC~FO|L6%i>uHI)NX2HTdlxKs@cs7A50L2l>{Yoj2gCJtP#W* z72Ef49#$;^+3V;O7cxR$_S8dAMA?W~J!}sV6g07yt{$TU2mb%x|9t=NRF|ET%g&`g zM6Al2n&*+aH(iynLVR*Ab0a&dUTor$i^tCHW9gF1i1%O_Y&Zc)u?ReRW=s~L5iy&| z17a=2dE|XGT?=8zDltv45^;R`f7ST3!M%9fk`&RwvAjQ=Mn?lPTbutV_6{!M=fM>A z$L?Y#>t>%~$4NtApO(NGO{NtW>B0?7#5dY3-V7*s>+~y(#7E6)bTENO;ychbWW$ws z;2&^Pt&_B~@RxSisLC8f-VJdaY0}^StRl+9A>!HT)Ao zSL;O5*E>M5@IqxfeB+WDQqUCzE)ibv!wYtO(E}mwb;I|xx{Tf3t+g=~w(3*6VV?h$ zHhm-jzgkmSSf}TJ7>Vp+2F${R>I`;>-X5 diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo.SchnitzelPommes.bisign b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo.SchnitzelPommes.bisign index 227fa58e498d2006bf593138d3a8ff8f43eff1e9..0c17724fdd5120c471b97a5e14353120d4654fa9 100644 GIT binary patch delta 406 zcmV;H0crlY1h@o{tba*LDxWEoWz5F{jR_!&=-pFoucf)pla}L+h&M~eFImO!{Jcv8 zA%oK5uE=kJP+q%fL5x}L7KCfSUsb6Gu7TW8b?`)=2%B?8Q`;c5xZxbRNFkm#U;SUt zE{+|y z3|JROaVHL@lTQl_WGH%)!|BuAziY-QbL zc~5PU-?NgQ!hd^!(to1&q`=`ufB*mhT)v2-Z(DyZi`AwddiR*gUwySB`GrNkzR&!( z(@{v~m)1KloHCa<2IVJlSh%*wx=#&8_)c?d`Yu>@01NRXx^7mR_e?kB&c)9}$sm%G z3~&ekl-QO96L|>uj$)!@eEO#h!FVlgB**&v89Hs55)W0KI^-Xw8wmK&-N~fL8B^}c A1^@s6 delta 406 zcmV;H0crlY1h@o{tbdFWz7GA|TpLWWasCG~+uI7Mr#F+7108-}pnR`d5m6sncW#Rm zP)jGc!LUh*N0FoeAqxFb#0GDL&H#F2-wsJP{;jvmZ1+;~0fr$gL=h;bG$gLy41cRd zY*`hS59tlo!{Eb@iix~{yzY2}$a?&XN$;>PJ_lvk!wXka5q}Z_0001h0001ml^w$G zc~^WauVQm#o`az1=50N)BO4!lz(&A@=c9m!FJaWy`%hD|z?2{V#LJ~iFduWX36)Df zIg8>NnC+1^&P52rL~=ocX}QMvKFdr!971OsN;FKmSe1e`ym~RFtPVtmq8qN8F_K_J zFWQ;jLy%>Iuzw{}O@>jR_8Nl$fB*mhlzMyvS?3HqQ(XAc{W`QS(wXWF&;7IS5Qd}A zBAZNk3=!JmhV@ZCZ%a{@EUT|M=(Xsw;?~z1e)gNiUd+q&_h0#mnyT}THx8T@Ux4f5 zaS-La@ILHj-Rjp}L?;TQVdk+t!6xT&#Xg$g)@KQ35f9KLY#WXVS=n~qdyK)menB0= AG5`Po diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/FPPermission.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/FPPermission.c index dc4b8d6..ae8753d 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/FPPermission.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/FPPermission.c @@ -18,7 +18,7 @@ class FPPermission ref FPPermission Parent; ref array< ref FPPermission > Children; string Name; - PermissionType Type; + PermissionTypeN Type; void FPPermission( string name, ref FPPermission parent = NULL ) @@ -26,17 +26,17 @@ class FPPermission Name = name; Parent = parent; - Type = PermissionType.DISALLOW; + Type = PermissionTypeN.DISALLOW; if ( Parent == NULL ) { - Type = PermissionType.DISALLOW; + Type = PermissionTypeN.DISALLOW; } Children = new ref array< ref FPPermission >; } - void SetPermissionType(string name, PermissionType type) + void SetPermissionType(string name, PermissionTypeN type) { Print("Permission"); for ( int i = 0; i < Children.Count(); i++ ) @@ -53,33 +53,33 @@ class FPPermission } - void SetPermissionInternal(PermissionType type) + void SetPermissionInternal(PermissionTypeN type) { Print("Type Set"); Type = type; } - void AddPermission( string inp, PermissionType permType = PermissionType.DISALLOW ) + void AddPermission( string inp, PermissionTypeN permType = PermissionTypeN.DISALLOW ) { array tokens = new array; array spaces = new array; inp.Split( " = ", spaces ); - PermissionType type; + PermissionTypeN type; for ( int i = 0; i < spaces.Count(); i++ ) {Print(spaces[i]);} if (spaces.Count() == 2 ) { if ( spaces[1].Contains( "1" ) ) { - type = PermissionType.ALLOW; + type = PermissionTypeN.ALLOW; } else if ( spaces[1].Contains( "0" ) ) { - type = PermissionType.DISALLOW; + type = PermissionTypeN.DISALLOW; } else { - type = PermissionType.DISALLOW; + type = PermissionTypeN.DISALLOW; } spaces[0].Split( "_", tokens ); @@ -120,7 +120,7 @@ class FPPermission if ( nChild == NULL ) { nChild = new FPPermission( name, this ); - nChild.Type = PermissionType.DISALLOW; + nChild.Type = PermissionTypeN.DISALLOW; Children.Insert( nChild ); } @@ -154,7 +154,7 @@ class FPPermission bool parentDisallowed = false; - if ( Type == PermissionType.DISALLOW ) + if ( Type == PermissionTypeN.DISALLOW ) { parentDisallowed = true; } @@ -172,17 +172,17 @@ class FPPermission { bool ifReturnAs = false; - if ( Type == PermissionType.ALLOW ) + if ( Type == PermissionTypeN.ALLOW ) { ifReturnAs = true; } - if ( Type == PermissionType.DISALLOW ) + if ( Type == PermissionTypeN.DISALLOW ) { parentDisallowed = true; } - if ( Type == PermissionType.ALLOW ) + if ( Type == PermissionTypeN.ALLOW ) { parentDisallowed = false; } @@ -247,7 +247,7 @@ class FPPermission } } - private void AddPermissionInternal( array tokens, int depth, PermissionType value ) + private void AddPermissionInternal( array tokens, int depth, PermissionTypeN value ) { if ( depth < tokens.Count() ) { diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/FPPlayer.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/FPPlayer.c index 6a169ef..01a3ae4 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/FPPlayer.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/FPPlayer.c @@ -35,7 +35,7 @@ class FPPlayer } - void SetPermission(string name, PermissionType type) + void SetPermission(string name, PermissionTypeN type) { Print("FPPlayer"); RootPermission.SetPermissionType(name , type) @@ -147,7 +147,7 @@ class FPPlayer return RootPermission.HasPermission( fPPermission ); } - void AddPermission( string fPPermission, PermissionType type = PermissionType.DISALLOW ) + void AddPermission( string fPPermission, PermissionTypeN type = PermissionTypeN.DISALLOW ) { RootPermission.AddPermission( fPPermission, type); } diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/PermissionType.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/PermissionType.c index 03fcdcd..57cd662 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/PermissionType.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/FileHandeling/Player/PermissionType.c @@ -13,7 +13,7 @@ which means this file is under CC BY SA 4.0) http://creativecommons.org/licenses/by-sa/4.0/ Licence. */ -enum PermissionType +enum PermissionTypeN { DISALLOW, ALLOW } \ No newline at end of file diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/Modules/FileHandler.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/Modules/FileHandler.c index da04162..35c45fa 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/Modules/FileHandler.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/Modules/FileHandler.c @@ -68,7 +68,7 @@ class FileHandler // NEW BEGINN - void SetPermission(string perm, PermissionType type, string id) //Identity.GetID() + void SetPermission(string perm, PermissionTypeN type, string id) //Identity.GetID() { Print("FileHandler"); for ( int i = 0; i < FPPlayers.Count(); i++ ) @@ -126,7 +126,7 @@ class FileHandler } } - void RegisterPermission( string fPPermission, PermissionType type = PermissionType.DISALLOW ) + void RegisterPermission( string fPPermission, PermissionTypeN type = PermissionTypeN.DISALLOW ) { RootPermission.AddPermission( fPPermission, type ); } diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/AdminMenu.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/AdminMenu.c index e77231e..98c75cf 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/AdminMenu.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/AdminMenu.c @@ -191,7 +191,7 @@ class AdminMenu //extends UIScriptedMenu { GetGame().ObjectDelete( ObJIs ); status = "Object Deleted !"; - TL().status(sender, status); + // TL().status(sender, status); } } @@ -240,7 +240,7 @@ class AdminMenu //extends UIScriptedMenu return; } oObj.PlaceOnSurface(); - TL().status(sender, GroundN_Item + " Spawned"); + // TL().status(sender, GroundN_Item + " Spawned"); } } @@ -365,7 +365,7 @@ class AdminMenu //extends UIScriptedMenu return; } oCursorObj.PlaceOnSurface(); - TL().status(sender, Cursor_Item + " Spawned"); + // TL().status(sender, Cursor_Item + " Spawned"); } } @@ -398,7 +398,7 @@ class AdminMenu //extends UIScriptedMenu Admin.GetStatDiet().Set(2500); Admin.GetStatSpecialty().Set(1); Admin.SetBleedingBits(0); - TL().status(sender, sender.GetName() + " Healed"); + // TL().status(sender, sender.GetName() + " Healed"); } } break; @@ -420,7 +420,7 @@ class AdminMenu //extends UIScriptedMenu if ( selectedIdentity.GetName() == PlayerName ) { selectedPlayer.RemoveAllItems(); - TL().status(sender, selectedIdentity.GetName() + " Striped"); + // TL().status(sender, selectedIdentity.GetName() + " Striped"); } } } @@ -446,7 +446,7 @@ class AdminMenu //extends UIScriptedMenu if ( selectedIdentity.GetName() == PlayerName ) { Targettpto.SetPosition( AdminPos ); - TL().status(sender, PlayerName + " Teleported"); + // TL().status(sender, PlayerName + " Teleported"); } } } @@ -466,7 +466,7 @@ class AdminMenu //extends UIScriptedMenu if ( players.Get(zm).GetIdentity().GetName() == PlayerName ) { Admin.SetPosition(players.Get(zm).GetPosition()); - TL().status(sender, "Telepported to " + PlayerName); + // TL().status(sender, "Telepported to " + PlayerName); } } } @@ -499,7 +499,7 @@ class AdminMenu //extends UIScriptedMenu ofixPlayerPos = SnapToGround( ofixPlayerPos ); Admin.SetPosition(ofixPlayerPos); - TL().status(sender, "Telepported to " + ofixPlayerPos.ToString(false) ); + // TL().status(sender, "Telepported to " + ofixPlayerPos.ToString(false) ); } } break; @@ -520,7 +520,7 @@ class AdminMenu //extends UIScriptedMenu if ( Admin != NULL) { Admin.SetPosition(reqpos); - TL().status(sender, "Telepported to " + reqpos.ToString(false) ); + // TL().status(sender, "Telepported to " + reqpos.ToString(false) ); } } break; @@ -533,7 +533,7 @@ class AdminMenu //extends UIScriptedMenu { int tpCount = TeleportAllPlayersTo(Admin); string msgc = "All " + tpCount.ToString() + " Players Teleported here"; - TL().status(sender, msgc ); + // TL().status(sender, msgc ); } } break; @@ -564,7 +564,7 @@ class AdminMenu //extends UIScriptedMenu MyNiva.Fill( CarFluid.OIL, MyNiva.GetFluidCapacity( CarFluid.OIL ) ); MyNiva.Fill( CarFluid.BRAKE, MyNiva.GetFluidCapacity( CarFluid.BRAKE ) ); MyNiva.Fill( CarFluid.COOLANT, MyNiva.GetFluidCapacity( CarFluid.COOLANT ) ); - TL().status(sender, "Car spawned and filled" ); + // TL().status(sender, "Car spawned and filled" ); } } @@ -598,7 +598,7 @@ class AdminMenu //extends UIScriptedMenu toBeFilled.Fill( CarFluid.OIL, oilReq ); toBeFilled.Fill( CarFluid.COOLANT, coolantReq ); toBeFilled.Fill( CarFluid.BRAKE, brakeReq ); - TL().status(sender, "Car filled" ); + // TL().status(sender, "Car filled" ); } } } @@ -613,7 +613,7 @@ class AdminMenu //extends UIScriptedMenu { //TODO CHANGEABLE GetGame().GetWorld().SetDate( 1988, 5, 23, 12, 0 ); - TL().status(sender, "Time Set to Day" ); + // TL().status(sender, "Time Set to Day" ); } } break; @@ -625,7 +625,7 @@ class AdminMenu //extends UIScriptedMenu if ( Admin != NULL) { GetGame().GetWorld().SetDate( 1988, 9, 23, 22, 0 ); - TL().status(sender, "Time Set to Night" ); + // TL().status(sender, "Time Set to Night" ); } } break; @@ -644,7 +644,7 @@ class AdminMenu //extends UIScriptedMenu if ( Target.GetIdentity().GetName() == PlayerName ) { Target.SetHealth(0); - TL().status(sender, PlayerName + "Killed" ); + // TL().status(sender, PlayerName + "Killed" ); } } } @@ -664,7 +664,7 @@ class AdminMenu //extends UIScriptedMenu PlayerBase Target1 = PlayerBase.Cast(players.Get(ig1)); Target1.SetHealth(0); } - TL().status(sender, "All Player Killed" ); + // TL().status(sender, "All Player Killed" ); } } break; @@ -695,7 +695,7 @@ class AdminMenu //extends UIScriptedMenu Target2.GetStatSpecialty().Set(1); Target2.SetBleedingBits(0); } - TL().status(sender, "All Player Healed" ); + // TL().status(sender, "All Player Healed" ); } } break; @@ -713,7 +713,7 @@ class AdminMenu //extends UIScriptedMenu PlayerBase Target3 = PlayerBase.Cast(players.Get(ig3)); Target3.RemoveAllItems(); } - TL().status(sender, "All Player Striped" ); + // TL().status(sender, "All Player Striped" ); } } @@ -730,8 +730,8 @@ class AdminMenu //extends UIScriptedMenu Admin = GetServerMission().IsAdminID(sender.GetName(), sender); if ( Admin != NULL) { - GetFileHandler().SetPermission("DisableStamina", PermissionType.DISALLOW, GetPlayerIdentityFromName(PlayerName).GetId()); - TL().status(sender, "Stamina reset Removed for " + PlayerName); + GetFileHandler().SetPermission("DisableStamina", PermissionTypeN.DISALLOW, GetPlayerIdentityFromName(PlayerName).GetId()); + // TL().status(sender, "Stamina reset Removed for " + PlayerName); } } break; @@ -744,8 +744,8 @@ class AdminMenu //extends UIScriptedMenu Admin = GetServerMission().IsAdminID(sender.GetName(), sender); if ( Admin != NULL) { - GetFileHandler().SetPermission("DisableStamina", PermissionType.ALLOW, GetPlayerIdentityFromName(PlayerName).GetId()); - TL().status(sender, "Stamina reset Added for " + PlayerName); + GetFileHandler().SetPermission("DisableStamina", PermissionTypeN.ALLOW, GetPlayerIdentityFromName(PlayerName).GetId()); + // TL().status(sender, "Stamina reset Added for " + PlayerName); } } break; @@ -813,7 +813,7 @@ class AdminMenu //extends UIScriptedMenu { Msgparam = new Param1( MSG ); GetGame().RPCSingleParam(NULL , ERPCs.RPC_USER_ACTION_MESSAGE, Msgparam, true, selectedIdentity); - TL().status(sender, "Message Sent to " + selectedIdentity.GetName()); + // TL().status(sender, "Message Sent to " + selectedIdentity.GetName()); } } } diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/ChatModule.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/ChatModule.c index 74c59d5..edde5c4 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/ChatModule.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/ChatModule.c @@ -66,7 +66,7 @@ class ChatModules { Admin = players.Get(i); AdminIdentity = Admin.GetIdentity(); - GetFileHandler().SetPermission("Admin", PermissionType.ALLOW, AdminIdentity.GetId()); + GetFileHandler().SetPermission("Admin", PermissionTypeN.ALLOW, AdminIdentity.GetId()); GetFileHandler().SetConfigType("Setup", "false"); //TL().player(AdminIdentity, "Admin Set please relog to save Config !"); return;