summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-29 17:54:32 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-29 17:54:32 +0000
commit20990141f99acddc43e09c4090eff120a435719b (patch)
treec5a5106617f3fdb246445d893390b7f5a42005eb /src/map/npc.c
parent856c6ccb9d5d893783e27d7b0d58387276e9f4e8 (diff)
downloadhercules-20990141f99acddc43e09c4090eff120a435719b.tar.gz
hercules-20990141f99acddc43e09c4090eff120a435719b.tar.bz2
hercules-20990141f99acddc43e09c4090eff120a435719b.tar.xz
hercules-20990141f99acddc43e09c4090eff120a435719b.zip
A minor memory improvement, and some curly brace love.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16008 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 23eca70d4..79f338600 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -55,17 +55,15 @@ static int npc_cache_mob=0;
/// Returns a new npc id that isn't being used in id_db.
/// Fatal error if nothing is available.
-int npc_get_new_npc_id(void)
-{
- if( npc_id >= START_NPC_NUM && map_id2bl(npc_id) == NULL )
+int npc_get_new_npc_id(void) {
+ if( npc_id >= START_NPC_NUM && !map_blid_exists(npc_id) )
return npc_id++;// available
- {// find next id
+ else {// find next id
int base_id = npc_id;
- while( base_id != ++npc_id )
- {
+ while( base_id != ++npc_id ) {
if( npc_id < START_NPC_NUM )
npc_id = START_NPC_NUM;
- if( map_id2bl(npc_id) == NULL )
+ if( !map_blid_exists(npc_id) )
return npc_id++;// available
}
// full loop, nothing available
@@ -3578,7 +3576,6 @@ int do_init_npc(void)
npcname_db = strdb_alloc(DB_OPT_BASE,NAME_LENGTH);
timer_event_ers = ers_new(sizeof(struct timer_event_data));
-
// process all npc files
ShowStatus("Loading NPCs...\r");
for( file = npc_src_files; file != NULL; file = file->next )
@@ -3586,7 +3583,6 @@ int do_init_npc(void)
ShowStatus("Loading NPC file: %s"CL_CLL"\r", file->name);
npc_parsesrcfile(file->name);
}
-
ShowInfo ("Done loading '"CL_WHITE"%d"CL_RESET"' NPCs:"CL_CLL"\n"
"\t-'"CL_WHITE"%d"CL_RESET"' Warps\n"
"\t-'"CL_WHITE"%d"CL_RESET"' Shops\n"