diff options
| author | Haru <haru@dotalux.com> | 2014-04-12 04:50:02 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-04-12 04:50:02 +0200 |
| commit | f4a566fc7f7bd0e9bbbe01c7341150ba3c12a03f (patch) | |
| tree | 836b1b59573430c21ea191c4615dbf97cb347bc8 /src/map/npc.c | |
| parent | 6f6a6b3db3b36846f68e6b8ccb59351dced66ab3 (diff) | |
| download | hercules-f4a566fc7f7bd0e9bbbe01c7341150ba3c12a03f.tar.gz hercules-f4a566fc7f7bd0e9bbbe01c7341150ba3c12a03f.tar.bz2 hercules-f4a566fc7f7bd0e9bbbe01c7341150ba3c12a03f.tar.xz hercules-f4a566fc7f7bd0e9bbbe01c7341150ba3c12a03f.zip | |
Fixed some compiler/analyzer warnings.
- Sanitized some macros (they weren't going to cause problems, but
better being safe than sorry)
- Parenthesized an incorrect expression in 6f6a6b3.
- Inverted an if(foo); else bar; statement in 6f6a6b3 to get rid of the
empty expression (for legibility).
- Commented out some unnecessary lines as suggested by clang's static
analyzer.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index f872a6170..ae374e961 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1155,8 +1155,7 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd) // have view ids of mobs to avoid this "issue" [Panikon] if (sd->npc_id != 0) { // The player clicked a npc after entering an OnTouch area - if( sd->areanpc_id == sd->npc_id ); - else + if( sd->areanpc_id != sd->npc_id ) ShowError("npc_click: npc_id != 0\n"); return 1; |