Disabling optimizations because one of them broke the combat asserts in

round 512.
Fixing a sprintf bug in building names
This commit is contained in:
Enno Rehling 2007-03-04 17:52:59 +00:00
parent 07ecc3e517
commit 0f0155fd0c
3 changed files with 5 additions and 4 deletions

View File

@ -489,8 +489,9 @@ get_unitrow(const fighter * af, const side * vs)
b->rowcache.result = get_row(af->side, row, vs);
return b->rowcache.result;
}
#else
return b->rowcache.result;
#else
return get_row(af->side, row, vs);
#endif
}
}

View File

@ -70,7 +70,7 @@ extern "C" {
#ifdef SMALL_BATTLE_MESSAGES
boolean small;
#endif
#define FASTROW
#undef FASTROW
#ifdef FASTROW
struct {
const struct side * as;
@ -80,7 +80,7 @@ extern "C" {
int result;
} rowcache;
#endif
#define FASTCOUNT
#undef FASTCOUNT
#ifdef FASTCOUNT
struct {
struct side * side;

View File

@ -1820,7 +1820,7 @@ buildingname (const building * b)
{
char *ibuf = idbuf[(++nextbuf) % 8];
snprintf(ibuf, sizeof(ibuf), "%s (%s)", strcheck(b->name, NAMESIZE), itoa36(b->no));
snprintf(ibuf, sizeof(name), "%s (%s)", strcheck(b->name, NAMESIZE), itoa36(b->no));
ibuf[sizeof(name)-1] = 0;
return ibuf;
}