From 09bb31aaa4fdb1442e08dc5d17dce8e3a40aa941 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Tue, 17 Feb 2009 10:52:18 +0000 Subject: [PATCH] Missed an important bit of last night's build script update. >_< git-svn-id: http://pcsx2.googlecode.com/svn/trunk@517 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/windows/VCprojects/vsprops/postBuild.tmpl | 2 +- pcsx2/windows/VCprojects/vsprops/postBuild.unknown | 2 +- plugins/spu2-x/src/Savestate.cpp | 6 +++--- plugins/spu2-x/src/defs.h | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pcsx2/windows/VCprojects/vsprops/postBuild.tmpl b/pcsx2/windows/VCprojects/vsprops/postBuild.tmpl index 8423bad3f5..5b260bef7f 100644 --- a/pcsx2/windows/VCprojects/vsprops/postBuild.tmpl +++ b/pcsx2/windows/VCprojects/vsprops/postBuild.tmpl @@ -7,7 +7,7 @@ rem DestDir - $(SolutionDir) - Directory of the destination, usually the sam rem DestFile - Base filename of the target/dest, without extension! rem DestExt - Extension of the target/dest! -set pcsxoutdir=%~2\bin\plugins +set pcsxoutdir=%~2\bin set pcsxoutname=%pcsxoutdir%\%~3%4 set pcsxnewname=%pcsxoutdir%\%~3-r$WCREV$$WCMODS?m:$%4 diff --git a/pcsx2/windows/VCprojects/vsprops/postBuild.unknown b/pcsx2/windows/VCprojects/vsprops/postBuild.unknown index d633aa67d3..35e76173e1 100644 --- a/pcsx2/windows/VCprojects/vsprops/postBuild.unknown +++ b/pcsx2/windows/VCprojects/vsprops/postBuild.unknown @@ -7,7 +7,7 @@ rem DestDir - $(SolutionDir) - Directory of the destination, usually the sam rem DestFile - Base filename of the target/dest, without extension! rem DestExt - Extension of the target/dest! -set pcsxoutdir=%~2\bin\plugins +set pcsxoutdir=%~2\bin set pcsxoutname=%pcsxoutdir%%~3%4 IF NOT EXIST %pcsxoutdir% ( diff --git a/plugins/spu2-x/src/Savestate.cpp b/plugins/spu2-x/src/Savestate.cpp index d4076a233e..28722c53bb 100644 --- a/plugins/spu2-x/src/Savestate.cpp +++ b/plugins/spu2-x/src/Savestate.cpp @@ -35,9 +35,9 @@ struct SPU2freezeData s16 OutPos; s16 InputPos; u32 Cycles; - s32 uTicks; int PlayMode; + // Used as a base pointer to a series PcmCache blocks. PcmCacheEntry cacheData; }; @@ -47,7 +47,7 @@ static const u32 SAVE_ID = 0x1227521; // versioning for saves. // Increment this when changes to the savestate system are made. -static const u32 SAVE_VERSION = 0x0001; +static const u32 SAVE_VERSION = 0x0002; static void wipe_the_cache() { @@ -126,7 +126,7 @@ s32 __fastcall ThawIt( SPU2freezeData& spud ) printf("\tAudio may not recover correctly. Save your game to memorycard, reset,\n\n"); printf(" and then continue from there.\n\n"); - disableFreezes=true; + disableFreezes = true; resetClock = true; // Do *not* reset the cores. diff --git a/plugins/spu2-x/src/defs.h b/plugins/spu2-x/src/defs.h index 5715b0cbb1..e7ced8e9c2 100644 --- a/plugins/spu2-x/src/defs.h +++ b/plugins/spu2-x/src/defs.h @@ -54,7 +54,6 @@ struct V_ADSR bool Releasing; // Ready To Release, triggered by Voice.Stop(); - public: bool Calculate(); }; @@ -113,7 +112,7 @@ struct V_Voice s32 SPc; // Previous sample values - used for interpolation -// [Air] : Inverted order of these members to match the access order in the +// Inverted order of these members to match the access order in the // code (might improve cache hits). s32 PV4; s32 PV3;