Changed struct script_queue::item into a VECTOR and Renamed to ::entries

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 77 insertions, 66 deletions

diff --git a/src/map/battleground.c b/src/map/battleground.c
index 2b7614761..208b4b99f 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -471,24 +471,34 @@ struct bg_arena *bg_name2arena (char *name) {
 	}
 	return NULL;
 }
-int bg_id2pos ( int queue_id, int account_id ) {
+
+/**
+ * Returns a character's position in a battleground's queue.
+ *
+ * @param queue_id   The ID of the battleground's queue.
+ * @param account_id The character's account ID.
+ *
+ * @return the position (starting at 1).
+ * @retval 0 if the queue doesn't exist or the given account ID isn't present in it.
+ */
+int bg_id2pos(int queue_id, int account_id)
+{
 	struct script_queue *queue = script->queue(queue_id);
-	if( queue ) {
-		int i, pos = 1;
-		for(i = 0; i < queue->size; i++ ) {
-			if( queue->item[i] > 0 ) {
-				if( queue->item[i] == account_id ) {
-					return pos;
-				}
-				pos++;
-			}
+	if (queue) {
+		int i;
+		ARR_FIND(0, VECTOR_LENGTH(queue->entries), i, VECTOR_INDEX(queue->entries, i) == account_id);
+		if (i != VECTOR_LENGTH(queue->entries)) {
+			return i+1;
 		}
 	}
 	return 0;
 }
-void bg_queue_ready_ack (struct bg_arena *arena, struct map_session_data *sd, bool response) {
+
+void bg_queue_ready_ack(struct bg_arena *arena, struct map_session_data *sd, bool response)
+{
 	nullpo_retv(arena);
 	nullpo_retv(sd);
+
 	if( arena->begin_timer == INVALID_TIMER || !sd->bg_queue.arena || sd->bg_queue.arena != arena ) {
 		bg->queue_pc_cleanup(sd);
 		return;
@@ -500,14 +510,14 @@ void bg_queue_ready_ack (struct bg_arena *arena, struct map_session_data *sd, bo
 		int i, count = 0;
 		sd->bg_queue.ready = 1;
 
-		for( i = 0; i < queue->size; i++ ) {
-			if (queue->item[i] > 0 && (sd = map->id2sd(queue->item[i])) != NULL) {
-				if( sd->bg_queue.ready == 1 )
-					count++;
-			}
+		for (i = 0; i < VECTOR_LENGTH(queue->entries); i++) {
+			struct map_session_data *tsd = map->id2sd(VECTOR_INDEX(queue->entries, i));
+
+			if (tsd != NULL && tsd->bg_queue.ready == 1)
+				count++;
 		}
 		/* check if all are ready then cancel timer, and start game  */
-		if( count == queue->items ) {
+		if (count == VECTOR_LENGTH(queue->entries)) {
 			timer->delete(arena->begin_timer,bg->begin_timer);
 			arena->begin_timer = INVALID_TIMER;
 			bg->begin(arena);
@@ -539,19 +549,20 @@ void bg_match_over(struct bg_arena *arena, bool canceled) {
 		return;
 	arena->ongoing = false;
 
-	for( i = 0; i < queue->size; i++ ) {
-		struct map_session_data * sd = NULL;
+	for (i = 0; i < VECTOR_LENGTH(queue->entries); i++) {
+		struct map_session_data *sd = map->id2sd(VECTOR_INDEX(queue->entries, i));
 
-		if (queue->item[i] > 0 && (sd = map->id2sd(queue->item[i])) != NULL) {
-			if( sd->bg_queue.arena ) {
-				bg->team_leave(sd, 0);
-				bg->queue_pc_cleanup(sd);
-			}
-			if (canceled)
-				clif->messagecolor_self(sd->fd, COLOR_RED, "BG Match Canceled: not enough players");
-			else
-				pc_setglobalreg(sd, script->add_str(arena->delay_var), (unsigned int)time(NULL));
+		if (sd == NULL)
+			continue;
+
+		if (sd->bg_queue.arena) {
+			bg->team_leave(sd, 0);
+			bg->queue_pc_cleanup(sd);
 		}
+		if (canceled)
+			clif->messagecolor_self(sd->fd, COLOR_RED, "BG Match Canceled: not enough players");
+		else
+			pc_setglobalreg(sd, script->add_str(arena->delay_var), (unsigned int)time(NULL));
 	}
 
 	arena->begin_timer = INVALID_TIMER;
@@ -564,15 +575,16 @@ void bg_begin(struct bg_arena *arena) {
 	int i, count = 0;
 
 	nullpo_retv(arena);
-	for( i = 0; i < queue->size; i++ ) {
-		struct map_session_data * sd = NULL;
+	for (i = 0; i < VECTOR_LENGTH(queue->entries); i++) {
+		struct map_session_data *sd = map->id2sd(VECTOR_INDEX(queue->entries, i));
 
-		if (queue->item[i] > 0 && (sd = map->id2sd(queue->item[i])) != NULL) {
-			if( sd->bg_queue.ready == 1 )
-				count++;
-			else
-				bg->queue_pc_cleanup(sd);
-		}
+		if (sd == NULL)
+			continue;
+
+		if (sd->bg_queue.ready == 1)
+			count++;
+		else
+			bg->queue_pc_cleanup(sd);
 	}
 	/* TODO/FIXME? I *think* it should check what kind of queue the player used, then check if his party/guild
 	 * (his team) still meet the join criteria (sort of what bg->can_queue does)
@@ -591,25 +603,24 @@ void bg_begin(struct bg_arena *arena) {
 		mapreg->setregstr(script->add_str("$@bg_delay_var$"),bg->gdelay_var);
 
 		count = 0;
-		for( i = 0; i < queue->size; i++ ) {
-			struct map_session_data * sd = NULL;
-
-			if (queue->item[i] > 0 && (sd = map->id2sd(queue->item[i])) != NULL) {
-				if( sd->bg_queue.ready == 1 ) {
-					mapreg->setreg(reference_uid(script->add_str("$@bg_member"), count), sd->status.account_id);
-					mapreg->setreg(reference_uid(script->add_str("$@bg_member_group"), count),
-								   sd->bg_queue.type == BGQT_GUILD ? sd->status.guild_id :
-								   sd->bg_queue.type == BGQT_PARTY ? sd->status.party_id :
-								   0
-								   );
-					mapreg->setreg(reference_uid(script->add_str("$@bg_member_type"), count),
-								   sd->bg_queue.type == BGQT_GUILD ? 1 :
-								   sd->bg_queue.type == BGQT_PARTY ? 2 :
-								   0
-								   );
-					count++;
-				}
-			}
+		for (i = 0; i < VECTOR_LENGTH(queue->entries); i++) {
+			struct map_session_data *sd = map->id2sd(VECTOR_INDEX(queue->entries, i));
+
+			if (sd == NULL || sd->bg_queue.ready != 1)
+				continue;
+
+			mapreg->setreg(reference_uid(script->add_str("$@bg_member"), count), sd->status.account_id);
+			mapreg->setreg(reference_uid(script->add_str("$@bg_member_group"), count),
+			               sd->bg_queue.type == BGQT_GUILD ? sd->status.guild_id :
+			               sd->bg_queue.type == BGQT_PARTY ? sd->status.party_id :
+			               0
+			               );
+			mapreg->setreg(reference_uid(script->add_str("$@bg_member_type"), count),
+			               sd->bg_queue.type == BGQT_GUILD ? 1 :
+			               sd->bg_queue.type == BGQT_PARTY ? 2 :
+			               0
+			               );
+			count++;
 		}
 		mapreg->setreg(script->add_str("$@bg_member_size"),count);
 
@@ -650,10 +661,10 @@ void bg_queue_pregame(struct bg_arena *arena) {
 	nullpo_retv(arena);
 
 	queue = script->queue(arena->queue_id);
-	for( i = 0; i < queue->size; i++ ) {
-		struct map_session_data * sd = NULL;
+	for (i = 0; i < VECTOR_LENGTH(queue->entries); i++) {
+		struct map_session_data *sd = map->id2sd(VECTOR_INDEX(queue->entries, i));
 
-		if (queue->item[i] > 0 && (sd = map->id2sd(queue->item[i])) != NULL) {
+		if (sd != NULL) {
 			clif->bgqueue_battlebegins(sd,arena->id,SELF);
 		}
 	}
@@ -671,7 +682,7 @@ void bg_queue_check(struct bg_arena *arena) {
 	nullpo_retv(arena);
 
 	queue = script->queue(arena->queue_id);
-	count = queue->items;
+	count = VECTOR_LENGTH(queue->entries);
 	if( count == arena->max_players ) {
 		if( arena->fillup_timer != INVALID_TIMER ) {
 			timer->delete(arena->fillup_timer,bg->fillup_timer);
@@ -720,7 +731,7 @@ void bg_queue_add(struct map_session_data *sd, struct bg_arena *arena, enum bg_q
 			break;
 	}
 
-	if( !(queue = script->queue(arena->queue_id)) || (queue->items+count) > arena->max_players ) {
+	if( !(queue = script->queue(arena->queue_id)) || (VECTOR_LENGTH(queue->entries)+count) > arena->max_players ) {
 		clif->bgqueue_ack(sd,BGQA_FAIL_PPL_OVERAMOUNT,arena->id);
 		return;
 	}
@@ -731,8 +742,8 @@ void bg_queue_add(struct map_session_data *sd, struct bg_arena *arena, enum bg_q
 			sd->bg_queue.arena = arena;
 			sd->bg_queue.ready = 0;
 			script->queue_add(arena->queue_id,sd->status.account_id);
-			clif->bgqueue_joined(sd, queue->items);
-			clif->bgqueue_update_info(sd,arena->id, queue->items);
+			clif->bgqueue_joined(sd, VECTOR_LENGTH(queue->entries));
+			clif->bgqueue_update_info(sd,arena->id, VECTOR_LENGTH(queue->entries));
 			break;
 		case BGQT_PARTY: {
 			struct party_data *p = party->search(sd->status.party_id);
@@ -742,8 +753,8 @@ void bg_queue_add(struct map_session_data *sd, struct bg_arena *arena, enum bg_q
 				p->data[i].sd->bg_queue.arena = arena;
 				p->data[i].sd->bg_queue.ready = 0;
 				script->queue_add(arena->queue_id,p->data[i].sd->status.account_id);
-				clif->bgqueue_joined(p->data[i].sd, queue->items);
-				clif->bgqueue_update_info(p->data[i].sd,arena->id, queue->items);
+				clif->bgqueue_joined(p->data[i].sd, VECTOR_LENGTH(queue->entries));
+				clif->bgqueue_update_info(p->data[i].sd,arena->id, VECTOR_LENGTH(queue->entries));
 			}
 		}
 			break;
@@ -755,8 +766,8 @@ void bg_queue_add(struct map_session_data *sd, struct bg_arena *arena, enum bg_q
 				sd->guild->member[i].sd->bg_queue.arena = arena;
 				sd->guild->member[i].sd->bg_queue.ready = 0;
 				script->queue_add(arena->queue_id,sd->guild->member[i].sd->status.account_id);
-				clif->bgqueue_joined(sd->guild->member[i].sd, queue->items);
-				clif->bgqueue_update_info(sd->guild->member[i].sd,arena->id, queue->items);
+				clif->bgqueue_joined(sd->guild->member[i].sd, VECTOR_LENGTH(queue->entries));
+				clif->bgqueue_update_info(sd->guild->member[i].sd,arena->id, VECTOR_LENGTH(queue->entries));
 			}
 			break;
 	}