zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

I've just realised that the JS puzzles' permalinks were not updating

Browse Source 
when the user pressed 'n' for a new game, because all the front end
knows is that it passed a keystroke to the puzzle, and it has no way
of hearing back that a particular keypress resulted in a game id
change.

To fix this, I've renamed midend_request_desc_changes to
midend_request_id_changes and expanded its remit to cover _any_ change
to the game ids. So now that callback in the Emscripten front end is
the only place from which update_permalinks is called (apart from
initialising them at setup time), and that should handle everything.

[originally from svn r9805]
This commit is contained in:
Simon Tatham
2013-04-05 15:49:20 +00:00
parent 841c9318f3
commit 8f87f2ce89
4 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
midend.c
View File

@ -82,8 +82,8 @@ struct midend {
int preferred_tilesize, tilesize, winwidth, winheight;
void (*game_desc_change_notify_function)(void *);
void *game_desc_change_notify_ctx;
void (*game_id_change_notify_function)(void *);
void *game_id_change_notify_ctx;
};
#define ensure(me) do { \
@ -499,6 +499,9 @@ void midend_new_game(midend *me)
me->ui = me->ourgame->new_ui(me->states[0].state);
midend_set_timer(me);
me->pressed_mouse_button = 0;
if (me->game_id_change_notify_function)
me->game_id_change_notify_function(me->game_id_change_notify_ctx);
}
int midend_can_undo(midend *me)
@ -1082,10 +1085,10 @@ int midend_wants_statusbar(midend *me)
return me->ourgame->wants_statusbar;
}
void midend_request_desc_changes(midend *me, void (*notify)(void *), void *ctx)
void midend_request_id_changes(midend *me, void (*notify)(void *), void *ctx)
{
me->game_desc_change_notify_function = notify;
me->game_desc_change_notify_ctx = ctx;
me->game_id_change_notify_function = notify;
me->game_id_change_notify_ctx = ctx;
}
void midend_supersede_game_desc(midend *me, char *desc, char *privdesc)
@ -1094,8 +1097,8 @@ void midend_supersede_game_desc(midend *me, char *desc, char *privdesc)
sfree(me->privdesc);
me->desc = dupstr(desc);
me->privdesc = privdesc ? dupstr(privdesc) : NULL;
if (me->game_desc_change_notify_function)
me->game_desc_change_notify_function(me->game_desc_change_notify_ctx);
if (me->game_id_change_notify_function)
me->game_id_change_notify_function(me->game_id_change_notify_ctx);
}
config_item *midend_get_config(midend *me, int which, char **wintitle)