Mercurial > malikania
comparison client/main.cpp @ 153:43a26de57fe7
Client: remove splashscreen state
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 13 Dec 2017 13:46:51 +0100 |
parents | 473e1eb96363 |
children | 4b292c20124c |
comparison
equal
deleted
inserted
replaced
152:16f27d6543bf | 153:43a26de57fe7 |
---|---|
18 | 18 |
19 #include <iostream> | 19 #include <iostream> |
20 | 20 |
21 #include <malikania/client/client.hpp> | 21 #include <malikania/client/client.hpp> |
22 #include <malikania/client/connection.hpp> | 22 #include <malikania/client/connection.hpp> |
23 #include <malikania/client/state/splashscreen_state.hpp> | 23 #include <malikania/client/state/login_state.hpp> |
24 #include <malikania/client/window.hpp> | 24 #include <malikania/client/window.hpp> |
25 | |
26 namespace res { | |
27 | |
28 namespace { | |
29 | |
30 #include <kingthings_spike.hpp> | |
31 | |
32 } // !namespace | |
33 | |
34 } // !res | |
35 | 25 |
36 int main() | 26 int main() |
37 { | 27 { |
38 boost::asio::io_service service; | 28 boost::asio::io_service service; |
39 | 29 |
40 mlk::client::connection conn(service); | 30 mlk::client::connection conn(service); |
41 mlk::client::window w; | 31 mlk::client::window w; |
42 mlk::client::client clt(service, conn, w); | 32 mlk::client::client clt(service, conn, w); |
43 mlk::client::font f(std::string(res::kingthings_spike, sizeof (res::kingthings_spike)), 64); | |
44 | 33 |
45 clt.set_state(std::make_unique<mlk::client::splashscreen_state>(std::move(f), "Malikania Kingdom")); | 34 clt.set_state(std::make_unique<mlk::client::login_state>(clt)); |
46 clt.run(); | 35 clt.run(); |
47 } | 36 } |