From e0b77e61c882a942953ae208e114375054a41cfe Mon Sep 17 00:00:00 2001
From: Xottab-DUTY <xottab-duty@yandex.ru>
Date: Wed, 10 Oct 2018 22:45:53 +0500
Subject: [PATCH] xrGame/ui_export_script.cpp: fixed compilation
 xrGameSpy/GameSpy_Browser.cpp: fixed mistake

---
 src/xrGame/ui_export_script.cpp   | 25 ++++++++++++++++++-------
 src/xrGameSpy/GameSpy_Browser.cpp |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/xrGame/ui_export_script.cpp b/src/xrGame/ui_export_script.cpp
index e088d455913..a70315baac3 100644
--- a/src/xrGame/ui_export_script.cpp
+++ b/src/xrGame/ui_export_script.cpp
@@ -13,10 +13,17 @@ using namespace luabind;
 
 CMainMenu* MainMenu();
 
-SCRIPT_EXPORT(UIRegistrator, (), {
-    module(luaState)[class_<CGameFont>("CGameFont")
-                         .enum_("EAligment")[value("alLeft", int(CGameFont::alLeft)),
-                             value("alRight", int(CGameFont::alRight)), value("alCenter", int(CGameFont::alCenter))],
+ICF static void UIRegistratorScriptExport(lua_State* luaState)
+{
+    module(luaState)
+    [
+        class_<CGameFont>("CGameFont")
+            .enum_("EAligment")
+            [
+                value("alLeft", int(CGameFont::alLeft)),
+                value("alRight", int(CGameFont::alRight)),
+                value("alCenter", int(CGameFont::alCenter))
+            ],
 
         class_<Patch_Dawnload_Progress>("Patch_Dawnload_Progress")
             .def("GetInProgress", &Patch_Dawnload_Progress::GetInProgress)
@@ -37,6 +44,10 @@ SCRIPT_EXPORT(UIRegistrator, (), {
             .def("GetAccountMngr", &CMainMenu::GetAccountMngr)
             .def("GetProfileStore", &CMainMenu::GetProfileStore)
 #endif
-                  ];
-    module(luaState, "main_menu")[def("get_main_menu", &MainMenu)];
-});
+    ];
+    module(luaState, "main_menu")
+    [
+        def("get_main_menu", &MainMenu)
+    ];
+}
+SCRIPT_EXPORT_FUNC(UIRegistrator, (), UIRegistratorScriptExport)
diff --git a/src/xrGameSpy/GameSpy_Browser.cpp b/src/xrGameSpy/GameSpy_Browser.cpp
index a7ea6f89fd5..86210440b72 100644
--- a/src/xrGameSpy/GameSpy_Browser.cpp
+++ b/src/xrGameSpy/GameSpy_Browser.cpp
@@ -328,7 +328,7 @@ void CGameSpy_Browser::ReadServerInfo(ServerInfo* pServerInfo, void* gsServer)
     {
         PlayerInfo PInfo;
         snprintf(
-            PInfo.Name, "%s", SBServerGetPlayerStringValueA(pServer, i, "player", "Unknown"));
+            PInfo.Name, sizeof(PInfo.Name) - 1, "%s", SBServerGetPlayerStringValueA(pServer, i, "player", "Unknown"));
         PInfo.Name[sizeof(PInfo.Name) - 1] = 0;
         PInfo.Frags = s16(SBServerGetPlayerIntValueA(pServer, i, "score", 0));
         PInfo.Deaths = u16(SBServerGetPlayerIntValueA(pServer, i, "deaths", 0));