Arma3_Epoch/DayZ-SA-Tomato
1
0
Fork 0
mirror of https://github.com/Tomato-dayZ/DayZ-SA-Tomato.git synced 2024-08-30 16:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copyright offlineMode and Hotfix

Browse Source 
Fix if Admins open the ui it opens for all player (rpc sent bach to everyone not just the admin from the request)
This commit is contained in:
SchnitzelPommes 2018-11-28 00:34:30 +01:00
parent c8a5d121f6
commit e4fed4bcd4
11 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DayZ-Sa-Tomato/Config/Admins.txt
View File

@ -1 +1,3 @@
76561198017833573
76561198134309775
76561198065995341 76561198065995341

BIN
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo
View File

Binary file not shown.

BIN
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo.SchnitzelPommes.bisign
View File

Binary file not shown.

2
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/CommunityOfflineServer.c
View File

@ -3,6 +3,8 @@
Copyright (C) 2018 DayZ-SA-Tomato Copyright (C) 2018 DayZ-SA-Tomato
This file is part of DayZ SA Tomato. This file is part of DayZ SA Tomato.
Originally from DayZCommunityOfflineMode
Link : https://github.com/Arkensor/DayZCommunityOfflineMode
DayZ SA Tomato is free software: you can redistribute it and/or modify DayZ SA Tomato is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/KeyMouseBinding.c
View File

@ -3,6 +3,8 @@
Copyright (C) 2018 DayZ-SA-Tomato Copyright (C) 2018 DayZ-SA-Tomato
This file is part of DayZ SA Tomato. This file is part of DayZ SA Tomato.
Originally from DayZCommunityOfflineMode
Link : https://github.com/Arkensor/DayZCommunityOfflineMode
DayZ SA Tomato is free software: you can redistribute it and/or modify DayZ SA Tomato is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/StaticFunctions.c
View File

@ -3,6 +3,8 @@
Copyright (C) 2018 DayZ-SA-Tomato Copyright (C) 2018 DayZ-SA-Tomato
This file is part of DayZ SA Tomato. This file is part of DayZ SA Tomato.
Originally from DayZCommunityOfflineMode
Link : https://github.com/Arkensor/DayZCommunityOfflineMode
DayZ SA Tomato is free software: you can redistribute it and/or modify DayZ SA Tomato is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

40
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/AdminMenu.c
View File

