From e83c989677addb0eb333f9917a116549cd147bae Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Wed, 3 Jan 2007 12:01:43 +0000 Subject: - Fixed FIFO defines in TURBO mode. Ref: http://www.eathena.ws/board/index.php?showtopic=129766 The rest of the TURBO related errors are about the HEAD defines having to be at the start of a block because they contain a variable declaration. (i won't fix these) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9611 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/atcommand.c | 4 ++-- src/map/intif.c | 2 +- src/map/map.c | 2 +- src/map/pc.c | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/map') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 41aa7becd..0d595bef3 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -5011,13 +5011,13 @@ int atcommand_kickall( nullpo_retr(-1, sd); pl_allsd = map_getallusers(&users); - + for (i = 0; i < users; i++) { if ((pl_sd = pl_allsd[i]) && pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kick only lower or same gm level if (sd->status.account_id != pl_sd->status.account_id) clif_GM_kick(sd, pl_sd, 0); - } } + } clif_displaymessage(fd, msg_txt(195)); // All players have been kicked! diff --git a/src/map/intif.c b/src/map/intif.c index c89d0c567..54c5bf73a 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -40,7 +40,7 @@ static const int packet_len_table[]={ }; extern int char_fd; // inter serverのfdはchar_fdを使う -#define inter_fd (char_fd) // エイリアス +#define inter_fd char_fd // エイリアス //----------------------------------------------------------------- // inter serverへの送信 diff --git a/src/map/map.c b/src/map/map.c index 1247206ab..1032472cc 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1871,7 +1871,7 @@ static int map_getallpc_sub(DBKey key,void * data,va_list ap) struct map_session_data** map_getallusers(int *users) { static struct map_session_data **all_sd=NULL; static unsigned int all_count = 0; - + if (users == NULL) { //Free up data if (all_sd) aFree(all_sd); diff --git a/src/map/pc.c b/src/map/pc.c index f0eb54ad6..0b2e7a56e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4851,13 +4851,13 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) if(sd->duel_invite > 0) duel_reject(sd->duel_invite, sd); } - + pc_setdead(sd); //Reset ticks. sd->hp_loss_tick = sd->sp_loss_tick = 0; - + pc_setglobalreg(sd,"PC_DIE_COUNTER",++sd->die_counter); - + if (sd->state.event_death){ if(!src) pc_setglobalreg(sd, "killerrid", 0); @@ -4865,7 +4865,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) pc_setglobalreg(sd,"killerrid",src->id); npc_script_event(sd,NPCE_DIE); } - + if ( sd && sd->spiritball && (sd->class_&MAPID_BASEMASK)==MAPID_GUNSLINGER ) // maybe also monks' spiritballs ? pc_delspiritball(sd,sd->spiritball,0); @@ -4900,7 +4900,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) ssd->status.manner -= 5; if(ssd->status.manner < 0) sc_start(src,SC_NOCHAT,100,0,0); - + // PK/Karma system code (not enabled yet) [celest] // originally from Kade Online, so i don't know if any of these is correct ^^; // note: karma is measured REVERSE, so more karma = more 'evil' / less honourable, @@ -4926,7 +4926,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) } break; } - + // PK/Karma system code (not enabled yet) [celest] /* -- cgit v1.2.3-70-g09d2