marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clonk doesn't stop digging automatically when he hits a wall

Tobias Zwick 2011-09-18 18:23:22 +02:00
parent 9d67bf366e
commit 988f05378f
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/game/object/C4Object.cpp
View File

@ -3158,14 +3158,8 @@ void C4Object::ContactAction()
ObjectActionStand(this);
return;
case DFA_DIG:
// Redirect downleft/downright
if (Action.ComDir==COMD_DownLeft)
{ Action.ComDir=COMD_Left; break; }
if (Action.ComDir==COMD_DownRight)
{ Action.ComDir=COMD_Right; break; }
// Else stop
ObjectComStopDig(this);
return;
// no special action
break;
case DFA_SWIM:
// Try corner scale out
if (!GBackLiquid(GetX(), GetY() - 1))
@ -3198,8 +3192,8 @@ void C4Object::ContactAction()
if (ObjectActionHangle(this,Action.Dir)) return;
break;
case DFA_DIG:
// Dig: Stop
if (!(pActionDef->GetPropertyInt(P_Attach) & CNAT_Top)) ObjectComStopDig(this); return;
// No action
break;
case DFA_HANGLE:
Action.ComDir=COMD_Stop;
break;
@ -3246,9 +3240,8 @@ void C4Object::ContactAction()
Action.ComDir=COMD_Stop;
return;
case DFA_DIG:
// Dig: Stop
if (!(pActionDef->GetPropertyInt(P_Attach) & CNAT_Left)) ObjectComStopDig(this);
return;
// Dig: no action
break;
}
}
@ -3293,9 +3286,8 @@ void C4Object::ContactAction()
Action.ComDir=COMD_Stop;
return;
case DFA_DIG:
// Dig: Stop
if (!(pActionDef->GetPropertyInt(P_Attach) & CNAT_Right)) ObjectComStopDig(this);
return;
// Dig: no action
break;
}
}