From 04b80f8de5a41a1ceb79768b930ad2fc16fa9b94 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 26 Nov 2006 01:30:34 +0000 Subject: [PATCH] - Reverted updaterevision.vcproj to r385 and added a note as a build event explaining the need to use mt.exe 6.0 or newer. Here is the note: VERY IMPORTANT: You must copy the mt.exe from %VSINSTALLDIR%\Common7\Tools\bin on top of the version in %VSINSTALLDIR%\VC\bin or your computer may restart while building. - Changed the ASecretTrigger::Activate() fix: There's no reason open scripts shouldn't be able to activate secret triggers; players just won't get credit for it in coop. - Added a NULL actor check to R_SetupFrame(). - Fixed: The player sounds in DEHSUPP were defined incorrectly. SVN r390 (trunk) --- docs/rh-log.txt | 12 ++ src/g_shared/a_secrettrigger.cpp | 4 +- src/r_main.cpp | 5 + tools/updaterevision/updaterevision.c | 17 +++ tools/updaterevision/updaterevision.vcproj | 157 +++++++++++---------- wadsrc/dehsupp.lmp | Bin 9571 -> 9565 bytes wadsrc/dehsupp.txt | 10 +- 7 files changed, 122 insertions(+), 83 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 116722407..465b34f3e 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,15 @@ +November 25, 2006 +- Reverted updaterevision.vcproj to r385 and added a note as a build event + explaining the need to use mt.exe 6.0 or newer. Here is the note: + VERY IMPORTANT: You must copy the mt.exe from %VSINSTALLDIR%\Common7\Tools\bin + on top of the version in %VSINSTALLDIR%\VC\bin or your computer may restart + while building. +- Changed the ASecretTrigger::Activate() fix: There's no reason open scripts + shouldn't be able to activate secret triggers; players just won't get + credit for it in coop. +- Added a NULL actor check to R_SetupFrame(). +- Fixed: The player sounds in DEHSUPP were defined incorrectly. + November 25, 2006 (Changes by Graf Zahl) - Fixed: SecretTriggers that were activated in an OPEN script caused a crash. - Converted Heretic's Clink (Sabreclaw) to DECORATE. diff --git a/src/g_shared/a_secrettrigger.cpp b/src/g_shared/a_secrettrigger.cpp index 300f37300..44497353a 100644 --- a/src/g_shared/a_secrettrigger.cpp +++ b/src/g_shared/a_secrettrigger.cpp @@ -75,9 +75,9 @@ void ASecretTrigger::Activate (AActor *activator) S_Sound (activator, CHAN_AUTO, "misc/secret", 1, ATTN_NORM); } } - level.found_secrets++; if (activator->player) activator->player->secretcount++; - Destroy (); } + level.found_secrets++; + Destroy (); } diff --git a/src/r_main.cpp b/src/r_main.cpp index 3e05f17e6..bc2c6873c 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -975,6 +975,11 @@ void R_CopyStackedViewParameters() void R_SetupFrame (AActor *actor) { + if (actor == NULL) + { + I_Error ("Tried to render from a NULL actor."); + } + player_t *player = actor->player; unsigned int newblend; InterpolationViewer *iview; diff --git a/tools/updaterevision/updaterevision.c b/tools/updaterevision/updaterevision.c index d601c26ef..4e498118d 100644 --- a/tools/updaterevision/updaterevision.c +++ b/tools/updaterevision/updaterevision.c @@ -3,6 +3,23 @@ * Public domain. This program uses the svnversion command to get the * repository revision for a particular directory and writes it into * a header file so that it can be used as a project's build number. + * + * VERY IMPORTANT: + * + * When building with Visual Studio 2005, you must copy + * the mt.exe from %VSINSTALLDIR%\Common7\Tools\bin on top of the version + * in %VSINSTALLDIR%\VC\bin or your computer may restart while building. + * This is due to the interaction of two separate bugs in both the old + * mt.exe installed in the VC\bin directory and the loader in XP SP2. + * Microsoft has a hotfix for XP SP2 but has yet to release it to the + * general public, but fortunately they already have a fixed mt.exe + * available. + * + * To check that you have done this correctly, the project is now set to + * have the manifest tool output its version when it executes. The buggy + * version is 5.2.3790.2014, and the fixed version is 6.0.4071.0. + * + * Ignore any warnings about Unrecognized Element "trustInfo". */ #define _CRT_SECURE_NO_DEPRECATE diff --git a/tools/updaterevision/updaterevision.vcproj b/tools/updaterevision/updaterevision.vcproj index 5463ea885..50d15744e 100644 --- a/tools/updaterevision/updaterevision.vcproj +++ b/tools/updaterevision/updaterevision.vcproj @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + u-!t{#i8`E!QW@bTVX=Wv617>q(M`my4Fy=(&T;>Yq7Ul`evzb>i zZ)V=le1`ct^E2iT%>P(eSOi&QSu|NpSR7b9S$tW-SmIc+SV~#iSf;WpVcE=bh~*T^ zC6-$(k62!@{HkYVW#wWOWmRC+W;J28VRd5lXN_h}V=ZDWXRT-LV4cD`pLI3sHr9iz zXIbyEzGMBx#?HpWCd4Mqrpac?X3yr#7QmLomd=*XR>juJHi>N>+e)^rZ2QKytUHXNQD0UY5RaU2;Or5rUJjT~JZ6F6pbEaF(fv5sR4$1aXT9A`N$ zbKK>4!SRKYfs=<*oKuz4kkgjal{1htiZhinm$QVkfwPNqI_FZ(&7220&vV}6e9rli z^A8sz7YCOpmlT(3J(oV06_+cQFIO~I3RgB)5mzNw3)cj$d0cC`_Hdo#y3BQx>k-#$ zuFqV5xS6=QxrMo9xK+7zxXrm8xc#}4xzoAxxGTAvxhHYYJCYVaEJ zI`F#j2J*)7X7CpC*6_CRPUM}*yO4Js?{41Xyf=6s^S9`U{9`^L}A&(AN(ugtH@Z^G}u@5>*>pUPjrU(Mgn zKbe0%|2qBy{1^D&@c*tCU>4vO5EhUYP!})~a1ihlh!98?$P=g(Xcp)dm?1D5>ym46toxg6O0wi5v&&M5}YZxL~xVfe!(+>w*(&vz7_nbm6DoR ulEI*rmRVfFpp{-!npeW0m6Mp4!k|@x6i6Q_IweExf delta 909 zcmccX_1LT4&(YUa)Sqz?0|NsG10RDJgDisvgCT2*D;S#?dl;uM z&SzZ3xQ+23<5|WVjE@=LF#cp>X5wd(WKw3*XR=~)WvUNmiet)TDrRbA>S3C}w3ulP z(>|udOlO#`GCgE^#q@#c4>Kb(C$l)SBC`gw8M7_3J98j&40AejF>@Vr7xOgch0N=j zcQPMkzQlZ&`3>_o78VvR7I7A37JU{g7B?1umSC0`mK2r(mTHzBmf0+;Sa!0UV7b6@ zgXICs3ziS84E3zstOBgktZJ-=tX8Z}tRAePtck2StQD-atgWnltg~2`vTkJE!+M`*HU3>^IoovH#{^ z<`CeJ;85n!>Ih{GZIm0;$eT@o`CWDR61mbD45EaCvhDb0u_(3|i?$rFkWW3|cvfc`1erS_O%jd4>iC@rDdq6)CBS%q1Cyo6DG=D*^yI C*6r;8 diff --git a/wadsrc/dehsupp.txt b/wadsrc/dehsupp.txt index 0b8558ede..3866ebfe0 100644 --- a/wadsrc/dehsupp.txt +++ b/wadsrc/dehsupp.txt @@ -492,7 +492,7 @@ SoundMap "plats/pt1_mid", "switches/normbutn", "switches/exitbutn", - "*pain100_1", + "*pain100", "demon/pain", "grunt/pain", "vile/pain", @@ -501,7 +501,7 @@ SoundMap "misc/gibbed", "misc/i_pkup", "misc/w_pkup", - "*land1", + "*land", "misc/teleport", "grunt/sight", "grunt/sight", @@ -524,8 +524,8 @@ SoundMap "vile/start", "imp/melee", "skeleton/swing", - "*death1", - "*xdeath1", + "*death", + "*xdeath", "grunt/death", "grunt/death", "grunt/death", @@ -548,7 +548,7 @@ SoundMap "baby/active", "baby/walk", "vile/active", - "*grunt1", + "*grunt", "world/barrelx", "*fist", "cyber/hoof",