diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 116722407a..465b34f3e0 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 300f37300e..44497353ad 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 3e05f17e68..bc2c6873cf 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 d601c26efc..4e498118df 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 5463ea885b..50d15744e2 100644 --- a/tools/updaterevision/updaterevision.vcproj +++ b/tools/updaterevision/updaterevision.vcproj @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +