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

Merge pull request #748 from ennorehling/master

Browse source 
3.14.2 changes to create-orders and gmtool
This commit is contained in:
Enno Rehling 2017-12-16 19:53:02 +01:00 committed by GitHub
commit de6afeac5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
process/create-orders
View file

@ -16,11 +16,14 @@ else
mv orders.dir orders.dir.$TURN
mkdir -p orders.dir
fi
ls -1rt orders.dir.$TURN/turn-* | xargs cat > orders.$TURN
find "orders.dir.$TURN" -maxdepth 1 -type f -printf "%T+\t%p\n" | sort | cut -f2 | while read
do
cat "$REPLY" >> "orders.$TURN"
done
lockfile -r3 -l120 orders.queue.lock
if [ -e orders.queue ] ; then
mv orders.queue orders.dir.$TURN/orders.queue
mv orders.queue "orders.dir.$TURN/orders.queue"
fi
rm -f orders.queue.lock

20
src/gmtool.c
View file

@ -720,6 +720,22 @@ static void select_regions(state * st, int selectmode)
}
}
}
else if (findmode == 'c') {
region *r;
sprintf(sbuffer, "%schaos", status);
statusline(st->wnd_status->handle, sbuffer);
for (r = regions; r; r = r->next) {
if (fval(r, RF_CHAOTIC)) {
if (selectmode & MODE_SELECT) {
select_coordinate(st->selected, r->x, r->y,
selectmode == MODE_SELECT);
}
else {
highlight_region(r, selectmode == MODE_MARK);
}
}
}
}
else if (findmode == 'm') {
region *r;
sprintf(sbuffer, "%smonsters", status);
@ -991,9 +1007,13 @@ static void handlekey(state * st, int c)
break;
case 'c': /* clear/reset */
reset_cursor(st);
st->modified = 1;
st->wnd_map->update |= 1;
break;
case 'C': /* clear/reset */
reset_rect(st);
st->modified = 1;
st->wnd_map->update |= 1;
break;
case 0x09: /* tab = next selected */
if (regions != NULL) {