X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.c;h=4de6490329e73b578c8fa54772fe6053cee9487f;hb=c26a4b9cbad862bce96e3dadcfaa85f7e2223de3;hp=c308dc4d403959ab02ce68bc22ce05c2d8573ba3;hpb=db60a2942eed420d693edea15e1db982184ff03d;p=umurmur.git

diff --git a/src/channel.c b/src/channel.c
index c308dc4..4de6490 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -254,7 +254,7 @@ void Chan_addChannel(channel_t *parent, channel_t *ch)
 }
 
 
-int Chan_playerLeave(client_t *client)
+int Chan_userLeave(client_t *client)
 {
 	channel_t *leaving = NULL;
 	int leaving_id = -1;
@@ -270,20 +270,20 @@ int Chan_playerLeave(client_t *client)
 	return leaving_id;
 }
 
-int Chan_playerJoin(channel_t *ch, client_t *client)
+int Chan_userJoin(channel_t *ch, client_t *client)
 {
 	int leaving_id;
 	
-	Log_debug("Add player %s to channel %s", client->playerName, ch->name); 
+	Log_debug("Add user %s to channel %s", client->username, ch->name); 
 
 	/* Only allowed in one channel at a time */
-	leaving_id = Chan_playerLeave(client);
+	leaving_id = Chan_userLeave(client);
 	list_add_tail(&client->chan_node, &ch->clients);
 	client->channel = (void *)ch;
 	return leaving_id;
 }
 
-int Chan_playerJoin_id(int channelid, client_t *client)
+int Chan_userJoin_id(int channelid, client_t *client)
 {
 	channel_t *ch_itr = NULL;
 	do {
@@ -294,10 +294,10 @@ int Chan_playerJoin_id(int channelid, client_t *client)
 		return -1;
 	}
 	else
-		return Chan_playerJoin(ch_itr, client);	
+		return Chan_userJoin(ch_itr, client);	
 }
 
-bool_t Chan_playerJoin_id_test(int channelid)
+bool_t Chan_userJoin_id_test(int channelid)
 {
 	channel_t *ch_itr = NULL;
 	do {
@@ -342,3 +342,28 @@ void Chan_removeChannel(channel_t *ch)
 {
 	list_del(&ch->node);
 }
+
+void Chan_buildTreeList(channel_t *ch, struct dlist *head)
+{
+	channellist_t *chl;
+	struct dlist *itr;
+	channel_t *sub;
+	
+	chl = malloc(sizeof(channellist_t));
+	chl->chan = ch;
+	init_list_entry(&chl->node);
+	list_add_tail(&chl->node, head);
+
+	list_iterate(itr, &ch->subs) {
+		sub = list_get_entry(itr, channel_t, node);
+		Chan_buildTreeList(sub, head);
+	}
+}
+
+void Chan_freeTreeList(struct dlist *head)
+{
+	struct dlist *itr, *save;
+	list_iterate_safe(itr, save, head) {
+		free(list_get_entry(itr, channellist_t, node));
+	}
+}