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

fix goto-select-faction (itoa bug).

This commit is contained in:
Enno Rehling 2018-02-25 19:36:28 +01:00
parent aacd0885df
commit b7dcee7e08
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gmtool.c
View File

@ -946,6 +946,7 @@ static void handlekey(state * st, int c)
static int findmode = 0; static int findmode = 0;
region *r; region *r;
char sbuffer[80]; char sbuffer[80];
const char *loc = locate;
int n, nx, ny, minpop, maxpop; int n, nx, ny, minpop, maxpop;
switch (c) { switch (c) {
@ -1247,7 +1248,7 @@ static void handlekey(state * st, int c)
else if (findmode == 'F') { else if (findmode == 'F') {
faction *f = select_faction(st); faction *f = select_faction(st);
if (f != NULL) { if (f != NULL) {
itoa36_r(f->no, locate, sizeof(locate)); loc = itoa36_r(f->no, locate, sizeof(locate));
findmode = 'f'; findmode = 'f';
} }
else { else {
@ -1260,8 +1261,9 @@ static void handlekey(state * st, int c)
break; break;
} }
/* achtung: fall-through ist absicht: */ /* achtung: fall-through ist absicht: */
if (!strlen(locate)) if (!strlen(loc)) {
break; break;
}
case 'n': case 'n':
if (findmode == 'u') { if (findmode == 'u') {
unit *u = findunit(atoi36(locate)); unit *u = findunit(atoi36(locate));
@ -1273,9 +1275,9 @@ static void handlekey(state * st, int c)
region *first = (mr && mr->r && mr->r->next) ? mr->r->next : regions; region *first = (mr && mr->r && mr->r->next) ? mr->r->next : regions;
if (findmode == 'f') { if (findmode == 'f') {
snprintf(sbuffer, sizeof(sbuffer), "find-faction: %s", locate); snprintf(sbuffer, sizeof(sbuffer), "find-faction: %s", loc);
statusline(st->wnd_status->handle, sbuffer); statusline(st->wnd_status->handle, sbuffer);
f = findfaction(atoi36(locate)); f = findfaction(atoi36(loc));
if (f == NULL) { if (f == NULL) {
statusline(st->wnd_status->handle, "faction not found."); statusline(st->wnd_status->handle, "faction not found.");
beep(); beep();