X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.h;h=7c4a2995fe7d8226d7add8cec6cf3362ecfb6f5e;hb=76f6cc6fd2eecb29f265226e43408a0d9ad41174;hp=cd916c29ebe59925594ed3f948c31919020c3db8;hpb=3cdeee27cb0c83268f73bfb8a745b0da9dd3f175;p=umurmur.git

diff --git a/src/channel.h b/src/channel.h
index cd916c2..7c4a299 100644
--- a/src/channel.h
+++ b/src/channel.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -39,6 +39,7 @@ typedef struct channel {
 	int id;
 	char *name;
 	char *desc;
+	char *password;
 	struct channel *parent;
 	bool_t temporary, noenter;
 	struct dlist node;
@@ -46,23 +47,38 @@ typedef struct channel {
 	struct dlist clients;
 	struct dlist flatlist_node;
 	struct dlist channel_links;
+	int linkcount;
 	struct dlist link_node;
 } channel_t;
 
+typedef struct {
+	channel_t *chan;
+	struct dlist node;
+} channellist_t;
+
+typedef enum {
+	CHJOIN_OK,
+	CHJOIN_NOENTER,
+	CHJOIN_WRONGPW,
+	CHJOIN_NOTFOUND,
+} channelJoinResult_t;
+	
 void Chan_init();
 void Chan_free();
 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);
-int Chan_playerJoin(channel_t *ch, client_t *client);
-int Chan_playerJoin_id(int channelid, client_t *client);
-int Chan_playerLeave(client_t *client);
-bool_t Chan_playerJoin_id_test(int channelid);
+int Chan_userJoin(channel_t *ch, client_t *client);
+int Chan_userJoin_id(int channelid, client_t *client);
+int Chan_userLeave(client_t *client);
+channelJoinResult_t Chan_userJoin_id_test(int channelid, client_t *client);
 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);
+void Chan_buildTreeList(channel_t *ch, struct dlist *head);
+void Chan_freeTreeList(struct dlist *head);
 
 #endif