git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@45311 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 27 insertions, 33 deletions

diff --git a/AUTHORS b/AUTHORS
index 4daac6b5..63db1295 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,11 +23,14 @@ PCSX-Reloaded Maintainer: Wei Mingzhi <whistler@openoffice.org>
 
 PCSX-Reloaded Contributors: avlex (Help on xcode project)
 			    dario86 (Various bugfixes)
+			    edgbla (Bugfix)
 			    Gabriele Gorla (Rewritten MDEC decoder)
-			    Giovanni Scafora (Italian Translation)
 			    maggix (Leopard compilation fix)
 			    NeToU (Bugfix)
 			    Peter Collingbourne (Various core/psxbios fixes)
 			    shalma (Various core fixes)
-			    Tibério Vítor (Brazilian Portuguese Translation)
 			    Tristin Celestin (PulseAudio support)
+
+PCSX-Reloaded Translators: Giovanni Scafora (Italian)
+			   Tibério Vítor (Brazilian Portuguese)
+			   Wei Mingzhi (Simplified & Traditional Chinese)
diff --git a/ChangeLog b/ChangeLog
index 84cafa03..77b31653 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ April 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
  * libpcsxcore/gte.c: Use u32 instead of unsigned long.
  * COPYING: Fixed a typo in FSF's address.
+ * plugins/dfxvideo/soft.c: Army Man invisible bullets fix (courtesy of
+   edgbla).
+ * AUTHORS: Updated info.
+ * data/pcsx.glade2: Likewise.
 
 April 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
diff --git a/data/pcsx.glade2 b/data/pcsx.glade2
index 7e5d15ab..5994b20c 100644
--- a/data/pcsx.glade2
+++ b/data/pcsx.glade2
@@ -2573,18 +2573,6 @@ the Free Software Foundation, Inc.</property>
     <property name="authors">PCSX-Reloaded Maintainer:
 Wei Mingzhi &lt;whistler_wmz@users.sf.net&gt;
 
-PCSX-Reloaded Contributors:
-avlex (Help on xcode project)
-dario86 (Various bugfixes)
-Gabriele Gorla (Rewritten MDEC decoder)
-Giovanni Scafora (Italian Translation)
-maggix (Leopard compilation fix)
-NeToU (Bugfix)
-Peter Collingbourne (Various core/psxbios fixes)
-shalma (Various core fixes)
-Tib&#xE9;rio V&#xED;tor (Brazilian Portuguese Translation)
-Tristin Celestin (PulseAudio support)
-
 PCSX-df Team:
 Ryan Schultz &lt;schultz.ryan@gmail.com&gt;
 Andrew Burton &lt;adb@iinet.net.au&gt;
diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c
index 0a55693a..21625664 100644
--- a/plugins/dfxvideo/soft.c
+++ b/plugins/dfxvideo/soft.c
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #define _IN_SOFT
-                   
+
 #include "externals.h"
 #include "soft.h"
 
@@ -26,7 +26,6 @@
 #include "menu.h"
 #include "swap.h"
 
-
 ////////////////////////////////////////////////////////////////////////////////////
 // "NO EDGE BUFFER" POLY VERSION... FUNCS BASED ON FATMAP.TXT FROM MRI / Doomsday
 ////////////////////////////////////////////////////////////////////////////////////
@@ -8330,7 +8329,7 @@ void HorzLineFlat(int y, int x0, int x1, unsigned short colour)
 		x1 = drawW;
 
 	for (x = x0; x <= x1; x++)
-		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+		GetShadeTransCol(&psxVuw[(y << 10) + x], colour);
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -8342,12 +8341,12 @@ void DrawSoftwareLineShade(int32_t rgb0, int32_t rgb1)
 	int32_t rgbt;
 	double m, dy, dx;
 
-	if(lx0>drawW && lx1>drawW) return;
-	if(ly0>drawH && ly1>drawH) return;
-	if(lx0<drawX && lx1<drawX) return;
-	if(ly0<drawY && ly1<drawY) return;
-	if(drawY>=drawH) return;
-	if(drawX>=drawW) return; 
+	if (lx0 > drawW && lx1 > drawW) return;
+	if (ly0 > drawH && ly1 > drawH) return;
+	if (lx0 < drawX && lx1 < drawX) return;
+	if (ly0 < drawY && ly1 < drawY) return;
+	if (drawY >= drawH) return;
+	if (drawX >= drawW) return; 
 
 	x0 = lx0;
 	y0 = ly0;
@@ -8384,13 +8383,13 @@ void DrawSoftwareLineShade(int32_t rgb0, int32_t rgb1)
 				rgb0 = rgb1;
 				x1 = xt;
 				y1 = yt;
-				rgb1 = rgb0;
+				rgb1 = rgbt;
 
 				dx = x1 - x0;
 				dy = y1 - y0;
 			}
 
-			m = dy/dx;
+			m = dy / dx;
 
 			if (m >= 0)
 			{
@@ -8415,14 +8414,14 @@ void DrawSoftwareLineFlat(int32_t rgb)
 	double m, dy, dx;
 	unsigned short colour = 0;
  
-	if(lx0>drawW && lx1>drawW) return;
-	if(ly0>drawH && ly1>drawH) return;
-	if(lx0<drawX && lx1<drawX) return;
-	if(ly0<drawY && ly1<drawY) return;
-	if(drawY>=drawH) return;
-	if(drawX>=drawW) return; 
-
-	colour = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
+	if (lx0 > drawW && lx1 > drawW) return;
+	if (ly0 > drawH && ly1 > drawH) return;
+	if (lx0 < drawX && lx1 < drawX) return;
+	if (ly0 < drawY && ly1 < drawY) return;
+	if (drawY >= drawH) return;
+	if (drawX >= drawW) return; 
+
+	colour = ((rgb & 0x00f80000) >> 9) | ((rgb & 0x0000f800) >> 6) | ((rgb & 0x000000f8) >> 3);
 
 	x0 = lx0;
 	y0 = ly0;