mirror of
https://github.com/ddnet/ddnet.git
synced 2024-10-21 08:18:18 +00:00
ebb2e4253d
Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
794 lines
26 KiB
C++
794 lines
26 KiB
C++
#include <base/system.h>
|
|
|
|
#include <engine/shared/config.h>
|
|
#include <engine/storage.h>
|
|
#include <engine/textrender.h>
|
|
|
|
#include <game/client/gameclient.h>
|
|
#include <game/client/ui_listbox.h>
|
|
#include <game/localization.h>
|
|
|
|
#include "menus.h"
|
|
|
|
#include <chrono>
|
|
|
|
using namespace FontIcons;
|
|
using namespace std::chrono_literals;
|
|
|
|
typedef std::function<void()> TMenuAssetScanLoadedFunc;
|
|
|
|
struct SMenuAssetScanUser
|
|
{
|
|
void *m_pUser;
|
|
TMenuAssetScanLoadedFunc m_LoadedFunc;
|
|
};
|
|
|
|
// IDs of the tabs in the Assets menu
|
|
enum
|
|
{
|
|
ASSETS_TAB_ENTITIES = 0,
|
|
ASSETS_TAB_GAME = 1,
|
|
ASSETS_TAB_EMOTICONS = 2,
|
|
ASSETS_TAB_PARTICLES = 3,
|
|
ASSETS_TAB_HUD = 4,
|
|
ASSETS_TAB_EXTRAS = 5,
|
|
NUMBER_OF_ASSETS_TABS = 6,
|
|
};
|
|
|
|
void CMenus::LoadEntities(SCustomEntities *pEntitiesItem, void *pUser)
|
|
{
|
|
auto *pRealUser = (SMenuAssetScanUser *)pUser;
|
|
auto *pThis = (CMenus *)pRealUser->m_pUser;
|
|
|
|
char aBuff[IO_MAX_PATH_LENGTH];
|
|
|
|
if(str_comp(pEntitiesItem->m_aName, "default") == 0)
|
|
{
|
|
for(int i = 0; i < MAP_IMAGE_MOD_TYPE_COUNT; ++i)
|
|
{
|
|
str_format(aBuff, sizeof(aBuff), "editor/entities_clear/%s.png", gs_apModEntitiesNames[i]);
|
|
CImageInfo ImgInfo;
|
|
if(pThis->Graphics()->LoadPNG(&ImgInfo, aBuff, IStorage::TYPE_ALL))
|
|
{
|
|
pEntitiesItem->m_aImages[i].m_Texture = pThis->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, ImgInfo.m_Format, 0);
|
|
pThis->Graphics()->FreePNG(&ImgInfo);
|
|
|
|
if(!pEntitiesItem->m_RenderTexture.IsValid())
|
|
pEntitiesItem->m_RenderTexture = pEntitiesItem->m_aImages[i].m_Texture;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
for(int i = 0; i < MAP_IMAGE_MOD_TYPE_COUNT; ++i)
|
|
{
|
|
str_format(aBuff, sizeof(aBuff), "assets/entities/%s/%s.png", pEntitiesItem->m_aName, gs_apModEntitiesNames[i]);
|
|
CImageInfo ImgInfo;
|
|
if(pThis->Graphics()->LoadPNG(&ImgInfo, aBuff, IStorage::TYPE_ALL))
|
|
{
|
|
pEntitiesItem->m_aImages[i].m_Texture = pThis->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, ImgInfo.m_Format, 0);
|
|
pThis->Graphics()->FreePNG(&ImgInfo);
|
|
|
|
if(!pEntitiesItem->m_RenderTexture.IsValid())
|
|
pEntitiesItem->m_RenderTexture = pEntitiesItem->m_aImages[i].m_Texture;
|
|
}
|
|
else
|
|
{
|
|
str_format(aBuff, sizeof(aBuff), "assets/entities/%s.png", pEntitiesItem->m_aName);
|
|
if(pThis->Graphics()->LoadPNG(&ImgInfo, aBuff, IStorage::TYPE_ALL))
|
|
{
|
|
pEntitiesItem->m_aImages[i].m_Texture = pThis->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, ImgInfo.m_Format, 0);
|
|
pThis->Graphics()->FreePNG(&ImgInfo);
|
|
|
|
if(!pEntitiesItem->m_RenderTexture.IsValid())
|
|
pEntitiesItem->m_RenderTexture = pEntitiesItem->m_aImages[i].m_Texture;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
int CMenus::EntitiesScan(const char *pName, int IsDir, int DirType, void *pUser)
|
|
{
|
|
auto *pRealUser = (SMenuAssetScanUser *)pUser;
|
|
auto *pThis = (CMenus *)pRealUser->m_pUser;
|
|
if(IsDir)
|
|
{
|
|
if(pName[0] == '.')
|
|
return 0;
|
|
|
|
// default is reserved
|
|
if(str_comp(pName, "default") == 0)
|
|
return 0;
|
|
|
|
SCustomEntities EntitiesItem;
|
|
str_copy(EntitiesItem.m_aName, pName);
|
|
CMenus::LoadEntities(&EntitiesItem, pUser);
|
|
pThis->m_vEntitiesList.push_back(EntitiesItem);
|
|
}
|
|
else
|
|
{
|
|
if(str_endswith(pName, ".png"))
|
|
{
|
|
char aName[IO_MAX_PATH_LENGTH];
|
|
str_truncate(aName, sizeof(aName), pName, str_length(pName) - 4);
|
|
// default is reserved
|
|
if(str_comp(aName, "default") == 0)
|
|
return 0;
|
|
|
|
SCustomEntities EntitiesItem;
|
|
str_copy(EntitiesItem.m_aName, aName);
|
|
CMenus::LoadEntities(&EntitiesItem, pUser);
|
|
pThis->m_vEntitiesList.push_back(EntitiesItem);
|
|
}
|
|
}
|
|
|
|
pRealUser->m_LoadedFunc();
|
|
|
|
return 0;
|
|
}
|
|
|
|
template<typename TName>
|
|
static void LoadAsset(TName *pAssetItem, const char *pAssetName, IGraphics *pGraphics, void *pUser)
|
|
{
|
|
char aBuff[IO_MAX_PATH_LENGTH];
|
|
|
|
if(str_comp(pAssetItem->m_aName, "default") == 0)
|
|
{
|
|
str_format(aBuff, sizeof(aBuff), "%s.png", pAssetName);
|
|
CImageInfo ImgInfo;
|
|
if(pGraphics->LoadPNG(&ImgInfo, aBuff, IStorage::TYPE_ALL))
|
|
{
|
|
pAssetItem->m_RenderTexture = pGraphics->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, ImgInfo.m_Format, 0);
|
|
pGraphics->FreePNG(&ImgInfo);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
str_format(aBuff, sizeof(aBuff), "assets/%s/%s.png", pAssetName, pAssetItem->m_aName);
|
|
CImageInfo ImgInfo;
|
|
if(pGraphics->LoadPNG(&ImgInfo, aBuff, IStorage::TYPE_ALL))
|
|
{
|
|
pAssetItem->m_RenderTexture = pGraphics->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, ImgInfo.m_Format, 0);
|
|
pGraphics->FreePNG(&ImgInfo);
|
|
}
|
|
else
|
|
{
|
|
str_format(aBuff, sizeof(aBuff), "assets/%s/%s/%s.png", pAssetName, pAssetItem->m_aName, pAssetName);
|
|
if(pGraphics->LoadPNG(&ImgInfo, aBuff, IStorage::TYPE_ALL))
|
|
{
|
|
pAssetItem->m_RenderTexture = pGraphics->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, ImgInfo.m_Format, 0);
|
|
pGraphics->FreePNG(&ImgInfo);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
template<typename TName>
|
|
static int AssetScan(const char *pName, int IsDir, int DirType, std::vector<TName> &vAssetList, const char *pAssetName, IGraphics *pGraphics, void *pUser)
|
|
{
|
|
auto *pRealUser = (SMenuAssetScanUser *)pUser;
|
|
if(IsDir)
|
|
{
|
|
if(pName[0] == '.')
|
|
return 0;
|
|
|
|
// default is reserved
|
|
if(str_comp(pName, "default") == 0)
|
|
return 0;
|
|
|
|
TName AssetItem;
|
|
str_copy(AssetItem.m_aName, pName);
|
|
LoadAsset(&AssetItem, pAssetName, pGraphics, pUser);
|
|
vAssetList.push_back(AssetItem);
|
|
}
|
|
else
|
|
{
|
|
if(str_endswith(pName, ".png"))
|
|
{
|
|
char aName[IO_MAX_PATH_LENGTH];
|
|
str_truncate(aName, sizeof(aName), pName, str_length(pName) - 4);
|
|
// default is reserved
|
|
if(str_comp(aName, "default") == 0)
|
|
return 0;
|
|
|
|
TName AssetItem;
|
|
str_copy(AssetItem.m_aName, aName);
|
|
LoadAsset(&AssetItem, pAssetName, pGraphics, pUser);
|
|
vAssetList.push_back(AssetItem);
|
|
}
|
|
}
|
|
|
|
pRealUser->m_LoadedFunc();
|
|
|
|
return 0;
|
|
}
|
|
|
|
int CMenus::GameScan(const char *pName, int IsDir, int DirType, void *pUser)
|
|
{
|
|
auto *pRealUser = (SMenuAssetScanUser *)pUser;
|
|
auto *pThis = (CMenus *)pRealUser->m_pUser;
|
|
IGraphics *pGraphics = pThis->Graphics();
|
|
return AssetScan(pName, IsDir, DirType, pThis->m_vGameList, "game", pGraphics, pUser);
|
|
}
|
|
|
|
int CMenus::EmoticonsScan(const char *pName, int IsDir, int DirType, void *pUser)
|
|
{
|
|
auto *pRealUser = (SMenuAssetScanUser *)pUser;
|
|
auto *pThis = (CMenus *)pRealUser->m_pUser;
|
|
IGraphics *pGraphics = pThis->Graphics();
|
|
return AssetScan(pName, IsDir, DirType, pThis->m_vEmoticonList, "emoticons", pGraphics, pUser);
|
|
}
|
|
|
|
int CMenus::ParticlesScan(const char *pName, int IsDir, int DirType, void *pUser)
|
|
{
|
|
auto *pRealUser = (SMenuAssetScanUser *)pUser;
|
|
auto *pThis = (CMenus *)pRealUser->m_pUser;
|
|
IGraphics *pGraphics = pThis->Graphics();
|
|
return AssetScan(pName, IsDir, DirType, pThis->m_vParticlesList, "particles", pGraphics, pUser);
|
|
}
|
|
|
|
int CMenus::HudScan(const char *pName, int IsDir, int DirType, void *pUser)
|
|
{
|
|
auto *pRealUser = (SMenuAssetScanUser *)pUser;
|
|
auto *pThis = (CMenus *)pRealUser->m_pUser;
|
|
IGraphics *pGraphics = pThis->Graphics();
|
|
return AssetScan(pName, IsDir, DirType, pThis->m_vHudList, "hud", pGraphics, pUser);
|
|
}
|
|
|
|
int CMenus::ExtrasScan(const char *pName, int IsDir, int DirType, void *pUser)
|
|
{
|
|
auto *pRealUser = (SMenuAssetScanUser *)pUser;
|
|
auto *pThis = (CMenus *)pRealUser->m_pUser;
|
|
IGraphics *pGraphics = pThis->Graphics();
|
|
return AssetScan(pName, IsDir, DirType, pThis->m_vExtrasList, "extras", pGraphics, pUser);
|
|
}
|
|
|
|
static std::vector<const CMenus::SCustomEntities *> gs_vpSearchEntitiesList;
|
|
static std::vector<const CMenus::SCustomGame *> gs_vpSearchGamesList;
|
|
static std::vector<const CMenus::SCustomEmoticon *> gs_vpSearchEmoticonsList;
|
|
static std::vector<const CMenus::SCustomParticle *> gs_vpSearchParticlesList;
|
|
static std::vector<const CMenus::SCustomHud *> gs_vpSearchHudList;
|
|
static std::vector<const CMenus::SCustomExtras *> gs_vpSearchExtrasList;
|
|
|
|
static bool gs_aInitCustomList[NUMBER_OF_ASSETS_TABS] = {
|
|
true,
|
|
};
|
|
|
|
static size_t gs_aCustomListSize[NUMBER_OF_ASSETS_TABS] = {
|
|
0,
|
|
};
|
|
|
|
static CLineInputBuffered<64> s_aFilterInputs[NUMBER_OF_ASSETS_TABS];
|
|
|
|
static int s_CurCustomTab = ASSETS_TAB_ENTITIES;
|
|
|
|
static const CMenus::SCustomItem *GetCustomItem(int CurTab, size_t Index)
|
|
{
|
|
if(CurTab == ASSETS_TAB_ENTITIES)
|
|
return gs_vpSearchEntitiesList[Index];
|
|
else if(CurTab == ASSETS_TAB_GAME)
|
|
return gs_vpSearchGamesList[Index];
|
|
else if(CurTab == ASSETS_TAB_EMOTICONS)
|
|
return gs_vpSearchEmoticonsList[Index];
|
|
else if(CurTab == ASSETS_TAB_PARTICLES)
|
|
return gs_vpSearchParticlesList[Index];
|
|
else if(CurTab == ASSETS_TAB_HUD)
|
|
return gs_vpSearchHudList[Index];
|
|
else if(CurTab == ASSETS_TAB_EXTRAS)
|
|
return gs_vpSearchExtrasList[Index];
|
|
|
|
return NULL;
|
|
}
|
|
|
|
template<typename TName>
|
|
void ClearAssetList(std::vector<TName> &vList, IGraphics *pGraphics)
|
|
{
|
|
for(size_t i = 0; i < vList.size(); ++i)
|
|
{
|
|
if(vList[i].m_RenderTexture.IsValid())
|
|
pGraphics->UnloadTexture(&(vList[i].m_RenderTexture));
|
|
vList[i].m_RenderTexture = IGraphics::CTextureHandle();
|
|
}
|
|
vList.clear();
|
|
}
|
|
|
|
void CMenus::ClearCustomItems(int CurTab)
|
|
{
|
|
if(CurTab == ASSETS_TAB_ENTITIES)
|
|
{
|
|
for(auto &Entity : m_vEntitiesList)
|
|
{
|
|
for(auto &Image : Entity.m_aImages)
|
|
{
|
|
if(Image.m_Texture.IsValid())
|
|
Graphics()->UnloadTexture(&Image.m_Texture);
|
|
Image.m_Texture = IGraphics::CTextureHandle();
|
|
}
|
|
}
|
|
m_vEntitiesList.clear();
|
|
|
|
// reload current entities
|
|
m_pClient->m_MapImages.ChangeEntitiesPath(g_Config.m_ClAssetsEntites);
|
|
}
|
|
else if(CurTab == ASSETS_TAB_GAME)
|
|
{
|
|
ClearAssetList(m_vGameList, Graphics());
|
|
|
|
// reload current game skin
|
|
GameClient()->LoadGameSkin(g_Config.m_ClAssetGame);
|
|
}
|
|
else if(CurTab == ASSETS_TAB_EMOTICONS)
|
|
{
|
|
ClearAssetList(m_vEmoticonList, Graphics());
|
|
|
|
// reload current emoticons skin
|
|
GameClient()->LoadEmoticonsSkin(g_Config.m_ClAssetEmoticons);
|
|
}
|
|
else if(CurTab == ASSETS_TAB_PARTICLES)
|
|
{
|
|
ClearAssetList(m_vParticlesList, Graphics());
|
|
|
|
// reload current particles skin
|
|
GameClient()->LoadParticlesSkin(g_Config.m_ClAssetParticles);
|
|
}
|
|
else if(CurTab == ASSETS_TAB_HUD)
|
|
{
|
|
ClearAssetList(m_vHudList, Graphics());
|
|
|
|
// reload current hud skin
|
|
GameClient()->LoadHudSkin(g_Config.m_ClAssetHud);
|
|
}
|
|
else if(CurTab == ASSETS_TAB_EXTRAS)
|
|
{
|
|
ClearAssetList(m_vExtrasList, Graphics());
|
|
|
|
// reload current DDNet particles skin
|
|
GameClient()->LoadExtrasSkin(g_Config.m_ClAssetExtras);
|
|
}
|
|
gs_aInitCustomList[CurTab] = true;
|
|
}
|
|
|
|
template<typename TName, typename TCaller>
|
|
void InitAssetList(std::vector<TName> &vAssetList, const char *pAssetPath, const char *pAssetName, FS_LISTDIR_CALLBACK pfnCallback, IGraphics *pGraphics, IStorage *pStorage, TCaller Caller)
|
|
{
|
|
if(vAssetList.empty())
|
|
{
|
|
TName AssetItem;
|
|
str_copy(AssetItem.m_aName, "default");
|
|
LoadAsset(&AssetItem, pAssetName, pGraphics, Caller);
|
|
vAssetList.push_back(AssetItem);
|
|
|
|
// load assets
|
|
pStorage->ListDirectory(IStorage::TYPE_ALL, pAssetPath, pfnCallback, Caller);
|
|
std::sort(vAssetList.begin(), vAssetList.end());
|
|
}
|
|
if(vAssetList.size() != gs_aCustomListSize[s_CurCustomTab])
|
|
gs_aInitCustomList[s_CurCustomTab] = true;
|
|
}
|
|
|
|
template<typename TName>
|
|
int InitSearchList(std::vector<const TName *> &vpSearchList, std::vector<TName> &vAssetList)
|
|
{
|
|
vpSearchList.clear();
|
|
int ListSize = vAssetList.size();
|
|
for(int i = 0; i < ListSize; ++i)
|
|
{
|
|
const TName *pAsset = &vAssetList[i];
|
|
|
|
// filter quick search
|
|
if(!s_aFilterInputs[s_CurCustomTab].IsEmpty() && !str_utf8_find_nocase(pAsset->m_aName, s_aFilterInputs[s_CurCustomTab].GetString()))
|
|
continue;
|
|
|
|
vpSearchList.push_back(pAsset);
|
|
}
|
|
return vAssetList.size();
|
|
}
|
|
|
|
void CMenus::RenderSettingsCustom(CUIRect MainView)
|
|
{
|
|
CUIRect TabBar, CustomList, QuickSearch, QuickSearchClearButton, DirectoryButton, Page1Tab, Page2Tab, Page3Tab, Page4Tab, Page5Tab, Page6Tab, ReloadButton;
|
|
|
|
MainView.HSplitTop(20, &TabBar, &MainView);
|
|
float TabsW = TabBar.w;
|
|
TabBar.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page1Tab, &Page2Tab);
|
|
Page2Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page2Tab, &Page3Tab);
|
|
Page3Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page3Tab, &Page4Tab);
|
|
Page4Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page4Tab, &Page5Tab);
|
|
Page5Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page5Tab, &Page6Tab);
|
|
|
|
static CButtonContainer s_aPageTabs[NUMBER_OF_ASSETS_TABS] = {};
|
|
|
|
if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_ENTITIES], Localize("Entities"), s_CurCustomTab == ASSETS_TAB_ENTITIES, &Page1Tab, IGraphics::CORNER_L, NULL, NULL, NULL, NULL, 4))
|
|
s_CurCustomTab = ASSETS_TAB_ENTITIES;
|
|
if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_GAME], Localize("Game"), s_CurCustomTab == ASSETS_TAB_GAME, &Page2Tab, 0, NULL, NULL, NULL, NULL, 4))
|
|
s_CurCustomTab = ASSETS_TAB_GAME;
|
|
if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_EMOTICONS], Localize("Emoticons"), s_CurCustomTab == ASSETS_TAB_EMOTICONS, &Page3Tab, 0, NULL, NULL, NULL, NULL, 4))
|
|
s_CurCustomTab = ASSETS_TAB_EMOTICONS;
|
|
if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_PARTICLES], Localize("Particles"), s_CurCustomTab == ASSETS_TAB_PARTICLES, &Page4Tab, 0, NULL, NULL, NULL, NULL, 4))
|
|
s_CurCustomTab = ASSETS_TAB_PARTICLES;
|
|
if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_HUD], Localize("HUD"), s_CurCustomTab == ASSETS_TAB_HUD, &Page5Tab, 0, NULL, NULL, NULL, NULL, 4))
|
|
s_CurCustomTab = ASSETS_TAB_HUD;
|
|
if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_EXTRAS], Localize("Extras"), s_CurCustomTab == ASSETS_TAB_EXTRAS, &Page6Tab, IGraphics::CORNER_R, NULL, NULL, NULL, NULL, 4))
|
|
s_CurCustomTab = ASSETS_TAB_EXTRAS;
|
|
|
|
auto LoadStartTime = time_get_nanoseconds();
|
|
SMenuAssetScanUser User;
|
|
User.m_pUser = this;
|
|
User.m_LoadedFunc = [&]() {
|
|
if(time_get_nanoseconds() - LoadStartTime > 500ms)
|
|
RenderLoading(Localize("Loading assets"), "", 0, false);
|
|
};
|
|
if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
|
|
{
|
|
if(m_vEntitiesList.empty())
|
|
{
|
|
SCustomEntities EntitiesItem;
|
|
str_copy(EntitiesItem.m_aName, "default");
|
|
LoadEntities(&EntitiesItem, &User);
|
|
m_vEntitiesList.push_back(EntitiesItem);
|
|
|
|
// load entities
|
|
Storage()->ListDirectory(IStorage::TYPE_ALL, "assets/entities", EntitiesScan, &User);
|
|
std::sort(m_vEntitiesList.begin(), m_vEntitiesList.end());
|
|
}
|
|
if(m_vEntitiesList.size() != gs_aCustomListSize[s_CurCustomTab])
|
|
gs_aInitCustomList[s_CurCustomTab] = true;
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_GAME)
|
|
{
|
|
InitAssetList(m_vGameList, "assets/game", "game", GameScan, Graphics(), Storage(), &User);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
|
|
{
|
|
InitAssetList(m_vEmoticonList, "assets/emoticons", "emoticons", EmoticonsScan, Graphics(), Storage(), &User);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
|
|
{
|
|
InitAssetList(m_vParticlesList, "assets/particles", "particles", ParticlesScan, Graphics(), Storage(), &User);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_HUD)
|
|
{
|
|
InitAssetList(m_vHudList, "assets/hud", "hud", HudScan, Graphics(), Storage(), &User);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
|
|
{
|
|
InitAssetList(m_vExtrasList, "assets/extras", "extras", ExtrasScan, Graphics(), Storage(), &User);
|
|
}
|
|
|
|
MainView.HSplitTop(10.0f, 0, &MainView);
|
|
|
|
// skin selector
|
|
MainView.HSplitTop(MainView.h - 10.0f - ms_ButtonHeight, &CustomList, &MainView);
|
|
if(gs_aInitCustomList[s_CurCustomTab])
|
|
{
|
|
int ListSize = 0;
|
|
if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
|
|
{
|
|
gs_vpSearchEntitiesList.clear();
|
|
ListSize = m_vEntitiesList.size();
|
|
for(int i = 0; i < ListSize; ++i)
|
|
{
|
|
const SCustomEntities *pEntity = &m_vEntitiesList[i];
|
|
|
|
// filter quick search
|
|
if(!s_aFilterInputs[s_CurCustomTab].IsEmpty() && !str_utf8_find_nocase(pEntity->m_aName, s_aFilterInputs[s_CurCustomTab].GetString()))
|
|
continue;
|
|
|
|
gs_vpSearchEntitiesList.push_back(pEntity);
|
|
}
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_GAME)
|
|
{
|
|
ListSize = InitSearchList(gs_vpSearchGamesList, m_vGameList);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
|
|
{
|
|
ListSize = InitSearchList(gs_vpSearchEmoticonsList, m_vEmoticonList);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
|
|
{
|
|
ListSize = InitSearchList(gs_vpSearchParticlesList, m_vParticlesList);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_HUD)
|
|
{
|
|
ListSize = InitSearchList(gs_vpSearchHudList, m_vHudList);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
|
|
{
|
|
ListSize = InitSearchList(gs_vpSearchExtrasList, m_vExtrasList);
|
|
}
|
|
gs_aInitCustomList[s_CurCustomTab] = false;
|
|
gs_aCustomListSize[s_CurCustomTab] = ListSize;
|
|
}
|
|
|
|
int OldSelected = -1;
|
|
float Margin = 10;
|
|
float TextureWidth = 150;
|
|
float TextureHeight = 150;
|
|
|
|
size_t SearchListSize = 0;
|
|
|
|
if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
|
|
{
|
|
SearchListSize = gs_vpSearchEntitiesList.size();
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_GAME)
|
|
{
|
|
SearchListSize = gs_vpSearchGamesList.size();
|
|
TextureHeight = 75;
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
|
|
{
|
|
SearchListSize = gs_vpSearchEmoticonsList.size();
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
|
|
{
|
|
SearchListSize = gs_vpSearchParticlesList.size();
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_HUD)
|
|
{
|
|
SearchListSize = gs_vpSearchHudList.size();
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
|
|
{
|
|
SearchListSize = gs_vpSearchExtrasList.size();
|
|
}
|
|
|
|
static CListBox s_ListBox;
|
|
s_ListBox.DoStart(TextureHeight + 15.0f + 10.0f + Margin, SearchListSize, CustomList.w / (Margin + TextureWidth), 1, OldSelected, &CustomList, false);
|
|
for(size_t i = 0; i < SearchListSize; ++i)
|
|
{
|
|
const SCustomItem *pItem = GetCustomItem(s_CurCustomTab, i);
|
|
if(pItem == NULL)
|
|
continue;
|
|
|
|
if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
|
|
{
|
|
if(str_comp(pItem->m_aName, g_Config.m_ClAssetsEntites) == 0)
|
|
OldSelected = i;
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_GAME)
|
|
{
|
|
if(str_comp(pItem->m_aName, g_Config.m_ClAssetGame) == 0)
|
|
OldSelected = i;
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
|
|
{
|
|
if(str_comp(pItem->m_aName, g_Config.m_ClAssetEmoticons) == 0)
|
|
OldSelected = i;
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
|
|
{
|
|
if(str_comp(pItem->m_aName, g_Config.m_ClAssetParticles) == 0)
|
|
OldSelected = i;
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_HUD)
|
|
{
|
|
if(str_comp(pItem->m_aName, g_Config.m_ClAssetHud) == 0)
|
|
OldSelected = i;
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
|
|
{
|
|
if(str_comp(pItem->m_aName, g_Config.m_ClAssetExtras) == 0)
|
|
OldSelected = i;
|
|
}
|
|
|
|
const CListboxItem Item = s_ListBox.DoNextItem(pItem, OldSelected >= 0 && (size_t)OldSelected == i);
|
|
CUIRect ItemRect = Item.m_Rect;
|
|
ItemRect.Margin(Margin / 2, &ItemRect);
|
|
if(!Item.m_Visible)
|
|
continue;
|
|
|
|
CUIRect TextureRect;
|
|
ItemRect.HSplitTop(15, &ItemRect, &TextureRect);
|
|
TextureRect.HSplitTop(10, NULL, &TextureRect);
|
|
UI()->DoLabel(&ItemRect, pItem->m_aName, ItemRect.h - 2, TEXTALIGN_MC);
|
|
if(pItem->m_RenderTexture.IsValid())
|
|
{
|
|
Graphics()->WrapClamp();
|
|
Graphics()->TextureSet(pItem->m_RenderTexture);
|
|
Graphics()->QuadsBegin();
|
|
Graphics()->SetColor(1, 1, 1, 1);
|
|
IGraphics::CQuadItem QuadItem(TextureRect.x + (TextureRect.w - TextureWidth) / 2, TextureRect.y + (TextureRect.h - TextureHeight) / 2, TextureWidth, TextureHeight);
|
|
Graphics()->QuadsDrawTL(&QuadItem, 1);
|
|
Graphics()->QuadsEnd();
|
|
Graphics()->WrapNormal();
|
|
}
|
|
}
|
|
|
|
const int NewSelected = s_ListBox.DoEnd();
|
|
if(OldSelected != NewSelected)
|
|
{
|
|
if(GetCustomItem(s_CurCustomTab, NewSelected)->m_aName[0] != '\0')
|
|
{
|
|
if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
|
|
{
|
|
str_copy(g_Config.m_ClAssetsEntites, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
|
|
m_pClient->m_MapImages.ChangeEntitiesPath(GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_GAME)
|
|
{
|
|
str_copy(g_Config.m_ClAssetGame, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
|
|
GameClient()->LoadGameSkin(g_Config.m_ClAssetGame);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
|
|
{
|
|
str_copy(g_Config.m_ClAssetEmoticons, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
|
|
GameClient()->LoadEmoticonsSkin(g_Config.m_ClAssetEmoticons);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
|
|
{
|
|
str_copy(g_Config.m_ClAssetParticles, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
|
|
GameClient()->LoadParticlesSkin(g_Config.m_ClAssetParticles);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_HUD)
|
|
{
|
|
str_copy(g_Config.m_ClAssetHud, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
|
|
GameClient()->LoadHudSkin(g_Config.m_ClAssetHud);
|
|
}
|
|
else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
|
|
{
|
|
str_copy(g_Config.m_ClAssetExtras, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
|
|
GameClient()->LoadExtrasSkin(g_Config.m_ClAssetExtras);
|
|
}
|
|
}
|
|
}
|
|
|
|
// render quick search
|
|
{
|
|
MainView.HSplitBottom(ms_ButtonHeight, &MainView, &QuickSearch);
|
|
QuickSearch.VSplitLeft(240.0f, &QuickSearch, &DirectoryButton);
|
|
QuickSearch.HSplitTop(5.0f, 0, &QuickSearch);
|
|
TextRender()->SetCurFont(TextRender()->GetFont(TEXT_FONT_ICON_FONT));
|
|
TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
|
|
|
|
UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
|
|
float wSearch = TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS, -1, -1.0f);
|
|
TextRender()->SetRenderFlags(0);
|
|
TextRender()->SetCurFont(NULL);
|
|
QuickSearch.VSplitLeft(wSearch, 0, &QuickSearch);
|
|
QuickSearch.VSplitLeft(5.0f, 0, &QuickSearch);
|
|
QuickSearch.VSplitLeft(QuickSearch.w - 15.0f, &QuickSearch, &QuickSearchClearButton);
|
|
if(Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
|
|
{
|
|
UI()->SetActiveItem(&s_aFilterInputs[s_CurCustomTab]);
|
|
s_aFilterInputs[s_CurCustomTab].SelectAll();
|
|
}
|
|
s_aFilterInputs[s_CurCustomTab].SetEmptyText(Localize("Search"));
|
|
if(UI()->DoClearableEditBox(&s_aFilterInputs[s_CurCustomTab], &QuickSearch, 14.0f))
|
|
gs_aInitCustomList[s_CurCustomTab] = true;
|
|
}
|
|
|
|
DirectoryButton.HSplitTop(5.0f, 0, &DirectoryButton);
|
|
DirectoryButton.VSplitRight(175.0f, 0, &DirectoryButton);
|
|
DirectoryButton.VSplitRight(25.0f, &DirectoryButton, &ReloadButton);
|
|
DirectoryButton.VSplitRight(10.0f, &DirectoryButton, 0);
|
|
static CButtonContainer s_AssetsDirID;
|
|
if(DoButton_Menu(&s_AssetsDirID, Localize("Assets directory"), 0, &DirectoryButton))
|
|
{
|
|
char aBuf[IO_MAX_PATH_LENGTH];
|
|
char aBufFull[IO_MAX_PATH_LENGTH + 7];
|
|
if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
|
|
str_copy(aBufFull, "assets/entities");
|
|
else if(s_CurCustomTab == ASSETS_TAB_GAME)
|
|
str_copy(aBufFull, "assets/game");
|
|
else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
|
|
str_copy(aBufFull, "assets/emoticons");
|
|
else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
|
|
str_copy(aBufFull, "assets/particles");
|
|
else if(s_CurCustomTab == ASSETS_TAB_HUD)
|
|
str_copy(aBufFull, "assets/hud");
|
|
else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
|
|
str_copy(aBufFull, "assets/extras");
|
|
Storage()->GetCompletePath(IStorage::TYPE_SAVE, aBufFull, aBuf, sizeof(aBuf));
|
|
Storage()->CreateFolder("assets", IStorage::TYPE_SAVE);
|
|
Storage()->CreateFolder(aBufFull, IStorage::TYPE_SAVE);
|
|
if(!open_file(aBuf))
|
|
{
|
|
dbg_msg("menus", "couldn't open file '%s'", aBuf);
|
|
}
|
|
}
|
|
GameClient()->m_Tooltips.DoToolTip(&s_AssetsDirID, &DirectoryButton, Localize("Open the directory to add custom assets"));
|
|
|
|
TextRender()->SetCurFont(TextRender()->GetFont(TEXT_FONT_ICON_FONT));
|
|
TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
|
|
static CButtonContainer s_AssetsReloadBtnID;
|
|
if(DoButton_Menu(&s_AssetsReloadBtnID, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &ReloadButton, nullptr, IGraphics::CORNER_ALL, 5, 0, vec4(1.0f, 1.0f, 1.0f, 0.75f), vec4(1, 1, 1, 0.5f)))
|
|
{
|
|
ClearCustomItems(s_CurCustomTab);
|
|
}
|
|
TextRender()->SetRenderFlags(0);
|
|
TextRender()->SetCurFont(NULL);
|
|
}
|
|
|
|
void CMenus::ConchainAssetsEntities(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
|
|
{
|
|
CMenus *pThis = (CMenus *)pUserData;
|
|
if(pResult->NumArguments() == 1)
|
|
{
|
|
const char *pArg = pResult->GetString(0);
|
|
if(str_comp(pArg, g_Config.m_ClAssetsEntites) != 0)
|
|
{
|
|
pThis->m_pClient->m_MapImages.ChangeEntitiesPath(pArg);
|
|
}
|
|
}
|
|
|
|
pfnCallback(pResult, pCallbackUserData);
|
|
}
|
|
|
|
void CMenus::ConchainAssetGame(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
|
|
{
|
|
CMenus *pThis = (CMenus *)pUserData;
|
|
if(pResult->NumArguments() == 1)
|
|
{
|
|
const char *pArg = pResult->GetString(0);
|
|
if(str_comp(pArg, g_Config.m_ClAssetGame) != 0)
|
|
{
|
|
pThis->GameClient()->LoadGameSkin(pArg);
|
|
}
|
|
}
|
|
|
|
pfnCallback(pResult, pCallbackUserData);
|
|
}
|
|
|
|
void CMenus::ConchainAssetParticles(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
|
|
{
|
|
CMenus *pThis = (CMenus *)pUserData;
|
|
if(pResult->NumArguments() == 1)
|
|
{
|
|
const char *pArg = pResult->GetString(0);
|
|
if(str_comp(pArg, g_Config.m_ClAssetParticles) != 0)
|
|
{
|
|
pThis->GameClient()->LoadParticlesSkin(pArg);
|
|
}
|
|
}
|
|
|
|
pfnCallback(pResult, pCallbackUserData);
|
|
}
|
|
|
|
void CMenus::ConchainAssetEmoticons(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
|
|
{
|
|
CMenus *pThis = (CMenus *)pUserData;
|
|
if(pResult->NumArguments() == 1)
|
|
{
|
|
const char *pArg = pResult->GetString(0);
|
|
if(str_comp(pArg, g_Config.m_ClAssetEmoticons) != 0)
|
|
{
|
|
pThis->GameClient()->LoadEmoticonsSkin(pArg);
|
|
}
|
|
}
|
|
|
|
pfnCallback(pResult, pCallbackUserData);
|
|
}
|
|
|
|
void CMenus::ConchainAssetHud(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
|
|
{
|
|
CMenus *pThis = (CMenus *)pUserData;
|
|
if(pResult->NumArguments() == 1)
|
|
{
|
|
const char *pArg = pResult->GetString(0);
|
|
if(str_comp(pArg, g_Config.m_ClAssetHud) != 0)
|
|
{
|
|
pThis->GameClient()->LoadHudSkin(pArg);
|
|
}
|
|
}
|
|
|
|
pfnCallback(pResult, pCallbackUserData);
|
|
}
|
|
|
|
void CMenus::ConchainAssetExtras(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
|
|
{
|
|
CMenus *pThis = (CMenus *)pUserData;
|
|
if(pResult->NumArguments() == 1)
|
|
{
|
|
const char *pArg = pResult->GetString(0);
|
|
if(str_comp(pArg, g_Config.m_ClAssetExtras) != 0)
|
|
{
|
|
pThis->GameClient()->LoadExtrasSkin(pArg);
|
|
}
|
|
}
|
|
|
|
pfnCallback(pResult, pCallbackUserData);
|
|
}
|