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

Cleanup: remove the game_state parameter to game_colours(). No game

Browse Source 
was actually using it, and also it wasn't being called again for
different game states or different game parameters, so it would have
been a mistake to depend on anything in that game state. Games are
now expected to commit in advance to a single fixed list of all the
colours they will ever need, which was the case in practice already
and simplifies any later port to a colour-poor platform. Also this
change has removed a lot of unnecessary faff from midend_colours().

[originally from svn r6416]
This commit is contained in:
Simon Tatham
2005-10-22 16:44:38 +00:00
parent b44d75aa4e
commit 40fcf516f4
28 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
midend.c
View File

@ -767,20 +767,9 @@ void midend_timer(midend *me, float tplus)
float *midend_colours(midend *me, int *ncolours)
{
game_state *state = NULL;
float *ret;
if (me->nstates == 0) {
char *aux = NULL;
char *desc = me->ourgame->new_desc(me->params, me->random,
&aux, TRUE);
state = me->ourgame->new_game(me, me->params, desc);
sfree(desc);
sfree(aux);
} else
state = me->states[0].state;
ret = me->ourgame->colours(me->frontend, state, ncolours);
ret = me->ourgame->colours(me->frontend, ncolours);
{
int i;
@ -810,9 +799,6 @@ float *midend_colours(midend *me, int *ncolours)
}
}
if (me->nstates == 0)
me->ourgame->free_game(state);
return ret;
}