Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2015-09-12 19:27:56 +02:00
commit 44dd66f2fb
2 changed files with 3 additions and 1 deletions

View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3
#define VERSION_MINOR 6
#define VERSION_BUILD 2
#define VERSION_BUILD 3

View File

@ -34,6 +34,7 @@
/* util includes */
#include <util/attrib.h>
#include <util/base36.h>
#include <util/log.h>
#include <util/rand.h>
#include <util/rng.h>
@ -887,6 +888,7 @@ int sp_igjarjuk(castorder *co) {
fi = summon_allies(fi, rc, 1);
u = fi->unit;
unit_setname(u, "Igjarjuk");
log_debug("%s calls a wyrm in %s", unitname(fi->unit), regionname(u->region, 0));
return co->level;
}