oreolek/steed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

instead call fixes

Browse source
This commit is contained in:
p.kosyh 2010-09-16 13:16:43 +00:00
parent a264682b2f
commit e1b5e15b60
3 changed files with 102 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,7 @@ int game_select(const char *name)
curgame_dir = oldgame;
return -1;
}
instead_function("game:ini", NULL, 0); instead_clear();
instead_function("game:ini", NULL); instead_clear();
return 0;
}
return 0;
@ -404,7 +404,7 @@ int game_load(int nr)
int game_saves_enabled(void)
{
int rc;
instead_function("isEnableSave", NULL, 0);
instead_function("isEnableSave", NULL);
rc = instead_bretval(0);
instead_clear();
return rc;
@ -413,7 +413,7 @@ int game_saves_enabled(void)
int game_autosave_enabled(void)
{
int rc;
instead_function("isEnableAutosave", NULL, 0);
instead_function("isEnableAutosave", NULL);
rc = instead_bretval(0);
instead_clear();
return rc;
@ -426,14 +426,20 @@ int game_save(int nr)
char *p;
if (s) {
if (nr == -1 || nr == 0) {
char *args_1[] = { "-1" };
char *args_0[] = { "0" };
struct instead_args args_1[] = {
{ .val = "-1", .type = INSTEAD_NUM },
{ .val = NULL, }
};
struct instead_args args_0[] = {
{ .val = "0", .type = INSTEAD_NUM },
{ .val = NULL, }
};
if (nr == -1)
instead_function("autosave", args_1, 1); /* enable saving for -1 */
instead_function("autosave", args_1); /* enable saving for -1 */
else if (!game_autosave_enabled())
return 0; /* nothing todo */
else
instead_function("autosave", args_0, 1); /* enable saving for 0 */
instead_function("autosave", args_0); /* enable saving for 0 */
instead_clear();
}
snprintf(cmd, sizeof(cmd) - 1, "save %s", s);
@ -1158,7 +1164,7 @@ static int check_fading(void)
{
int rc;
int st;
instead_function("get_fading", NULL, 0);
instead_function("get_fading", NULL);
rc = instead_bretval(0);
st = instead_iretval(1);
@ -1194,7 +1200,7 @@ static void game_autosave(void)
int b,r;
if (!curgame_dir)
return;
instead_function("get_autosave", NULL, 0);
instead_function("get_autosave", NULL);
b = instead_bretval(0);
r = instead_iretval(1);
instead_clear();
@ -1210,7 +1216,7 @@ static void dec_music(void *data)
int rc;
if (!curgame_dir)
return;
instead_function("dec_music_loop", NULL, 0);
instead_function("dec_music_loop", NULL);
rc = instead_iretval(0);
instead_clear();
if (rc == -1)
@ -1231,7 +1237,7 @@ void game_music_player(void)
return;
if (!opt_music)
return;
instead_function("get_music", NULL, 0);
instead_function("get_music", NULL);
mus = instead_retval(0);
loop = instead_iretval(1);
unix_path(mus);
@ -1315,11 +1321,16 @@ void game_sound_player(void)
char *snd;
int chan = -1;
int loop = 1;
char *args[] = { "nil", "-1" };
struct instead_args args[] = {
{ .val = "nil", .type = INSTEAD_NIL },
{ .val = "-1", .type = INSTEAD_NUM },
{ .val = NULL }
};
if (!snd_volume_mus(-1))
return;
instead_function("get_sound", NULL, 0);
instead_function("get_sound", NULL);
loop = instead_iretval(2);
chan = instead_iretval(1);
@ -1329,11 +1340,11 @@ void game_sound_player(void)
if (chan != -1) {
/* halt channel */
snd_halt_chan(chan, 500);
instead_function("set_sound", args, 2); instead_clear();
instead_function("set_sound", args); instead_clear();
}
return;
}
instead_function("set_sound", args, 2); instead_clear();
instead_function("set_sound", args); instead_clear();
unix_path(snd);
w = sound_find(snd);
@ -1443,13 +1454,13 @@ int game_cmd(char *cmd)
if (!cmdstr)
goto inv; /* hackish? ok, yes it is... */
instead_function("get_title", NULL, 0);
instead_function("get_title", NULL);
title = instead_retval(0);
instead_clear();
new_place = check_new_place(title);
instead_function("get_picture", NULL, 0);
instead_function("get_picture", NULL);
pict = instead_retval(0);
instead_clear();
@ -1639,11 +1650,13 @@ inv:
// input_clear();
err:
game_autosave();
#if 0
if (err_msg) {
mouse_reset(1);
game_menu(menu_warning);
return -1;
}
#endif
return 0;
}
@ -2427,7 +2440,7 @@ static int game_bg_coord(int x, int y, int *ox, int *oy)
static int game_input(int down, const char *key, int x, int y, int mb)
{
char *p;
char *args[8];
struct instead_args args[8];
char tx[16];
char ty[16];
@ -2435,17 +2448,16 @@ static int game_input(int down, const char *key, int x, int y, int mb)
char tpy[16];
char tmb[16];
int n = 0;
if (game_paused())
return -1;
if (mb == -1) {
const char *k;
args[0] = "kbd";
args[1] = (down)?"true":"false";
args[0].val = "kbd"; args[0].type = INSTEAD_STR;
args[1].val = (down)?"true":"false"; args[1].type = INSTEAD_BOOL;
k = (key)?key:"unknown";
args[2] = (char*)k;
n = 3;
args[2].val = (char*)k; args[2].type = INSTEAD_STR;
args[3].val = NULL;
} else {
int px = -1;
int py = -1;
@ -2455,21 +2467,21 @@ static int game_input(int down, const char *key, int x, int y, int mb)
snprintf(tx, sizeof(tx), "%d", x);
snprintf(ty, sizeof(ty), "%d", y);
snprintf(tmb, sizeof(tmb), "%d", mb);
args[0] = "mouse";
args[1] = (down)?"true":"false";
args[2] = tmb;
args[3] = tx;
args[4] = ty;
n = 5;
args[0].val = "mouse"; args[0].type = INSTEAD_STR;
args[1].val = (down)?"true":"false"; args[1].type = INSTEAD_BOOL;
args[2].val = tmb; args[2].type = INSTEAD_NUM;
args[3].val = tx; args[3].type = INSTEAD_NUM;
args[4].val = ty; args[4].type = INSTEAD_NUM;
args[5].val = NULL;
if (px != -1) {
snprintf(tpx, sizeof(tpx), "%d", px);
snprintf(tpy, sizeof(tpy), "%d", py);
args[5] = tpx;
args[6] = tpy;
n = 7;
args[5].val = tpx; args[5].type = INSTEAD_NUM;
args[6].val = tpy; args[6].type = INSTEAD_NUM;
args[7].val = NULL;
}
}
if (instead_function("stead.input", args, n)) {
if (instead_function("stead.input", &args)) {
instead_clear();
return -1;
}
@ -2738,6 +2750,10 @@ int game_loop(void)
game_highlight(x, y, 1);
}
game_cursor(CURSOR_ON);
if (err_msg) {
mouse_reset(1);
game_menu(menu_warning);
}
}
return 0;
}

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

@ -166,35 +166,30 @@ char *instead_cmd(char *s)
#else
char *instead_cmd(char *s)
{
char *p;
p = s; //encode_esc_string(s);
if (!p)
return p;
s = togame(p); //free(p);
struct instead_args args[] = {
{ .val = NULL, .type = INSTEAD_STR },
{ .val = NULL, },
};
if (!s)
return s;
lua_getglobal(L, "iface");
lua_getfield(L, -1, "cmd");
lua_remove(L, -2);
lua_getglobal(L, "iface");
lua_pushstring(L, s);
free(s);
if (lua_pcall(L, 2, 1, 0) != 0) {
fprintf(stderr, "Error calling iface:cmd...\n");
game_err_msg("Error calling iface:cmd.");
return NULL;
}
p = (char*)lua_tostring(L, -1);
if (p)
p = fromgame(p);
return p;
s = togame(s);
if (!s)
return NULL;
args[0].val = s;
instead_function("iface:cmd", args);
free(s);
return instead_retval(0);
}
#endif
int instead_function(char *s, char **args, int n)
int instead_function(char *s, struct instead_args *args)
{
int base = 0;
int status = 0;
int n = 0;
char *p;
char f[64];
int method = 0;
strcpy(f, s);
p = strchr(f, '.');
if (!p)
@ -212,31 +207,34 @@ int instead_function(char *s, char **args, int n)
} else
lua_getglobal(L, s);
if (args) {
int i = 0;
for (i = 0; i < n; i++) {
if (!strcmp(args[i], "nil"))
while (args->val) {
switch(args->type) {
case INSTEAD_NIL:
lua_pushnil(L);
else if(args[i][0] >='0' && args[i][0] <= '9')
lua_pushnumber(L, atoi(args[i]));
else if (!strcmp(args[i], "true"))
lua_pushboolean(L, 1);
else if (!strcmp(args[i], "false"))
lua_pushboolean(L, 0);
else
lua_pushstring(L, args[i]);
break;
case INSTEAD_NUM:
lua_pushnumber(L, atoi(args->val));
break;
case INSTEAD_BOOL:
if (!strcmp(args->val, "true"))
lua_pushboolean(L, 1);
else
lua_pushboolean(L, 0);
break;
default:
case INSTEAD_STR:
lua_pushstring(L, args->val);
}
args ++;
n ++;
}
if (lua_pcall(L, method + n, LUA_MULTRET, 0) != 0) {
fprintf(stderr, "Error calling %s...\n", s);
game_err_msg("Error calling function.");
return -1;
}
return 0;
}
if (lua_pcall(L, method, LUA_MULTRET, 0) != 0) {
fprintf(stderr, "Error calling %s...\n", s);
return -1;
status = lua_pcall(L, method + n, LUA_MULTRET, base);
if (status) {
fprintf(stderr, "Error calling:%s\n", s);
lua_gc(L, LUA_GCCOLLECT, 0);
}
return 0;
return report(L, status);
}
int luacall(char *cmd)
@ -470,7 +468,7 @@ static void instead_timer_do(void *data)
char *p;
if (game_paused())
goto out;
if (instead_function("stead.timer", NULL, 0)) {
if (instead_function("stead.timer", NULL)) {
instead_clear();
goto out;
}

12
src/sdl-instead/instead.h
View file

@ -1,11 +1,21 @@
#ifndef __INSTEAD_H__
#define __INSTEAD_H__
#define INSTEAD_NIL 0
#define INSTEAD_NUM 1
#define INSTEAD_STR 2
#define INSTEAD_BOOL 3
struct instead_args {
int type;
const char *val;
};
extern int instead_init(void);
extern int instead_load(char *game);
extern void instead_done(void);
extern char *instead_cmd(char *s);
extern int instead_function(char *s, char **args, int n);
extern int instead_function(char *s, struct instead_args *args);
extern int instead_eval(char *s);
extern int instead_clear(void);
extern char *instead_retval(int n);