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 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Q0UL@_Eul_-W< zP&?{E2hb683Vnetpds`#nn1VFG@8X2hd32KgtKrSF2K*?^|%7Za1(CBop?V!iU;sn zd>Q|QZ{R=iKZKBwq>)ULOQNKR6qEI&oV-XHNjrIu^pXK`j(kIg$#pVDZj*ZnN~xkL zbTM5{bLlF&ny#gr=oVT}U!e)Qo4!kX=rMYN4$>=hl-{BD7-xnhu~e4HRlzqm&WZ$wM*-bXhF%S5Bp3ZZ4lt0JIcqNbVdfv)+@h<)WKf)8o z`Ds4LFY#f1i{IsQLWv}iCYFg6VwETo>%<08E^0-iXce!E4$&$0i^HN%^ovi$X>m?m z5hG$$+!B9FAdP%Lrps*kq%4%Ba-*!4G1(w@$PW3w{7??aK{+IUkvHXE^1gyfs1&t8 zr6<%1^|&fj#cGqPQZK1`)vVf7r#h%UQlG0!YD8UAW9oM`rS5B_wNBOxb-I37=jo_k zt1ESlj_YQ!PmMZFJRcn`?2q+&iwv z^}Da!ckT~2oAB6cpX^ipGN0q4zQmXLN+0*ley88#_xc`x%%AdK`|tg@p9)c!6fOy~ z!~C!$d_JrTTf&a8JM0ZV3D1U?!|UN#I2q1Fs;Vm*YC&Yn*6j@-Qd8d;|Bt$gcom3j WtJoUP&dLIjrvFbt-9Q3QEcq7^weExf delta 909 zcmWNHYfP180D#~7{e8dpbDth8}5DOrK?M@iO6IVor6Il5CUPtdYS z=-4cxT9OxLBZqS`i&CeRp-X4!Xi#}+w27w9!qrGN;@9&$+jD8@$kOz(MbA}aRKYy} z00A7B4rYRRpcs^bCqN}w1=fHB*aBL?``}a11Ny)*a0U#5E8tHs2JS%&4a|TKz`3vh zJ_Z-TN>~HyU;|9R6l{TQ@IBZCd*Bgx5}t!Ya0K3j;|QYwWuaVDh{{j}N>`&g6hjHr zjM`8q+KUdLoS-em8xPPUI7WM8xI*iY;?c8g7L$?xN{cs?)X5&iXD z`~)B1=lKx7&F={;yvP)}V!l`)7K0MTgieJ`=s7Pkbd#h|}Vt z7#1Vqw)jsnIZe)#`LaYlB`amETrJnhgnV6YmF@Bq`MK}=rB$oyQ2W$j^^H2OhSe1{s{T^r8fl?Jouy~%eEoa^abJM~_@U-#;x`ivgd*9qd{2^395tD!Mb2`&>U zup+DpUkW#d&0%}k750Q*hNr>{;ni?791AD&qA%Ac8;U{Rnph$U^44zL6i-go`uccu Z3LENU@#3PQ7pF8eHR7rB@Me51=YKlZ?d<>n 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",