@ -75,7 +75,7 @@ class AdminMenu //extends UIScriptedMenu
Print("Admin Menu sender name : " + sender.GetName() + "PlainID : " + sender.GetPlainId()); Print("Admin Menu sender name : " + sender.GetName() + "PlainID : " + sender.GetPlainId());
AdminIdentity = Admin.GetIdentity(); AdminIdentity = Admin.GetIdentity();
AdminUID = AdminIdentity.GetPlainId(); AdminUID = AdminIdentity.GetPlainId();
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_OK, new Param1<string>( "Test" ), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_OK, new Param1<string>( "Test" ), false, AdminIdentity );
} }
} }
@ -169,7 +169,7 @@ class AdminMenu //extends UIScriptedMenu
EntityAI oObjp = GetGame().CreateObject( ItemPrev_Item, vector.Zero, false, false ); EntityAI oObjp = GetGame().CreateObject( ItemPrev_Item, vector.Zero, false, false );
//obEditor.addObject( oObj ); //obEditor.addObject( oObj );
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Spawn_ItemPrev_ok, new Param1<EntityAI>( oObjp ), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Spawn_ItemPrev_ok, new Param1<EntityAI>( oObjp ), false, AdminIdentity );
@ -680,12 +680,12 @@ class AdminMenu //extends UIScriptedMenu
{ {
ScriptRPC IsStamina = new ScriptRPC(); ScriptRPC IsStamina = new ScriptRPC();
IsStamina.Write(PlayerName); IsStamina.Write(PlayerName);
IsStamina.Send(NULL, M_RPCs.M_Admin_Menu_Player_Stamina_ok, false, sender); IsStamina.Send(NULL, M_RPCs.M_Admin_Menu_Player_Stamina_ok, false, AdminIdentity);
}else }else
{ {
ScriptRPC IsStamina2 = new ScriptRPC(); ScriptRPC IsStamina2 = new ScriptRPC();
IsStamina2.Write("NULL"); IsStamina2.Write("NULL");
IsStamina2.Send(NULL, M_RPCs.M_Admin_Menu_Player_Stamina_ok, false, sender); IsStamina2.Send(NULL, M_RPCs.M_Admin_Menu_Player_Stamina_ok, false, AdminIdentity);
} }
} }
} }
@ -712,7 +712,7 @@ class AdminMenu //extends UIScriptedMenu
if ( selectedIdentity.GetName() == MSGName ) if ( selectedIdentity.GetName() == MSGName )
{ {
Msgparam = new Param1<string>( MSG ); Msgparam = new Param1<string>( MSG );
GetGame().RPCSingleParam(Admin, ERPCs.RPC_USER_ACTION_MESSAGE, Msgparam, true, sender); GetGame().RPCSingleParam(Admin, ERPCs.RPC_USER_ACTION_MESSAGE, Msgparam, true, AdminIdentity);
} }
} }
} }
@ -772,7 +772,7 @@ class AdminMenu //extends UIScriptedMenu
PPos.Write(health); PPos.Write(health);
PPos.Write(blood); PPos.Write(blood);
PPos.Write(positionP); PPos.Write(positionP);
PPos.Send(NULL, M_RPCs.M_Admin_Menu_Player_Health, false, sender); PPos.Send(NULL, M_RPCs.M_Admin_Menu_Player_Health, false, AdminIdentity);
} }
} }
if ( GetGame().IsClient() && GetGame().IsMultiplayer() ) if ( GetGame().IsClient() && GetGame().IsMultiplayer() )
@ -788,75 +788,75 @@ class AdminMenu //extends UIScriptedMenu
void SendRPC() void SendRPC()
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu, new Param1<vector>( GetCursorPos() ), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu, new Param1<vector>( GetCursorPos() ), false, AdminIdentity );
} }
void SendRPCItem(string item) void SendRPCItem(string item)
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Spawn_Ground, new Param1<string>(item), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Spawn_Ground, new Param1<string>(item), false, AdminIdentity );
} }
void SendRPCHeal() void SendRPCHeal()
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Heal, new Param1<string>(""), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Heal, new Param1<string>(""), false, AdminIdentity );
} }
void SendRPCStrip(string PlayerName) void SendRPCStrip(string PlayerName)
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Strip, new Param1<string>(PlayerName), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Strip, new Param1<string>(PlayerName), false, AdminIdentity );
} }
void SendRPCTpTo(string PlayerName) void SendRPCTpTo(string PlayerName)
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_TpTo, new Param1<string>(PlayerName), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_TpTo, new Param1<string>(PlayerName), false, AdminIdentity );
} }
void SendRPCTpMe(string PlayerName) void SendRPCTpMe(string PlayerName)
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_TpMe, new Param1<string>(PlayerName), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_TpMe, new Param1<string>(PlayerName), false, AdminIdentity );
} }
void SendRPCTpAllMe() void SendRPCTpAllMe()
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_TpAllMe, new Param1<string>(""), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_TpAllMe, new Param1<string>(""), false, AdminIdentity );
} }
void SendRPCSpCar() void SendRPCSpCar()
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Spawn_Car, new Param1<string>(""), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Spawn_Car, new Param1<string>(""), false, AdminIdentity );
} }
void SendRPCDay() void SendRPCDay()
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Day, new Param1<string>(""), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Day, new Param1<string>(""), false, AdminIdentity );
} }
void SendRPCNight() void SendRPCNight()
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Night, new Param1<string>(""), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Night, new Param1<string>(""), false, AdminIdentity );
} }
void SendRPCRefill() void SendRPCRefill()
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Car_Refill, new Param1<string>(""), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Car_Refill, new Param1<string>(""), false, AdminIdentity );
} }
void SendRPCTpToPos(string pos) void SendRPCTpToPos(string pos)
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_TpToPos, new Param1<string>(pos), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_TpToPos, new Param1<string>(pos), false, AdminIdentity );
} }
void SendRPCKill(string PlayerName) void SendRPCKill(string PlayerName)
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Kill, new Param1<string>(PlayerName), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Kill, new Param1<string>(PlayerName), false, AdminIdentity );
} }
void SendRPCSpWear() void SendRPCSpWear()
{ {
GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_SpWear, new Param1<string>(""), false, NULL ); GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_SpWear, new Param1<string>(""), false, AdminIdentity );
} }

2
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/DevCam.c
View File

@ -3,6 +3,8 @@
Copyright (C) 2018 DayZ-SA-Tomato Copyright (C) 2018 DayZ-SA-Tomato
This file is part of DayZ SA Tomato. This file is part of DayZ SA Tomato.
Originally from DayZCommunityOfflineMode
Link : https://github.com/Arkensor/DayZCommunityOfflineMode
DayZ SA Tomato is free software: you can redistribute it and/or modify DayZ SA Tomato is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/DevTeleport.c
View File

@ -3,6 +3,8 @@
Copyright (C) 2018 DayZ-SA-Tomato Copyright (C) 2018 DayZ-SA-Tomato
This file is part of DayZ SA Tomato. This file is part of DayZ SA Tomato.
Originally from DayZCommunityOfflineMode
Link : https://github.com/Arkensor/DayZCommunityOfflineMode
DayZ SA Tomato is free software: you can redistribute it and/or modify DayZ SA Tomato is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

18
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Commands.layout
View File

@ -172,6 +172,24 @@ FrameWidgetClass rootFrame {
text "Teleport (n Key)" text "Teleport (n Key)"
checked 0 checked 0
} }
ButtonWidgetClass btn_Command_Test {
position 152.78999 631.31201
size 378.93399 48
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
text "Test Load Conf"
}
TextWidgetClass Text_Command_Test {
position 573.13898 627.05402
size 342.647 48
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
text "Param"
}
} }
} }
} }

2
DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Main.layout
View File

@ -420,7 +420,7 @@ FrameWidgetClass settings_menu_root {
vexactsize 1 vexactsize 1
priority 1 priority 1
style Normal style Normal
text "Admin Menu" text "DayZ SA Tomato"
font "gui/fonts/sdf_MetronLight72" font "gui/fonts/sdf_MetronLight72"
"text color" 0.8157 0.1255 0.7843 1 "text color" 0.8157 0.1255 0.7843 1
"exact text" 0 "exact text" 0