mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-21 16:05:44 -07:00
Fix bit rot in the 'unfinished' subdir.
Several of the source files here won't quite compile any more, because of minor things like const-correctness and the UI_UPDATE change. Now they should all build again (without prejudice to how useful they are once they have built). The biggest change was to remove the fatal() implementation from the standalone path.c, because my new plan is that basically everything that's not linked against a true puzzle frontend will be linked against nullfe.c, which provides that function anyway.
This commit is contained in:
@ -4,6 +4,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include "puzzles.h"
|
||||
|
||||
@ -530,7 +531,7 @@ if (ctx->sparegrid3[ctx->pathends[i*2]] != i ||
|
||||
|
||||
ctx->sparepathends[i*2] = first;
|
||||
ctx->sparepathends[i*2+1] = last;
|
||||
//printf("new ends of path %d: %d,%d\n", i, first, last);
|
||||
/* printf("new ends of path %d: %d,%d\n", i, first, last); */
|
||||
ctx->pathspare[i] = 2; /* fixed */
|
||||
}
|
||||
}
|
||||
@ -839,7 +840,7 @@ static int *gridgen(int w, int h, random_state *rs)
|
||||
int main(void)
|
||||
{
|
||||
int w = 10, h = 8;
|
||||
random_state *rs = random_init("12345", 5);
|
||||
random_state *rs = random_new("12345", 5);
|
||||
int x, y, i, *grid;
|
||||
|
||||
for (i = 0; i < 10; i++) {
|
||||
@ -863,21 +864,3 @@ int main(void)
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef TEST_GENERAL
|
||||
#include <stdarg.h>
|
||||
|
||||
void fatal(const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
|
||||
fprintf(stderr, "fatal error: ");
|
||||
|
||||
va_start(ap, fmt);
|
||||
vfprintf(stderr, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
fprintf(stderr, "\n");
|
||||
exit(1);
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user