From b84371357a5a9bb4acb78f32342fcf03655da00c Mon Sep 17 00:00:00 2001
From: "chaos.powdertoy.co.uk" <admin@powdertoy.co.uk>
Date: Sat, 22 Oct 2011 14:40:23 -0400
Subject: [PATCH 1/4] Version Increment

---
 includes/defines.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/defines.h b/includes/defines.h
index f588d4aa3..70e1af8ea 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 99
 //VersionInfoEnd
 
 #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter.

From 05eb16e14c679f92d766ace0b421e793f73faf69 Mon Sep 17 00:00:00 2001
From: jacksonmj <mj-pt@jacksonmj.co.uk>
Date: Sat, 22 Oct 2011 19:27:32 +0800
Subject: [PATCH 2/4] Fix LIGH overwriting fire_alpha

---
 src/graphics.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics.c b/src/graphics.c
index 2ca21ccd6..b9882138b 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;

From 49f6439bb7ab5082aaa22a82cd6b7a2721e357bf Mon Sep 17 00:00:00 2001
From: Der Messer <der-messer@gmx.de>
Date: Sun, 23 Oct 2011 15:39:54 +0800
Subject: [PATCH 3/4] Fixed bug in compile process: Linker option '-lrt' was
 not set so ld complained about "undefined reference to 'clock_gettime'"

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 399f6d622..071d5a530 100644
--- a/Makefile
+++ b/Makefile
@@ -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

From aca5faed909663141625a3423efdb517479afed7 Mon Sep 17 00:00:00 2001
From: "chaos.powdertoy.co.uk" <admin@powdertoy.co.uk>
Date: Sun, 23 Oct 2011 12:06:11 -0400
Subject: [PATCH 4/4] Version Increment

---
 includes/defines.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/defines.h b/includes/defines.h
index 70e1af8ea..dfe24b22a 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 99
+#define BUILD_NUM 100
 //VersionInfoEnd
 
 #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter.