cleaning entities

Author: CereVenteo

DevRookies/DevRookies/Enemy.cpp

@@ -38,11 +38,6 @@ bool Enemy::CleanUp()
 	return false;
 }
 
-void Enemy::Die()
-{
-
-}
-
 const Collider* Enemy::GetCollider() const
 {
 	return collider;

DevRookies/DevRookies/Enemy.h

@@ -11,8 +11,6 @@
 class Enemy: public Entity
 {
 protected:
-	/*Animation * animation = nullptr;
-	Collider* collider = nullptr;*/
 
 	float distance = 400.0F;
 
@@ -44,7 +42,6 @@ class Enemy: public Entity
 
 	//virtual void Draw(SDL_Texture* sprites);
 	virtual void OnCollision(Collider*, Collider*) {};
-	void Die();
 
 	bool Save(pugi::xml_node&) const;
 	bool Load(pugi::xml_node&);

DevRookies/DevRookies/Entity.h

@@ -36,7 +36,6 @@ class Entity
 	virtual bool PreUpdate() { return true; };
 	virtual bool Update(float dt) { return true; };
 	virtual bool PostUpdate() { return true; };
-
 	virtual bool CleanUp() { return true; };
 	virtual bool Save(pugi::xml_node& file) const;
 	virtual bool Load(pugi::xml_node& file);
@@ -46,7 +45,7 @@ class Entity
 	virtual void OnCollision(Collider*) {};
 	void		AddCollider();
 
-	bool flipX = false;
+	
 
 	virtual fPoint GetPosition();
 	virtual void SetPosition(const float &x, const float &y);
@@ -58,6 +57,7 @@ class Entity
 	Collider* collider = nullptr;
 	Animation* current_animation = nullptr;
 	SDL_Texture* texture = nullptr;
+	bool flipX = false;
 
 };
 

DevRookies/DevRookies/Player.cpp

@@ -266,7 +266,7 @@ void Player::PreMove() {
 				current_movement = IDLE;
 
 		if (godmode) {
-			if (App->input->GetKey(SDL_SCANCODE_W) == KEY_REPEAT)
+			if (App->input->GetKey(SDL_SCANCODE_S) == KEY_REPEAT)
 				if (current_godmove != UPGOD)
 					current_godmove = DOWNGOD;
 				else
@@ -279,7 +279,7 @@ void Player::PreMove() {
 					current_godmove = IDLEGOD;
 		}
 		else{
-			if (App->input->GetKey(SDL_SCANCODE_W) == KEY_DOWN)
+			if (App->input->GetKey(SDL_SCANCODE_S) == KEY_DOWN)
 				if (current_element == FIRE)
 					current_element = ICE;
 				else
@@ -289,12 +289,12 @@ void Player::PreMove() {
 				if (App->input->GetKey(SDL_SCANCODE_SPACE) == KEY_DOWN)
 					current_movement = UP;
 
-				if (App->input->GetKey(SDL_SCANCODE_S) == KEY_DOWN && App->input->GetKey(SDL_SCANCODE_A) == KEY_REPEAT) {
+				if (App->input->GetKey(SDL_SCANCODE_B) == KEY_DOWN && App->input->GetKey(SDL_SCANCODE_A) == KEY_REPEAT) {
 					current_movement = LEFT_HIT;
 					AddFX(2, 0);
 				}
 
-				if (App->input->GetKey(SDL_SCANCODE_S) == KEY_DOWN && App->input->GetKey(SDL_SCANCODE_D) == KEY_REPEAT) {
+				if (App->input->GetKey(SDL_SCANCODE_B) == KEY_DOWN && App->input->GetKey(SDL_SCANCODE_D) == KEY_REPEAT) {
 					current_movement = RIGHT_HIT;
 					AddFX(2, 0);
 				}

DevRookies/DevRookies/Player.h

@@ -23,9 +23,7 @@ class Player : public Entity
 	fPoint		lastPosition;
 	p2SString   player_texture, jump_fx_name, dash_fx_name, dead_fx_name, victory_fx_name;
 
-	
 	uint		heigth_animation = 53;
-	uint		scene = 1;
 
 	void		PreMove();
 	void		Move();