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

seed a single faction from newplayers file.

This commit is contained in:
Enno Rehling 2017-07-23 09:15:23 +02:00
parent bdb30f1b82
commit 475c9f8cd8
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/gmtool.c
View File

@ -1,4 +1,4 @@
/* /*
* +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de> * +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
* | | Enno Rehling <enno@eressea.de> * | | Enno Rehling <enno@eressea.de>
* | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de> * | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
@ -81,7 +81,7 @@ int gm_codepage = -1;
static void unicode_remove_diacritics(const char *rp, char *wp) { static void unicode_remove_diacritics(const char *rp, char *wp) {
while (*rp) { while (*rp) {
if (gm_codepage >=0 && *rp & 0x80) { if (gm_codepage >= 0 && *rp & 0x80) {
size_t sz = 0; size_t sz = 0;
unsigned char ch; unsigned char ch;
switch (gm_codepage) { switch (gm_codepage) {
@ -115,7 +115,7 @@ int umvwprintw(WINDOW *win, int y, int x, const char *format, ...) {
va_start(args, format); va_start(args, format);
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
vsnprintf(buffer, sizeof(buffer)-1, format, args); vsnprintf(buffer, sizeof(buffer) - 1, format, args);
va_end(args); va_end(args);
simplify(buffer, buffer); simplify(buffer, buffer);
@ -344,7 +344,7 @@ map_region *cursor_region(const view * v, const coordinate * c)
static void static void
draw_cursor(WINDOW * win, selection * s, const view * v, const coordinate * c, draw_cursor(WINDOW * win, selection * s, const view * v, const coordinate * c,
int show) int show)
{ {
int lines = getmaxy(win) / THEIGHT; int lines = getmaxy(win) / THEIGHT;
int xp, yp, nx, ny; int xp, yp, nx, ny;
@ -814,7 +814,7 @@ static void select_regions(state * st, int selectmode)
st->wnd_map->update |= 3; st->wnd_map->update |= 3;
} }
void loaddata(state *st) { static void loaddata(state *st) {
char datafile[MAX_PATH]; char datafile[MAX_PATH];
askstring(st->wnd_status->handle, "save as:", datafile, sizeof(datafile)); askstring(st->wnd_status->handle, "save as:", datafile, sizeof(datafile));
@ -824,7 +824,7 @@ void loaddata(state *st) {
} }
} }
void savedata(state *st) { static void savedata(state *st) {
char datafile[MAX_PATH]; char datafile[MAX_PATH];
askstring(st->wnd_status->handle, "save as:", datafile, sizeof(datafile)); askstring(st->wnd_status->handle, "save as:", datafile, sizeof(datafile));
@ -835,6 +835,20 @@ void savedata(state *st) {
} }
} }
static void seed_player(state *st, const newfaction *player) {
if (player) {
region *r;
int nx = st->cursor.x;
int ny = st->cursor.y;
pnormalize(&nx, &ny, st->cursor.pl);
r = findregion(nx, ny);
if (r) {
addplayer(r, addfaction(player->email, player->password, player->race,
player->lang, player->subscription));
}
}
}
static void handlekey(state * st, int c) static void handlekey(state * st, int c)
{ {
window *wnd; window *wnd;
@ -897,10 +911,6 @@ static void handlekey(state * st, int c)
loaddata(st); loaddata(st);
break; break;
case 'B': case 'B':
if (!new_players) {
join_path(basepath(), "newfactions", sbuffer, sizeof(sbuffer));
new_players = read_newfactions(sbuffer);
}
cnormalize(&st->cursor, &nx, &ny); cnormalize(&st->cursor, &nx, &ny);
minpop = config_get_int("editor.population.min", 8); minpop = config_get_int("editor.population.min", 8);
maxpop = config_get_int("editor.population.max", minpop); maxpop = config_get_int("editor.population.max", minpop);
@ -1111,13 +1121,15 @@ static void handlekey(state * st, int c)
else else
tag_region(st->selected, nx, ny); tag_region(st->selected, nx, ny);
break; break;
case 'A': case 's': /* seed */
if (!new_players) { if (new_players) {
join_path(basepath(), "newfactions", sbuffer, sizeof(sbuffer)); newfaction * next = new_players->next;
new_players = read_newfactions(sbuffer); seed_player(st, new_players);
free(new_players->email);
free(new_players->password);
free(new_players);
new_players = next;
} }
seed_players(&new_players, false);
st->wnd_map->update |= 1;
break; break;
case '/': case '/':
statusline(st->wnd_status->handle, "find-"); statusline(st->wnd_status->handle, "find-");
@ -1289,13 +1301,15 @@ void run_mapper(void)
int split = 20; int split = 20;
state *st; state *st;
point tl; point tl;
/* FIXME: dsiable logging char sbuffer[512];
int old_flags = log_flags;
log_flags &= ~(LOG_CPERROR | LOG_CPWARNING); if (!new_players) {
*/ join_path(basepath(), "newfactions", sbuffer, sizeof(sbuffer));
new_players = read_newfactions(sbuffer);
}
init_curses(); init_curses();
curs_set(1); curs_set(1);
set_readline(curses_readline); set_readline(curses_readline);
assert(stdscr); assert(stdscr);
getbegyx(stdscr, x, y); getbegyx(stdscr, x, y);
@ -1384,15 +1398,15 @@ void run_mapper(void)
set_readline(NULL); set_readline(NULL);
curs_set(1); curs_set(1);
endwin(); endwin();
/* FIXME: reset logging /* FIXME: reset logging
log_flags = old_flags; log_flags = old_flags;
*/ */
state_close(st); state_close(st);
} }
int int
curses_readline(struct lua_State *L, char *buffer, size_t size, curses_readline(struct lua_State *L, char *buffer, size_t size,
const char *prompt) const char *prompt)
{ {
UNUSED_ARG(L); UNUSED_ARG(L);
askstring(hstatus, prompt, buffer, size); askstring(hstatus, prompt, buffer, size);

1
src/gmtool.h
View File

@ -22,7 +22,6 @@ extern "C" {
struct terrain_type; struct terrain_type;
struct newfaction; struct newfaction;
int gmmain(int argc, char *argv[]);
int curses_readline(struct lua_State *L, char *buffer, size_t size, int curses_readline(struct lua_State *L, char *buffer, size_t size,
const char *prompt); const char *prompt);