--- deliantra/server/include/client.h 2007/04/25 18:47:50 1.49 +++ deliantra/server/include/client.h 2007/04/27 02:43:04 1.50 @@ -108,43 +108,6 @@ } }; -struct refitem -{ - object_ptr op; -}; - -// this represents a container on the client side. -// right now, there are only ever two of them: -// the inventory and the floor/open container -//TODO: unused as of yet -struct client_container : vector< refitem, slice_allocator > -{ - client *ns; - enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type; - - bool item_changed; // one of the items in here possibly changed - - // for mapspace and container - int x, y; - maptile *map; - - // for container - object *env; - - client_container (client *ns) - : ns (ns), type (CC_NONE) { } - - tag_t tag () const; - - inline iterator merge_item (iterator i, object *op); - - void clear (); - void update (); - - void set_mapspace (maptile *map, int x, int y); - void set_container (object *env); -}; - /* how many times we are allowed to give the wrong password before being kicked. */ #define MAX_PASSWORD_FAILURES 5 @@ -247,7 +210,6 @@ iow socket_ev; void socket_cb (iow &w, int got); iw cmd_ev; void cmd_cb (iw &w); - client_container cc_inv, cc_other; std::deque< command, slice_allocator > cmd_queue;