summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-30 20:17:55 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-30 20:17:55 +0000
commit9fbf9932e874845247f285e5c1c4f6c15b4cea58 (patch)
tree47939b089708ffc221cc819177f3632e5cdaa543 /src/map/npc.c
parentc6e18085940a91c2656bc6bfeb795693b1fbb3c4 (diff)
downloadhercules-9fbf9932e874845247f285e5c1c4f6c15b4cea58.tar.gz
hercules-9fbf9932e874845247f285e5c1c4f6c15b4cea58.tar.bz2
hercules-9fbf9932e874845247f285e5c1c4f6c15b4cea58.tar.xz
hercules-9fbf9932e874845247f285e5c1c4f6c15b4cea58.zip
- Removed more trailing tabs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 7802ac1f9..8a7a38b05 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -594,7 +594,7 @@ int npc_timerevent_start(struct npc_data* nd, int rid)
else if( nd->u.scr.timerid != INVALID_TIMER )
return 0;
- // Arrange for the next event
+ // Arrange for the next event
ted = ers_alloc(timer_event_ers, struct timer_event_data);
ted->next = j; // Set event index
ted->time = nd->u.scr.timer_event[j].timer;
@@ -696,8 +696,8 @@ void npc_timerevent_quit(struct map_session_data* sd)
old_tick = nd->u.scr.timertick;
old_timer = nd->u.scr.timer;
- nd->u.scr.rid = sd->bl.id;
- nd->u.scr.timertick = gettick();
+ nd->u.scr.rid = sd->bl.id;
+ nd->u.scr.timertick = gettick();
nd->u.scr.timer = ted->time;
//Execute label
@@ -741,7 +741,7 @@ int npc_settimerevent_tick(struct npc_data* nd, int newtimer)
nullpo_ret(nd);
- // TODO: Set player attached timer's tick.
+ // TODO: Set player attached timer's tick.
old_rid = nd->u.scr.rid;
nd->u.scr.rid = 0;
@@ -1738,7 +1738,7 @@ int npc_unload(struct npc_data* nd)
if( nd->subtype == SCRIPT )
{
struct s_mapiterator* iter;
- struct block_list* bl;
+ struct block_list* bl;
ev_db->foreach(ev_db,npc_unload_ev,nd->exname); //Clean up all events related
@@ -3186,7 +3186,7 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con
map[m].flag.leaves=state;
/**
* No longer available, keeping here just in case it's back someday. [Ind]
- **/
+ **/
//else if (!strcmpi(w3,"rain"))
// map[m].flag.rain=state;
else if (!strcmpi(w3,"nightenabled"))