---
src/character/character.h | 7 ----
src/interface/man_machine_interface.cpp | 51 -------------------------------
src/weapon/grapple.cpp | 23 --------------
src/weapon/grapple.h | 4 --
src/weapon/supertux.cpp | 42 -------------------------
src/weapon/supertux.h | 7 ----
src/weapon/weapon.cpp | 35 ---------------------
src/weapon/weapon.h | 8 -----
8 files changed, 0 insertions(+), 177 deletions(-)
diff --git a/src/character/character.h b/src/character/character.h
index 4e7ad28..28fe8c5 100644
--- a/src/character/character.h
+++ b/src/character/character.h
@@ -240,31 +240,24 @@ public:
// Keyboard handling
void HandleKeyPressed_MoveRight(bool slowly);
- void HandleKeyRefreshed_MoveRight(bool /*slowly*/) {};
void HandleKeyReleased_MoveRight(bool slowly);
void HandleKeyPressed_MoveLeft(bool slowly);
- void HandleKeyRefreshed_MoveLeft(bool /*slowly*/) {};
void HandleKeyReleased_MoveLeft(bool slowly);
void HandleKeyPressed_Up(bool slowly);
- void HandleKeyRefreshed_Up(bool /*slowly*/) {};
void HandleKeyReleased_Up(bool slowly);
void HandleKeyPressed_Down(bool slowly);
- void HandleKeyRefreshed_Down(bool /*slowly*/) {};
void HandleKeyReleased_Down(bool slowly);
void HandleKeyPressed_Jump();
- void HandleKeyRefreshed_Jump() const {};
void HandleKeyReleased_Jump() const {};
void HandleKeyPressed_HighJump();
- void HandleKeyRefreshed_HighJump() const { };
void HandleKeyReleased_HighJump() const { };
void HandleKeyPressed_BackJump();
- void HandleKeyRefreshed_BackJump() const {};
void HandleKeyReleased_BackJump() const {};
};
diff --git a/src/interface/man_machine_interface.cpp
b/src/interface/man_machine_interface.cpp
index ea9ee87..daf0c46 100644
--- a/src/interface/man_machine_interface.cpp
+++ b/src/interface/man_machine_interface.cpp
@@ -482,57 +482,6 @@ void ManMachineInterface::Refresh() const
if (MoveCamera(key))
continue;
-
- // Managing keys related to character moves
- // Available only when local
- if (!ActiveTeam().IsLocal()) return;
- if (ActiveCharacter().IsDead()) return;
- if (Game::GetInstance()->ReadState() == Game::END_TURN) return;
-
- // Movements are managed by weapons because sometimes it overrides the
keys
- switch (key) {
-
- case KEY_MOVE_RIGHT:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_MoveRight(false);
- break;
- case KEY_MOVE_RIGHT_SLOWLY:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_MoveRight(true);
- break;
- case KEY_MOVE_LEFT:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_MoveLeft(false);
- break;
- case KEY_MOVE_LEFT_SLOWLY:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_MoveLeft(true);
- break;
- case KEY_UP:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_Up(false);
- break;
- case KEY_UP_SLOWLY:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_Up(true);
- break;
- case KEY_DOWN:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_Down(false);
- break;
- case KEY_DOWN_SLOWLY:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_Down(true);
- break;
- case KEY_JUMP:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_Jump();
- break;
- case KEY_HIGH_JUMP:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_HighJump();
- break;
- case KEY_BACK_JUMP:
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_BackJump();
- break;
- case KEY_SHOOT:
- if (Game::GetInstance()->ReadState() == Game::PLAYING) {
- ActiveTeam().AccessWeapon().HandleKeyRefreshed_Shoot();
- }
- break;
- default:
- break;
- }
}
}
}
diff --git a/src/weapon/grapple.cpp b/src/weapon/grapple.cpp
index 8c2f081..f3d879b 100644
--- a/src/weapon/grapple.cpp
+++ b/src/weapon/grapple.cpp
@@ -726,12 +726,6 @@ void Grapple::HandleKeyPressed_Up(bool slowly)
ActiveCharacter().HandleKeyPressed_Up(slowly);
}
-void Grapple::HandleKeyRefreshed_Up(bool slowly)
-{
- if (!IsInUse())
- ActiveCharacter().HandleKeyRefreshed_Up(slowly);
-}
-
void Grapple::HandleKeyReleased_Up(bool slowly)
{
if (IsInUse())
@@ -748,12 +742,6 @@ void Grapple::HandleKeyPressed_Down(bool slowly)
ActiveCharacter().HandleKeyPressed_Down(slowly);
}
-void Grapple::HandleKeyRefreshed_Down(bool slowly)
-{
- if (!IsInUse())
- ActiveCharacter().HandleKeyRefreshed_Down(slowly);
-}
-
void Grapple::HandleKeyReleased_Down(bool slowly)
{
if (IsInUse())
@@ -770,12 +758,6 @@ void Grapple::HandleKeyPressed_MoveLeft(bool slowly)
ActiveCharacter().HandleKeyPressed_MoveLeft(slowly);
}
-void Grapple::HandleKeyRefreshed_MoveLeft(bool slowly)
-{
- if (!IsInUse())
- ActiveCharacter().HandleKeyRefreshed_MoveLeft(slowly);
-}
-
void Grapple::HandleKeyReleased_MoveLeft(bool slowly)
{
if (IsInUse())
@@ -792,11 +774,6 @@ void Grapple::HandleKeyPressed_MoveRight(bool slowly)
ActiveCharacter().HandleKeyPressed_MoveRight(slowly);
}
-void Grapple::HandleKeyRefreshed_MoveRight(bool slowly)
-{
- if (!IsInUse())
- ActiveCharacter().HandleKeyRefreshed_MoveRight(slowly);
-}
void Grapple::HandleKeyReleased_MoveRight(bool slowly)
{
diff --git a/src/weapon/grapple.h b/src/weapon/grapple.h
index b66806c..f9875db 100644
--- a/src/weapon/grapple.h
+++ b/src/weapon/grapple.h
@@ -130,19 +130,15 @@ class Grapple : public Weapon
// Keys management
void HandleKeyPressed_Up(bool slowly);
- void HandleKeyRefreshed_Up(bool slowly);
void HandleKeyReleased_Up(bool slowly);
void HandleKeyPressed_Down(bool slowly);
- void HandleKeyRefreshed_Down(bool slowly);
void HandleKeyReleased_Down(bool slowly);
void HandleKeyPressed_MoveRight(bool slowly);
- void HandleKeyRefreshed_MoveRight(bool slowly);
void HandleKeyReleased_MoveRight(bool slowly);
void HandleKeyPressed_MoveLeft(bool slowly);
- void HandleKeyRefreshed_MoveLeft(bool slowly);
void HandleKeyReleased_MoveLeft(bool slowly);
void PrintDebugRope();
diff --git a/src/weapon/supertux.cpp b/src/weapon/supertux.cpp
index 948f681..a6bc429 100644
--- a/src/weapon/supertux.cpp
+++ b/src/weapon/supertux.cpp
@@ -305,12 +305,6 @@ void TuxLauncher::HandleKeyPressed_MoveRight(bool slowly)
ActiveCharacter().HandleKeyPressed_MoveRight(slowly);
}
-void TuxLauncher::HandleKeyRefreshed_MoveRight(bool slowly)
-{
- if (!current_tux && !tux_death_time)
- ActiveCharacter().HandleKeyRefreshed_MoveRight(slowly);
-}
-
void TuxLauncher::HandleKeyReleased_MoveRight(bool slowly)
{
StopMovingRightForAllPlayers();
@@ -326,12 +320,6 @@ void TuxLauncher::HandleKeyPressed_MoveLeft(bool slowly)
ActiveCharacter().HandleKeyPressed_MoveLeft(slowly);
}
-void TuxLauncher::HandleKeyRefreshed_MoveLeft(bool slowly)
-{
- if (!current_tux && !tux_death_time)
- ActiveCharacter().HandleKeyRefreshed_MoveLeft(slowly);
-}
-
void TuxLauncher::HandleKeyReleased_MoveLeft(bool slowly)
{
StopMovingLeftForAllPlayers();
@@ -345,12 +333,6 @@ void TuxLauncher::HandleKeyPressed_Up(bool slowly)
ActiveCharacter().HandleKeyPressed_Up(slowly);
}
-void TuxLauncher::HandleKeyRefreshed_Up(bool slowly)
-{
- if (!current_tux && !tux_death_time)
- ActiveCharacter().HandleKeyRefreshed_Up(slowly);
-}
-
void TuxLauncher::HandleKeyReleased_Up(bool slowly)
{
if (!current_tux && !tux_death_time)
@@ -363,12 +345,6 @@ void TuxLauncher::HandleKeyPressed_Down(bool slowly)
ActiveCharacter().HandleKeyPressed_Down(slowly);
}
-void TuxLauncher::HandleKeyRefreshed_Down(bool slowly)
-{
- if (!current_tux && !tux_death_time)
- ActiveCharacter().HandleKeyRefreshed_Down(slowly);
-}
-
void TuxLauncher::HandleKeyReleased_Down(bool slowly)
{
if (!current_tux && !tux_death_time)
@@ -381,12 +357,6 @@ void TuxLauncher::HandleKeyPressed_Jump()
ActiveCharacter().HandleKeyPressed_Jump();
}
-void TuxLauncher::HandleKeyRefreshed_Jump()
-{
- if (!current_tux && !tux_death_time)
- ActiveCharacter().HandleKeyRefreshed_Jump();
-}
-
void TuxLauncher::HandleKeyReleased_Jump()
{
if (!current_tux && !tux_death_time)
@@ -399,12 +369,6 @@ void TuxLauncher::HandleKeyPressed_HighJump()
ActiveCharacter().HandleKeyPressed_HighJump();
}
-void TuxLauncher::HandleKeyRefreshed_HighJump()
-{
- if (!current_tux && !tux_death_time)
- ActiveCharacter().HandleKeyRefreshed_HighJump();
-}
-
void TuxLauncher::HandleKeyReleased_HighJump()
{
if (!current_tux && !tux_death_time)
@@ -417,12 +381,6 @@ void TuxLauncher::HandleKeyPressed_BackJump()
ActiveCharacter().HandleKeyPressed_BackJump();
}
-void TuxLauncher::HandleKeyRefreshed_BackJump()
-{
- if (!current_tux && !tux_death_time)
- ActiveCharacter().HandleKeyRefreshed_BackJump();
-}
-
void TuxLauncher::HandleKeyReleased_BackJump()
{
if (!current_tux && !tux_death_time)
diff --git a/src/weapon/supertux.h b/src/weapon/supertux.h
index a1da831..dc76769 100644
--- a/src/weapon/supertux.h
+++ b/src/weapon/supertux.h
@@ -56,31 +56,24 @@ public:
void StopShooting();
virtual void HandleKeyPressed_MoveRight(bool slowly);
- virtual void HandleKeyRefreshed_MoveRight(bool slowly);
virtual void HandleKeyReleased_MoveRight(bool slowly);
virtual void HandleKeyPressed_MoveLeft(bool slowly);
- virtual void HandleKeyRefreshed_MoveLeft(bool slowly);
virtual void HandleKeyReleased_MoveLeft(bool slowly);
virtual void HandleKeyPressed_Up(bool slowly);
- virtual void HandleKeyRefreshed_Up(bool slowly);
virtual void HandleKeyReleased_Up(bool slowly);
virtual void HandleKeyPressed_Down(bool slowly);
- virtual void HandleKeyRefreshed_Down(bool slowly);
virtual void HandleKeyReleased_Down(bool slowly);
virtual void HandleKeyPressed_Jump();
- virtual void HandleKeyRefreshed_Jump();
virtual void HandleKeyReleased_Jump();
virtual void HandleKeyPressed_HighJump();
- virtual void HandleKeyRefreshed_HighJump();
virtual void HandleKeyReleased_HighJump();
virtual void HandleKeyPressed_BackJump();
- virtual void HandleKeyRefreshed_BackJump();
virtual void HandleKeyReleased_BackJump();
void RefreshFromNetwork(double angle, Point2d pos);
diff --git a/src/weapon/weapon.cpp b/src/weapon/weapon.cpp
index 5c64e36..9f9c28b 100644
--- a/src/weapon/weapon.cpp
+++ b/src/weapon/weapon.cpp
@@ -778,11 +778,6 @@ void Weapon::HandleKeyPressed_MoveRight(bool slowly)
ActiveCharacter().HandleKeyPressed_MoveRight(slowly);
}
-void Weapon::HandleKeyRefreshed_MoveRight(bool slowly)
-{
- ActiveCharacter().HandleKeyRefreshed_MoveRight(slowly);
-}
-
void Weapon::HandleKeyReleased_MoveRight(bool slowly)
{
ActiveCharacter().HandleKeyReleased_MoveRight(slowly);
@@ -793,11 +788,6 @@ void Weapon::HandleKeyPressed_MoveLeft(bool slowly)
ActiveCharacter().HandleKeyPressed_MoveLeft(slowly);
}
-void Weapon::HandleKeyRefreshed_MoveLeft(bool slowly)
-{
- ActiveCharacter().HandleKeyRefreshed_MoveLeft(slowly);
-}
-
void Weapon::HandleKeyReleased_MoveLeft(bool slowly)
{
ActiveCharacter().HandleKeyReleased_MoveLeft(slowly);
@@ -808,11 +798,6 @@ void Weapon::HandleKeyPressed_Up(bool slowly)
ActiveCharacter().HandleKeyPressed_Up(slowly);
}
-void Weapon::HandleKeyRefreshed_Up(bool slowly)
-{
- ActiveCharacter().HandleKeyRefreshed_Up(slowly);
-}
-
void Weapon::HandleKeyReleased_Up(bool slowly)
{
ActiveCharacter().HandleKeyReleased_Up(slowly);
@@ -823,11 +808,6 @@ void Weapon::HandleKeyPressed_Down(bool slowly)
ActiveCharacter().HandleKeyPressed_Down(slowly);
}
-void Weapon::HandleKeyRefreshed_Down(bool slowly)
-{
- ActiveCharacter().HandleKeyRefreshed_Down(slowly);
-}
-
void Weapon::HandleKeyReleased_Down(bool slowly)
{
ActiveCharacter().HandleKeyReleased_Down(slowly);
@@ -838,11 +818,6 @@ void Weapon::HandleKeyPressed_Jump()
ActiveCharacter().HandleKeyPressed_Jump();
}
-void Weapon::HandleKeyRefreshed_Jump()
-{
- ActiveCharacter().HandleKeyRefreshed_Jump();
-}
-
void Weapon::HandleKeyReleased_Jump()
{
ActiveCharacter().HandleKeyReleased_Jump();
@@ -853,11 +828,6 @@ void Weapon::HandleKeyPressed_HighJump()
ActiveCharacter().HandleKeyPressed_HighJump();
}
-void Weapon::HandleKeyRefreshed_HighJump()
-{
- ActiveCharacter().HandleKeyRefreshed_HighJump();
-}
-
void Weapon::HandleKeyReleased_HighJump()
{
ActiveCharacter().HandleKeyReleased_HighJump();
@@ -868,11 +838,6 @@ void Weapon::HandleKeyPressed_BackJump()
ActiveCharacter().HandleKeyPressed_BackJump();
}
-void Weapon::HandleKeyRefreshed_BackJump()
-{
- ActiveCharacter().HandleKeyRefreshed_BackJump();
-}
-
void Weapon::HandleKeyReleased_BackJump()
{
ActiveCharacter().HandleKeyReleased_BackJump();
diff --git a/src/weapon/weapon.h b/src/weapon/weapon.h
index b8a0134..03cc9be 100644
--- a/src/weapon/weapon.h
+++ b/src/weapon/weapon.h
@@ -249,36 +249,28 @@ public:
// Key Shoot management
void HandleKeyPressed_Shoot();
- void HandleKeyRefreshed_Shoot() {};
void HandleKeyReleased_Shoot();
// To override standard moves of character
virtual void HandleKeyPressed_MoveRight(bool slowly);
- virtual void HandleKeyRefreshed_MoveRight(bool slowly);
virtual void HandleKeyReleased_MoveRight(bool slowly);
virtual void HandleKeyPressed_MoveLeft(bool slowly);
- virtual void HandleKeyRefreshed_MoveLeft(bool slowly);
virtual void HandleKeyReleased_MoveLeft(bool slowly);
virtual void HandleKeyPressed_Up(bool slowly);
- virtual void HandleKeyRefreshed_Up(bool slowly);
virtual void HandleKeyReleased_Up(bool slowly);
virtual void HandleKeyPressed_Down(bool slowly);
- virtual void HandleKeyRefreshed_Down(bool slowly);
virtual void HandleKeyReleased_Down(bool slowly);
virtual void HandleKeyPressed_Jump();
- virtual void HandleKeyRefreshed_Jump();
virtual void HandleKeyReleased_Jump();
virtual void HandleKeyPressed_HighJump();
- virtual void HandleKeyRefreshed_HighJump();
virtual void HandleKeyReleased_HighJump();
virtual void HandleKeyPressed_BackJump();
- virtual void HandleKeyRefreshed_BackJump();
virtual void HandleKeyReleased_BackJump();
// Other keys
--
1.6.0.4
_______________________________________________
Wormux-dev mailing list
Wormux-dev@gna.org
https://mail.gna.org/listinfo/wormux-dev
