From 73cf4cd3614292c7bd1b1fab5ef051e905cca9f2 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 24 Feb 2009 12:56:51 +0000
Subject: [PATCH] git-svn-id: http://pcsx2.googlecode.com/svn/trunk@588
 96395faa-99c1-11dd-bbfe-3dabce05a288

---
 pcsx2/Misc.cpp               | 38 +++++++++++++++++++-----------------
 pcsx2/windows/WinMain.cpp    |  6 +++---
 plugins/spu2-x/src/Mixer.cpp |  2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/pcsx2/Misc.cpp b/pcsx2/Misc.cpp
index bc5baefa25..d5bfd9ea65 100644
--- a/pcsx2/Misc.cpp
+++ b/pcsx2/Misc.cpp
@@ -35,7 +35,7 @@
 #include "VU.h"
 #include "iCore.h"
 #include "iVUzerorec.h"
-#include "BaseblockEx.h"		// for debuild block dumping (which may or may not work anymore?)
+#include "BaseblockEx.h"		// included for devbuild block dumping (which may or may not work anymore?)
 
 #include "GS.h"
 #include "COP0.h"
@@ -53,30 +53,32 @@ static int g_Pcsx2Recording = 0; // true 1 if recording video and sound
 
 const char *LabelAuthors = { N_(
 	"PCSX2, a PS2 emulator\n\n"
-	"originally written by:\n"
-	"saqib, refraction, zerofrog,\n"
-	"shadow, linuzappz, florin,\n"
-	"nachbrenner, auMatt, loser, \n"
-	"alexey silinov, goldfinger\n"
+	"Active Devs: Arcum42, Refraction,\n"
+	"drk||raziel, cottonvibes, gigaherz,\n"
+	"rama, Jake.Stine, saqib, Tmkk\n"
 	"\n"
-	"Devs:\n"
-	"Arcum42, drkIIRaziel, Cottonvibes, \n"
-	"Jake.Stine, Rama\n\n"
-	"Testing:\n"
-	"Krakatos\n"
+	"Inactive devs: Alexey silinov, Aumatt,\n"
+	"Florin, goldfinger, Linuzappz, loser,\n"
+	"Nachbrenner, shadow, Zerofrog\n"
 	"\n"
-	"Webmasters: CKemu, Falcon4ever")
+	"Betatesting: Bositman, ChaosCode,\n"
+	"CKemu, crushtest, GeneralPlot,\n"
+	"Krakatos, Paorotaku, Rudy_X\n"
+	"\n"
+	"Webmasters: CKemu, Falcon4ever"
+	)
 };
 
 const char *LabelGreets = { N_(
-	"Greets to: Bobbi, Keith, CpUMasteR, Nave, Snake785\n\n"
-	"Special thanks to: Gigaherz, Gabest, Sjeep, Dreamtime, F|RES, BGnome, MrBrown, \n"
-	"Seta-San, Skarmeth, blackd_wd, _Demo_\n"
+	"Contributors: Hiryu and Sjeep for libcvd (the iso parsing and\n"
+	"filesystem driver code), nneeve, pseudonym\n"
 	"\n"
-	"Credits: Hiryu && Sjeep for their libcdvd (iso parsing and filesystem driver code)\n"
+	"Plugin Specialists: ChickenLiver (Lilypad), Efp (efp),\n"
+	"Gabest (Gsdx, Cdvdolio, Xpad)\n"
 	"\n"
-	"Some betatester/support dudes: Belmont, bositman, ChaosCode, CKemu, crushtest,"
-	"Falcon4ever, GeneralPlot, jegHegy, parotaku, Prafull, Razorblade, Rudy_X, Seta-san")
+	"Special thanks to: black_wd, Belmont, BGome, _Demo_, Dreamtime,\n"
+	"F|RES, MrBrown, razorblade, Seta-san, Skarmeth"
+	)
 };
 
 static struct {
diff --git a/pcsx2/windows/WinMain.cpp b/pcsx2/windows/WinMain.cpp
index 50cde0617e..7b6a1e446c 100644
--- a/pcsx2/windows/WinMain.cpp
+++ b/pcsx2/windows/WinMain.cpp
@@ -769,8 +769,8 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				break;
 
 			case ID_HELP_HELP:
-				//system("help\\index.html");
-				system("compat_list\\compat_list.html");
+				ShellExecute( hWnd, "open", "http://www.pcsx2.net", NULL, NULL, SW_SHOWNORMAL );
+				//system("compat_list\\compat_list.html");
 				break;
 
 			case ID_CONFIG_MEMCARDS:
@@ -1049,7 +1049,7 @@ void CreateMainMenu() {
 
 
     ADDSUBMENU(0, _("&Help"));
-	ADDMENUITEM(0,_("&Compatibility List..."), ID_HELP_HELP);
+	ADDMENUITEM(0,_("&Pcsx2 Website..."), ID_HELP_HELP);
 	ADDMENUITEM(0,_("&About..."), ID_HELP_ABOUT);
 
 	if( !IsDevBuild )
diff --git a/plugins/spu2-x/src/Mixer.cpp b/plugins/spu2-x/src/Mixer.cpp
index acef98dc2c..13d82d08d2 100644
--- a/plugins/spu2-x/src/Mixer.cpp
+++ b/plugins/spu2-x/src/Mixer.cpp
@@ -436,7 +436,7 @@ static s32 __forceinline GetVoiceValues_Cubic( V_Core& thiscore, uint voiceidx )
 	s32 val = (z0 * mu) >> 12;
 	val = ((val + z1) * mu) >> 12;
 	val = ((val + z2) * mu) >> 12;
-	val += vc.PV2;
+	val += vc.PV3;
 
 	// Note!  It's very important that ADSR stay as accurate as possible.  By the way
 	// it is used, various sound effects can end prematurely if we truncate more than