← Back to branch summary

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

« back to all changes in this revision

Viewing changes to netslide.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings
  • Date: 2011-07-11 03:56:55 UTC
  • mfrom: (1.1.13 upstream) (3.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110711035655-bfr08qpm3dm3unnq
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:
netslide.c
1059
1059
                            game_drawstate *ds, int x, int y, int button)
1060
1060
{
1061
1061
    int cx, cy;
1062
 
    int n, dx, dy;
 
1062
    int dx, dy;
1063
1063
    char buf[80];
1064
1064
 
1065
1065
    button &= ~MOD_MASK;
1101
1101
        if (cx == -1) dx = +1;
1102
1102
        else if (cx == state->width) dx = -1;
1103
1103
        else return NULL;
1104
 
        n = state->width;
1105
1104
        dy = 0;
1106
1105
    }
1107
1106
    else if (cx >= 0 && cx < state->width && cx != state->cx)
1109
1108
        if (cy == -1) dy = +1;
1110
1109
        else if (cy == state->height) dy = -1;
1111
1110
        else return NULL;
1112
 
        n = state->height;
1113
1111
        dx = 0;
1114
1112
    }
1115
1113
    else
1585
1583
static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
1586
1584
                 game_state *state, int dir, game_ui *ui, float t, float ft)
1587
1585
{
1588
 
    int x, y, tx, ty, frame;
 
1586
    int x, y, frame;
1589
1587
    unsigned char *active;
1590
1588
    float xshift = 0.0;
1591
1589
    float yshift = 0.0;
1677
1675
        t = ANIM_TIME - t;
1678
1676
    }
1679
1677
 
1680
 
    tx = ty = -1;
1681
1678
    if (oldstate && (t < ANIM_TIME)) {
1682
1679
        /*
1683
1680
         * We're animating a slide, of row/column number
1829
1826
    return 0.0F;
1830
1827
}
1831
1828
 
 
1829
static int game_status(game_state *state)
 
1830
{
 
1831
    return state->completed ? +1 : 0;
 
1832
}
 
1833
 
1832
1834
static int game_timing_state(game_state *state, game_ui *ui)
1833
1835
{
1834
1836
    return FALSE;
1877
1879
    game_redraw,
1878
1880
    game_anim_length,
1879
1881
    game_flash_length,
 
1882
    game_status,
1880
1883
    FALSE, FALSE, game_print_size, game_print,
1881
1884
    TRUE,                              /* wants_statusbar */
1882
1885
    FALSE, game_timing_state,