Skip to content

Commit

Permalink
Hexen: Fixed immediate plane moves
Browse files Browse the repository at this point in the history
The client was ignoring plane moves that
happened with speed zero, meaning the move
is supposed to happen immediately.

This fixes the problem of e.g. windows not
breaking in MAP01.
  • Loading branch information
skyjake committed Jun 23, 2011
1 parent b696524 commit 8b1f947
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion doomsday/engine/portable/src/cl_world.c
Expand Up @@ -245,7 +245,7 @@ void Cl_AddMover(uint sectornum, clmovertype_t type, float dest, float speed)
dest, speed);
#endif

if(speed == 0 || sectornum >= numSectors)
if(sectornum >= numSectors)
return;

// Remove any existing movers for the same plane.
Expand Down
6 changes: 6 additions & 0 deletions doomsday/plugins/jheretic/src/p_spec.c
Expand Up @@ -432,6 +432,12 @@ void P_InitPicAnims(void)

boolean P_ActivateLine(linedef_t *ld, mobj_t *mo, int side, int actType)
{
if(IS_CLIENT)
{
// Clients do not activate lines.
return false;
}

switch(actType)
{
case SPAC_CROSS:
Expand Down
7 changes: 7 additions & 0 deletions doomsday/plugins/jhexen/src/p_acs.c
Expand Up @@ -359,6 +359,13 @@ boolean P_StartACS(int number, uint map, byte* args, mobj_t* activator,
acs_t* script;
aste_t* statePtr;

#ifdef _DEBUG
if(IS_CLIENT)
{
Con_Message("P_StartACS: Client is attempting to start a script!\n");
}
#endif

NewScript = NULL;
if(map && map-1 != gameMap)
{ // Script is not for the current map.
Expand Down
6 changes: 6 additions & 0 deletions doomsday/plugins/jhexen/src/p_spec.c
Expand Up @@ -614,6 +614,12 @@ boolean P_ActivateLine(linedef_t *line, mobj_t *mo, int side, int activationType
boolean buttonSuccess;
xline_t *xline = P_ToXLine(line);

if(IS_CLIENT)
{
// Clients do not activate lines.
return false;
}

lineActivation = GET_SPAC(xline->flags);
if(lineActivation != activationType)
return false;
Expand Down

0 comments on commit 8b1f947

Please sign in to comment.