Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[StartupMessages] Adapt code to coding guidelines

Browse Source
This commit is contained in:
momo5502 2017-02-06 21:46:57 +01:00
parent a0b21f43a0
commit ddd8cb8b6a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Components/Modules/StartupMessages.cpp
View File

@ -2,9 +2,8 @@
namespace Components namespace Components
{ {
std::list<std::string> startupMessages; int StartupMessages::TotalMessages = -1;
std::list<std::string> StartupMessages::MessageList;
int totalMessages = -1;
StartupMessages::StartupMessages() StartupMessages::StartupMessages()
{ {
@ -17,26 +16,26 @@ namespace Components
UIScript::Add("nextStartupMessage", [](UIScript::Token) UIScript::Add("nextStartupMessage", [](UIScript::Token)
{ {
if (!startupMessages.size()) return; if (!StartupMessages::MessageList.size()) return;
if (totalMessages < 1) if (StartupMessages::TotalMessages < 1)
{ {
totalMessages = startupMessages.size(); StartupMessages::TotalMessages = StartupMessages::MessageList.size();
} }
std::string message = startupMessages.front(); std::string message = StartupMessages::MessageList.front();
startupMessages.pop_front(); StartupMessages::MessageList.pop_front();
Game::Dvar_SetStringByName("ui_startupMessage", message.data()); Game::Dvar_SetStringByName("ui_startupMessage", message.data());
Game::Dvar_SetStringByName("ui_startupMessageTitle", Utils::String::VA("Messages (%d/%d)", totalMessages - startupMessages.size(), totalMessages)); Game::Dvar_SetStringByName("ui_startupMessageTitle", Utils::String::VA("Messages (%d/%d)", StartupMessages::TotalMessages - StartupMessages::MessageList.size(), StartupMessages::TotalMessages));
Game::Dvar_SetStringByName("ui_startupNextButtonText", startupMessages.size() ? "Next" : "Close"); Game::Dvar_SetStringByName("ui_startupNextButtonText", StartupMessages::MessageList.size() ? "Next" : "Close");
Game::Cbuf_AddText(0, "openmenu startup_messages"); Game::Cbuf_AddText(0, "openmenu startup_messages");
}); });
} }
void StartupMessages::AddMessage(std::string message) void StartupMessages::AddMessage(std::string message)
{ {
startupMessages.push_back(message); StartupMessages::MessageList.push_back(message);
} }
} }

4
src/Components/Modules/StartupMessages.hpp
View File

@ -12,5 +12,9 @@ namespace Components
#endif #endif
static void AddMessage(std::string message); static void AddMessage(std::string message);
private:
static int TotalMessages = -1;
static std::list<std::string> MessageList;
}; };
} }