[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4076 - in trunk/pingus/src: editor pingus pingus/actions p
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4076 - in trunk/pingus/src: editor pingus pingus/actions pingus/components pingus/screens pingus/worldobjs |
|
Date: |
Sun, 8 Nov 2009 01:28:09 +0100 |
Author: grumbel
Date: 2009-11-08 01:27:52 +0100 (Sun, 08 Nov 2009)
New Revision: 4076
Modified:
trunk/pingus/src/editor/action_properties.cpp
trunk/pingus/src/editor/action_properties.hpp
trunk/pingus/src/pingus/action_holder.cpp
trunk/pingus/src/pingus/action_holder.hpp
trunk/pingus/src/pingus/actions/angel.hpp
trunk/pingus/src/pingus/actions/basher.cpp
trunk/pingus/src/pingus/actions/basher.hpp
trunk/pingus/src/pingus/actions/blocker.cpp
trunk/pingus/src/pingus/actions/blocker.hpp
trunk/pingus/src/pingus/actions/boarder.cpp
trunk/pingus/src/pingus/actions/boarder.hpp
trunk/pingus/src/pingus/actions/bomber.cpp
trunk/pingus/src/pingus/actions/bomber.hpp
trunk/pingus/src/pingus/actions/bridger.cpp
trunk/pingus/src/pingus/actions/bridger.hpp
trunk/pingus/src/pingus/actions/climber.cpp
trunk/pingus/src/pingus/actions/climber.hpp
trunk/pingus/src/pingus/actions/digger.cpp
trunk/pingus/src/pingus/actions/digger.hpp
trunk/pingus/src/pingus/actions/drown.hpp
trunk/pingus/src/pingus/actions/exiter.hpp
trunk/pingus/src/pingus/actions/faller.cpp
trunk/pingus/src/pingus/actions/faller.hpp
trunk/pingus/src/pingus/actions/floater.cpp
trunk/pingus/src/pingus/actions/floater.hpp
trunk/pingus/src/pingus/actions/jumper.cpp
trunk/pingus/src/pingus/actions/jumper.hpp
trunk/pingus/src/pingus/actions/laser_kill.hpp
trunk/pingus/src/pingus/actions/miner.cpp
trunk/pingus/src/pingus/actions/miner.hpp
trunk/pingus/src/pingus/actions/rocket_launcher.cpp
trunk/pingus/src/pingus/actions/rocket_launcher.hpp
trunk/pingus/src/pingus/actions/slider.cpp
trunk/pingus/src/pingus/actions/slider.hpp
trunk/pingus/src/pingus/actions/smashed.hpp
trunk/pingus/src/pingus/actions/splashed.hpp
trunk/pingus/src/pingus/actions/superman.hpp
trunk/pingus/src/pingus/actions/waiter.cpp
trunk/pingus/src/pingus/actions/waiter.hpp
trunk/pingus/src/pingus/actions/walker.cpp
trunk/pingus/src/pingus/actions/walker.hpp
trunk/pingus/src/pingus/components/action_button.cpp
trunk/pingus/src/pingus/components/button_panel.cpp
trunk/pingus/src/pingus/components/button_panel.hpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingu.hpp
trunk/pingus/src/pingus/pingu_action.cpp
trunk/pingus/src/pingus/pingu_action.hpp
trunk/pingus/src/pingus/pingu_enums.cpp
trunk/pingus/src/pingus/pingu_enums.hpp
trunk/pingus/src/pingus/pingu_holder.cpp
trunk/pingus/src/pingus/screens/game_session.cpp
trunk/pingus/src/pingus/screens/game_session.hpp
trunk/pingus/src/pingus/server.cpp
trunk/pingus/src/pingus/server.hpp
trunk/pingus/src/pingus/server_event.cpp
trunk/pingus/src/pingus/server_event.hpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/pingus/worldobjs/exit.cpp
trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
trunk/pingus/src/pingus/worldobjs/hammer.cpp
trunk/pingus/src/pingus/worldobjs/laser_exit.cpp
trunk/pingus/src/pingus/worldobjs/smasher.cpp
Log:
Renamed Actions::ActionName to ActionName::Enum
Modified: trunk/pingus/src/editor/action_properties.cpp
===================================================================
--- trunk/pingus/src/editor/action_properties.cpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/editor/action_properties.cpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -39,16 +39,16 @@
y_pos(0),
action_comps()
{
- add_action(Actions::BASHER);
- add_action(Actions::BLOCKER);
- add_action(Actions::BOMBER);
- add_action(Actions::BRIDGER);
- add_action(Actions::CLIMBER);
- add_action(Actions::DIGGER);
- add_action(Actions::FLOATER);
- add_action(Actions::JUMPER);
- add_action(Actions::MINER);
- add_action(Actions::SLIDER);
+ add_action(ActionName::BASHER);
+ add_action(ActionName::BLOCKER);
+ add_action(ActionName::BOMBER);
+ add_action(ActionName::BRIDGER);
+ add_action(ActionName::CLIMBER);
+ add_action(ActionName::DIGGER);
+ add_action(ActionName::FLOATER);
+ add_action(ActionName::JUMPER);
+ add_action(ActionName::MINER);
+ add_action(ActionName::SLIDER);
}
ActionProperties::~ActionProperties()
@@ -68,10 +68,10 @@
}
void
-ActionProperties::add_action(Actions::ActionName id)
+ActionProperties::add_action(ActionName::Enum id)
{
ActionComponent comp;
- comp.checkbox = new Checkbox(Rect(Vector2i(10,10 + y_pos), Size(80,20)),
Actions::action_to_screenname(id));
+ comp.checkbox = new Checkbox(Rect(Vector2i(10,10 + y_pos), Size(80,20)),
ActionName::to_screenname(id));
comp.inputbox = new Inputbox(Rect(Vector2i(100,10 + y_pos), Size(40,20)));
comp.checkbox->set_checked(true);
@@ -102,7 +102,7 @@
std::map<std::string, int> actions = level->get_actions();
for(std::map<std::string, int>::iterator i = actions.begin(); i !=
actions.end(); ++i)
{
- ActionComponents::iterator j =
action_comps.find(Actions::action_from_string(i->first));
+ ActionComponents::iterator j =
action_comps.find(ActionName::from_string(i->first));
if (j != action_comps.end())
{
j->second.inputbox->set_text(StringUtil::to_string(i->second));
@@ -112,23 +112,23 @@
}
void
-ActionProperties::on_checkbox_change(bool t, Actions::ActionName id)
+ActionProperties::on_checkbox_change(bool t, ActionName::Enum id)
{
if (t)
{
- level->set_action(Actions::action_to_string(id),
+ level->set_action(ActionName::to_string(id),
StringUtil::to<int>(action_comps[id].inputbox->get_text()));
}
else
{
- level->set_action(Actions::action_to_string(id), 0);
+ level->set_action(ActionName::to_string(id), 0);
}
}
void
-ActionProperties::on_inputbox_change(const std::string& value,
Actions::ActionName id)
+ActionProperties::on_inputbox_change(const std::string& value,
ActionName::Enum id)
{
- level->set_action(Actions::action_to_string(id), StringUtil::to<int>(value));
+ level->set_action(ActionName::to_string(id), StringUtil::to<int>(value));
}
} // namespace Editor
Modified: trunk/pingus/src/editor/action_properties.hpp
===================================================================
--- trunk/pingus/src/editor/action_properties.hpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/editor/action_properties.hpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -42,7 +42,7 @@
Inputbox* inputbox;
};
- typedef std::map<Actions::ActionName, ActionComponent> ActionComponents;
+ typedef std::map<ActionName::Enum, ActionComponent> ActionComponents;
ActionComponents action_comps;
public:
@@ -52,12 +52,12 @@
void draw_background(DrawingContext& gc);
void update (float delta);
- void add_action(Actions::ActionName id);
+ void add_action(ActionName::Enum id);
void set_level(EditorLevel* level);
- void on_checkbox_change(bool t, Actions::ActionName id);
- void on_inputbox_change(const std::string& str, Actions::ActionName id);
+ void on_checkbox_change(bool t, ActionName::Enum id);
+ void on_inputbox_change(const std::string& str, ActionName::Enum id);
private:
ActionProperties (const ActionProperties&);
Modified: trunk/pingus/src/pingus/action_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/action_holder.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/action_holder.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -18,8 +18,6 @@
#include "pingus/pingus_level.hpp"
-using namespace Actions;
-
ActionHolder::ActionHolder(const PingusLevel& plf) :
available_actions()
{
@@ -27,7 +25,7 @@
for(std::map<std::string, int>::const_iterator i = actions.begin(); i !=
actions.end(); ++i)
{
- set_actions(Actions::action_from_string(i->first), i->second);
+ set_actions(ActionName::from_string(i->first), i->second);
}
}
@@ -35,12 +33,12 @@
{
}
-std::vector<Actions::ActionName>
+std::vector<ActionName::Enum>
ActionHolder::get_available_actions()
{
- std::vector<ActionName> ret;
+ std::vector<ActionName::Enum> ret;
- for(std::map<ActionName, int>::iterator i= available_actions.begin();
+ for(std::map<ActionName::Enum, int>::iterator i= available_actions.begin();
i != available_actions.end(); ++i)
ret.push_back(i->first);
@@ -48,19 +46,19 @@
}
void
-ActionHolder::set_actions (ActionName name, int available)
+ActionHolder::set_actions (ActionName::Enum name, int available)
{
available_actions[name] = available;
}
void
-ActionHolder::push_action (ActionName name)
+ActionHolder::push_action (ActionName::Enum name)
{
available_actions[name]++;
}
bool
-ActionHolder::pop_action (ActionName name)
+ActionHolder::pop_action (ActionName::Enum name)
{
int& avail = available_actions[name];
@@ -76,7 +74,7 @@
}
int
-ActionHolder::get_available (ActionName name)
+ActionHolder::get_available (ActionName::Enum name)
{
return available_actions[name];
}
Modified: trunk/pingus/src/pingus/action_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/action_holder.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/action_holder.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -39,7 +39,7 @@
* where the integer <i>n</i> indicates how much more actions
* called <i>name</i> can be created.
*/
- std::map<Actions::ActionName, int> available_actions;
+ std::map<ActionName::Enum, int> available_actions;
public:
/** Create an action holder from the number of actions given in a
@@ -48,29 +48,29 @@
~ActionHolder();
/** @return a list of available actions in the current level */
- std::vector<Actions::ActionName> get_available_actions();
+ std::vector<ActionName::Enum> get_available_actions();
/** Sets the number of actions, which are available in the pool.
* @param name the name of the action
* @param available the number of actions available
*/
- void set_actions (Actions::ActionName name, int available);
+ void set_actions (ActionName::Enum name, int available);
/** Adds an action to the pool of actions, making one more action available
* @param name the name of the action
*/
- void push_action (Actions::ActionName name);
+ void push_action (ActionName::Enum name);
/** Removes an action from the pool of actions
@return true if an action was available and removed, false if no
actions where available */
- bool pop_action (Actions::ActionName name);
+ bool pop_action (ActionName::Enum name);
/** Returns the number of actions of the specified name which are available
* thru get_action()
* @return 0 if the name is unknown FIXME: should use .find instead of []
*/
- int get_available (Actions::ActionName name);
+ int get_available (ActionName::Enum name);
private:
ActionHolder (const ActionHolder&);
Modified: trunk/pingus/src/pingus/actions/angel.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/angel.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/angel.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -32,7 +32,7 @@
public:
Angel (Pingu* p);
- ActionName get_type () const { return Actions::ANGEL; }
+ ActionName::Enum get_type () const { return ActionName::ANGEL; }
void update ();
void draw (SceneContext& gc);
Modified: trunk/pingus/src/pingus/actions/basher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/basher.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/basher.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -71,7 +71,7 @@
if (rel_getpixel(0, -1) == Groundtype::GP_WATER
|| rel_getpixel(0, -1) == Groundtype::GP_LAVA)
{
- pingu->set_action(Actions::DROWN);
+ pingu->set_action(ActionName::DROWN);
}
// If walking on to something (i.e. hasn't fallen)
else if (rel_getpixel(0, -1) != Groundtype::GP_NOTHING)
@@ -84,7 +84,7 @@
// Change direction and let walk code walk forward/up to get out.
Sound::PingusSound::play_sound("chink");
pingu->direction.change();
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
}
else if (have_something_to_dig())
{
@@ -96,7 +96,7 @@
else if
(static_cast<float>(sprite[pingu->direction].get_current_frame()) // FIXME:
Game logic must be separate from Sprite
/
static_cast<float>(sprite[pingu->direction].get_frame_count()) > 0.6f)
{ // FIXME: EVIL! Engine must not relay on graphic
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
}
}
}
@@ -126,7 +126,7 @@
if (y_inc < -max_steps_down)
{
// The step down is too much. So stop being a Basher and be a Faller.
- pingu->set_action(Actions::FALLER);
+ pingu->set_action(ActionName::FALLER);
}
else
{
Modified: trunk/pingus/src/pingus/actions/basher.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/basher.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/basher.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -53,7 +53,7 @@
public:
Basher (Pingu* p);
- ActionName get_type () const { return Actions::BASHER; }
+ ActionName::Enum get_type () const { return ActionName::BASHER; }
void draw (SceneContext& gc);
void update ();
Modified: trunk/pingus/src/pingus/actions/blocker.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/blocker.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/blocker.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -48,7 +48,7 @@
{
if (!standing_on_ground())
{
- pingu->set_action(Actions::FALLER);
+ pingu->set_action(ActionName::FALLER);
return;
}
else
Modified: trunk/pingus/src/pingus/actions/blocker.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/blocker.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/blocker.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -30,7 +30,7 @@
public:
Blocker (Pingu* p);
- ActionName get_type() const { return Actions::BLOCKER; }
+ ActionName::Enum get_type() const { return ActionName::BLOCKER; }
void draw (SceneContext& gc);
void update();
Modified: trunk/pingus/src/pingus/actions/boarder.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -63,7 +63,7 @@
pingu->apply_force(Vector3f(float(speed *
static_cast<float>(pingu->direction) * 0.5f),
-float(speed *
static_cast<float>(abs(pingu->direction)) * 0.5f)));
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
return;
}
}
@@ -71,7 +71,7 @@
else
{
pingu->apply_force (Vector3f(speed * static_cast<float>(pingu->direction),
0));
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
}
}
Modified: trunk/pingus/src/pingus/actions/boarder.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/boarder.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/boarder.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -33,7 +33,7 @@
public:
Boarder (Pingu* p);
- ActionName get_type () const { return Actions::BOARDER; }
+ ActionName::Enum get_type () const { return ActionName::BOARDER; }
void draw (SceneContext& gc);
void update ();
Modified: trunk/pingus/src/pingus/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -75,7 +75,7 @@
if (sprite[pingu->direction].get_current_frame() <= 9 && (rel_getpixel(0,
-1) == Groundtype::GP_WATER
|| rel_getpixel(0,
-1) == Groundtype::GP_LAVA))
{
- pingu->set_action(Actions::DROWN);
+ pingu->set_action(ActionName::DROWN);
return;
}
@@ -83,7 +83,7 @@
if (sprite[pingu->direction].get_current_frame () <= 9 && rel_getpixel(0,
-1) != Groundtype::GP_NOTHING
&& velocity.y > deadly_velocity)
{
- pingu->set_action(Actions::SPLASHED);
+ pingu->set_action(ActionName::SPLASHED);
return;
}
Modified: trunk/pingus/src/pingus/actions/bomber.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/bomber.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -41,7 +41,7 @@
public:
Bomber (Pingu* p);
- ActionName get_type() const { return Actions::BOMBER; }
+ ActionName::Enum get_type() const { return ActionName::BOMBER; }
ActionType get_activation_mode() const { return COUNTDOWN_TRIGGERED; }
void draw (SceneContext& gc);
Modified: trunk/pingus/src/pingus/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -110,7 +110,7 @@
else // We reached a wall...
{
pingu->direction.change ();
- pingu->set_action (Actions::WALKER);
+ pingu->set_action (ActionName::WALKER);
return;
}
}
@@ -137,13 +137,13 @@
else
{
pingu->direction.change ();
- pingu->set_action (Actions::WALKER);
+ pingu->set_action (ActionName::WALKER);
return;
}
}
else // Out of bricks
{
- pingu->set_action(Actions::WAITER);
+ pingu->set_action(ActionName::WAITER);
return;
}
}
Modified: trunk/pingus/src/pingus/actions/bridger.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/bridger.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/bridger.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -48,7 +48,7 @@
Bridger(Pingu*);
std::string get_name () const;
- ActionName get_type () const { return Actions::BRIDGER; }
+ ActionName::Enum get_type () const { return ActionName::BRIDGER; }
void update ();
void update_build ();
Modified: trunk/pingus/src/pingus/actions/climber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/climber.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/climber.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -68,14 +68,14 @@
}
// Finish climbing.
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
}
}
else
{
// std::cout << "Climber failed, falling down" << std::endl;
pingu->direction.change();
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
}
}
@@ -86,11 +86,11 @@
}
bool
-Climber::change_allowed(ActionName new_action)
+Climber::change_allowed(ActionName::Enum new_action)
{
return
- (new_action == Actions::FLOATER) ||
- (new_action == Actions::JUMPER);
+ (new_action == ActionName::FLOATER) ||
+ (new_action == ActionName::JUMPER);
}
} // namespace Actions
Modified: trunk/pingus/src/pingus/actions/climber.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/climber.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/climber.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -32,7 +32,7 @@
public:
Climber (Pingu*);
- ActionName get_type () const { return Actions::CLIMBER; }
+ ActionName::Enum get_type () const { return ActionName::CLIMBER; }
ActionType get_activation_mode () const { return WALL_TRIGGERED; }
void draw (SceneContext& gc);
@@ -40,7 +40,7 @@
void update ();
char get_persistent_char () { return 'c'; }
- bool change_allowed(ActionName new_action);
+ bool change_allowed(ActionName::Enum new_action);
private:
Climber (const Climber&);
Modified: trunk/pingus/src/pingus/actions/digger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/digger.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/digger.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -41,7 +41,7 @@
if (rel_getpixel(0, -1) == Groundtype::GP_WATER
|| rel_getpixel(0, -1) == Groundtype::GP_LAVA)
{
- pingu->set_action(Actions::DROWN);
+ pingu->set_action(ActionName::DROWN);
return;
}
@@ -54,7 +54,7 @@
if (!have_something_to_dig())
{
dig ();
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
}
}
Modified: trunk/pingus/src/pingus/actions/digger.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/digger.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/digger.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -33,7 +33,7 @@
public:
Digger(Pingu*);
- ActionName get_type () const { return Actions::DIGGER; }
+ ActionName::Enum get_type () const { return ActionName::DIGGER; }
bool have_something_to_dig ();
void dig ();
Modified: trunk/pingus/src/pingus/actions/drown.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/drown.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/drown.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -30,7 +30,7 @@
public:
Drown (Pingu* p);
- ActionName get_type () const { return Actions::DROWN; }
+ ActionName::Enum get_type () const { return ActionName::DROWN; }
void draw (SceneContext& gc);
void update ();
Modified: trunk/pingus/src/pingus/actions/exiter.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/exiter.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/exiter.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -31,7 +31,7 @@
public:
Exiter(Pingu*);
void init(void);
- ActionName get_type() const { return Actions::EXITER; }
+ ActionName::Enum get_type() const { return ActionName::EXITER; }
void draw (SceneContext& gc);
void update();
Modified: trunk/pingus/src/pingus/actions/faller.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/faller.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/faller.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -102,22 +102,22 @@
if (rel_getpixel(0, -1) == Groundtype::GP_WATER
|| rel_getpixel(0, -1) == Groundtype::GP_LAVA)
{
- pingu->set_action(Actions::DROWN);
+ pingu->set_action(ActionName::DROWN);
}
// Did we stop too fast?
else if (Math::abs(pingu->get_velocity().y) > deadly_velocity)
{
//std::cout << "Pingus splashed: " << pingu->get_velocity().y << " "
<< deadly_velocity << std::endl;
- pingu->set_action(Actions::SPLASHED);
+ pingu->set_action(ActionName::SPLASHED);
}
else
{
// This is where the jumper bug happens
//std::cout << "Reached the unreachable: " << pingu->get_velocity().y
<< std::endl;
- if (pingu->get_previous_action() == Actions::BLOCKER)
+ if (pingu->get_previous_action() == ActionName::BLOCKER)
pingu->set_action(pingu->get_previous_action());
else
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
}
}
// If the Pingu collided into something while moving up...
@@ -151,9 +151,9 @@
}
bool
-Faller::change_allowed (ActionName new_action)
+Faller::change_allowed (ActionName::Enum new_action)
{
- return new_action == Actions::FLOATER || new_action == Actions::CLIMBER;
+ return new_action == ActionName::FLOATER || new_action ==
ActionName::CLIMBER;
}
} // namespace Actions
Modified: trunk/pingus/src/pingus/actions/faller.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/faller.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/faller.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -35,9 +35,9 @@
void draw (SceneContext& gc);
void update();
- bool change_allowed (Actions::ActionName new_action);
+ bool change_allowed (ActionName::Enum new_action);
- ActionName get_type() const { return Actions::FALLER; }
+ ActionName::Enum get_type() const { return ActionName::FALLER; }
bool is_tumbling () const;
private:
Modified: trunk/pingus/src/pingus/actions/floater.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/floater.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/floater.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -49,7 +49,7 @@
}
else
{
- pingu->set_action (Actions::WALKER);
+ pingu->set_action (ActionName::WALKER);
}
}
@@ -60,7 +60,7 @@
}
bool
-Floater::change_allowed (ActionName)
+Floater::change_allowed(ActionName::Enum)
{
return false;
}
Modified: trunk/pingus/src/pingus/actions/floater.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/floater.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/floater.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -32,7 +32,7 @@
public:
Floater(Pingu* p);
- ActionName get_type() const { return Actions::FLOATER; }
+ ActionName::Enum get_type() const { return ActionName::FLOATER; }
ActionType get_activation_mode() const { return FALL_TRIGGERED; }
void init(void);
@@ -41,7 +41,7 @@
void update();
char get_persistent_char () { return 'f'; }
- bool change_allowed (ActionName new_action);
+ bool change_allowed (ActionName::Enum new_action);
private:
Floater (const Floater&);
Modified: trunk/pingus/src/pingus/actions/jumper.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -41,7 +41,7 @@
Jumper::update ()
{
// if climber, do a wall-jump, else just jump forward
- if ((pingu->get_previous_action() == Actions::CLIMBER))
+ if ((pingu->get_previous_action() == ActionName::CLIMBER))
pingu->direction.change();
if (pingu->direction.is_left())
@@ -56,7 +56,7 @@
// Move the pingu in the air, so that it can start 'falling'
pingu->set_y(pingu->get_y() - 1);
- pingu->set_action (Actions::FALLER);
+ pingu->set_action (ActionName::FALLER);
}
} // namespace Actions
Modified: trunk/pingus/src/pingus/actions/jumper.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/jumper.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/jumper.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -30,7 +30,7 @@
public:
Jumper(Pingu*);
- ActionName get_type() const { return Actions::JUMPER; }
+ ActionName::Enum get_type() const { return ActionName::JUMPER; }
void draw (SceneContext& gc);
void update();
Modified: trunk/pingus/src/pingus/actions/laser_kill.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/laser_kill.hpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/actions/laser_kill.hpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -32,7 +32,7 @@
public:
LaserKill (Pingu*);
- ActionName get_type () const { return Actions::LASERKILL; }
+ ActionName::Enum get_type () const { return ActionName::LASERKILL; }
void init (void);
void draw (SceneContext& gc);
Modified: trunk/pingus/src/pingus/actions/miner.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/miner.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/miner.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -61,7 +61,7 @@
WorldObj::get_world()->remove(miner_radius,
static_cast<int>(pingu->get_x() -
static_cast<float>((miner_radius.get_width() / 2) + pingu->direction)),
static_cast<int>(pingu->get_y() -
static_cast<float>(miner_radius.get_width() + 3) ));
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
}
else if (rel_getpixel(0, -1) == Groundtype::GP_SOLID
|| rel_getpixel(0, pingu_height) == Groundtype::GP_SOLID)
@@ -72,7 +72,7 @@
WorldObj::get_world()->remove(miner_radius,
static_cast<int>(pingu->get_x() -
static_cast<float>((miner_radius.get_width() / 2) + pingu->direction)),
static_cast<int>(pingu->get_y() -
static_cast<float>(miner_radius.get_width() + 1) ));
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
// Stop Pingu walking further into the solid.
pingu->direction.change();
Modified: trunk/pingus/src/pingus/actions/miner.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/miner.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/miner.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -34,7 +34,7 @@
Miner (Pingu* p);
virtual ~Miner () {}
- ActionName get_type () const { return Actions::MINER; }
+ ActionName::Enum get_type () const { return ActionName::MINER; }
void draw (SceneContext& gc);
void update ();
Modified: trunk/pingus/src/pingus/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -45,7 +45,7 @@
{
if (sprite[pingu->direction].is_finished())
{
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
return;
}
Modified: trunk/pingus/src/pingus/actions/rocket_launcher.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.hpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.hpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -31,7 +31,7 @@
RocketLauncher(Pingu*);
~RocketLauncher() {}
- ActionName get_type () const { return Actions::ROCKETLAUNCHER; }
+ ActionName::Enum get_type () const { return ActionName::ROCKETLAUNCHER; }
void draw (SceneContext& gc);
void update ();
Modified: trunk/pingus/src/pingus/actions/slider.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/slider.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/slider.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -55,7 +55,7 @@
pingu->set_velocity(pingu->get_velocity() + Vector3f(-speed, 0.0));
}
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
return;
}
}
@@ -63,7 +63,7 @@
speed -= 7 * 0.025f;
if (speed < 1)
{
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
return;
}
}
Modified: trunk/pingus/src/pingus/actions/slider.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/slider.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/slider.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -30,7 +30,7 @@
public:
Slider (Pingu* p);
- ActionName get_type() const { return Actions::SLIDER; }
+ ActionName::Enum get_type() const { return ActionName::SLIDER; }
void draw (SceneContext& gc);
void update();
Modified: trunk/pingus/src/pingus/actions/smashed.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/smashed.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/smashed.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -33,7 +33,7 @@
public:
Smashed (Pingu*);
- ActionName get_type () const { return Actions::SMASHED; }
+ ActionName::Enum get_type () const { return ActionName::SMASHED; }
void draw (SceneContext& gc);
void update ();
Modified: trunk/pingus/src/pingus/actions/splashed.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/splashed.hpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/actions/splashed.hpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -32,13 +32,13 @@
public:
Splashed (Pingu*);
- ActionName get_type () const { return Actions::SPLASHED; }
+ ActionName::Enum get_type () const { return ActionName::SPLASHED; }
void draw (SceneContext& gc);
void update ();
bool catchable () { return false; }
- bool change_allowed (Actions::ActionName) { return false; }
+ bool change_allowed (ActionName::Enum ) { return false; }
private:
Splashed (const Splashed&);
Modified: trunk/pingus/src/pingus/actions/superman.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/superman.hpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/actions/superman.hpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -32,7 +32,7 @@
public:
Superman (Pingu*);
- ActionName get_type () const { return Actions::SUPERMAN; }
+ ActionName::Enum get_type () const { return ActionName::SUPERMAN; }
void draw (SceneContext& gc);
void update ();
Modified: trunk/pingus/src/pingus/actions/waiter.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -36,7 +36,7 @@
if (countdown < 0)
{
- pingu->set_action(Actions::WALKER);
+ pingu->set_action(ActionName::WALKER);
return;
}
Modified: trunk/pingus/src/pingus/actions/waiter.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/waiter.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/waiter.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -34,7 +34,7 @@
public:
Waiter (Pingu*);
- ActionName get_type () const { return Actions::WAITER; }
+ ActionName::Enum get_type () const { return ActionName::WAITER; }
void draw (SceneContext& gc);
void update ();
Modified: trunk/pingus/src/pingus/actions/walker.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/walker.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/walker.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -71,7 +71,7 @@
if (rel_getpixel(0, -1) == Groundtype::GP_WATER)
{
- pingu->set_action(Actions::DROWN);
+ pingu->set_action(ActionName::DROWN);
return;
}
@@ -98,7 +98,7 @@
}
else
{
- pingu->set_action(Actions::FALLER);
+ pingu->set_action(ActionName::FALLER);
return;
}
}
@@ -166,7 +166,7 @@
// We take the step, so that we are in the air
pingu->set_x(pingu->get_x() + static_cast<float>(pingu->direction));
// We reached a cliff
- pingu->set_action(Actions::FALLER);
+ pingu->set_action(ActionName::FALLER);
return;
}
}
@@ -208,7 +208,7 @@
{
gc.color().draw(walker[pingu->direction], pingu->get_pos());
- if (pingu->get_fall_action() && pingu->get_fall_action()->get_type() ==
Actions::FLOATER)
+ if (pingu->get_fall_action() && pingu->get_fall_action()->get_type() ==
ActionName::FLOATER)
{
gc.color().draw(floaterlayer[pingu->direction], pingu->get_pos());
}
Modified: trunk/pingus/src/pingus/actions/walker.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/walker.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/actions/walker.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -36,7 +36,7 @@
void draw (SceneContext& gc);
void update ();
- ActionName get_type () const { return Actions::WALKER; }
+ ActionName::Enum get_type () const { return ActionName::WALKER; }
private:
Walker (const Walker&);
Modified: trunk/pingus/src/pingus/components/action_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.cpp 2009-11-08
00:05:32 UTC (rev 4075)
+++ trunk/pingus/src/pingus/components/action_button.cpp 2009-11-08
00:27:52 UTC (rev 4076)
@@ -21,8 +21,6 @@
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-using namespace Actions;
-
ArmageddonButton::ArmageddonButton(Server* s, int x, int y) :
RectComponent(Rect(Vector2i(x, y), Size(38, 60))),
server(s),
Modified: trunk/pingus/src/pingus/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -22,8 +22,6 @@
#include "pingus/server.hpp"
#include "util/string_util.hpp"
-using namespace Actions;
-
ButtonPanel::ButtonPanel(GameSession* s, const Vector2i& pos) :
RectComponent(Rect()),
session(s),
@@ -36,7 +34,7 @@
{
ActionHolder* aholder = session->get_server()->get_action_holder();
- std::vector<ActionName> actions = aholder->get_available_actions();
+ std::vector<ActionName::Enum> actions = aholder->get_available_actions();
set_rect(Rect(Vector2i(pos.x, pos.y - (actions.size() * 38)/2),
Size(60, actions.size() * 38)));
@@ -44,11 +42,11 @@
// Sort the action so that they always have the same order in the panel
std::sort(actions.begin(), actions.end());
- for(std::vector<ActionName>::size_type i = 0; i < actions.size(); ++i)
+ for(std::vector<ActionName::Enum>::size_type i = 0; i < actions.size(); ++i)
{
ActionButton button;
button.name = actions[i];
- button.sprite = Sprite("pingus/player0/" + action_to_string(button.name) +
"/right");
+ button.sprite = Sprite("pingus/player0/" +
ActionName::to_string(button.name) + "/right");
button.sprite.set_hotspot(origin_center, 0, 0);
button.sprite.set_play_loop(true);
buttons.push_back(button);
@@ -78,7 +76,8 @@
if (show_tip && tip_button == i)
{
- gc.print_left(Fonts::pingus_small, Vector2i(rect.left + 65, rect.top + 5
+ 38*i), action_to_screenname(buttons[i].name));
+ gc.print_left(Fonts::pingus_small, Vector2i(rect.left + 65, rect.top + 5
+ 38*i),
+ ActionName::to_screenname(buttons[i].name));
}
}
}
@@ -93,7 +92,7 @@
buttons[i].sprite.set_frame(0);
}
-ActionName
+ActionName::Enum
ButtonPanel::get_action_name()
{
return buttons[current_button].name;
Modified: trunk/pingus/src/pingus/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -30,7 +30,7 @@
private:
struct ActionButton
{
- Actions::ActionName name;
+ ActionName::Enum name;
Sprite sprite;
ActionButton() :
@@ -56,7 +56,7 @@
void draw(DrawingContext& gc);
void update (float delta);
- Actions::ActionName get_action_name();
+ ActionName::Enum get_action_name();
// Set the n'th button active
void set_button(int n);
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-08 00:05:32 UTC (rev 4075)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-08 00:27:52 UTC (rev 4076)
@@ -57,7 +57,7 @@
countdown_action(),
wall_action(),
fall_action(),
- previous_action(FALLER),
+ previous_action(ActionName::FALLER),
id(arg_id),
action_time(-1),
owner_id(owner),
@@ -71,7 +71,7 @@
// Initialisize the action, after this step the action ptr will
// always be valid in the pingu class
- action = create_action(FALLER);
+ action = create_action(ActionName::FALLER);
}
Pingu::~Pingu ()
@@ -85,7 +85,7 @@
}
bool
-Pingu::change_allowed (ActionName new_action)
+Pingu::change_allowed(ActionName::Enum new_action)
{
assert (action);
return action->change_allowed (new_action);
@@ -231,13 +231,13 @@
}
bool
-Pingu::request_set_action (ActionName action_name)
+Pingu::request_set_action (ActionName::Enum action_name)
{
return request_set_action(create_action(action_name));
}
void
-Pingu::set_action (ActionName action_name)
+Pingu::set_action (ActionName::Enum action_name)
{
set_action(create_action(action_name));
}
@@ -412,7 +412,7 @@
return action->get_name();
}
-ActionName
+ActionName::Enum
Pingu::get_action ()
{
return action->get_type();
@@ -460,32 +460,32 @@
}
boost::shared_ptr<PinguAction>
-Pingu::create_action(ActionName action_)
+Pingu::create_action(ActionName::Enum action_)
{
switch(action_)
{
- case ANGEL: return boost::shared_ptr<PinguAction>(new Angel(this));
- case BASHER: return boost::shared_ptr<PinguAction>(new Basher(this));
- case BLOCKER: return boost::shared_ptr<PinguAction>(new Blocker(this));
- case BOARDER: return boost::shared_ptr<PinguAction>(new Boarder(this));
- case BOMBER: return boost::shared_ptr<PinguAction>(new Bomber(this));
- case BRIDGER: return boost::shared_ptr<PinguAction>(new Bridger(this));
- case CLIMBER: return boost::shared_ptr<PinguAction>(new Climber(this));
- case DIGGER: return boost::shared_ptr<PinguAction>(new Digger(this));
- case DROWN: return boost::shared_ptr<PinguAction>(new Drown(this));
- case EXITER: return boost::shared_ptr<PinguAction>(new Exiter(this));
- case FALLER: return boost::shared_ptr<PinguAction>(new Faller(this));
- case FLOATER: return boost::shared_ptr<PinguAction>(new Floater(this));
- case JUMPER: return boost::shared_ptr<PinguAction>(new Jumper(this));
- case LASERKILL: return boost::shared_ptr<PinguAction>(new LaserKill(this));
- case MINER: return boost::shared_ptr<PinguAction>(new Miner(this));
- case ROCKETLAUNCHER: return boost::shared_ptr<PinguAction>(new
RocketLauncher(this));
- case SLIDER: return boost::shared_ptr<PinguAction>(new Slider(this));
- case SMASHED: return boost::shared_ptr<PinguAction>(new Smashed(this));
- case SPLASHED: return boost::shared_ptr<PinguAction>(new Splashed(this));
- case SUPERMAN: return boost::shared_ptr<PinguAction>(new Superman(this));
- case WAITER: return boost::shared_ptr<PinguAction>(new Waiter(this));
- case WALKER: return boost::shared_ptr<PinguAction>(new Walker(this));
+ case ActionName::ANGEL: return boost::shared_ptr<PinguAction>(new
Angel(this));
+ case ActionName::BASHER: return boost::shared_ptr<PinguAction>(new
Basher(this));
+ case ActionName::BLOCKER: return boost::shared_ptr<PinguAction>(new
Blocker(this));
+ case ActionName::BOARDER: return boost::shared_ptr<PinguAction>(new
Boarder(this));
+ case ActionName::BOMBER: return boost::shared_ptr<PinguAction>(new
Bomber(this));
+ case ActionName::BRIDGER: return boost::shared_ptr<PinguAction>(new
Bridger(this));
+ case ActionName::CLIMBER: return boost::shared_ptr<PinguAction>(new
Climber(this));
+ case ActionName::DIGGER: return boost::shared_ptr<PinguAction>(new
Digger(this));
+ case ActionName::DROWN: return boost::shared_ptr<PinguAction>(new
Drown(this));
+ case ActionName::EXITER: return boost::shared_ptr<PinguAction>(new
Exiter(this));
+ case ActionName::FALLER: return boost::shared_ptr<PinguAction>(new
Faller(this));
+ case ActionName::FLOATER: return boost::shared_ptr<PinguAction>(new
Floater(this));
+ case ActionName::JUMPER: return boost::shared_ptr<PinguAction>(new
Jumper(this));
+ case ActionName::LASERKILL: return boost::shared_ptr<PinguAction>(new
LaserKill(this));
+ case ActionName::MINER: return boost::shared_ptr<PinguAction>(new
Miner(this));
+ case ActionName::ROCKETLAUNCHER: return boost::shared_ptr<PinguAction>(new
RocketLauncher(this));
+ case ActionName::SLIDER: return boost::shared_ptr<PinguAction>(new
Slider(this));
+ case ActionName::SMASHED: return boost::shared_ptr<PinguAction>(new
Smashed(this));
+ case ActionName::SPLASHED: return boost::shared_ptr<PinguAction>(new
Splashed(this));
+ case ActionName::SUPERMAN: return boost::shared_ptr<PinguAction>(new
Superman(this));
+ case ActionName::WAITER: return boost::shared_ptr<PinguAction>(new
Waiter(this));
+ case ActionName::WALKER: return boost::shared_ptr<PinguAction>(new
Walker(this));
default: assert(!"Invalid action name provied");
}
}
Modified: trunk/pingus/src/pingus/pingu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu.hpp 2009-11-08 00:05:32 UTC (rev 4075)
+++ trunk/pingus/src/pingus/pingu.hpp 2009-11-08 00:27:52 UTC (rev 4076)
@@ -59,7 +59,7 @@
/** The previous_action contains the action type that was in action
before action got applied, its here to enable action to behave
differently depending on the previous action */
- Actions::ActionName previous_action;
+ ActionName::Enum previous_action;
/** The uniq id of the Pingu, this is used to refer to the Pingu in
a demo file or in a network connection */
@@ -83,7 +83,7 @@
bool request_set_action(boost::shared_ptr<PinguAction>);
void set_action(boost::shared_ptr<PinguAction>);
- boost::shared_ptr<PinguAction> create_action(Actions::ActionName action);
+ boost::shared_ptr<PinguAction> create_action(ActionName::Enum action);
public:
@@ -118,7 +118,7 @@
const float& get_y () const { return pos_y; }
/** Checks if this action allows to be overwritten with the given new action
*/
- bool change_allowed (Actions::ActionName new_action);
+ bool change_allowed (ActionName::Enum new_action);
/// Check if the pingu is still alive
bool is_alive (void);
@@ -157,11 +157,11 @@
action, it will be hold back for later execution, same with a
timed action, normal action will be applied if the current
action allows that. */
- bool request_set_action (Actions::ActionName action_name);
+ bool request_set_action (ActionName::Enum action_name);
/** Set an action without any checking, the action will take
instantly control. */
- void set_action (Actions::ActionName action_name);
+ void set_action (ActionName::Enum action_name);
/// set the wall action if we have one
bool request_wall_action ();
@@ -218,14 +218,14 @@
bool catchable ();
/** @return the name of the action the Pingu currently has */
- Actions::ActionName get_action ();
+ ActionName::Enum get_action ();
/** @return the action that was active before the action returned by
get_action() took place. This is used in a few situations where
an action needs to now what the Pingu was doing before the
action took place (faller->bomber translation is different
walker->bomber, etc.). */
- Actions::ActionName get_previous_action() const { return previous_action; }
+ ActionName::Enum get_previous_action() const { return previous_action; }
private:
Pingu (const Pingu&);
Modified: trunk/pingus/src/pingus/pingu_action.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/pingu_action.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -95,7 +95,7 @@
std::string
PinguAction::get_name () const
{
- return Actions::action_to_screenname(get_type());
+ return ActionName::to_screenname(get_type());
}
void
@@ -234,7 +234,7 @@
// FIXME: quick&dirty way to kill falling pingus
if (resultant_force.y >= deadly_velocity)
{
- pingu->set_action(Actions::SPLASHED);
+ pingu->set_action(ActionName::SPLASHED);
return;
}
// Make it so that the Pingu won't go down any further.
Modified: trunk/pingus/src/pingus/pingu_action.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/pingu_action.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -58,7 +58,7 @@
int rel_getpixel (int x, int y);
/** Checks if this action allows to be overwritten with the given new action
*/
- virtual bool change_allowed (Actions::ActionName) { return true; }
+ virtual bool change_allowed (ActionName::Enum action) { return true; }
/// The "AI" of the pingu.
virtual void update () = 0;
@@ -74,7 +74,7 @@
virtual std::string get_name () const;
/// The type of the action
- virtual Actions::ActionName get_type () const =0;
+ virtual ActionName::Enum get_type () const =0;
/** Return the character that is shown when a persitent action is
activated in the CaptureRectangle. */
Modified: trunk/pingus/src/pingus/pingu_enums.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_enums.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/pingu_enums.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -18,14 +18,9 @@
#include "gettext.h"
-// Pingu "globals". Make [deadly_velocity = 20 * sqrt("normal gravity")] so
-// that the "deadly distance" is the same and therefore doesn't break levels.
-const float deadly_velocity = 10.0f;
-const int pingu_height = 26;
+namespace ActionName {
-namespace Actions {
-
-std::string action_to_screenname (ActionName action)
+std::string to_screenname(Enum action)
{
switch (action)
{
@@ -56,7 +51,7 @@
}
}
-std::string action_to_string(ActionName action)
+std::string to_string(Enum action)
{
switch (action)
{
@@ -87,7 +82,7 @@
}
}
-ActionName action_from_string(const std::string& action)
+Enum from_string(const std::string& action)
{
if (action == "angel") return ANGEL;
if (action == "basher") return BASHER;
Modified: trunk/pingus/src/pingus/pingu_enums.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_enums.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/pingu_enums.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -19,12 +19,13 @@
#include <string>
-namespace Actions {
+namespace ActionName {
/** The order of the actions here are the same as the order of actions
in the buttonpanel, so if the order in the buttonpanel is not what
it should be it needs to be changed here. */
-enum ActionName {
+enum Enum
+{
ANGEL,
BASHER,
BLOCKER,
@@ -52,21 +53,22 @@
/** Converts a action enum into its internal string representation, as
used in the xml or the resource files Bomber => "bomber" */
-std::string action_to_string(Actions::ActionName action);
+std::string to_string(Enum action);
/** Converts a internal action string back into its action enum
representation "bomber" => Bomber */
-Actions::ActionName action_from_string(const std::string& action);
+Enum from_string(const std::string& action);
/** Convert a action enum into its visual representation, aka the
thing that is seen on the screen for the user Bomber => "Bomber" */
-std::string action_to_screenname(Actions::ActionName action);
+std::string to_screenname(Enum action);
} // namespace ActionName
-// Pingu "globals"
-extern const int pingu_height;
-extern const float deadly_velocity;
+// Pingu "globals". Make [deadly_velocity = 20 * sqrt("normal gravity")] so
+// that the "deadly distance" is the same and therefore doesn't break levels.
+const float deadly_velocity = 10.0f;
+const int pingu_height = 26;
#endif
Modified: trunk/pingus/src/pingus/pingu_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -65,7 +65,7 @@
pingu != pingus.end();
++pingu)
{
- if ((*pingu)->get_action() == Actions::WALKER)
+ if ((*pingu)->get_action() == ActionName::WALKER)
(*pingu)->draw (gc);
}
@@ -80,7 +80,7 @@
pingu != pingus.end();
++pingu)
{
- if ((*pingu)->get_action() != Actions::WALKER)
+ if ((*pingu)->get_action() != ActionName::WALKER)
(*pingu)->draw (gc);
}
}
Modified: trunk/pingus/src/pingus/screens/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -332,7 +332,7 @@
}
}
-Actions::ActionName
+ActionName::Enum
GameSession::get_action_name() const
{
return button_panel->get_action_name();
Modified: trunk/pingus/src/pingus/screens/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.hpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/screens/game_session.hpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -101,7 +101,7 @@
void on_escape_press ();
void on_action_axis_move (float);
- Actions::ActionName get_action_name() const;
+ ActionName::Enum get_action_name() const;
void set_fast_forward(bool value);
bool get_fast_forward() const;
Modified: trunk/pingus/src/pingus/server.cpp
===================================================================
--- trunk/pingus/src/pingus/server.cpp 2009-11-08 00:05:32 UTC (rev 4075)
+++ trunk/pingus/src/pingus/server.cpp 2009-11-08 00:27:52 UTC (rev 4076)
@@ -24,8 +24,6 @@
#include "pingus/world.hpp"
#include "util/system.hpp"
-using Actions::action_from_string;
-
static std::string get_date_string ()
{
char buffer[32];
@@ -108,7 +106,7 @@
}
void
-Server::send_pingu_action_event (Pingu* pingu, Actions::ActionName action)
+Server::send_pingu_action_event (Pingu* pingu, ActionName::Enum action)
{
record(ServerEvent::make_pingu_action_event(get_time(), pingu->get_id(),
pingu->get_pos(), action));
Modified: trunk/pingus/src/pingus/server.hpp
===================================================================
--- trunk/pingus/src/pingus/server.hpp 2009-11-08 00:05:32 UTC (rev 4075)
+++ trunk/pingus/src/pingus/server.hpp 2009-11-08 00:27:52 UTC (rev 4076)
@@ -61,7 +61,7 @@
press ESCAPE inside a game */
void send_finish_event();
void send_armageddon_event();
- void send_pingu_action_event(Pingu* pingu, Actions::ActionName action);
+ void send_pingu_action_event(Pingu* pingu, ActionName::Enum action);
private:
void record(const ServerEvent& event);
Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/server_event.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -27,7 +27,7 @@
time_stamp(0),
pingu_id(0),
pos(),
- pingu_action(Actions::WALKER)
+ pingu_action(ActionName::WALKER)
{
}
@@ -36,7 +36,7 @@
time_stamp(0),
pingu_id(0),
pos(),
- pingu_action(Actions::WALKER)
+ pingu_action(ActionName::WALKER)
{
if (reader.get_name() == "armageddon")
{
@@ -68,7 +68,7 @@
if (reader.read_string("raw-y", raw_y))
pos.y = Math::string2float(raw_y);
- reader.read_enum("action", pingu_action, Actions::action_from_string);
+ reader.read_enum("action", pingu_action, &ActionName::from_string);
}
@@ -98,7 +98,7 @@
<< "(id " << pingu_id << ") "
<< "(raw-x \"" << Math::float2string(pos.x) << "\") "
<< "(raw-y \"" << Math::float2string(pos.y) << "\") "
- << "(action \"" << Actions::action_to_string(pingu_action) << "\"))"
+ << "(action \"" << ActionName::to_string(pingu_action) << "\"))"
<< std::endl;
break;
@@ -135,7 +135,7 @@
}
ServerEvent
-ServerEvent::make_pingu_action_event(int t, int id, const Vector3f& pos,
Actions::ActionName action)
+ServerEvent::make_pingu_action_event(int t, int id, const Vector3f& pos,
ActionName::Enum action)
{
ServerEvent event;
event.type = PINGU_ACTION_EVENT;
Modified: trunk/pingus/src/pingus/server_event.hpp
===================================================================
--- trunk/pingus/src/pingus/server_event.hpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/server_event.hpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -49,7 +49,7 @@
Vector3f pos;
/** action name */
- Actions::ActionName pingu_action;
+ ActionName::Enum pingu_action;
ServerEvent();
@@ -77,7 +77,7 @@
/** The pingu action event is triggered whenever the user applies an
action to a Pingu */
- static ServerEvent make_pingu_action_event(int t, int id, const Vector3f&
pos, Actions::ActionName action);
+ static ServerEvent make_pingu_action_event(int t, int id, const Vector3f&
pos, ActionName::Enum action);
};
#endif
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-08 00:05:32 UTC (rev 4075)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-08 00:27:52 UTC (rev 4076)
@@ -31,8 +31,6 @@
#include "pingus/worldobj_factory.hpp"
#include "pingus/worldobjs/entrance.hpp"
-using Actions::BOMBER;
-
static
bool WorldObj_less (WorldObj* a, WorldObj* b)
{
@@ -152,7 +150,7 @@
if (pingu && pingu->get_status() == Pingu::PS_ALIVE)
{
- pingu->request_set_action(BOMBER);
+ pingu->request_set_action(ActionName::BOMBER);
break;
}
else
Modified: trunk/pingus/src/pingus/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-08 00:05:32 UTC (rev
4075)
+++ trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-08 00:27:52 UTC (rev
4076)
@@ -92,10 +92,10 @@
// Now, make sure the pingu isn't already exiting, gone, or dead
if ( (*pingu)->get_status() != Pingu::PS_EXITED
&& (*pingu)->get_status() != Pingu::PS_DEAD
- && (*pingu)->get_action() != Actions::EXITER)
+ && (*pingu)->get_action() != ActionName::EXITER)
{
// Pingu actually exits
- (*pingu)->set_action(Actions::EXITER);
+ (*pingu)->set_action(ActionName::EXITER);
}
}
}
Modified: trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -66,7 +66,7 @@
if ( pingu->get_pos().x > pos.x + 31 && pingu->get_pos().x < pos.x + 31 +
15
&& pingu->get_pos().y > pos.y + 56 && pingu->get_pos().y < pos.y + 56
+ 56)
{
- if (pingu->get_action() != Actions::SPLASHED)
+ if (pingu->get_action() != ActionName::SPLASHED)
{
if (!smashing)
{
@@ -75,7 +75,7 @@
}
if (surface.get_current_frame() == 4)
- pingu->set_action(Actions::SPLASHED);
+ pingu->set_action(ActionName::SPLASHED);
}
}
}
Modified: trunk/pingus/src/pingus/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -54,11 +54,11 @@
for (PinguIter pingu_it = holder->begin (); pingu_it != holder->end ();
++pingu_it)
{
Pingu* pingu = *pingu_it;
- if (pingu->get_action() != Actions::SPLASHED)
+ if (pingu->get_action() != ActionName::SPLASHED)
{
if (pingu->get_x() > pos.x + 55 && pingu->get_x() < pos.x + 77
&& pingu->get_y() > pos.y + 146 && pingu->get_y() < pos.y + 185)
- pingu->set_action(Actions::SPLASHED);
+ pingu->set_action(ActionName::SPLASHED);
}
}
sprite.restart();
Modified: trunk/pingus/src/pingus/worldobjs/laser_exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/laser_exit.cpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/worldobjs/laser_exit.cpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -70,10 +70,10 @@
if ( pingu->get_x () < pos.x + 34 + 10 && pingu->get_x () > pos.x + 34
&& pingu->get_y () < pos.y + 43 + 20 && pingu->get_y () > pos.y +
43)
{
- if (pingu->get_action() != Actions::LASERKILL)
+ if (pingu->get_action() != ActionName::LASERKILL)
{
killing = true;
- pingu->set_action(Actions::LASERKILL);
+ pingu->set_action(ActionName::LASERKILL);
}
}
}
Modified: trunk/pingus/src/pingus/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-08 00:05:32 UTC
(rev 4075)
+++ trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-08 00:27:52 UTC
(rev 4076)
@@ -76,8 +76,8 @@
static_cast<int>(pos.x + 250),
static_cast<int>(pos.y + 190)))
{
- if ((*pingu)->get_action() != Actions::SPLASHED)
- (*pingu)->set_action(Actions::SPLASHED);
+ if ((*pingu)->get_action() != ActionName::SPLASHED)
+ (*pingu)->set_action(ActionName::SPLASHED);
}
}
}
@@ -128,7 +128,7 @@
&& pingu->get_pos().x > pos.x + 190
&& pingu->get_pos().x < pos.x + 210))
{
- if (pingu->get_action() != Actions::SPLASHED)
+ if (pingu->get_action() != ActionName::SPLASHED)
{
if (!smashing)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4076 - in trunk/pingus/src: editor pingus pingus/actions pingus/components pingus/screens pingus/worldobjs,
grumbel at BerliOS <=