OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added scaling to double size for idmypos display.

Browse source 
- Changed: Players don't telefrag when they are spawned now but after all
  actors have been spawned to avoid accidental voodoo doll telefragging.
- Fixed: ACS scripts for non-existent maps were started on the current one.
- Added a 'wallbouncefactor' property to AActor.
- Reverted forceunderwater change from r1026 and fixed the problem for real:
  SECF_FORCEDUNDERWATER only has meaning when coming from the heightsec.
  So the initial check of the current sector in AActor::UpdateWaterLevel
  must only check for SECF_UNDERWATER, not SECF_UNDERWATERMASK.

SVN r1027 (trunk)
This commit is contained in:
Christoph Oelckers 2008-06-10 09:16:01 +00:00
commit 4e7a6c54ef
15 changed files with 83 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/p_lnspec.cpp
View file

@ -1558,10 +1558,11 @@ FUNC(LS_ACS_Execute)
{
level_info_t *info;
if ( (arg1 == 0) || !(info = FindLevelByNum (arg1)) )
if (arg1 == 0)
return P_StartScript (it, ln, arg0, level.mapname, backSide, arg2, arg3, arg4, false, false);
else
else if ((info = FindLevelByNum (arg1)) )
return P_StartScript (it, ln, arg0, info->mapname, backSide, arg2, arg3, arg4, false, false);
else return false;
}
FUNC(LS_ACS_ExecuteAlways)
@ -1569,10 +1570,11 @@ FUNC(LS_ACS_ExecuteAlways)
{
level_info_t *info;
if ( (arg1 == 0) || !(info = FindLevelByNum (arg1)) )
if (arg1 == 0)
return P_StartScript (it, ln, arg0, level.mapname, backSide, arg2, arg3, arg4, true, false);
else
else if ((info = FindLevelByNum (arg1)) )
return P_StartScript (it, ln, arg0, info->mapname, backSide, arg2, arg3, arg4, true, false);
else return false;
}
FUNC(LS_ACS_LockedExecute)
@ -1607,9 +1609,9 @@ FUNC(LS_ACS_Suspend)
{
level_info_t *info;
if ( (arg1 == 0) || !(info = FindLevelByNum (arg1)) )
if (arg1 == 0)
P_SuspendScript (arg0, level.mapname);
else
else if ((info = FindLevelByNum (arg1)) )
P_SuspendScript (arg0, info->mapname);
return true;
@ -1620,9 +1622,9 @@ FUNC(LS_ACS_Terminate)
{
level_info_t *info;
if ( (arg1 == 0) || !(info = FindLevelByNum (arg1)) )
if (arg1 == 0)
P_TerminateScript (arg0, level.mapname);
else
else if ((info = FindLevelByNum (arg1)) )
P_TerminateScript (arg0, info->mapname);
return true;