summaryrefslogtreecommitdiff
path: root/src/map/mob.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-01-08 19:00:34 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-01-08 19:54:26 -0800
commitf2fd4885c2a906414e0f36acf95d252e5a9d5805 (patch)
tree918bff247135e9223a5126f1b85f4ae4fc9ba1aa /src/map/mob.cpp
parent3e42921c657bc93094f0c7d96855aae9b0be5a7e (diff)
downloadtmwa-f2fd4885c2a906414e0f36acf95d252e5a9d5805.tar.gz
tmwa-f2fd4885c2a906414e0f36acf95d252e5a9d5805.tar.bz2
tmwa-f2fd4885c2a906414e0f36acf95d252e5a9d5805.tar.xz
tmwa-f2fd4885c2a906414e0f36acf95d252e5a9d5805.zip
Improve warning management more
Diffstat (limited to 'src/map/mob.cpp')
-rw-r--r--src/map/mob.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index df739a8..06026de 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -21,10 +21,6 @@
#include "pc.hpp"
#include "skill.hpp"
-#ifndef max
-#define max( a, b ) (((a) > (b)) ? (a) : (b) )
-#endif
-
#define MIN_MOBTHINKTIME 100
#define MOB_LAZYMOVEPERC 50 // Move probability in the negligent mode MOB (rate of 1000 minute)
@@ -4606,7 +4602,8 @@ int mob_readskilldb(void)
{
char *sp[20], *p;
int mob_id;
- struct mob_skill *ms;
+ // always initialized, but clang is not smart enough yet
+ struct mob_skill *ms = nullptr;
int j = 0;
if (line[0] == '/' && line[1] == '/')