about summary refs log tree commit diff
path: root/src/game/client/gameclient.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-09-01 05:54:00 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-09-01 05:54:00 +0000
commit9c704c6a0510e9c5f8af8e9c1f810e9688345111 (patch)
treedc8e7598702963ca4d4ff260824c031ed4e66ce3 /src/game/client/gameclient.cpp
parent04eddacd65fd3da680e3d896368cb766b377e6e2 (diff)
downloadzcatch-9c704c6a0510e9c5f8af8e9c1f810e9688345111.tar.gz
zcatch-9c704c6a0510e9c5f8af8e9c1f810e9688345111.zip
added mapimages component
Diffstat (limited to 'src/game/client/gameclient.cpp')
-rw-r--r--src/game/client/gameclient.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index 977b7863..6403873a 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -5,11 +5,9 @@
 
 #include <game/layers.hpp>
 #include "gc_render.hpp"
-#include "gc_map_image.hpp"
 
 #include "gameclient.hpp"
 
-
 #include "components/binds.hpp"
 #include "components/broadcast.hpp"
 #include "components/camera.hpp"
@@ -24,6 +22,7 @@
 #include "components/hud.hpp"
 #include "components/items.hpp"
 #include "components/killmessages.hpp"
+#include "components/mapimages.hpp"
 #include "components/maplayers.hpp"
 #include "components/menus.hpp"
 #include "components/motd.hpp"
@@ -58,6 +57,7 @@ static DAMAGEIND damageind;
 
 static PLAYERS players;
 static ITEMS items;
+static MAPIMAGES mapimages;
 
 static MAPLAYERS maplayers_background(MAPLAYERS::TYPE_BACKGROUND);
 static MAPLAYERS maplayers_foreground(MAPLAYERS::TYPE_FOREGROUND);
@@ -102,9 +102,11 @@ void GAMECLIENT::on_init()
 	sounds = &::sounds;
 	motd = &::motd;
 	damageind = &::damageind;
+	mapimages = &::mapimages;
 	
 	// make a list of all the systems, make sure to add them in the corrent render order
 	all.add(skins);
+	all.add(mapimages);
 	all.add(effects); // doesn't render anything, just updates effects
 	all.add(particles);
 	all.add(binds);
@@ -233,7 +235,6 @@ void GAMECLIENT::on_connected()
 {
 	layers_init();
 	col_init();
-	img_init();
 	render_tilemap_generate_skip();
 		
 	on_reset();