OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added UDMF LOcknumber property, submitted by Nightfall.

Browse source 
SVN r3331 (trunk)
This commit is contained in:
Christoph Oelckers 2011-12-12 16:07:32 +00:00
commit b1905c16ef
5 changed files with 75 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/p_spec.cpp
View file

@ -57,12 +57,13 @@
#include "gi.h"
#include "statnums.h"
#include "g_level.h"
#include "v_font.h"
#include "a_sharedglobal.h"
#include "farchive.h"
// State.
#include "r_state.h"
#include "v_font.h"
#include "a_sharedglobal.h"
#include "farchive.h"
#include "a_keys.h"
// State.
#include "r_state.h"
#include "c_console.h"
@ -232,12 +233,14 @@ bool P_ActivateLine (line_t *line, AActor *mo, int side, int activationType)
BYTE special;
if (!P_TestActivateLine (line, mo, side, activationType))
{
return false;
}
lineActivation = line->activation;
repeat = line->flags & ML_REPEAT_SPECIAL;
buttonSuccess = false;
{
return false;
}
int remote = (line->special != 7 && line->special != 8 && (line->special < 11 || line->special > 14));
if (line->locknumber > 0 && !P_CheckKeys (mo, line->locknumber, remote)) return false;
lineActivation = line->activation;
repeat = line->flags & ML_REPEAT_SPECIAL;
buttonSuccess = false;
buttonSuccess = P_ExecuteSpecial(line->special,
line, mo, side == 1, line->args[0],
line->args[1], line->args[2],