Merge branch 'cracker64' into dev

Conflicts:
	includes/powder.h
	src/graphics.c
	src/main.c
	src/powder.c
This commit is contained in:
jacksonmj
2011-01-15 16:23:51 +00:00
4 changed files with 110 additions and 18 deletions

View File

@@ -768,6 +768,8 @@ extern int pfree;
extern unsigned pmap[YRES][XRES];
unsigned cb_pmap[YRES][XRES];
unsigned photons[YRES][XRES];
int try_move(int i, int x, int y, int nx, int ny);
int eval_move(int pt, int nx, int ny, unsigned *rr);