This commit is contained in:
Paul 2001-02-06 21:19:53 +00:00
parent 89cd3b1fcc
commit 4b980a9213

View file

@ -271,8 +271,9 @@ Pos.vy=((Pos.vy-16)&0xfffffff0)+colHeight;
} }
else else
{ {
if(m_currentState!=STATE_FALL&&m_currentState!=STATE_BUTTFALL&& if(m_currentState!=STATE_FALL&&m_currentState!=STATE_FALLFAR&&
m_currentState!=STATE_JUMP&&m_currentState!=STATE_BUTTBOUNCE) m_currentState!=STATE_BUTTFALL&&m_currentState!=STATE_BUTTBOUNCE&&
m_currentState!=STATE_JUMP)
{ {
setState(STATE_FALL); setState(STATE_FALL);
} }
@ -427,7 +428,7 @@ DVECTOR CPlayer::getCameraPos()
{ {
DVECTOR cameraPos; DVECTOR cameraPos;
cameraPos.vx=Pos.vx+m_cameraOffset.vx; cameraPos.vx=Pos.vx+m_cameraOffset.vx;
cameraPos.vy=Pos.vy+m_cameraOffset.vy+m_cameraLookYOffset; cameraPos.vy=Pos.vy+m_cameraOffset.vy;//+m_cameraLookYOffset;
return cameraPos; return cameraPos;
} }