Merge branch 'sqc-14_classe_remoteplayer' of https://github.com/CegepSTH/SQCSim2023 into sqc-14_classe_remoteplayer
This commit is contained in:
		| @@ -25,7 +25,8 @@ void RemotePlayer::Feed(const netprot::Output out) { | |||||||
| 		Vector3f positionDelta = current.position - previous.position; | 		Vector3f positionDelta = current.position - previous.position; | ||||||
| 		m_position = current.position + positionDelta; | 		m_position = current.position + positionDelta; | ||||||
| 		m_direction = current.direction; | 		m_direction = current.direction; | ||||||
| 		m_team_id = current.id; | 		//Rajouter un get ID public dans la classe player	 | ||||||
|  | 		//m_team_id = current.id; | ||||||
|  |  | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| @@ -36,27 +37,27 @@ void RemotePlayer::Feed(const netprot::Output out) { | |||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	if (current.states.shooting) { | 	if (current.states.shooting) { | ||||||
| 		true; | 		//true; | ||||||
| 		m_animstate = Anim::SHOOTING; | 		m_animstate = Anim::SHOOTING; | ||||||
| 	} | 	} | ||||||
| 	else if (current.states.jumping) { | 	else if (current.states.jumping) { | ||||||
| 		true; | 		//true; | ||||||
| 		m_animstate = Anim::JUMPING; | 		m_animstate = Anim::JUMPING; | ||||||
| 	} | 	} | ||||||
| 	else if (current.states.dead) { | 	else if (current.states.dead) { | ||||||
| 		true; | 		//true; | ||||||
| 		m_animstate = Anim::DEAD; | 		m_animstate = Anim::DEAD; | ||||||
| 	} | 	} | ||||||
| 	else if(current.states.powerup){ | 	else if(current.states.powerup){ | ||||||
| 		true; | 		//true; | ||||||
| 		m_animstate = Anim::POWERUP; | 		m_animstate = Anim::POWERUP; | ||||||
| 	} | 	} | ||||||
| 	else if (current.states.still) { | 	else if (current.states.still) { | ||||||
| 		true; | 		//true; | ||||||
| 		m_animstate = Anim::STILL; | 		m_animstate = Anim::STILL; | ||||||
| 	} | 	} | ||||||
| 	else if (current.states.running) { | 	else if (current.states.running) { | ||||||
| 		true; | 		//true; | ||||||
| 		m_animstate = Anim::RUNNING; | 		m_animstate = Anim::RUNNING; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user