empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop useless checks for player->aborted in draw_map()

Browse source 
player->aborted gets set when we get an interrupt or EOF cookie from
the player, when update or shutdown abort commands, and when we abort
an attack (not relevant here).

The checks are useless: player interrupt and EOF are checked
elsewhere, and update/shutdown can run only when we yield the
processor, which we never do (output doesn't yield because C_MOD is
set).
This commit is contained in:
Markus Armbruster 2011-04-09 15:36:40 +02:00
parent 2f86e79e80
commit 5230ea8de4
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/subs/maps.c
View file

@ -193,19 +193,19 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
CANT_REACH(); CANT_REACH();
/* fall through */ /* fall through */
case 'b': case 'b':
while (bmnxtsct(nsp) && !player->aborted) { while (bmnxtsct(nsp)) {
if (0 != (c = player->bmap[nsp->id])) if (0 != (c = player->bmap[nsp->id]))
wmap[nsp->dy][nsp->dx] = c; wmap[nsp->dy][nsp->dx] = c;
} }
break; break;
case 't': case 't':
while (bmnxtsct(nsp) && !player->aborted) { while (bmnxtsct(nsp)) {
if (0 != (c = player->map[nsp->id])) if (0 != (c = player->map[nsp->id]))
wmap[nsp->dy][nsp->dx] = c; wmap[nsp->dy][nsp->dx] = c;
} }
break; break;
case 'r': case 'r':
while (bmnxtsct(nsp) && !player->aborted) { while (bmnxtsct(nsp)) {
player->bmap[nsp->id] = player->bmap[nsp->id] =
player->map[nsp->id]; player->map[nsp->id];
if (0 != (c = player->bmap[nsp->id])) if (0 != (c = player->bmap[nsp->id]))
@ -221,7 +221,7 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
memset(bitmap, 0, (WORLD_SZ() + 7) / 8); memset(bitmap, 0, (WORLD_SZ() + 7) / 8);
bitinit2(nsp, bitmap, player->cnum); bitinit2(nsp, bitmap, player->cnum);
} }
while (nxtsct(nsp, &sect) && !player->aborted) { while (nxtsct(nsp, &sect)) {
if (!player->god && !emp_getbit(nsp->x, nsp->y, bitmap)) if (!player->god && !emp_getbit(nsp->x, nsp->y, bitmap))
continue; continue;
wmap[nsp->dy][nsp->dx] wmap[nsp->dy][nsp->dx]
@ -240,7 +240,7 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
memset(bitmap, 0, (WORLD_SZ() + 7) / 8); memset(bitmap, 0, (WORLD_SZ() + 7) / 8);
bitinit2(nsp, bitmap, player->cnum); bitinit2(nsp, bitmap, player->cnum);
} }
while (nxtsct(nsp, &sect) && !player->aborted) { while (nxtsct(nsp, &sect)) {
if (!player->god && !emp_getbit(nsp->x, nsp->y, bitmap)) if (!player->god && !emp_getbit(nsp->x, nsp->y, bitmap))
continue; continue;
mapch = map_char(sect.sct_type, sect.sct_own, player->owner); mapch = map_char(sect.sct_type, sect.sct_own, player->owner);
@ -250,8 +250,6 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
if (changed) if (changed)
writemap(player->cnum); writemap(player->cnum);
} }
if (player->aborted)
return RET_OK;
i = 0; i = 0;
while (ef_mappable[i] != EF_BAD) { while (ef_mappable[i] != EF_BAD) {
@ -280,7 +278,7 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
struct sctstr sect; struct sctstr sect;
snxtsct_rewind(nsp); snxtsct_rewind(nsp);
while (nxtsct(nsp, &sect) && !player->aborted) { while (nxtsct(nsp, &sect)) {
if (sect.sct_own == player->cnum) if (sect.sct_own == player->cnum)
wmap[nsp->dy][nsp->dx] |= 0x80; wmap[nsp->dy][nsp->dx] |= 0x80;
} }