X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.h;h=c092c56b46c9b809ec87c8a3917075a02952af0c;hb=3f354796584346b4ecc6c1cf44bfe1c360c84ef7;hp=3fdd9409282d462f325f92d5179008234789f987;hpb=6a6908d7031a79b5767d86a4da056f65a742ac9f;p=umurmur.git

diff --git a/src/channel.h b/src/channel.h
index 3fdd940..c092c56 100644
--- a/src/channel.h
+++ b/src/channel.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -37,13 +37,16 @@
 
 typedef struct channel {
 	int id;
-	char name[MAX_TEXT];
-	char desc[MAX_TEXT];
+	char *name;
+	char *desc;
 	struct channel *parent;
+	bool_t temporary, noenter;
 	struct dlist node;
 	struct dlist subs;
 	struct dlist clients;
 	struct dlist flatlist_node;
+	struct dlist channel_links;
+	struct dlist link_node;
 } channel_t;
 
 void Chan_init();
@@ -52,10 +55,14 @@ void Chan_addChannel(channel_t *parent, channel_t *sub);
 void Chan_removeChannel(channel_t *c);
 void Chan_addClient(channel_t *c, client_t *client);
 void Chan_removeClient(channel_t *c, client_t *client);
-void Chan_playerJoin(channel_t *ch, client_t *client);
-void Chan_playerJoin_id(int channelid, client_t *client);
-void Chan_iterate(channel_t **channelpptr);
+int Chan_userJoin(channel_t *ch, client_t *client);
+int Chan_userJoin_id(int channelid, client_t *client);
+int Chan_userLeave(client_t *client);
+bool_t Chan_userJoin_id_test(int channelid);
+channel_t *Chan_iterate(channel_t **channelpptr);
+channel_t *Chan_iterate_siblings(channel_t *parent, channel_t **channelpptr);
 channel_t *Chan_createChannel(const char *name, const char *desc);
+channel_t *Chan_fromId(int channelid);
 void Chan_freeChannel(channel_t *ch);
 
 #endif