aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-04-29 09:31:06 +0200
committerdec05eba <dec05eba@protonmail.com>2018-04-29 09:31:10 +0200
commite7caed2208893723181892d5e197b924311373fb (patch)
tree1a92cd65f23537eb57b4d80646e84bd359bc0ee2 /src/main.cpp
parentf90a5705bd65a4ebb5edc9df003a383039fec555 (diff)
Improve scaling, start implementing color scheme
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 580b362..dff2328 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@
#include "../include/Video.hpp"
#include "../include/Command.hpp"
#include "../include/Settings.hpp"
+#include "../include/ColorScheme.hpp"
#include <string>
#include <SFML/Graphics.hpp>
#include <cstring>
@@ -280,11 +281,11 @@ int main(int argc, char **argv)
#endif
});
- Command::add("scaling", [](const vector<string> &args)
+ Command::add("scale", [](const vector<string> &args)
{
if(args.size() != 1)
{
- fprintf(stderr, "Expected 1 argument for command scaling, got %u argument(s)\n", args.size());
+ fprintf(stderr, "Expected 1 argument for command scale, got %u argument(s)\n", args.size());
return;
}
@@ -316,7 +317,7 @@ int main(int argc, char **argv)
Channel::getCurrent()->processEvent(event);
}
- window.clear(sf::Color(40, 40, 40));
+ window.clear(ColorScheme::getBackgroundColor());
ChannelSidePanel::draw(window);
Channel::getCurrent()->draw(window, cache);
UsersSidePanel::draw(window);