From b53834a72fe88fc5655451ca1769f192df795b07 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 14 Feb 2008 15:40:46 +0000 Subject: [PATCH] - Added Karate Chris's patch for 0-tid == activator in action specials Thing_SetSpecial and Thing_SetTranslation. - -moved BUGS_FORUM_URL to version.h SVN r745 (trunk) --- docs/rh-log.txt | 5 +++++ src/p_lnspec.cpp | 21 ++++++++++++++++++--- src/version.h | 1 + src/win32/i_crash.cpp | 2 -- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index d7cca25118..bebb5552d5 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,8 @@ +February 14, 2008 (Changes by Graf Zahl) +- Added Karate Chris's patch for 0-tid == activator in action specials + Thing_SetSpecial and Thing_SetTranslation. +- -moved BUG_FORUM_URL to version.h + February 13, 2008 - Removed most checks on vid_hw2d/test2d. This now gets checked only once per frame to avoid the remote possibility that it could change during the middle diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 002ba7b8a6..825bbe3d31 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -901,7 +901,14 @@ FUNC(LS_Thing_SetSpecial) // [BC] // [RH] Use the SetThingSpecial ACS command instead. // It can set all args and not just the first three. { - if (arg0 != 0) + if (arg0 == 0) + { + it->special = arg1; + it->args[0] = arg2; + it->args[1] = arg3; + it->args[2] = arg4; + } + else { AActor *actor; FActorIterator iterator (arg0); @@ -1513,10 +1520,18 @@ FUNC(LS_Thing_SetTranslation) range = 0; } - while ( (target = iterator.Next ()) ) + if (arg0 == 0) { ok = true; - target->Translation = range==0? target->GetDefault()->Translation : range; + it->Translation = range==0? it->GetDefault()->Translation : range; + } + else + { + while ( (target = iterator.Next ()) ) + { + ok = true; + target->Translation = range==0? target->GetDefault()->Translation : range; + } } return ok; diff --git a/src/version.h b/src/version.h index 53778d4125..0ce672640f 100644 --- a/src/version.h +++ b/src/version.h @@ -93,6 +93,7 @@ // More stuff that needs to be different for derivatives. #define GAMENAME "ZDoom" #define FORUM_URL "http://forum.zdoom.org" +#define BUGS_FORUM_URL "http://forum.zdoom.org/index.php?c=3" #ifdef unix #define HOME_DIR "~/.zdoom" diff --git a/src/win32/i_crash.cpp b/src/win32/i_crash.cpp index fbbfa0ae17..fa9513b23c 100644 --- a/src/win32/i_crash.cpp +++ b/src/win32/i_crash.cpp @@ -65,8 +65,6 @@ // MACROS ------------------------------------------------------------------ -#define BUGS_FORUM_URL "http://forum.zdoom.org/index.php?c=3" - #define REMOTE_HOST "localhost" #define REMOTE_PORT "80" #define UPLOAD_URI "/test.php"