[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.96,1.97 action_button.c
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.96,1.97 action_button.cxx,1.11,1.12 exit_menu.cxx,1.6,1.7 hurry_up.cxx,1.2,1.3 input_debug_screen.cxx,1.2,1.3 option_menu.cxx,1.4,1.5 pingus_counter.cxx,1.6,1.7 playfield.cxx,1.20,1.21 plt_xml.hxx,1.4,1.5 smallmap.cxx,1.13,1.14 story.cxx,1.6,1.7 surface_button.cxx,1.11,1.12 time_display.cxx,1.6,1.7 worldobj_data_factory.cxx,1.4,1.5 worldobj_group_data.cxx,1.6,1.7 worldobj_group_data.hxx,1.5,1.6 xml_helper.cxx,1.13,1.14 xml_helper.hxx,1.7,1.8 trap.cxx,1.2,NONE trap.hxx,1.3,NONE trap_data.cxx,1.7,NONE trap_data.hxx,1.6,NONE |
|
Date: |
6 Sep 2002 17:33:31 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv25346
Modified Files:
Makefile.am action_button.cxx exit_menu.cxx hurry_up.cxx
input_debug_screen.cxx option_menu.cxx pingus_counter.cxx
playfield.cxx plt_xml.hxx smallmap.cxx story.cxx
surface_button.cxx time_display.cxx worldobj_data_factory.cxx
worldobj_group_data.cxx worldobj_group_data.hxx xml_helper.cxx
xml_helper.hxx
Removed Files:
trap.cxx trap.hxx trap_data.cxx trap_data.hxx
Log Message:
- removed Trap/TrapData/TrapObj - editor needs to be updated
- various clean up
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- Makefile.am 5 Sep 2002 12:40:22 -0000 1.96
+++ Makefile.am 6 Sep 2002 17:33:29 -0000 1.97
@@ -320,10 +320,6 @@
time_display.hxx \
timer.cxx \
timer.hxx \
-trap.cxx \
-trap.hxx \
-trap_data.cxx \
-trap_data.hxx \
true_server.cxx \
true_server.hxx \
view.cxx \
Index: action_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- action_button.cxx 5 Sep 2002 12:24:01 -0000 1.11
+++ action_button.cxx 6 Sep 2002 17:33:29 -0000 1.12
@@ -107,10 +107,10 @@
init(x, y, name, owner_id);
}
-VerticalActionButton::~VerticalActionButton() {}
+VerticalActionButton::~VerticalActionButton () {}
bool
-VerticalActionButton::is_at(int x, int y)
+VerticalActionButton::is_at (int x, int y)
{
if (x > x_pos && x < x_pos + 60
&& y > y_pos && y <= y_pos + 35)
@@ -124,7 +124,7 @@
}
void
-VerticalActionButton::draw(GraphicContext& gc)
+VerticalActionButton::draw (GraphicContext& gc)
{
std::string str;
// FIXME: This could need some optimization, throwing strings all
@@ -173,9 +173,10 @@
surface.put_screen(x_pos + 20 - surface.get_width ()/2,
y_pos + 17 - surface.get_height ()/2,
action_c);
+ UNUSED_ARG(gc);
}
-ArmageddonButton::ArmageddonButton(Server* s, int x, int y)
+ArmageddonButton::ArmageddonButton (Server* s, int x, int y)
: server (s),
x_pos (x), y_pos (y),
background (PingusResource::load_surface("buttons/hbuttonbgb", "core")),
@@ -187,10 +188,10 @@
counter = 0;
}
-ArmageddonButton::~ArmageddonButton() { }
+ArmageddonButton::~ArmageddonButton () { }
void
-ArmageddonButton::draw(GraphicContext& gc)
+ArmageddonButton::draw (GraphicContext& gc)
{
if (server->get_armageddon ())
{
@@ -202,10 +203,12 @@
background.put_screen (x_pos, y_pos);
surface.put_screen(x_pos, y_pos, 7);
}
+
+ UNUSED_ARG(gc);
}
void
-ArmageddonButton::update(float delta)
+ArmageddonButton::update (float delta)
{
if (pressed)
{
@@ -250,7 +253,7 @@
if(x); if(y);
}
-ForwardButton::ForwardButton(Server* s, int x, int y)
+ForwardButton::ForwardButton (Server* s, int x, int y)
: server (s),
x_pos (x), y_pos (y),
background (PingusResource::load_surface("buttons/hbuttonbgb", "core")),
@@ -259,10 +262,10 @@
surface = PingusResource::load_surface("buttons/fast_forward", "core");
}
-ForwardButton::~ForwardButton() {}
+ForwardButton::~ForwardButton () {}
void
-ForwardButton::draw(GraphicContext& gc)
+ForwardButton::draw (GraphicContext& gc)
{
if (server->get_fast_forward())
{
@@ -274,10 +277,11 @@
}
surface.put_screen(x_pos, y_pos);
+ UNUSED_ARG(gc);
}
bool
-ForwardButton::is_at(int x, int y)
+ForwardButton::is_at (int x, int y)
{
if (x > x_pos && x < x_pos + int(surface.get_width())
&& y > y_pos && y < y_pos + int(surface.get_height()))
@@ -296,7 +300,7 @@
if(x); if(y);
}
-PauseButton::PauseButton(Server* s, int x, int y)
+PauseButton::PauseButton (Server* s, int x, int y)
: server (s),
x_pos(x), y_pos(y),
background (PingusResource::load_surface("buttons/hbuttonbgb", "core")),
@@ -305,10 +309,10 @@
surface = PingusResource::load_surface("buttons/pause", "core");
}
-PauseButton::~PauseButton() {}
+PauseButton::~PauseButton () {}
void
-PauseButton::draw(GraphicContext& gc)
+PauseButton::draw (GraphicContext& gc)
{
if (server->get_pause())
backgroundhl.put_screen (x_pos, y_pos);
@@ -316,6 +320,7 @@
background.put_screen (x_pos, y_pos);
surface.put_screen(x_pos, y_pos);
+ UNUSED_ARG(gc);
}
bool
@@ -335,7 +340,8 @@
{
server->set_pause(!server->get_pause ());
- if(x); if(y);
+ UNUSED_ARG(x);
+ UNUSED_ARG(y);
}
/* EOF */
Index: exit_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_menu.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- exit_menu.cxx 5 Sep 2002 12:24:01 -0000 1.6
+++ exit_menu.cxx 6 Sep 2002 17:33:29 -0000 1.7
@@ -37,7 +37,7 @@
return x > 270 && x < 390 && y > 300 && y < 380;
}
- void draw (GraphicContext& gc) {}
+ void draw (GraphicContext& gc) { UNUSED_ARG(gc); }
void on_primary_button_press (int, int)
{
@@ -61,7 +61,7 @@
return x > 430 && x < 540 && y > 300 && y < 380;
}
- void draw (GraphicContext& gc) {}
+ void draw (GraphicContext& gc) { UNUSED_ARG(gc); }
void on_primary_button_press (int, int)
{
@@ -88,6 +88,7 @@
0, 0, 0, 0.5);
sur.put_screen (CL_Display::get_width ()/2 - sur.get_width ()/2,
CL_Display::get_height ()/2 - sur.get_height ()/2);
+ UNUSED_ARG(gc);
}
void
Index: hurry_up.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/hurry_up.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hurry_up.cxx 5 Sep 2002 12:24:02 -0000 1.2
+++ hurry_up.cxx 6 Sep 2002 17:33:29 -0000 1.3
@@ -26,14 +26,15 @@
#include "world.hxx"
#include "server.hxx"
-HurryUp::HurryUp()
+HurryUp::HurryUp () : font(PingusResource::load_font("Fonts/pingus","fonts")),
+ is_running(false),
+ is_finished(false),
+ center_reached(false),
+ client(0),
+ wait_counter(0),
+ x_pos(-200.0),
+ speed(3.0f)
{
- font = PingusResource::load_font("Fonts/pingus","fonts");
- x_pos = -200.0;
- center_reached = false;
- is_running = false;
- is_finished = false;
- speed = 3.0f;
}
HurryUp::~HurryUp()
@@ -48,13 +49,14 @@
if (is_running)
{
- font->print_right(CL_Display::get_width() - (int)x_pos,
+ font->print_right(CL_Display::get_width() - static_cast<int>(x_pos),
CL_Display::get_height()/2 - font->get_height(),
"Hurry");
- font->print_left((int)x_pos,
+ font->print_left(static_cast<int>(x_pos),
CL_Display::get_height()/2 - font->get_height(),
"Up");
}
+ UNUSED_ARG(gc);
}
void
@@ -67,7 +69,7 @@
if (center_reached)
{
// Wait some secs
- if ((unsigned int)wait_counter < CL_System::get_time())
+ if (static_cast<unsigned int>(wait_counter) < CL_System::get_time())
{
speed *= 1.2f;
x_pos += speed;
@@ -81,7 +83,7 @@
x_pos += speed;
speed *= 1.2f;
- if ((int)x_pos > CL_Display::get_width()/2)
+ if (static_cast<int>(x_pos) > CL_Display::get_width()/2)
{
x_pos = CL_Display::get_width()/2;
center_reached = true;
@@ -91,8 +93,8 @@
}
else if (!is_finished)
{
- if (client->get_server()->get_world()->get_time_left() != -1 &&
- client->get_server()->get_world()->get_time_left() < 10 * 15)
+ if ( client->get_server()->get_world()->get_time_left() != -1
+ && client->get_server()->get_world()->get_time_left() < 10 * 15)
is_running = true;
}
}
@@ -104,4 +106,3 @@
}
/* EOF */
-
Index: input_debug_screen.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input_debug_screen.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input_debug_screen.cxx 5 Sep 2002 12:24:02 -0000 1.2
+++ input_debug_screen.cxx 6 Sep 2002 17:33:29 -0000 1.3
@@ -34,6 +34,7 @@
InputDebugScreen::draw (GraphicContext& gc)
{
std::cout << "InputDebugScreen::draw ()" << std::endl;
+ UNUSED_ARG(gc);
}
/** Pass a delta to the screen */
Index: option_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/option_menu.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- option_menu.cxx 5 Sep 2002 12:24:02 -0000 1.4
+++ option_menu.cxx 6 Sep 2002 17:33:29 -0000 1.5
@@ -155,6 +155,7 @@
font->print_right(x_pos + CL_Display::get_width() - 35, y_pos, to_string
(*value_int).c_str ());
}
+ UNUSED_ARG(gc);
}
void
Index: pingus_counter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_counter.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pingus_counter.cxx 5 Sep 2002 12:24:02 -0000 1.6
+++ pingus_counter.cxx 6 Sep 2002 17:33:29 -0000 1.7
@@ -55,6 +55,7 @@
world->get_number_to_save());
font->print_center(CL_Display::get_width ()/2,3, str);
+ UNUSED_ARG(gc);
}
void
Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- playfield.cxx 5 Sep 2002 12:24:02 -0000 1.20
+++ playfield.cxx 6 Sep 2002 17:33:29 -0000 1.21
@@ -94,7 +94,7 @@
}
void
-Playfield::draw(GraphicContext& gc)
+Playfield::draw (GraphicContext& gc)
{
for(std::vector<View*>::iterator i = view.begin();
i != view.end();
@@ -138,10 +138,11 @@
scroll_center_x - 15, scroll_center_y,
1.0f, 1.0f, 0.0f, 1.0f);
}
+ UNUSED_ARG(gc);
}
Pingu*
-Playfield::current_pingu_find(int x_pos, int y_pos)
+Playfield::current_pingu_find (int x_pos, int y_pos)
{
double min_dist = 500.0;
double dist;
Index: plt_xml.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plt_xml.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plt_xml.hxx 23 Aug 2002 15:49:50 -0000 1.4
+++ plt_xml.hxx 6 Sep 2002 17:33:29 -0000 1.5
@@ -20,11 +20,8 @@
#ifndef HEADER_PINGUS_PLT_XML_HXX
#define HEADER_PINGUS_PLT_XML_HXX
-#include <vector>
#include <map>
#include "backgrounds/surface_background_data.hxx"
-
-#include "libxmlfwd.hxx"
class PLTXML
{
Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- smallmap.cxx 5 Sep 2002 12:24:02 -0000 1.13
+++ smallmap.cxx 6 Sep 2002 17:33:29 -0000 1.14
@@ -144,14 +144,14 @@
}
void
-SmallMap::set_client(Client* c)
+SmallMap::set_client (Client* c)
{
client = c;
init();
}
void
-SmallMap::draw(GraphicContext& gc)
+SmallMap::draw (GraphicContext& gc)
{
Playfield* playfield = client->get_playfield();
@@ -171,8 +171,8 @@
Display::draw_rect(x_of,
y_of + CL_Display::get_height() - sur.get_height(),
- x_of + Math::min(rwidth, int(sur.get_width())),
- y_of + Math::min(rheight, int(sur.get_height())) +
CL_Display::get_height() - sur.get_height(),
+ x_of + Math::min(rwidth,
static_cast<int>(sur.get_width())),
+ y_of + Math::min(rheight,
static_cast<int>(sur.get_height())) + CL_Display::get_height() -
sur.get_height(),
0.0, 1.0, 0.0, 1.0);
// FIXME: This should use put_target(), but put_target(), does not
@@ -192,10 +192,11 @@
}
*/
draw_pingus();
+ UNUSED_ARG(gc);
}
void
-SmallMap::draw_pingus()
+SmallMap::draw_pingus ()
{
int x;
int y;
Index: story.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/story.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- story.cxx 5 Sep 2002 12:24:02 -0000 1.6
+++ story.cxx 6 Sep 2002 17:33:29 -0000 1.7
@@ -73,6 +73,8 @@
small_font->print_left(125, 80 + story.get_height() + 25 + (4 *
small_font->get_height()), "...");
small_font->print_left(125, 80 + story.get_height() + 25 + (5 *
small_font->get_height()), "...");
small_font->print_left(125, 80 + story.get_height() + 25 + (6 *
small_font->get_height()), "...");
+
+ UNUSED_ARG(gc);
}
void
Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- surface_button.cxx 5 Sep 2002 12:24:02 -0000 1.11
+++ surface_button.cxx 6 Sep 2002 17:33:29 -0000 1.12
@@ -34,7 +34,7 @@
#include <config.h>
#include "my_gettext.hxx"
-SurfaceButton::SurfaceButton()
+SurfaceButton::SurfaceButton ()
{
font = PingusResource::load_font("Fonts/pingus_small", "fonts");
font_large = PingusResource::load_font("Fonts/pingus", "fonts");
@@ -49,12 +49,12 @@
//std::cout << "done" << std::endl;
}
-SurfaceButton::~SurfaceButton()
+SurfaceButton::~SurfaceButton ()
{
}
void
-SurfaceButton::draw(GraphicContext& gc)
+SurfaceButton::draw (GraphicContext& gc)
{
if (mouse_over && !pressed)
{
@@ -87,8 +87,8 @@
CL_Display::get_height() - 20,
desc.c_str());
- surface_p.put_screen(int(x_pos - surface_p.get_width()/2 * shrink),
- int(y_pos - surface_p.get_height()/2 * shrink),
+ surface_p.put_screen(static_cast<int>(x_pos - surface_p.get_width()/2 *
shrink),
+ static_cast<int>(y_pos - surface_p.get_height()/2 *
shrink),
shrink, shrink);
if (line2.empty())
{
@@ -109,12 +109,13 @@
surface_p.put_screen(x_pos - surface_p.get_width()/2,
y_pos - surface_p.get_height()/2);
}
+ UNUSED_ARG(gc);
}
void
SurfaceButton::update (float delta)
{
- if(delta);
+ UNUSED_ARG(delta);
}
void
Index: time_display.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/time_display.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- time_display.cxx 5 Sep 2002 12:24:02 -0000 1.6
+++ time_display.cxx 6 Sep 2002 17:33:29 -0000 1.7
@@ -27,14 +27,14 @@
#include "world.hxx"
#include "server.hxx"
-TimeDisplay::TimeDisplay()
+TimeDisplay::TimeDisplay ()
{
//font = PingusResource::load_font("Fonts/numbers","fonts");
font = PingusResource::load_font("Fonts/pingus_small","fonts");
}
void
-TimeDisplay::draw(GraphicContext& gc)
+TimeDisplay::draw (GraphicContext& gc)
{
int time_value = server->get_world()->get_time_left();
char time_string[8];
@@ -57,7 +57,7 @@
p = time_string;
// Replace any space with a zero
- while(*p++)
+ while (*p++)
{
if (*p == ' ')
*p = '0';
@@ -70,6 +70,8 @@
}
}
font->print_right(CL_Display::get_width() - 5, 1, time_string);
+
+ UNUSED_ARG(gc);
}
void
Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- worldobj_data_factory.cxx 4 Sep 2002 14:55:11 -0000 1.4
+++ worldobj_data_factory.cxx 6 Sep 2002 17:33:29 -0000 1.5
@@ -34,7 +34,6 @@
#include "worldobjs/conveyor_belt.hxx"
#include "worldobjs/teleporter.hxx"
-#include "trap_data.hxx"
#include "hotspot_data.hxx"
#include "entrance_data.hxx"
#include "worldobj_data_factory.hxx"
@@ -64,7 +63,7 @@
instance_ = new WorldObjDataFactory ();
// Registring Factories
- new WorldObjDataFactoryImpl<TrapData>("trap");
+ //new WorldObjDataFactoryImpl<TrapData>("trap");
new WorldObjDataFactoryImpl<LiquidData>("liquid");
new WorldObjDataFactoryImpl<HotspotData>("hotspot");
new WorldObjDataFactoryImpl<EntranceData>("entrance");
Index: worldobj_group_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_group_data.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- worldobj_group_data.cxx 2 Jul 2002 10:42:38 -0000 1.6
+++ worldobj_group_data.cxx 6 Sep 2002 17:33:29 -0000 1.7
@@ -26,7 +26,6 @@
// FIXME: Factory pattern for this would be nice
#include "exit_data.hxx"
#include "entrance_data.hxx"
-#include "trap_data.hxx"
#include "hotspot_data.hxx"
#include "liquid_data.hxx"
@@ -61,10 +60,10 @@
{
add (new EntranceData (doc, cur));
}
- else if (strcmp((char*)cur->name, "trap") == 0)
- {
- add (new TrapData (doc, cur));
- }
+ //else if (strcmp((char*)cur->name, "trap") == 0)
+ //{
+ //add (new TrapData (doc, cur));
+ //}
else if (strcmp((char*)cur->name, "hotspot") == 0)
{
add(new HotspotData (doc, cur));
Index: worldobj_group_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_group_data.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- worldobj_group_data.hxx 23 Aug 2002 15:49:52 -0000 1.5
+++ worldobj_group_data.hxx 6 Sep 2002 17:33:29 -0000 1.6
@@ -20,7 +20,6 @@
#ifndef HEADER_PINGUS_WORLDOBJ_GROUP_DATA_HXX
#define HEADER_PINGUS_WORLDOBJ_GROUP_DATA_HXX
-#include <vector>
#include "worldobj_data.hxx"
#include "libxmlfwd.hxx"
Index: xml_helper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- xml_helper.cxx 22 Aug 2002 00:36:30 -0000 1.13
+++ xml_helper.cxx 6 Sep 2002 17:33:29 -0000 1.14
@@ -18,11 +18,12 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <fstream>
+#include <ClanLib/Core/Math/cl_vector.h>
#include "string_converter.hxx"
-#include "xml_helper.hxx"
#include "color.hxx"
#include "res_descriptor.hxx"
#include "resource_modifier.hxx"
+#include "xml_helper.hxx"
// Hack: if xmlIsBlankNode() is not present, we define an empty dummy
#ifdef NO_XMLISBLANKNODE
Index: xml_helper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xml_helper.hxx 23 Aug 2002 15:49:52 -0000 1.7
+++ xml_helper.hxx 6 Sep 2002 17:33:29 -0000 1.8
@@ -25,7 +25,6 @@
#include <string>
#include <iosfwd>
-#include <ClanLib/Core/Math/cl_vector.h>
// FIX: Under windows, it's necessary to use libxml/parser.h, or MS's
// compiler will fails.
@@ -54,7 +53,7 @@
int xmlIsBlankNode(xmlNodePtr node);
#endif
-// class CL_Vector;
+class CL_Vector;
class Color;
class ResDescriptor;
@@ -62,26 +61,26 @@
{
public:
- static std::string encode_entities(const std::string& arg_str);
+ static std::string encode_entities (const std::string& arg_str);
- static xmlNodePtr skip_blank(xmlNodePtr cur);
+ static xmlNodePtr skip_blank (xmlNodePtr cur);
/// A set of function to parse an xml file
//@{
- static ResDescriptor parse_surface(xmlDocPtr doc, xmlNodePtr cur);
- static CL_Vector parse_vector(xmlDocPtr doc, xmlNodePtr cur);
- static std::string parse_string(xmlDocPtr doc, xmlNodePtr cur);
- static int parse_int(xmlDocPtr doc, xmlNodePtr cur);
- static float parse_float(xmlDocPtr doc, xmlNodePtr cur);
- static Color parse_color(xmlDocPtr doc, xmlNodePtr cur);
+ static ResDescriptor parse_surface (xmlDocPtr doc, xmlNodePtr cur);
+ static CL_Vector parse_vector (xmlDocPtr doc, xmlNodePtr cur);
+ static std::string parse_string (xmlDocPtr doc, xmlNodePtr cur);
+ static int parse_int (xmlDocPtr doc, xmlNodePtr cur);
+ static float parse_float (xmlDocPtr doc, xmlNodePtr cur);
+ static Color parse_color (xmlDocPtr doc, xmlNodePtr cur);
//@}
/// A set of functions to write data down to an xml file
//@{
/** Writes the given res_desc to the ofstream */
- static void write_desc_xml(std::ostream& xml, ResDescriptor desc);
+ static void write_desc_xml (std::ostream& xml, ResDescriptor desc);
/** Write a CL_Vector to an xml stream */
- static void write_vector_xml(std::ostream& xml, const CL_Vector& pos);
+ static void write_vector_xml (std::ostream& xml, const CL_Vector& pos);
//@}
private:
--- trap.cxx DELETED ---
--- trap.hxx DELETED ---
--- trap_data.cxx DELETED ---
--- trap_data.hxx DELETED ---
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.96,1.97 action_button.cxx,1.11,1.12 exit_menu.cxx,1.6,1.7 hurry_up.cxx,1.2,1.3 input_debug_screen.cxx,1.2,1.3 option_menu.cxx,1.4,1.5 pingus_counter.cxx,1.6,1.7 playfield.cxx,1.20,1.21 plt_xml.hxx,1.4,1.5 smallmap.cxx,1.13,1.14 story.cxx,1.6,1.7 surface_button.cxx,1.11,1.12 time_display.cxx,1.6,1.7 worldobj_data_factory.cxx,1.4,1.5 worldobj_group_data.cxx,1.6,1.7 worldobj_group_data.hxx,1.5,1.6 xml_helper.cxx,1.13,1.14 xml_helper.hxx,1.7,1.8 trap.cxx,1.2,NONE trap.hxx,1.3,NONE trap_data.cxx,1.7,NONE trap_data.hxx,1.6,NONE,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.hxx,1.14,1.15 object_selector.cxx,1.9,1.10 object_selector.hxx,1.7,1.8 plfobj.cxx,1.9,1.10 plfobj.hxx,1.8,1.9 rect_editorobj.cxx,1.3,1.4 rect_editorobj.hxx,1.3,1.4 sprite_editorobj.cxx,1.3,1.4 sprite_editorobj.hxx,1.3,1.4 start_pos.hxx,1.5,1.6 weather_obj.hxx,1.5,1.6
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src surface_button.cxx,1.12,1.13
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.hxx,1.14,1.15 object_selector.cxx,1.9,1.10 object_selector.hxx,1.7,1.8 plfobj.cxx,1.9,1.10 plfobj.hxx,1.8,1.9 rect_editorobj.cxx,1.3,1.4 rect_editorobj.hxx,1.3,1.4 sprite_editorobj.cxx,1.3,1.4 sprite_editorobj.hxx,1.3,1.4 start_pos.hxx,1.5,1.6 weather_obj.hxx,1.5,1.6
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src surface_button.cxx,1.12,1.13
- Index(es):