[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.9,1.10 action_but
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.9,1.10 action_button.hxx,1.8,1.9 action_data.cxx,1.4,1.5 action_data.hxx,1.4,1.5 action_holder.hxx,1.4,1.5 button_panel.cxx,1.11,1.12 exit.cxx,1.4,1.5 multiplayer_client_child.cxx,1.8,1.9 pingu.cxx,1.19,1.20 pingu.hxx,1.10,1.11 pingu_action.hxx,1.11,1.12 pingu_action_factory.cxx,1.7,1.8 pingu_action_factory.hxx,1.4,1.5 pingu_enums.cxx,1.1,1.2 pingu_enums.hxx,1.6,1.7 playfield.cxx,1.17,1.18 plf_plf.cxx,1.7,1.8 server.cxx,1.11,1.12 string_converter.hxx,1.5,1.6 world.cxx,1.18,1.19 xml_plf.cxx,1.10,1.11 |
|
Date: |
25 Aug 2002 09:08:51 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv10564
Modified Files:
action_button.cxx action_button.hxx action_data.cxx
action_data.hxx action_holder.hxx button_panel.cxx exit.cxx
multiplayer_client_child.cxx pingu.cxx pingu.hxx
pingu_action.hxx pingu_action_factory.cxx
pingu_action_factory.hxx pingu_enums.cxx pingu_enums.hxx
playfield.cxx plf_plf.cxx server.cxx string_converter.hxx
world.cxx xml_plf.cxx
Log Message:
- moved actions into own namespace
- some little cleanup
Index: action_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- action_button.cxx 14 Aug 2002 12:45:01 -0000 1.9
+++ action_button.cxx 25 Aug 2002 09:08:48 -0000 1.10
@@ -29,7 +29,7 @@
#include "world.hxx"
#include "string_converter.hxx"
-using namespace Pingus::Actions;
+using namespace Actions;
ActionButton::ActionButton() {}
Index: action_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- action_button.hxx 23 Aug 2002 15:49:47 -0000 1.8
+++ action_button.hxx 25 Aug 2002 09:08:48 -0000 1.9
@@ -26,7 +26,7 @@
#include "pingu_enums.hxx"
#include "gui/component.hxx"
-using Pingus::Actions::ActionName;
+using Actions::ActionName;
class Server;
class ActionHolder;
Index: action_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- action_data.cxx 29 Jul 2002 10:44:12 -0000 1.4
+++ action_data.cxx 25 Aug 2002 09:08:48 -0000 1.5
@@ -20,7 +20,7 @@
#include "pingu_enums.hxx"
#include "action_data.hxx"
-using namespace Pingus::Actions;
+using namespace Actions;
std::vector<ActionData> default_actions;
Index: action_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- action_data.hxx 29 Jun 2002 14:01:32 -0000 1.4
+++ action_data.hxx 25 Aug 2002 09:08:48 -0000 1.5
@@ -27,10 +27,10 @@
{
public:
ActionData() {}
- ActionData(Pingus::Actions::ActionName name_, int i) : name(name_),
number_of(i)
+ ActionData(Actions::ActionName name_, int i) : name(name_), number_of(i)
{}
- Pingus::Actions::ActionName name;
+ Actions::ActionName name;
int number_of;
};
Index: action_holder.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_holder.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- action_holder.hxx 23 Aug 2002 15:49:47 -0000 1.4
+++ action_holder.hxx 25 Aug 2002 09:08:48 -0000 1.5
@@ -24,7 +24,7 @@
#include <map>
#include "pingu_enums.hxx"
-using Pingus::Actions::ActionName;
+using Actions::ActionName;
class PLF;
class PinguAction;
Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- button_panel.cxx 17 Aug 2002 17:56:23 -0000 1.11
+++ button_panel.cxx 25 Aug 2002 09:08:48 -0000 1.12
@@ -27,7 +27,7 @@
#include "world.hxx"
#include "plf.hxx"
-using namespace Pingus::Actions;
+using namespace Actions;
CL_Surface ButtonPanel::button_cap;
Index: exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exit.cxx 28 Jun 2002 16:45:27 -0000 1.4
+++ exit.cxx 25 Aug 2002 09:08:48 -0000 1.5
@@ -26,7 +26,7 @@
#include "pingu_action.hxx"
#include "pingu.hxx"
-using namespace Pingus::Actions;
+using namespace Actions;
Exit::Exit(const ExitData& data)
: sprite (data.desc, 10.0f),
Index: multiplayer_client_child.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- multiplayer_client_child.cxx 12 Aug 2002 22:52:04 -0000 1.8
+++ multiplayer_client_child.cxx 25 Aug 2002 09:08:48 -0000 1.9
@@ -99,7 +99,7 @@
char str[256];
sprintf(str, "Pingu: %d:%s",
pingu->get_id(),
-
Pingus::Actions::action_to_string(button_panel->get_action_name()).c_str());
+
Actions::action_to_string(button_panel->get_action_name()).c_str());
server->send_event(str);
}
*/
Index: pingu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- pingu.cxx 23 Aug 2002 15:49:49 -0000 1.19
+++ pingu.cxx 25 Aug 2002 09:08:48 -0000 1.20
@@ -33,7 +33,7 @@
#include "debug.hxx"
#include "string_converter.hxx"
-using namespace Pingus::Actions;
+using namespace Actions;
const float deadly_velocity = 20.0;
int Pingu::id_counter = 0;
Index: pingu.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pingu.hxx 23 Aug 2002 15:49:49 -0000 1.10
+++ pingu.hxx 25 Aug 2002 09:08:48 -0000 1.11
@@ -27,9 +27,6 @@
#include "direction.hxx"
#include "pingu_enums.hxx"
#include "worldobj.hxx"
-#include "pingu_enums.hxx"
-
-using Pingus::Actions::ActionName;
// Forward declarations
class CL_Font;
@@ -109,7 +106,7 @@
int get_y(void);
/** Checks if this action allows to be overwritten with the given new action
*/
- bool change_allowed (ActionName new_action);
+ bool change_allowed (Actions::ActionName new_action);
/// Check if the pingu is still alive
bool is_alive(void);
@@ -141,11 +138,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 (ActionName action_name);
+ bool request_set_action (Actions::ActionName action_name);
/** Set an action without any checking, the action will take
instantly control. */
- void set_action (ActionName action_name);
+ void set_action (Actions::ActionName action_name);
/// set the wall action if we have one
bool request_wall_action ();
Index: pingu_action.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pingu_action.hxx 23 Aug 2002 15:49:49 -0000 1.11
+++ pingu_action.hxx 25 Aug 2002 09:08:48 -0000 1.12
@@ -65,7 +65,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 (Pingus::Actions::ActionName) { return true; }
+ virtual bool change_allowed (Actions::ActionName) { return true; }
/** Used to load all data, which is needed by the action, its
seperated and called in set_pingu(), because some data will be
@@ -87,7 +87,7 @@
virtual std::string get_name () const =0;
/// The type of the action
- virtual Pingus::Actions::ActionName get_type () const =0;
+ virtual Actions::ActionName get_type () const =0;
/** Return the character that is shown when a persitent action is
activated in the CaptureRectangle. */
Index: pingu_action_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action_factory.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingu_action_factory.cxx 23 Aug 2002 15:49:49 -0000 1.7
+++ pingu_action_factory.cxx 25 Aug 2002 09:08:48 -0000 1.8
@@ -46,6 +46,8 @@
#include "pingu_action_factory.hxx"
+using namespace Actions;
+
PinguActionFactory::PinguActionFactory ()
{
}
@@ -66,29 +68,29 @@
void
PinguActionFactory::register_core_actions ()
{
- new PinguActionFactoryImpl<class Angel> (Pingus::Actions::Angel);
- new PinguActionFactoryImpl<class Basher> (Pingus::Actions::Basher);
- new PinguActionFactoryImpl<class Blocker> (Pingus::Actions::Blocker);
- new PinguActionFactoryImpl<class Boarder> (Pingus::Actions::Boarder);
- new PinguActionFactoryImpl<class Bomber> (Pingus::Actions::Bomber);
- new PinguActionFactoryImpl<class Bridger> (Pingus::Actions::Bridger);
- new PinguActionFactoryImpl<class Climber> (Pingus::Actions::Climber);
- new PinguActionFactoryImpl<class Digger> (Pingus::Actions::Digger);
- new PinguActionFactoryImpl<class Drown> (Pingus::Actions::Drown);
- new PinguActionFactoryImpl<class Exiter> (Pingus::Actions::Exiter);
- new PinguActionFactoryImpl<class Faller> (Pingus::Actions::Faller);
- new PinguActionFactoryImpl<class Floater> (Pingus::Actions::Floater);
- new PinguActionFactoryImpl<class Jumper> (Pingus::Actions::Jumper);
- new PinguActionFactoryImpl<class LaserKill>
(Pingus::Actions::Laserkill);
- new PinguActionFactoryImpl<class Miner> (Pingus::Actions::Miner);
- new PinguActionFactoryImpl<class RocketLauncher>
(Pingus::Actions::Rocketlauncher);
- new PinguActionFactoryImpl<class Slider> (Pingus::Actions::Slider);
- new PinguActionFactoryImpl<class Smashed> (Pingus::Actions::Smashed);
- new PinguActionFactoryImpl<class Splashed> (Pingus::Actions::Splashed);
- new PinguActionFactoryImpl<class Superman> (Pingus::Actions::Superman);
- new PinguActionFactoryImpl<class Teleported>
(Pingus::Actions::Teleported);
- new PinguActionFactoryImpl<class Waiter> (Pingus::Actions::Waiter);
- new PinguActionFactoryImpl<class Walker> (Pingus::Actions::Walker);
+ new PinguActionFactoryImpl<class Angel> (Angel);
+ new PinguActionFactoryImpl<class Basher> (Basher);
+ new PinguActionFactoryImpl<class Blocker> (Blocker);
+ new PinguActionFactoryImpl<class Boarder> (Boarder);
+ new PinguActionFactoryImpl<class Bomber> (Bomber);
+ new PinguActionFactoryImpl<class Bridger> (Bridger);
+ new PinguActionFactoryImpl<class Climber> (Climber);
+ new PinguActionFactoryImpl<class Digger> (Digger);
+ new PinguActionFactoryImpl<class Drown> (Drown);
+ new PinguActionFactoryImpl<class Exiter> (Exiter);
+ new PinguActionFactoryImpl<class Faller> (Faller);
+ new PinguActionFactoryImpl<class Floater> (Floater);
+ new PinguActionFactoryImpl<class Jumper> (Jumper);
+ new PinguActionFactoryImpl<class LaserKill> (Laserkill);
+ new PinguActionFactoryImpl<class Miner> (Miner);
+ new PinguActionFactoryImpl<class RocketLauncher> (Rocketlauncher);
+ new PinguActionFactoryImpl<class Slider> (Slider);
+ new PinguActionFactoryImpl<class Smashed> (Smashed);
+ new PinguActionFactoryImpl<class Splashed> (Splashed);
+ new PinguActionFactoryImpl<class Superman> (Superman);
+ new PinguActionFactoryImpl<class Teleported> (Teleported);
+ new PinguActionFactoryImpl<class Waiter> (Waiter);
+ new PinguActionFactoryImpl<class Walker> (Walker);
}
PinguAction*
Index: pingu_action_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action_factory.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pingu_action_factory.hxx 23 Aug 2002 15:49:49 -0000 1.4
+++ pingu_action_factory.hxx 25 Aug 2002 09:08:48 -0000 1.5
@@ -32,7 +32,7 @@
/** This vector saves all allocated actions to delete them at a later point
*/
std::vector<PinguAction*> all_actions;
- std::map<ActionName, PinguActionAbstractFactory*> factories;
+ std::map<Actions::ActionName, PinguActionAbstractFactory*> factories;
static PinguActionFactory* instance_;
PinguActionFactory ();
@@ -40,7 +40,7 @@
public:
static PinguActionFactory* instance ();
- void register_factory (ActionName id, PinguActionAbstractFactory*);
+ void register_factory (Actions::ActionName id, PinguActionAbstractFactory*);
/** Delete all actions which this class has allocated. This needs to
be called seperatly from the constructor, due to the used
@@ -48,7 +48,7 @@
void delete_actions ();
/** Allocate the given action */
- PinguAction* create (ActionName id);
+ PinguAction* create (Actions::ActionName id);
private:
PinguActionFactory (const PinguActionFactory&);
@@ -58,7 +58,7 @@
class PinguActionAbstractFactory
{
public:
- PinguActionAbstractFactory (ActionName id) {
+ PinguActionAbstractFactory (Actions::ActionName id) {
PinguActionFactory::instance ()-> register_factory (id, this);
}
@@ -73,7 +73,7 @@
class PinguActionFactoryImpl : public PinguActionAbstractFactory
{
public:
- PinguActionFactoryImpl (ActionName id)
+ PinguActionFactoryImpl (Actions::ActionName id)
: PinguActionAbstractFactory (id)
{
}
Index: pingu_enums.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_enums.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pingu_enums.cxx 28 Jun 2002 15:10:25 -0000 1.1
+++ pingu_enums.cxx 25 Aug 2002 09:08:48 -0000 1.2
@@ -19,70 +19,68 @@
#include "pingu_enums.hxx"
-namespace Pingus {
+namespace Actions {
- namespace Actions {
+ std::string action_to_string(ActionName action) {
- std::string action_to_string(ActionName action) {
+ switch (action) {
- switch (action) {
-
- case Angel : return "angel";
- case Basher : return "basher";
- case Blocker : return "blocker";
- case Boarder : return "boarder";
- case Bomber : return "bomber";
- case Bridger : return "bridger";
- case Climber : return "climber";
- case Digger : return "digger";
- case Drown : return "drown";
- case Exiter : return "exiter";
- case Faller : return "faller";
- case Floater : return "floater";
- case Jumper : return "jumper";
- case Laserkill : return "laserkill";
- case Miner : return "miner";
- case Rocketlauncher : return "rocketlauncher";
- case Slider : return "slider";
- case Smashed : return "smashed";
- case Splashed : return "splashed";
- case Superman : return "superman";
- case Teleported : return "teleported";
- case Waiter : return "waiter";
- case Walker : return "walker";
- default : return "Fehler";
- }
- }
+ case Angel : return "angel";
+ case Basher : return "basher";
+ case Blocker : return "blocker";
+ case Boarder : return "boarder";
+ case Bomber : return "bomber";
+ case Bridger : return "bridger";
+ case Climber : return "climber";
+ case Digger : return "digger";
+ case Drown : return "drown";
+ case Exiter : return "exiter";
+ case Faller : return "faller";
+ case Floater : return "floater";
+ case Jumper : return "jumper";
+ case Laserkill : return "laserkill";
+ case Miner : return "miner";
+ case Rocketlauncher : return "rocketlauncher";
+ case Slider : return "slider";
+ case Smashed : return "smashed";
+ case Splashed : return "splashed";
+ case Superman : return "superman";
+ case Teleported : return "teleported";
+ case Waiter : return "waiter";
+ case Walker : return "walker";
+ default : return "Fehler";
+ }
+ }
- ActionName action_from_string(const std::string& action) {
+ ActionName action_from_string(const std::string& action) {
- if (action == "angel") return Angel;
- if (action == "basher") return Basher;
- if (action == "blocker") return Blocker;
- if (action == "boarder") return Boarder;
- if (action == "bomber") return Bomber;
- if (action == "bridger") return Bridger;
- if (action == "climber") return Climber;
- if (action == "digger") return Digger;
- if (action == "drown") return Drown;
- if (action == "exiter") return Exiter;
- if (action == "faller") return Faller;
- if (action == "floater") return Floater;
- if (action == "jumper") return Jumper;
- if (action == "laserkill") return Laserkill;
- if (action == "miner") return Miner;
- if (action == "rocketlauncher") return Rocketlauncher;
- if (action == "slider") return Slider;
- if (action == "smashed") return Smashed;
- if (action == "splashed") return Splashed;
- if (action == "superman") return Superman;
- if (action == "teleported") return Teleported;
- if (action == "waiter") return Waiter;
- if (action == "walker") return Walker;
-
- return Walker;
- }
+ if (action == "angel") return Angel;
+ if (action == "basher") return Basher;
+ if (action == "blocker") return Blocker;
+ if (action == "boarder") return Boarder;
+ if (action == "bomber") return Bomber;
+ if (action == "bridger") return Bridger;
+ if (action == "climber") return Climber;
+ if (action == "digger") return Digger;
+ if (action == "drown") return Drown;
+ if (action == "exiter") return Exiter;
+ if (action == "faller") return Faller;
+ if (action == "floater") return Floater;
+ if (action == "jumper") return Jumper;
+ if (action == "laserkill") return Laserkill;
+ if (action == "miner") return Miner;
+ if (action == "rocketlauncher") return Rocketlauncher;
+ if (action == "slider") return Slider;
+ if (action == "smashed") return Smashed;
+ if (action == "splashed") return Splashed;
+ if (action == "superman") return Superman;
+ if (action == "teleported") return Teleported;
+ if (action == "waiter") return Waiter;
+ if (action == "walker") return Walker;
+ return Walker;
}
+
}
+/* EOF */
Index: pingu_enums.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_enums.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pingu_enums.hxx 23 Aug 2002 15:49:49 -0000 1.6
+++ pingu_enums.hxx 25 Aug 2002 09:08:48 -0000 1.7
@@ -27,45 +27,42 @@
good idea. Maybe that should be changed to a bitmask. */
enum PinguStatus { PS_ALIVE, PS_EXITED, PS_DEAD };
-///
enum PingusGameMode {
INTERACTIVE_MODE,
DEMO_MODE
};
-namespace Pingus {
-
- namespace Actions {
+namespace Actions {
- enum ActionName { Angel,
- Basher,
- Blocker,
- Boarder,
- Bomber,
- Bridger,
- Climber,
- Digger,
- Drown,
- Exiter,
- Faller,
- Floater,
- Jumper,
- Laserkill,
- Miner,
- Rocketlauncher,
- Slider,
- Smashed,
- Splashed,
- Superman,
- Teleported,
- Waiter,
- Walker
- };
+ enum ActionName { Angel,
+ Basher,
+ Blocker,
+ Boarder,
+ Bomber,
+ Bridger,
+ Climber,
+ Digger,
+ Drown,
+ Exiter,
+ Faller,
+ Floater,
+ Jumper,
+ Laserkill,
+ Miner,
+ Rocketlauncher,
+ Slider,
+ Smashed,
+ Splashed,
+ Superman,
+ Teleported,
+ Waiter,
+ Walker
+ };
- std::string action_to_string (ActionName action);
- ActionName action_from_string (const std::string& action);
- }
+ std::string action_to_string (ActionName action);
+ ActionName action_from_string (const std::string& action);
}
+
#endif
Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- playfield.cxx 23 Aug 2002 15:49:50 -0000 1.17
+++ playfield.cxx 25 Aug 2002 09:08:48 -0000 1.18
@@ -228,7 +228,7 @@
{
char str[256];
sprintf(str, "Pingu: %d:%s", current_pingu->get_id(),
-
Pingus::Actions::action_to_string(buttons->get_action_name()).c_str());
+
Actions::action_to_string(buttons->get_action_name()).c_str());
server->send_event(str);
}
}
Index: plf_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf_plf.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- plf_plf.cxx 23 Aug 2002 15:49:50 -0000 1.7
+++ plf_plf.cxx 25 Aug 2002 09:08:48 -0000 1.8
@@ -25,7 +25,7 @@
#include "pingu_enums.hxx"
using namespace std;
-using Pingus::Actions::action_from_string;
+using Actions::action_from_string;
int str_to_int(const string& str);
float str_to_float(const string& str);
Index: server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- server.cxx 23 Aug 2002 15:49:50 -0000 1.11
+++ server.cxx 25 Aug 2002 09:08:48 -0000 1.12
@@ -30,7 +30,7 @@
#include "world.hxx"
using namespace std;
-using Pingus::Actions::action_from_string;
+using Actions::action_from_string;
PingusEvent::PingusEvent()
{
Index: string_converter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/string_converter.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- string_converter.hxx 23 Aug 2002 15:49:51 -0000 1.5
+++ string_converter.hxx 25 Aug 2002 09:08:48 -0000 1.6
@@ -37,17 +37,16 @@
class CL_Vector;
template <class T>
-std::string to_string(const T& any)
+std::string to_string (const T& any)
{
#ifdef HAVE_SSTREAM
std::ostringstream oss;
+ oss << any ;
#else
std::ostrstream oss;
+ oss << any << std::ends;
#endif
- oss << any;
return oss.str();
- oss << any << std::ends;
- oss.str();
}
Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- world.cxx 23 Aug 2002 15:49:52 -0000 1.18
+++ world.cxx 25 Aug 2002 09:08:48 -0000 1.19
@@ -34,7 +34,7 @@
#include "game_time.hxx"
using namespace std;
-using Pingus::Actions::Bomber;
+using Actions::Bomber;
static
bool WorldObj_less (WorldObj* a, WorldObj* b)
Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- xml_plf.cxx 23 Aug 2002 15:49:52 -0000 1.10
+++ xml_plf.cxx 25 Aug 2002 09:08:48 -0000 1.11
@@ -32,7 +32,7 @@
#include "liquid_data.hxx"
using namespace std;
-using Pingus::Actions::action_from_string;
+using Actions::action_from_string;
XMLPLF::XMLPLF(const std::string& filename)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.9,1.10 action_button.hxx,1.8,1.9 action_data.cxx,1.4,1.5 action_data.hxx,1.4,1.5 action_holder.hxx,1.4,1.5 button_panel.cxx,1.11,1.12 exit.cxx,1.4,1.5 multiplayer_client_child.cxx,1.8,1.9 pingu.cxx,1.19,1.20 pingu.hxx,1.10,1.11 pingu_action.hxx,1.11,1.12 pingu_action_factory.cxx,1.7,1.8 pingu_action_factory.hxx,1.4,1.5 pingu_enums.cxx,1.1,1.2 pingu_enums.hxx,1.6,1.7 playfield.cxx,1.17,1.18 plf_plf.cxx,1.7,1.8 server.cxx,1.11,1.12 string_converter.hxx,1.5,1.6 world.cxx,1.18,1.19 xml_plf.cxx,1.10,1.11,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.7,1.8
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions Makefile.am,1.12,1.13 angel.cxx,1.6,1.7 angel.hxx,1.6,1.7 basher.cxx,1.10,1.11 basher.hxx,1.6,1.7 blocker.cxx,1.4,1.5 blocker.hxx,1.6,1.7 boarder.cxx,1.4,1.5 boarder.hxx,1.6,1.7 bomber.cxx,1.8,1.9 bomber.hxx,1.8,1.9 bridger.cxx,1.10,1.11 bridger.hxx,1.8,1.9 climber.cxx,1.6,1.7 climber.hxx,1.5,1.6 digger.cxx,1.8,1.9 digger.hxx,1.5,1.6 drown.cxx,1.3,1.4 drown.hxx,1.5,1.6 exiter.cxx,1.3,1.4 exiter.hxx,1.5,1.6 faller.cxx,1.15,1.16 faller.hxx,1.10,1.11 floater.cxx,1.10,1.11 floater.hxx,1.7,1.8 jumper.cxx,1.6,1.7 jumper.hxx,1.5,1.6 laser_kill.cxx,1.2,1.3 laser_kill.hxx,1.5,1.6 miner.cxx,1.6,1.7 miner.hxx,1.5,1.6 rocket_launcher.cxx,1.4,1.5 rocket_launcher.hxx,1.5,1.6 slider.cxx,1.4,1.5 slider.hxx,1.5,1.6 smashed.cxx,1.2,1.3 smashed.hxx,1.5,1.6 splashed.cxx,1.3,1.4 splashed.hxx,1.5,1.6 superman.cxx,1.2,1.3 superman.hxx,1.6,1.7 teleported.cxx,1.4,1.5 teleported.hxx,1.5,1.6 waiter.cxx,1.3,1.4 waiter.hxx,1.5,1.6 walker.cxx,1.16,1.17 walker.hxx,1.5,1.6
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.7,1.8
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions Makefile.am,1.12,1.13 angel.cxx,1.6,1.7 angel.hxx,1.6,1.7 basher.cxx,1.10,1.11 basher.hxx,1.6,1.7 blocker.cxx,1.4,1.5 blocker.hxx,1.6,1.7 boarder.cxx,1.4,1.5 boarder.hxx,1.6,1.7 bomber.cxx,1.8,1.9 bomber.hxx,1.8,1.9 bridger.cxx,1.10,1.11 bridger.hxx,1.8,1.9 climber.cxx,1.6,1.7 climber.hxx,1.5,1.6 digger.cxx,1.8,1.9 digger.hxx,1.5,1.6 drown.cxx,1.3,1.4 drown.hxx,1.5,1.6 exiter.cxx,1.3,1.4 exiter.hxx,1.5,1.6 faller.cxx,1.15,1.16 faller.hxx,1.10,1.11 floater.cxx,1.10,1.11 floater.hxx,1.7,1.8 jumper.cxx,1.6,1.7 jumper.hxx,1.5,1.6 laser_kill.cxx,1.2,1.3 laser_kill.hxx,1.5,1.6 miner.cxx,1.6,1.7 miner.hxx,1.5,1.6 rocket_launcher.cxx,1.4,1.5 rocket_launcher.hxx,1.5,1.6 slider.cxx,1.4,1.5 slider.hxx,1.5,1.6 smashed.cxx,1.2,1.3 smashed.hxx,1.5,1.6 splashed.cxx,1.3,1.4 splashed.hxx,1.5,1.6 superman.cxx,1.2,1.3 superman.hxx,1.6,1.7 teleported.cxx,1.4,1.5 teleported.hxx,1.5,1.6 waiter.cxx,1.3,1.4 waiter.hxx,1.5,1.6 walker.cxx,1.16,1.17 walker.hxx,1.5,1.6
- Index(es):