yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove C++ definitions of some config variables

Browse Source 
The following config variables are no longer accessed by the C++ code
directly:

- cg_lastQuickConnectHost
- cg_playerName (not to be confused with cg_playerNames)

The AngelScript code still uses them, though.
This commit is contained in:
yvt 2017-09-11 21:03:18 +09:00
parent 7d0d8e3704
commit 228f1b1ee5
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Scripts/Gui/CreateProfileScreen.as
View File

@ -28,8 +28,8 @@ namespace spades {
private spades::ui::Field@ nameField; private spades::ui::Field@ nameField;
private spades::ui::Button@ okButton; private spades::ui::Button@ okButton;
private ConfigItem cg_playerName("cg_playerName"); private ConfigItem cg_playerName("cg_playerName", "Deuce");
private ConfigItem cg_playerNameIsSet("cg_playerNameIsSet"); private ConfigItem cg_playerNameIsSet("cg_playerNameIsSet", "0");
CreateProfileScreen(spades::ui::UIElement@ owner) { CreateProfileScreen(spades::ui::UIElement@ owner) {
super(owner.Manager); super(owner.Manager);

2
Resources/Scripts/Gui/MainScreen.as
View File

@ -360,7 +360,7 @@ namespace spades {
bool loading = false, loaded = false; bool loading = false, loaded = false;
private ConfigItem cg_protocolVersion("cg_protocolVersion", "3"); private ConfigItem cg_protocolVersion("cg_protocolVersion", "3");
private ConfigItem cg_lastQuickConnectHost("cg_lastQuickConnectHost"); private ConfigItem cg_lastQuickConnectHost("cg_lastQuickConnectHost", "127.0.0.1");
private ConfigItem cg_serverlistSort("cg_serverlistSort", "16385"); private ConfigItem cg_serverlistSort("cg_serverlistSort", "16385");
MainScreenMainMenu(MainScreenUI@ ui) { MainScreenMainMenu(MainScreenUI@ ui) {

4
Sources/Gui/MainScreen.cpp
View File

@ -23,14 +23,10 @@
#include <Client/Client.h> #include <Client/Client.h>
#include <Client/Fonts.h> #include <Client/Fonts.h>
#include <Core/Exception.h> #include <Core/Exception.h>
#include <Core/Settings.h>
#include <Core/Strings.h> #include <Core/Strings.h>
#include <ScriptBindings/Config.h> #include <ScriptBindings/Config.h>
#include <ScriptBindings/ScriptFunction.h> #include <ScriptBindings/ScriptFunction.h>
DEFINE_SPADES_SETTING(cg_lastQuickConnectHost, "127.0.0.1");
DEFINE_SPADES_SETTING(cg_playerName, "Deuce");
namespace spades { namespace spades {
namespace gui { namespace gui {
MainScreen::MainScreen(client::IRenderer *r, client::IAudioDevice *a, MainScreen::MainScreen(client::IRenderer *r, client::IAudioDevice *a,