diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-24 14:47:03 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-24 14:47:03 +0000 |
| commit | 917ebc17c617dfd27e4e997dce713cb1dfb6cfdc (patch) | |
| tree | 11d85f18ef289de3de322bed5274dc616c23ac45 /src/game/client/components/menus.cpp | |
| parent | 2f28978237f0ead749a39229f1c683df63d34871 (diff) | |
| download | zcatch-917ebc17c617dfd27e4e997dce713cb1dfb6cfdc.tar.gz zcatch-917ebc17c617dfd27e4e997dce713cb1dfb6cfdc.zip | |
begun the work on voting
Diffstat (limited to 'src/game/client/components/menus.cpp')
| -rw-r--r-- | src/game/client/components/menus.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 36bf6378..6c28138d 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -23,6 +23,7 @@ extern "C" { #include <game/generated/gc_data.hpp> #include <game/client/components/binds.hpp> #include <game/client/components/motd.hpp> +#include <game/client/components/voting.hpp> #include <game/client/gameclient.hpp> #include <game/client/animstate.hpp> #include <game/client/gc_render.hpp> @@ -620,8 +621,8 @@ void MENUS::render_news(RECT main_view) void MENUS::render_game(RECT main_view) { - RECT button; - ui_hsplit_t(&main_view, 45.0f, &main_view, 0); + RECT button, votearea; + ui_hsplit_t(&main_view, 45.0f, &main_view, &votearea); ui_draw_rect(&main_view, color_tabbar_active, CORNER_ALL, 10.0f); ui_hsplit_t(&main_view, 10.0f, 0, &main_view); @@ -688,6 +689,23 @@ void MENUS::render_game(RECT main_view) } } } + + ui_hsplit_t(&votearea, 10.0f, 0, &votearea); + ui_hsplit_t(&votearea, 25.0f+10.0f*2, &votearea, 0); + + ui_draw_rect(&votearea, color_tabbar_active, CORNER_ALL, 10.0f); + + ui_vmargin(&votearea, 10.0f, &votearea); + ui_hmargin(&votearea, 10.0f, &votearea); + if(gameclient.voting->is_voting()) + { + + } + else + { + ui_do_label(&votearea, "No vote in progress", 18.0f, -1); + } + } void MENUS::render_serverinfo(RECT main_view) |