← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sgt-puzzles/saucy-proposed

« back to all changes in this revision

Viewing changes to lightup.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings
  • Date: 2011-07-11 03:56:55 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110711035655-qjakg0h7wv99tmu9
Tags: 9179-1
http://bugs.debian.org/625425
* New upstream version:
  - Remove unused-but-set variables - closes: #625425
  - Avoid infinite loop in Loopy at Easy level
  - Add Penrose tilings to Loopy
* Update German translation, thanks to Helge Kreutzmann
* Do not compile with -Werror

Show diffs side-by-side

added added

removed removed

Lines of Context:
lightup.c
1402
1402
            }
1403
1403
        }
1404
1404
    }
 
1405
    debug(("Stripped %d unused numbers.\n", n));
1405
1406
    return n;
1406
1407
}
1407
1408
 
1475
1476
                           char **aux, int interactive)
1476
1477
{
1477
1478
    game_state *news = new_state(params), *copys;
1478
 
    int nsol, i, j, run, x, y, wh = params->w*params->h, num;
 
1479
    int i, j, run, x, y, wh = params->w*params->h, num;
1479
1480
    char *ret, *p;
1480
1481
    int *numindices;
1481
1482
 
1499
1500
            /* Take a copy, remove numbers we didn't use and check there's
1500
1501
             * still a unique solution; if so, use the copy subsequently. */
1501
1502
            copys = dup_game(news);
1502
 
            nsol = strip_unused_nums(copys);
1503
 
            debug(("Stripped %d unused numbers.\n", nsol));
 
1503
            strip_unused_nums(copys);
1504
1504
            if (!puzzle_is_good(copys, params->difficulty)) {
1505
1505
                debug(("Stripped grid is not good, reverting.\n"));
1506
1506
                free_game(copys);
2160
2160
    return 0.0F;
2161
2161
}
2162
2162
 
 
2163
static int game_status(game_state *state)
 
2164
{
 
2165
    return state->completed ? +1 : 0;
 
2166
}
 
2167
 
2163
2168
static int game_timing_state(game_state *state, game_ui *ui)
2164
2169
{
2165
2170
    return TRUE;
2262
2267
    game_redraw,
2263
2268
    game_anim_length,
2264
2269
    game_flash_length,
 
2270
    game_status,
2265
2271
    TRUE, FALSE, game_print_size, game_print,
2266
2272
    FALSE,                             /* wants_statusbar */
2267
2273
    FALSE, game_timing_state,