From a5e07a787cda5b58bcc31623ca972fb4cbb447a4 Mon Sep 17 00:00:00 2001
From: Simon <simon@hardwired.org.uk>
Date: Sat, 2 Apr 2011 16:00:39 +0100
Subject: [PATCH] Less glow for Portal

---
 src/graphics.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/graphics.c b/src/graphics.c
index 05f514375..928b6a7c6 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1951,12 +1951,14 @@ void draw_parts(pixel *vid)
 						drad = (M_PI * ((float)orbl[r]) / 180.0f)*1.41f;
 						nxo = ddist*cos(drad);
 						nyo = ddist*sin(drad);
-						addpixel(vid, nx+nxo, ny+nyo, PIXR(ptypes[t].pcolors), PIXG(ptypes[t].pcolors), PIXB(ptypes[t].pcolors), 255-orbd[r]);
-						if(cmode == CM_FIRE){
-							fire_rv = fire_r[(ny+nyo)/CELL][(nx+nxo)/CELL];
-							fire_rv += (255-orbd[r])/32;
-							if(fire_rv>255) fire_rv = 255;
-							fire_r[(ny+nyo)/CELL][(nx+nxo)/CELL] = fire_rv;
+						if(ny+nyo>0 && ny+nyo<YRES && nx+nxo>0 && nx+nxo<XRES){
+							addpixel(vid, nx+nxo, ny+nyo, PIXR(ptypes[t].pcolors), PIXG(ptypes[t].pcolors), PIXB(ptypes[t].pcolors), 255-orbd[r]);
+							if(cmode == CM_FIRE && r == 1){
+								fire_rv = fire_r[(ny+nyo)/CELL][(nx+nxo)/CELL];
+								fire_rv += 1;
+								if(fire_rv>255) fire_rv = 255;
+								fire_r[(ny+nyo)/CELL][(nx+nxo)/CELL] = fire_rv;
+							}
 						}
 						addpixel(vid, nx, ny, PIXR(ptypes[t].pcolors), PIXG(ptypes[t].pcolors), PIXB(ptypes[t].pcolors), 200);
 					}
@@ -1988,12 +1990,14 @@ void draw_parts(pixel *vid)
 						drad = (M_PI * ((float)orbl[r]) / 180.0f)*1.41f;
 						nxo = ddist*cos(drad);
 						nyo = ddist*sin(drad);
-						addpixel(vid, nx+nxo, ny+nyo, PIXR(ptypes[t].pcolors), PIXG(ptypes[t].pcolors), PIXB(ptypes[t].pcolors), 255-orbd[r]);
-						if(cmode == CM_FIRE){
-							fire_bv = fire_b[(ny+nyo)/CELL][(nx+nxo)/CELL];
-							fire_bv += (255-orbd[r])/32;
-							if(fire_bv>255) fire_bv = 255;
-							fire_b[(ny+nyo)/CELL][(nx+nxo)/CELL] = fire_bv;
+						if(ny+nyo>0 && ny+nyo<YRES && nx+nxo>0 && nx+nxo<XRES){
+							addpixel(vid, nx+nxo, ny+nyo, PIXR(ptypes[t].pcolors), PIXG(ptypes[t].pcolors), PIXB(ptypes[t].pcolors), 255-orbd[r]);
+							if(cmode == CM_FIRE && r == 1){
+								fire_bv = fire_b[(ny+nyo)/CELL][(nx+nxo)/CELL];
+								fire_bv += 1;
+								if(fire_bv>255) fire_bv = 255;
+								fire_b[(ny+nyo)/CELL][(nx+nxo)/CELL] = fire_bv;
+							}
 						}
 						addpixel(vid, nx, ny, PIXR(ptypes[t].pcolors), PIXG(ptypes[t].pcolors), PIXB(ptypes[t].pcolors), 200);
 					}