summaryrefslogtreecommitdiff
path: root/src/map/battleground.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-09-18 17:48:20 +0200
committerHaru <haru@dotalux.com>2015-09-18 17:48:20 +0200
commit58e3177021890543faf6363fcb3326617100571d (patch)
tree15b14edc6937bcb50d5ff98893cc48de02aca99b /src/map/battleground.c
parent442a306a60d4529f5cae70c0a659b4bc31d2f07b (diff)
downloadhercules-58e3177021890543faf6363fcb3326617100571d.tar.gz
hercules-58e3177021890543faf6363fcb3326617100571d.tar.bz2
hercules-58e3177021890543faf6363fcb3326617100571d.tar.xz
hercules-58e3177021890543faf6363fcb3326617100571d.zip
Clarified the intent of several assignments inside conditional expressions
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battleground.c')
-rw-r--r--src/map/battleground.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/battleground.c b/src/map/battleground.c
index e825025a9..a92b3faef 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -501,7 +501,7 @@ void bg_queue_ready_ack (struct bg_arena *arena, struct map_session_data *sd, bo
sd->bg_queue.ready = 1;
for( i = 0; i < queue->size; i++ ) {
- if( queue->item[i] > 0 && ( sd = map->id2sd(queue->item[i]) ) ) {
+ if (queue->item[i] > 0 && (sd = map->id2sd(queue->item[i])) != NULL) {
if( sd->bg_queue.ready == 1 )
count++;
}
@@ -542,7 +542,7 @@ void bg_match_over(struct bg_arena *arena, bool canceled) {
for( i = 0; i < queue->size; i++ ) {
struct map_session_data * sd = NULL;
- if( queue->item[i] > 0 && ( sd = map->id2sd(queue->item[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);
@@ -567,7 +567,7 @@ void bg_begin(struct bg_arena *arena) {
for( i = 0; i < queue->size; i++ ) {
struct map_session_data * sd = NULL;
- if( queue->item[i] > 0 && ( sd = map->id2sd(queue->item[i]) ) ) {
+ if (queue->item[i] > 0 && (sd = map->id2sd(queue->item[i])) != NULL) {
if( sd->bg_queue.ready == 1 )
count++;
else
@@ -594,7 +594,7 @@ void bg_begin(struct bg_arena *arena) {
for( i = 0; i < queue->size; i++ ) {
struct map_session_data * sd = NULL;
- if( queue->item[i] > 0 && ( sd = map->id2sd(queue->item[i]) ) ) {
+ 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),
@@ -653,7 +653,7 @@ void bg_queue_pregame(struct bg_arena *arena) {
for( i = 0; i < queue->size; i++ ) {
struct map_session_data * sd = NULL;
- if( queue->item[i] > 0 && ( sd = map->id2sd(queue->item[i]) ) ) {
+ if (queue->item[i] > 0 && (sd = map->id2sd(queue->item[i])) != NULL) {
clif->bgqueue_battlebegins(sd,arena->id,SELF);
}
}