From c68e77cac9558316ac16d58c0f6b888599ab021a Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 11 Apr 2011 14:15:59 +0200 Subject: - make moving animation a bit smoother (on my computer at least) - make animation stop after getting blocked --- pacman-c++/util.cpp | 80 +++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 42 deletions(-) (limited to 'pacman-c++/util.cpp') diff --git a/pacman-c++/util.cpp b/pacman-c++/util.cpp index 3d04d9f..e82c961 100644 --- a/pacman-c++/util.cpp +++ b/pacman-c++/util.cpp @@ -93,56 +93,52 @@ namespace Util { switch (mov) { - case Actor::None: - return Transmission::direction_none; - break; - case Actor::Left: - return Transmission::direction_left; - break; - case Actor::Right: - return Transmission::direction_right; - break; - case Actor::Up: - return Transmission::direction_up; - break; - case Actor::Down: - return Transmission::direction_down; - break; - default: - if (def == static_cast(-1)) - Q_ASSERT(false); - else - return def; + case Actor::None: + return Transmission::direction_none; + break; + case Actor::Left: + return Transmission::direction_left; + break; + case Actor::Right: + return Transmission::direction_right; + break; + case Actor::Up: + return Transmission::direction_up; + break; + case Actor::Down: + return Transmission::direction_down; + break; + default: + return def; + break; } - return 0; // for pleasing the compiler + return def; } Actor::Movement transmissionMovementToActor(Transmission::field_t field, Actor::Movement def) { switch (field) { - case Transmission::direction_none: - return Actor::None; - break; - case Transmission::direction_left: - return Actor::Left; - break; - case Transmission::direction_right: - return Actor::Right; - break; - case Transmission::direction_up: - return Actor::Up; - break; - case Transmission::direction_down: - return Actor::Down; - break; - default: - if (def == Actor::Movement(-1)) - Q_ASSERT(false); - else - return def; + case Transmission::direction_none: + return Actor::None; + break; + case Transmission::direction_left: + return Actor::Left; + break; + case Transmission::direction_right: + return Actor::Right; + break; + case Transmission::direction_up: + return Actor::Up; + break; + case Transmission::direction_down: + return Actor::Down; + break; + default: + return def; + break; } - return Actor::None; // for pleasing the compiler + return def; } void QByteArrayToStdString(const QByteArray& arr, std::string& str) -- cgit v1.2.3