X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.h;h=35caceb4946d1f6c4707e506fc8547cbc927055c;hb=36601a5de5f90e16188deadd271b70595b4cc237;hp=d0b0a8a4314627b867fff54ff86037a43d134eb4;hpb=90a18c3aebe9e2478bc9b24bd2d1680e1487cf8f;p=umurmur.git

diff --git a/src/channel.h b/src/channel.h
index d0b0a8a..35caceb 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-2013, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -39,29 +39,47 @@ typedef struct channel {
 	int id;
 	char *name;
 	char *desc;
+	char *password;
 	struct channel *parent;
-	bool_t temporary, noenter;
+	bool_t temporary, noenter, silent;
+	int position;
 	struct dlist node;
 	struct dlist subs;
 	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);
-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