diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-08 16:05:20 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-08 16:05:20 +0000 |
| commit | 24f1e9e8b1865f47475d32214bcaa039a79a5df2 (patch) | |
| tree | c63d5930dd96beed7f79674284f3b022bc3ef745 /src/map/npc.c | |
| parent | 80de35a12f4da3003c7e4c8f63bbc72b075baa0f (diff) | |
| download | hercules-24f1e9e8b1865f47475d32214bcaa039a79a5df2.tar.gz hercules-24f1e9e8b1865f47475d32214bcaa039a79a5df2.tar.bz2 hercules-24f1e9e8b1865f47475d32214bcaa039a79a5df2.tar.xz hercules-24f1e9e8b1865f47475d32214bcaa039a79a5df2.zip | |
- Updated some Guild WoE rules to behave as explained here: http://www.eathena.ws/board/index.php?showtopic=146581
- Removed the nosave mapflags from the Guild Castles, as per the previously linked topic.
- Added some missing map_freeblock_lock calls to castend_pos and castend_id functions to prevent (rather unlikely) dangling pointer crashes.
- Improved the debug message when the npc_scriptcont npc IDs don't match.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10187 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 9d12fa2d6..faee6fc10 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1206,10 +1206,9 @@ int npc_scriptcont(struct map_session_data *sd,int id) if( id != sd->npc_id ){ TBL_NPC* nd_sd=(TBL_NPC*)map_id2bl(sd->npc_id); TBL_NPC* nd=(TBL_NPC*)map_id2bl(id); - if( nd_sd && nd ) - ShowWarning("npc_scriptcont: %s (sd->npc_id=%d) is not %s (id=%d).\n", nd_sd->name, sd->npc_id, nd->name, id); - else - ShowDebug("npc_scriptcont: Invalid npc ID, npc_id variable not cleared? %x (sd->npc_id=%d) is not %x (id=%d)\n", (int)nd_sd, sd->npc_id, (int)nd, id); + ShowDebug("npc_scriptcont: %s (sd->npc_id=%d) is not %s (id=%d).\n", + nd_sd?nd_sd->name:"'Unknown NPC'", sd->npc_id, + nd?nd->name:"'Unknown NPC'", id); return 1; } |