diff --git a/Rules.make.standalone b/Rules.make.standalone index 048e657..2ac691f 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -1,4 +1,4 @@ -VERSION := \"0.9.3\" +VERSION := \"1.0.0\" DESTDIR= BIN= diff --git a/Rules.make.system b/Rules.make.system index 484fa25..5ff62d9 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -1,4 +1,4 @@ -VERSION := \"0.9.3\" +VERSION := \"1.0.0\" PREFIX=/usr/local DESTDIR= diff --git a/Rules.windows b/Rules.windows index ac9e057..675a7db 100644 --- a/Rules.windows +++ b/Rules.windows @@ -1,4 +1,4 @@ -VERSION := \"0.9.3\" +VERSION := \"1.0.0\" PREFIX= DESTDIR= diff --git a/debian/changelog b/debian/changelog index a262957..15e2ce6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +instead (1.0.1) unstable; urgency=low + + * aother mouse buttons -- escape + * escape as use cancel + * lifeoff from life methid + + -- Peter Kosyh
The interpreter of STEAD (Simple Text Adventures) allows to play games, combining visual novels, text adventure and classic quests of 1990-s. The STEAD games features are:
Интерпретатор STEAD (Simply Text Adventure) позволяет проигрывать игры, которые по жанру являются смесью визуальной новеллы, текстового квеста и классических квестов 90-х. Особенности STEAD игры:
diff --git a/doc/instead.6 b/doc/instead.6 index a594741..fed9a7a 100644 --- a/doc/instead.6 +++ b/doc/instead.6 @@ -1,4 +1,4 @@ -.TH INSTEAD 6 "Version 0.9.3" Instead GAMES +.TH INSTEAD 6 "Version 1.0.0" Instead GAMES .SH NAME diff --git a/src/sdl-instead/game.c b/src/sdl-instead/game.c index 0b6b80b..7dd16cb 100644 --- a/src/sdl-instead/game.c +++ b/src/sdl-instead/game.c @@ -2072,7 +2072,10 @@ int game_loop(void) if (game_click(x, y, 1) == -1) break; } else if (!is_key(&ev, "escape")) { - menu_toggle(); + if (use_xref) + disable_use(); + else + menu_toggle(); } else if (!is_key(&ev, "tab")) { select_frame(shift_pressed); } /*else if (!is_key(&ev, "home") || !is_key(&ev, "[7]")) { @@ -2124,10 +2127,14 @@ int game_loop(void) game_menu(old_menu); } } else if (ev.type == MOUSE_DOWN) { - game_highlight(-1, -1, 0); - game_click(ev.x, ev.y, 0); - x = ev.x; - y = ev.y; + if (ev.code != 1) + disable_use(); + else { + game_highlight(-1, -1, 0); + game_click(ev.x, ev.y, 0); + x = ev.x; + y = ev.y; + } } else if (ev.type == MOUSE_UP) { game_highlight(-1, -1, 0); if (game_click(ev.x, ev.y, 1) == -1) diff --git a/src/sdl-instead/input.c b/src/sdl-instead/input.c index 4ed3744..02e0940 100644 --- a/src/sdl-instead/input.c +++ b/src/sdl-instead/input.c @@ -94,20 +94,21 @@ int input(struct inp_event *inp, int wait) inp->type = MOUSE_UP; inp->x = event.button.x; inp->y = event.button.y; + inp->code = event.button.button; if (event.button.button == 4) inp->type = 0; else if (event.button.button == 5) - inp->type = 0; + inp->type = 0; break; case SDL_MOUSEBUTTONDOWN: inp->type = MOUSE_DOWN; inp->x = event.button.x; inp->y = event.button.y; + inp->code = event.button.button; if (event.button.button == 4) inp->type = MOUSE_WHEEL_UP; else if (event.button.button == 5) inp->type = MOUSE_WHEEL_DOWN; - while (SDL_PeepEvents(&peek, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEBUTTONDOWN)) > 0) { if (!((event.button.button == 4 && inp->type == MOUSE_WHEEL_UP) || diff --git a/stead/stead.lua b/stead/stead.lua index 8ab0d6f..c84d18f 100644 --- a/stead/stead.lua +++ b/stead/stead.lua @@ -1,5 +1,5 @@ stead = { - version = "0.9.3", + version = "1.0.0", table = table, string = string, math = math,