From 17553cfbf619895d81628d1e4fb568904ec47618 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers <coelckers@zdoom.fake> Date: Sun, 29 Nov 2009 11:24:01 +0000 Subject: [PATCH] - fixed: Line_SetBlocking and Line_SetTextureScale were not in the list of action specials used by DECORATE or MAPINFO. - fixed: Teleport_NoStop was not in the line special function table. SVN r2010 (trunk) --- docs/rh-log.txt | 5 +++++ src/actionspecials.h | 2 ++ src/p_lnspec.cpp | 10 +++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 53b5891ef9..2dd7aafa3d 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,8 @@ +November 29, 2009 (Changes by Graf Zahl) +- fixed: Line_SetBlocking and Line_SetTextureScale were not in the list + of action specials used by DECORATE or MAPINFO. +- fixed: Teleport_NoStop was not in the line special function table. + November 28, 2009 - Fixed: The FPS meter cannot use I_MSTime(), because if the game is started with +vid_fps 1, it can need the time before the timer is ready to start. diff --git a/src/actionspecials.h b/src/actionspecials.h index aefdcc9514..98c899f5bb 100644 --- a/src/actionspecials.h +++ b/src/actionspecials.h @@ -53,6 +53,8 @@ DEFINE_SPECIAL(Sector_SetLink, 51, 4, 4, 4) DEFINE_SPECIAL(Scroll_Wall, 52, 5, 5, 5) DEFINE_SPECIAL(Line_SetTextureOffset, 53, 5, 5, 5) DEFINE_SPECIAL(Sector_ChangeFlags, 54, 3, 3, 3) +DEFINE_SPECIAL(Line_SetBlocking, 55, 3, 3, 3) +DEFINE_SPECIAL(Line_SetTextureScale, 56, 5, 5, 5) DEFINE_SPECIAL(Plat_PerpetualRaise, 60, 3, 3, 3) DEFINE_SPECIAL(Plat_Stop, 61, 1, 1, 1) diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 7417ebbefd..7a51075b4c 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -3120,14 +3120,14 @@ lnSpecFunc LineSpecials[256] = LS_NOP, // 151 Team_UseFP LS_NOP, // 152 Team_Score LS_NOP, // 153 Team_Init - LS_NOP, // 154 Var_Lock + LS_Teleport_NoStop, LS_NOP, // 155 Team_RemoveItem LS_NOP, // 156 Team_GiveItem // [BC] End LS_NOP, // 157 - LS_NOP, // 158 - LS_NOP, // 159 - LS_NOP, // 160 - LS_NOP, // 161 + LS_NOP, // 158 (FS_Execute in GZDoom) + LS_NOP, // 159 (Sector_SetPlaneReflection in GZDoom) + LS_NOP, // 160 (Sector_Set3DFloor in GZDoom and Vavoom) + LS_NOP, // 161 (Sector_SetContents in GZDoom and Vavoom) LS_NOP, // 162 LS_NOP, // 163 LS_NOP, // 164