R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-27 14:39:43 +02:00
parent 7db3e16a97
commit 28ff12272f
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/sdklauncher/basepanel.cpp
View File

@ -449,11 +449,11 @@ void CUIBaseSurface::Init()
this->m_ConsoleListView->SetView(Forms::View::Details);
this->m_ConsoleListView->SetVirtualMode(true);
this->m_ConsoleListView->SetFullRowSelect(true);
this->m_ConsoleGroupExt->AddControl(this->m_ConsoleListView);
this->m_ConsoleListView->Columns.Add({ "index", 40 });
this->m_ConsoleListView->Columns.Add({ "buffer", 387 });
this->m_ConsoleListView->MouseClick += &VirtualItemToClipboard;
this->m_ConsoleListView->RetrieveVirtualItem += &GetVirtualItem;
this->m_ConsoleGroupExt->AddControl(this->m_ConsoleListView);
this->ResumeLayout(false);
this->PerformLayout();

44
r5dev/squirrel/sqinit.cpp
View File

@ -116,8 +116,8 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT GetServerName(HSQUIRRELVM v)
{
int iServerIndex = sq_getinteger(v, 1);
std::string svServerName = g_pBrowser->m_vServerList[iServerIndex].svServerName;
SQInteger iServerIndex = sq_getinteger(v, 1);
string svServerName = g_pBrowser->m_vServerList[iServerIndex].svServerName;
sq_pushstring(v, svServerName.c_str(), -1);
@ -129,8 +129,8 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT GetServerPlaylist(HSQUIRRELVM v)
{
int iServerIndex = sq_getinteger(v, 1);
std::string svServerPlaylist = g_pBrowser->m_vServerList[iServerIndex].svPlaylist;
SQInteger iServerIndex = sq_getinteger(v, 1);
string svServerPlaylist = g_pBrowser->m_vServerList[iServerIndex].svPlaylist;
sq_pushstring(v, svServerPlaylist.c_str(), -1);
@ -142,8 +142,8 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT GetServerMap(HSQUIRRELVM v)
{
int iServerIndex = sq_getinteger(v, 1);
std::string svServerMapName = g_pBrowser->m_vServerList[iServerIndex].svMapName;
SQInteger iServerIndex = sq_getinteger(v, 1);
string svServerMapName = g_pBrowser->m_vServerList[iServerIndex].svMapName;
sq_pushstring(v, svServerMapName.c_str(), -1);
@ -156,7 +156,6 @@ namespace VSquirrel
SQRESULT GetServerCount(HSQUIRRELVM v)
{
g_pBrowser->GetServerList(); // Refresh svListing list.
sq_pushinteger(v, g_pBrowser->m_vServerList.size());
return SQ_OK;
@ -167,7 +166,7 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT GetPromoData(HSQUIRRELVM v)
{
enum class R5RPromoData : int
enum class R5RPromoData : SQInteger
{
PromoLargeTitle,
PromoLargeDesc,
@ -177,9 +176,9 @@ namespace VSquirrel
PromoRightDesc
};
R5RPromoData ePromoIndex = (R5RPromoData)sq_getinteger(v, 1);
R5RPromoData ePromoIndex = static_cast<R5RPromoData>(sq_getinteger(v, 1));
std::string svPromo = std::string();
string svPromo;
switch (ePromoIndex)
{
@ -243,10 +242,10 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT CreateServerFromMenu(HSQUIRRELVM v)
{
std::string svServerName = sq_getstring(v, 1);
std::string svServerMapName = sq_getstring(v, 2);
std::string svServerPlaylist = sq_getstring(v, 3);
EServerVisibility eServerVisibility = (EServerVisibility)sq_getinteger(v, 4);
string svServerName = sq_getstring(v, 1);
string svServerMapName = sq_getstring(v, 2);
string svServerPlaylist = sq_getstring(v, 3);
EServerVisibility eServerVisibility = static_cast<EServerVisibility>(sq_getinteger(v, 4));
if (svServerName.empty() || svServerMapName.empty() || svServerPlaylist.empty())
return SQ_OK;
@ -268,9 +267,8 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT JoinPrivateServerFromMenu(HSQUIRRELVM v)
{
std::string svHiddenServerRequestMessage = std::string();
std::string svToken = sq_getstring(v, 1);
string svHiddenServerRequestMessage;
string svToken = sq_getstring(v, 1);
ServerListing svListing;
bool result = g_pR5net->GetServerByToken(svListing, svHiddenServerRequestMessage, svToken); // Send szToken connect request.
@ -287,22 +285,19 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT GetPrivateServerMessage(HSQUIRRELVM v)
{
std::string svHiddenServerRequestMessage = std::string();
std::string svToken = sq_getstring(v, 1);
string svHiddenServerRequestMessage;
string svToken = sq_getstring(v, 1);
ServerListing serverListing;
bool result = g_pR5net->GetServerByToken(serverListing, svHiddenServerRequestMessage, svToken); // Send szToken connect request.
if (!serverListing.svServerName.empty())
{
svHiddenServerRequestMessage = "Found Server: " + serverListing.svServerName;
sq_pushstring(v, svHiddenServerRequestMessage.c_str(), -1);
}
else
{
svHiddenServerRequestMessage = "Error: Server Not Found";
sq_pushstring(v, svHiddenServerRequestMessage.c_str(), -1);
}
@ -316,14 +311,13 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT ConnectToIPFromMenu(HSQUIRRELVM v)
{
std::string svIpAddr = sq_getstring(v, 1);
std::string svEncKey = sq_getstring(v, 2);
string svIpAddr = sq_getstring(v, 1);
string svEncKey = sq_getstring(v, 2);
if (svIpAddr.empty() || svEncKey.empty())
return SQ_OK;
DevMsg(eDLL_T::UI, "Connecting to server with ip-address '%s' and encryption key '%s'\n", svIpAddr.c_str(), svEncKey.c_str());
g_pBrowser->ConnectToServer(svIpAddr, svEncKey);
return SQ_OK;