diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-29 11:34:49 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-29 11:34:49 +0000 |
| commit | eac9658b7395a45d0b48cad340fd9ccf7bec0fde (patch) | |
| tree | d5bd824038a9b095dd8ea5d9ab4cca88ce1afb0f /src/game/client/gameclient.cpp | |
| parent | 6d44adb7114a0be6ecb1b0fabc6fe69d308cad1c (diff) | |
| download | zcatch-eac9658b7395a45d0b48cad340fd9ccf7bec0fde.tar.gz zcatch-eac9658b7395a45d0b48cad340fd9ccf7bec0fde.zip | |
added voting gui and a lot of other minor changes
Diffstat (limited to 'src/game/client/gameclient.cpp')
| -rw-r--r-- | src/game/client/gameclient.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index e1634706..2696e185 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -24,6 +24,7 @@ #include "components/killmessages.hpp" #include "components/mapimages.hpp" #include "components/maplayers.hpp" +#include "components/maplist.hpp" #include "components/menus.hpp" #include "components/motd.hpp" #include "components/particles.hpp" @@ -62,6 +63,7 @@ static PLAYERS players; static NAMEPLATES nameplates; static ITEMS items; static MAPIMAGES mapimages; +static MAPLIST maplist; static MAPLAYERS maplayers_background(MAPLAYERS::TYPE_BACKGROUND); static MAPLAYERS maplayers_foreground(MAPLAYERS::TYPE_FOREGROUND); @@ -108,6 +110,7 @@ void GAMECLIENT::on_console_init() damageind = &::damageind; mapimages = &::mapimages; voting = &::voting; + maplist = &::maplist; // make a list of all the systems, make sure to add them in the corrent render order all.add(skins); @@ -119,6 +122,7 @@ void GAMECLIENT::on_console_init() all.add(camera); all.add(sounds); all.add(voting); + all.add(maplist); all.add(particles); // doesn't render anything, just updates all the particles all.add(&maplayers_background); // first to render @@ -489,6 +493,8 @@ static void evolve(NETOBJ_CHARACTER *character, int tick) tempcore.world = &tempworld; tempcore.read(character); //tempcore.input.direction = character->wanted_direction; + if(tick-character->tick > 50*3) + dbg_msg("", "%d -> %d = %d", character->tick, tick, tick-character->tick); while(character->tick < tick) { character->tick++; |