diff options
Diffstat (limited to 'src/core/moves.h')
| -rw-r--r-- | src/core/moves.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/moves.h b/src/core/moves.h index bbc8e7c..8ed267d 100644 --- a/src/core/moves.h +++ b/src/core/moves.h | |||
| @@ -21,7 +21,7 @@ STATIC uint8_t inverse_move(uint8_t); | |||
| 21 | STATIC void sortparallel_moves(size_t n, uint8_t [n]); | 21 | STATIC void sortparallel_moves(size_t n, uint8_t [n]); |
| 22 | STATIC bool are_lastmoves_singlecw(size_t n, const uint8_t [n]); | 22 | STATIC bool are_lastmoves_singlecw(size_t n, const uint8_t [n]); |
| 23 | 23 | ||
| 24 | STATIC cube_t applymoves(cube_t, const char *); | 24 | STATIC oriented_cube_t applymoves(oriented_cube_t, const char *); |
| 25 | 25 | ||
| 26 | #define FOREACH_READMOVE(ARG_BUF, ARG_MOVE, ARG_C, ARG_MAX, \ | 26 | #define FOREACH_READMOVE(ARG_BUF, ARG_MOVE, ARG_C, ARG_MAX, \ |
| 27 | RET_ERROR, ARG_ACTION) \ | 27 | RET_ERROR, ARG_ACTION) \ |
| @@ -335,17 +335,17 @@ are_lastmoves_singlecw(size_t n, const uint8_t moves[n]) | |||
| 335 | return isbase(moves[n-1]) && (!two || isbase(moves[n-2])); | 335 | return isbase(moves[n-1]) && (!two || isbase(moves[n-2])); |
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | STATIC cube_t | 338 | STATIC oriented_cube_t |
| 339 | applymoves(cube_t cube, const char *buf) | 339 | applymoves(oriented_cube_t cube, const char *buf) |
| 340 | { | 340 | { |
| 341 | int c; | 341 | int c; |
| 342 | uint8_t m; | 342 | uint8_t m; |
| 343 | 343 | ||
| 344 | DBG_ASSERT(isconsistent(cube), ZERO_CUBE, | 344 | DBG_ASSERT(isconsistent(cube), ZERO_ORIENTED_CUBE, |
| 345 | "move error: inconsistent cube\n"); | 345 | "move error: inconsistent cube\n"); |
| 346 | 346 | ||
| 347 | FOREACH_READMOVE(buf, m, c, -1, ZERO_CUBE, | 347 | FOREACH_READMOVE(buf, m, c, -1, ZERO_ORIENTED_CUBE, |
| 348 | cube = move(cube, m); | 348 | cube.cube = move(cube.cube, m); |
| 349 | ) | 349 | ) |
| 350 | 350 | ||
| 351 | return cube; | 351 | return cube; |
