oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

cleanup

Browse source
This commit is contained in:
p.kosyh 2010-06-08 03:25:41 +00:00
parent 12f07c268c
commit a24c731c4b
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sdl-instead/game.c
View file

@ -2381,7 +2381,7 @@ static int game_input(int down, const char *key, int x, int y, int mb)
extern char zip_game_dirname[]; extern char zip_game_dirname[];
extern int unpack(const char *zipfilename, const char *dirname); extern int unpack(const char *zipfilename, const char *dirname);
#ifdef _USE_BROWSE
int game_from_disk(void) int game_from_disk(void)
{ {
int i = 0; int i = 0;
@ -2396,9 +2396,11 @@ int game_from_disk(void)
game_menu(old_menu); game_menu(old_menu);
} }
mouse_cursor(1); mouse_cursor(1);
game_cursor(CURSOR_OFF);
browse_dialog = 1; browse_dialog = 1;
g = p = open_file_dialog(); g = p = open_file_dialog();
browse_dialog = 0; browse_dialog = 0;
game_cursor(CURSOR_ON);
mouse_cursor(0); mouse_cursor(0);
if (!p) if (!p)
return -1; return -1;
@ -2446,7 +2448,7 @@ clean:
return -1; return -1;
#endif #endif
} }
#endif
int game_loop(void) int game_loop(void)
{ {
static int alt_pressed = 0; static int alt_pressed = 0;
@ -2513,10 +2515,12 @@ int game_loop(void)
menu_toggle(); menu_toggle();
} else if (!is_key(&ev, "f4")) { } else if (!is_key(&ev, "f4")) {
#ifdef _USE_UNPACK #ifdef _USE_UNPACK
#ifdef _USE_BROWSE
mouse_reset(1); mouse_reset(1);
if (!game_from_disk()) { if (!game_from_disk()) {
shift_pressed = alt_pressed = 0; shift_pressed = alt_pressed = 0;
} }
#endif
#endif #endif
} else if (!is_key(&ev, "escape")) { } else if (!is_key(&ev, "escape")) {
if (use_xref) if (use_xref)

15
src/sdl-instead/instead.c
View file

@ -414,7 +414,14 @@ static const luaL_Reg base_funcs[] = {
static int instead_package(void) static int instead_package(void)
{ {
char *p; char *p;
char stead_path[PATH_MAX] = "package.path=\""; char stead_path[PATH_MAX] = "package.path=\"./?.lua;";
p = game_local_stead_path();
if (p) {
strcat(stead_path, p);
strcat(stead_path, "/?.lua");
strcat(stead_path, ";");
}
if (STEAD_PATH[0] == '.') { if (STEAD_PATH[0] == '.') {
strcat(stead_path, game_cwd); strcat(stead_path, game_cwd);
@ -424,12 +431,6 @@ static int instead_package(void)
strcat(stead_path, STEAD_PATH); strcat(stead_path, STEAD_PATH);
} }
strcat(stead_path, "/?.lua"); strcat(stead_path, "/?.lua");
p = game_local_stead_path();
if (p) {
strcat(stead_path, ";");
strcat(stead_path, p);
strcat(stead_path, "/?.lua");
}
strcat(stead_path, "\""); strcat(stead_path, "\"");
instead_eval(stead_path); instead_clear(); instead_eval(stead_path); instead_clear();
/* putenv(stead_path); */ /* putenv(stead_path); */

2
src/sdl-instead/menu.c
View file

@ -571,9 +571,11 @@ int game_menu_act(const char *a)
game_menu_box(1, game_menu_gen()); game_menu_box(1, game_menu_gen());
} else if (!strcmp(a,"/quit")) { } else if (!strcmp(a,"/quit")) {
return -1; return -1;
#ifdef _USE_BROWSE
} else if (!strcmp(a,"/browse")) { } else if (!strcmp(a,"/browse")) {
game_from_disk(); game_from_disk();
return 0; return 0;
#endif
} else if (cur_menu == menu_games) { } else if (cur_menu == menu_games) {
char *p; char *p;
p = strdup(a); p = strdup(a);