diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-23 16:59:25 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-23 16:59:25 (GMT) |
| commit | 0a8f65b2cf69604151fcb26c8c1de80951005d1f (patch) | |
| tree | e672c2127a48b48d4486179f0f553ab84c16d416 | |
| parent | b549688fddecbf98b79183bae0d4894f5b1ab154 (diff) | |
| parent | aca5faed909663141625a3423efdb517479afed7 (diff) | |
| download | powder-0a8f65b2cf69604151fcb26c8c1de80951005d1f.zip powder-0a8f65b2cf69604151fcb26c8c1de80951005d1f.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | includes/defines.h | 2 | ||||
| -rw-r--r-- | src/graphics.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -9,7 +9,7 @@ PYCOMMAND := $(PY_BIN) getheader.py CFLAGS := -w -std=c99 -D_POSIX_C_SOURCE=200112L -DLUACONSOLE -DGRAVFFT -Iincludes/ -D_GNU_SOURCE OFLAGS := -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -LFLAGS := -lpthread -lSDL -lfftw3f -lm -lbz2 -lX11 -llua5.1 #-lpython$(PY_VERSION) -L$(PY_LIBPATH) -I$(PY_INCPATH) $(PY_LDFLAGS) +LFLAGS := -lpthread -lSDL -lfftw3f -lm -lbz2 -lX11 -llua5.1 -lrt #-lpython$(PY_VERSION) -L$(PY_LIBPATH) -I$(PY_INCPATH) $(PY_LDFLAGS) LFLAGS_X := -lm -lbz2 -lSDLmain -I/Library/Frameworks/Python.framework/Versions/$(PY_VERSION)/include/python$(PY_VERSION) MFLAGS_SSE3 := -march=native -DX86 -DX86_SSE3 -msse3 MFLAGS_SSE2 := -march=native -DX86 -DX86_SSE2 -msse2 diff --git a/includes/defines.h b/includes/defines.h index f588d4a..dfe24b2 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -10,7 +10,7 @@ //VersionInfoStart #define SAVE_VERSION 65 #define MINOR_VERSION 5 -#define BUILD_NUM 98 +#define BUILD_NUM 100 //VersionInfoEnd #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. diff --git a/src/graphics.c b/src/graphics.c index 45b2de1..8413a73 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -3393,7 +3393,7 @@ void draw_parts(pixel *vid) int rx, ry; for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) - if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) + if (x+rx>=0 && y+ry>=0 && x+rx<XRES/CELL && y+ry<YRES/CELL && (rx || ry)) { cr = R*(a-0.3)/6; cg = G*(a-0.3)/6; |