Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

Disabling optimizations because one of them broke the combat asserts in

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/kernel/battle.c
View file

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

4
src/common/kernel/battle.h
View file

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

2
src/common/kernel/eressea.c
View file

@ -1820,7 +1820,7 @@ buildingname (const building * b)
{ {
char *ibuf = idbuf[(++nextbuf) % 8]; 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; ibuf[sizeof(name)-1] = 0;
return ibuf; return ibuf;
} }