[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src vector.cxx,NONE,1.1 vector.hxx,NONE,1
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src vector.cxx,NONE,1.1 vector.hxx,NONE,1.1 Makefile.am,1.110,1.111 action_button.hxx,1.12,1.13 button_panel.cxx,1.14,1.15 capture_rectangle.cxx,1.7,1.8 client.cxx,1.23,1.24 client.hxx,1.18,1.19 col_map.cxx,1.10,1.11 display_graphic_context.cxx,1.4,1.5 display_graphic_context.hxx,1.3,1.4 exit_menu.cxx,1.9,1.10 force_vector.cxx,1.6,1.7 force_vector.hxx,1.5,1.6 game_session.cxx,1.10,1.11 graphic_context.hxx,1.2,1.3 input_event.hxx,1.7,1.8 intro.cxx,1.4,1.5 intro.hxx,1.5,1.6 multiplayer_client.cxx,1.4,1.5 multiplayer_client_child.cxx,1.11,1.12 multiplayer_client_child.hxx,1.6,1.7 multiplayer_game.cxx,1.9,1.10 option_menu.cxx,1.6,1.7 pingu.cxx,1.27,1.28 pingu.hxx,1.17,1.18 pingu_holder.cxx,1.9,1.10 pingu_holder.hxx,1.7,1.8 pingus_menu_manager.cxx,1.13,1.14 playfield.cxx,1.22,1.23 playfield_view.cxx,1.3,1.4 playfield_view.hxx,1.6,1.7 plf.cxx,1.9,1.10 plt_xml.cxx,1.7,1.8 smallmap_image.cxx,1.7,1.8 smallmap_image.hxx,1.7,1.8 sprite.cxx,1.6,1.7 sprite.hxx,1.6,1.7 story.cxx,1.11,1.12 string_converter.hxx,1.7,1.8 theme.cxx,1.7,1.8 theme_selector.cxx,1.6,1.7 true_server.cxx,1.9,1.10 usb_mouse_controller.cxx,1.1,1.2 usb_mouse_controller.hxx,1.5,1.6 view.cxx,1.12,1.13 view.hxx,1.9,1.10 world.cxx,1.26,1.27 world.hxx,1.13,1.14 worldobj_data_factory.cxx,1.25,1.26 xml_helper.cxx,1.17,1.18 xml_helper.hxx,1.11,1.12 xml_plf.cxx,1.25,1.26 |
Date: |
28 Sep 2002 11:52:56 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv10023
Modified Files:
Makefile.am action_button.hxx button_panel.cxx
capture_rectangle.cxx client.cxx client.hxx col_map.cxx
display_graphic_context.cxx display_graphic_context.hxx
exit_menu.cxx force_vector.cxx force_vector.hxx
game_session.cxx graphic_context.hxx input_event.hxx intro.cxx
intro.hxx multiplayer_client.cxx multiplayer_client_child.cxx
multiplayer_client_child.hxx multiplayer_game.cxx
option_menu.cxx pingu.cxx pingu.hxx pingu_holder.cxx
pingu_holder.hxx pingus_menu_manager.cxx playfield.cxx
playfield_view.cxx playfield_view.hxx plf.cxx plt_xml.cxx
smallmap_image.cxx smallmap_image.hxx sprite.cxx sprite.hxx
story.cxx string_converter.hxx theme.cxx theme_selector.cxx
true_server.cxx usb_mouse_controller.cxx
usb_mouse_controller.hxx view.cxx view.hxx world.cxx world.hxx
worldobj_data_factory.cxx xml_helper.cxx xml_helper.hxx
xml_plf.cxx
Added Files:
vector.cxx vector.hxx
Log Message:
replaced CL_Vector with a smaller Vector class
--- NEW FILE: vector.cxx ---
// $Id: vector.cxx,v 1.1 2002/09/28 11:52:22 torangan Exp $
//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <math.h>
#include <iostream>
#include "vector.hxx"
Vector::Vector (float x_, float y_, float z_) : x(x_), y(y_), z(z_)
{
}
Vector::Vector (const Vector& old) : x(old.x), y(old.y), z(old.z)
{
}
Vector&
Vector::operator= (const Vector& old)
{
if (this != &old)
{
x = old.x;
y = old.y;
z = old.z;
}
return *this;
}
Vector
Vector::operator- () const
{
return Vector(-x, -y, -z);
}
Vector
Vector::operator+ (const Vector& add) const
{
return Vector(x + add.x, y + add.y, z + add.z);
}
Vector
Vector::operator- (const Vector& sub) const
{
return Vector(x - sub.x, y - sub.y, z - sub.z);
}
Vector
Vector::operator* (float mul) const
{
return Vector(mul * x, mul * y, mul * z);
}
Vector&
Vector::operator+= (const Vector& add)
{
x += add.x;
y += add.y;
z += add.z;
return *this;
}
Vector&
Vector::operator-= (const Vector& sub)
{
x -= sub.x;
y -= sub.y;
z -= sub.z;
return *this;
}
Vector&
Vector::operator*= (float mul)
{
x *= mul;
y *= mul;
z *= mul;
return *this;
}
void
Vector::normalize ()
{
float f = sqrt(x * x + y * y + z * z);
if (f)
{
x /= f;
y /= f;
z /= f;
}
}
Vector
Vector::rotate (float angle, const Vector& pos) const
{
const float s = sin(angle);
const float c = cos(angle);
return Vector( x * (pos.x * pos.x * (1-c) + c)
+ y * (pos.x * pos.y * (1-c) - pos.z *s)
+ z * (pos.x * pos.z * (1-c) + pos.y *s),
x * (pos.y * pos.x * (1-c) + pos.z *s)
+ y * (pos.y * pos.y * (1-c) + c)
+ z * (pos.y * pos.z * (1-c) - pos.x *s),
x * (pos.x * pos.z * (1-c) - pos.y *s)
+ y * (pos.y * pos.z * (1-c) + pos.x *s)
+ z * (pos.z * pos.z * (1-c) + c)
);
}
std::ostream& operator<< (std::ostream& os, const Vector& v)
{
return os << v.x << " " << v.y << " " << v.z;
}
/* EOF */
--- NEW FILE: vector.hxx ---
// $Id: vector.hxx,v 1.1 2002/09/28 11:52:22 torangan Exp $
//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef HEADER_PINGUS_VECTOR_HXX
#define HEADER_PINGUS_VECTOR_HXX
#include <iosfwd>
#include "pingus.hxx"
class Vector
{
public:
float x;
float y;
float z;
public:
explicit Vector (float x_=0, float y_=0, float z_=0);
Vector (const Vector& old);
Vector& operator= (const Vector& old);
Vector operator- () const;
Vector operator+ (const Vector& add) const;
Vector operator- (const Vector& sub) const;
Vector operator* ( float mul) const;
Vector& operator+= (const Vector& add);
Vector& operator-= (const Vector& sub);
Vector& operator*= ( float mul);
void normalize ();
Vector rotate (float angle, const Vector& pos) const;
friend std::ostream& operator<< (std::ostream& os, const Vector& v);
};
std::ostream& operator<< (std::ostream& os, const Vector& v);
#endif
/* EOF */
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- Makefile.am 27 Sep 2002 16:01:55 -0000 1.110
+++ Makefile.am 28 Sep 2002 11:52:21 -0000 1.111
@@ -293,6 +293,8 @@
timer.hxx \
true_server.cxx \
true_server.hxx \
+vector.cxx \
+vector.hxx \
view.cxx \
view.hxx \
wav_provider.cxx \
Index: action_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- action_button.hxx 27 Sep 2002 11:26:43 -0000 1.12
+++ action_button.hxx 28 Sep 2002 11:52:21 -0000 1.13
@@ -31,7 +31,7 @@
class Server;
class ActionHolder;
class CL_Font;
-class CL_Vector;
+class Vector;
/** ArmageddonButton, press it to start the armageddon and to turn all
pingus into bomber
Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- button_panel.cxx 14 Sep 2002 19:06:33 -0000 1.14
+++ button_panel.cxx 28 Sep 2002 11:52:21 -0000 1.15
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Core/System/system.h>
#include "globals.hxx"
#include "button_panel.hxx"
Index: capture_rectangle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/capture_rectangle.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- capture_rectangle.cxx 14 Sep 2002 19:06:33 -0000 1.7
+++ capture_rectangle.cxx 28 Sep 2002 11:52:21 -0000 1.8
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "vector.hxx"
#include <ClanLib/Display/Font/font.h>
#include "pingu.hxx"
#include "pingus_resource.hxx"
@@ -79,7 +79,7 @@
}
// Draw the caputure rectangle
- sur->put_screen(pingu->get_center_pos() +
CL_Vector(x_offset,y_offset));
+ sur->put_screen(pingu->get_center_pos() + Vector(x_offset,y_offset));
// If pingu has an action, print its name
if (pingu->get_action())
@@ -96,16 +96,16 @@
// Paint the direction arrow
if (pingu->direction.is_left())
{
- arrow_left.put_screen(pingu->get_center_pos() + CL_Vector
(x_offset, y_offset + 28));
+ arrow_left.put_screen(pingu->get_center_pos() + Vector (x_offset,
y_offset + 28));
}
else
{
- arrow_right.put_screen(pingu->get_center_pos() + CL_Vector
(x_offset, y_offset + 28));
+ arrow_right.put_screen(pingu->get_center_pos() + Vector
(x_offset, y_offset + 28));
}
}
else
{
- sur->put_screen(pingu->get_center_pos() + CL_Vector (x_offset,
y_offset));
+ sur->put_screen(pingu->get_center_pos() + Vector (x_offset,
y_offset));
}
}
}
Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- client.cxx 19 Sep 2002 13:30:08 -0000 1.23
+++ client.cxx 28 Sep 2002 11:52:21 -0000 1.24
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <config.h>
#include <ClanLib/Core/System/system.h>
#include <ClanLib/Display/Display/display.h>
@@ -442,7 +443,7 @@
{
GUIScreen::draw (gc);
if (!server->get_plf()->get_playable())
- gc.draw(unplayable, CL_Vector(400, 50));
+ gc.draw(unplayable, Vector(400, 50));
}
void
Index: client.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.hxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- client.hxx 27 Sep 2002 11:26:43 -0000 1.18
+++ client.hxx 28 Sep 2002 11:52:21 -0000 1.19
@@ -39,7 +39,7 @@
} // namespace GUI
class CL_Key;
-class CL_Vector;
+class Vector;
class ButtonPanel;
class Controller;
class Cursor;
Index: col_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/col_map.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- col_map.cxx 17 Sep 2002 16:23:30 -0000 1.10
+++ col_map.cxx 28 Sep 2002 11:52:21 -0000 1.11
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Display/SurfaceProviders/canvas.h>
#include "graphic_context.hxx"
#include "globals.hxx"
Index: display_graphic_context.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/display_graphic_context.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- display_graphic_context.cxx 11 Sep 2002 12:45:57 -0000 1.4
+++ display_graphic_context.cxx 28 Sep 2002 11:52:21 -0000 1.5
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
#include "math.hxx"
@@ -27,7 +28,7 @@
int /*x_offset*/, int
/*y_offset*/)
: x1 (x1), y1 (y1), x2 (x2), y2 (y2), offset (-(x2 - x1)/2.0f,
-(y2-x1)/2.0f, 1.0f)
{
- center = CL_Vector ((x2 - x1)/2.0f + x1,
+ center = Vector ((x2 - x1)/2.0f + x1,
(y2 - y1)/2.0f + y1);
std::cout << "View: " << x1 << ", " << y1 << ", " << x2 << ", " << y2
<< std::endl;
@@ -51,7 +52,7 @@
return CL_Rect ();
}
-CL_Vector
+Vector
DisplayGraphicContext::get_offset ()
{
return offset;
@@ -80,10 +81,10 @@
rect.y1 = Math::min (arg_rect.y1, arg_rect.y2);
rect.y2 = Math::max (arg_rect.y1, arg_rect.y2);
- CL_Vector pos1 = screen_to_world (CL_Vector(rect.x1, rect.y1));
- CL_Vector pos2 = screen_to_world (CL_Vector(rect.x2, rect.y2));
+ Vector pos1 = screen_to_world (Vector(rect.x1, rect.y1));
+ Vector pos2 = screen_to_world (Vector(rect.x2, rect.y2));
- CL_Vector center = (pos2 + pos1) * 0.5f;
+ Vector center = (pos2 + pos1) * 0.5f;
offset = -center;
float width = pos2.x - pos1.x;
@@ -118,19 +119,19 @@
}
void
-DisplayGraphicContext::move (const CL_Vector & delta)
+DisplayGraphicContext::move (const Vector & delta)
{
offset += delta;
}
-CL_Vector
-DisplayGraphicContext::screen_to_world (CL_Vector pos)
+Vector
+DisplayGraphicContext::screen_to_world (Vector pos)
{
return ((pos - center) * (1.0f/offset.z)) - offset;
}
-CL_Vector
-DisplayGraphicContext::world_to_screen (CL_Vector pos)
+Vector
+DisplayGraphicContext::world_to_screen (Vector pos)
{
return ((pos + offset) * offset.z) + center;
}
@@ -148,14 +149,14 @@
}
void
-DisplayGraphicContext::draw (Sprite& sprite, const CL_Vector& pos)
+DisplayGraphicContext::draw (Sprite& sprite, const Vector& pos)
{
- CL_Vector tmp_pos = pos;
+ Vector tmp_pos = pos;
sprite.put_screen (tmp_pos + offset + center);
}
void
-DisplayGraphicContext::draw (Sprite& sprite, const CL_Vector& pos, int frame)
+DisplayGraphicContext::draw (Sprite& sprite, const Vector& pos, int frame)
{
CL_Surface sur (sprite.get_surface ());
draw (sur,
@@ -165,7 +166,7 @@
}
void
-DisplayGraphicContext::draw (CL_Surface& sur, const CL_Vector& pos)
+DisplayGraphicContext::draw (CL_Surface& sur, const Vector& pos)
{
if (offset.z == 1.0)
{
@@ -183,7 +184,7 @@
}
void
-DisplayGraphicContext::draw (CL_Surface& sur, const CL_Vector& pos, int frame)
+DisplayGraphicContext::draw (CL_Surface& sur, const Vector& pos, int frame)
{
draw (sur, int(pos.x), int(pos.y), frame);
}
@@ -233,7 +234,7 @@
}
void
-DisplayGraphicContext::draw_line (const CL_Vector& pos1, const CL_Vector& pos2,
+DisplayGraphicContext::draw_line (const Vector& pos1, const Vector& pos2,
float r, float g, float b, float a)
{
draw_line (int(pos1.x), int(pos1.y), int(pos2.x), int(pos2.y), r, g, b, a);
@@ -288,8 +289,8 @@
// FIXME: Probally not the fast circle draw algo on this world...
const float pi = 3.1415927f * 2.0f;
const float steps = 8;
- CL_Vector current (radius, 0);
- CL_Vector next = current.rotate (pi/steps, CL_Vector (0, 0, 1.0f));
+ Vector current (radius, 0);
+ Vector next = current.rotate (pi/steps, Vector (0, 0, 1.0f));
for (int i = 0; i < steps; ++i)
{
@@ -297,7 +298,7 @@
int(x_pos + next.x), int(y_pos + next.y),
r, g, b, a);
current = next;
- next = next.rotate (pi/8, CL_Vector (0, 0, 1.0f));
+ next = next.rotate (pi/8, Vector (0, 0, 1.0f));
}
}
Index: display_graphic_context.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/display_graphic_context.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- display_graphic_context.hxx 27 Sep 2002 11:26:43 -0000 1.3
+++ display_graphic_context.hxx 28 Sep 2002 11:52:21 -0000 1.4
@@ -20,7 +20,7 @@
#ifndef HEADER_DISPLAY_GRAPHIC_CONTEXT_HXX
#define HEADER_DISPLAY_GRAPHIC_CONTEXT_HXX
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "vector.hxx"
#include <ClanLib/Core/Math/rect.h>
#include "graphic_context.hxx"
@@ -34,17 +34,17 @@
int x1, y1, x2, y2;
/** scroll offset */
- CL_Vector offset;
+ Vector offset;
/** center of the display */
- CL_Vector center;
+ Vector center;
public:
DisplayGraphicContext (int x1, int y1, int x2, int y2,
int /*x_offset*/, int /*y_offset*/);
virtual ~DisplayGraphicContext ();
- CL_Vector get_offset ();
+ Vector get_offset ();
float get_x_offset ();
float get_y_offset ();
@@ -64,17 +64,17 @@
void zoom_to (const CL_Rect & rect);
/// Scroll the view by the given delta
- void move (const CL_Vector & delta);
+ void move (const Vector & delta);
/** Converts a given screen coordinate, as returned by
CL_Mouse::get_x(), into the world coordinate system. */
- CL_Vector screen_to_world (CL_Vector pos);
- CL_Vector world_to_screen (CL_Vector pos);
+ Vector screen_to_world (Vector pos);
+ Vector world_to_screen (Vector pos);
- void draw (Sprite& sprite, const CL_Vector& pos);
- void draw (Sprite& sprite, const CL_Vector& pos, int frame);
- void draw (CL_Surface& sur, const CL_Vector& pos);
- void draw (CL_Surface& sur, const CL_Vector& pos, int frame);
+ void draw (Sprite& sprite, const Vector& pos);
+ void draw (Sprite& sprite, const Vector& pos, int frame);
+ void draw (CL_Surface& sur, const Vector& pos);
+ void draw (CL_Surface& sur, const Vector& pos, int frame);
void draw (CL_Surface& sur, int x_pos, int y_pos);
void draw (CL_Surface& sur, int x_pos, int y_pos, int frame);
@@ -84,7 +84,7 @@
float size_x, float size_y, int frame);
/** Draw a line */
- void draw_line (const CL_Vector& pos1, const CL_Vector& pos2,
+ void draw_line (const Vector& pos1, const Vector& pos2,
float r, float g, float b, float a = 1.0f);
/** Draw a line */
void draw_line (int x1, int y1, int x2, int y2,
Index: exit_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_menu.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exit_menu.cxx 19 Sep 2002 13:30:08 -0000 1.9
+++ exit_menu.cxx 28 Sep 2002 11:52:21 -0000 1.10
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include "pingus_menu_manager.hxx"
#include "pingus_resource.hxx"
Index: force_vector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/force_vector.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- force_vector.cxx 27 Sep 2002 11:26:43 -0000 1.6
+++ force_vector.cxx 28 Sep 2002 11:52:21 -0000 1.7
@@ -22,7 +22,7 @@
#include <math.h>
#include "force_vector.hxx"
-CL_Vector grav(0.0,1.0);
+Vector grav(0.0,1.0);
std::vector<GravityForce> ForcesHolder::grav_array;
std::vector<ExplosionForce> ForcesHolder::explo_array;
@@ -51,10 +51,10 @@
}
// Apply the explosion force
-CL_Vector
-ExplosionForce::apply_forces(CL_Vector p,CL_Vector v)
+Vector
+ExplosionForce::apply_forces(Vector p,Vector v)
{
- CL_Vector tmpv = v;
+ Vector tmpv = v;
float imod,dist;
// Is p within the radius of the explosion?
@@ -109,10 +109,10 @@
clear_explo_list();
}
-CL_Vector
-ForcesHolder::apply_forces(CL_Vector p,CL_Vector v)
+Vector
+ForcesHolder::apply_forces(Vector p,Vector v)
{
- CL_Vector tv = v;
+ Vector tv = v;
// Go through all of the forces and apply them all
for (GForceIter i = grav_array.begin(); i != grav_array.end(); ++i)
Index: force_vector.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/force_vector.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- force_vector.hxx 27 Sep 2002 11:26:43 -0000 1.5
+++ force_vector.hxx 28 Sep 2002 11:52:21 -0000 1.6
@@ -24,27 +24,27 @@
#include "pingus.hxx"
#include <vector>
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "vector.hxx"
/// Gravity
-extern CL_Vector grav;
+extern Vector grav;
/** A Gravity Force is a force which points in one direction */
class GravityForce {
protected:
/// The force vector
- CL_Vector ifv;
+ Vector ifv;
public:
///
- GravityForce(CL_Vector fv) : ifv(fv)
+ GravityForce(Vector fv) : ifv(fv)
{
}
/** Applies the force to a velocity vector, v, a position p and
returns the new velicty vector. Just adds fv to v, p is ignored
as gravity is universal. */
- CL_Vector apply_forces(CL_Vector p,CL_Vector v)
+ Vector apply_forces(Vector p,Vector v)
{
UNUSED_ARG(p);
return v + ifv;
@@ -68,10 +68,10 @@
float isize;
/// The position
- CL_Vector ip;
+ Vector ip;
public:
- ExplosionForce(float inten, float size,CL_Vector p) : iinten(inten),
isize(size), ip(p)
+ ExplosionForce(float inten, float size,Vector p) : iinten(inten),
isize(size), ip(p)
{
}
@@ -81,7 +81,7 @@
ExplosionForce& operator= (const ExplosionForce& old);
- CL_Vector apply_forces(CL_Vector p,CL_Vector v);
+ Vector apply_forces(Vector p,Vector v);
};
@@ -113,7 +113,7 @@
static void clear_all_forces();
/// Apply forces
- static CL_Vector apply_forces(CL_Vector p,CL_Vector v);
+ static Vector apply_forces(Vector p,Vector v);
private:
ForcesHolder (const ForcesHolder&);
Index: game_session.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_session.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- game_session.cxx 17 Sep 2002 21:45:56 -0000 1.10
+++ game_session.cxx 28 Sep 2002 11:52:21 -0000 1.11
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include "client.hxx"
#include "true_server.hxx"
#include "game_session.hxx"
@@ -30,11 +31,11 @@
Timer timer;
timer.start();
- plf = PLF::create (filename);
+ plf = PLF::create(filename);
std::cout << "Timer: Level loading took: " << timer.stop() << std::endl;
timer.start();
- server = new TrueServer (plf);
+ server = new TrueServer(plf);
std::cout << "Timer: TrueServer creation took: " << timer.stop() <<
std::endl;
timer.start();
Index: graphic_context.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/graphic_context.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- graphic_context.hxx 5 Sep 2002 11:26:35 -0000 1.2
+++ graphic_context.hxx 28 Sep 2002 11:52:21 -0000 1.3
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_GRAPHIC_CONTEXT_HXX
#include <string>
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "vector.hxx"
#include <ClanLib/Core/Math/rect.h>
class Sprite;
@@ -35,7 +35,7 @@
{
private:
public:
- virtual CL_Vector get_offset () =0;
+ virtual Vector get_offset () =0;
/** Return the rectandle which represents the visible part of the
world, so that objects outsite it can be cliped away easily */
@@ -55,17 +55,17 @@
virtual void zoom_to (const CL_Rect & rect) =0;
/// Scroll the view by the given delta
- virtual void move (const CL_Vector & delta) =0;
+ virtual void move (const Vector & delta) =0;
/** Converts a given screen coordinate, as returned by
CL_Mouse::get_x(), into the world coordinate system. */
- virtual CL_Vector screen_to_world (CL_Vector pos) =0;
- virtual CL_Vector world_to_screen (CL_Vector pos) =0;
+ virtual Vector screen_to_world (Vector pos) =0;
+ virtual Vector world_to_screen (Vector pos) =0;
- virtual void draw (Sprite& sprite, const CL_Vector& pos) =0;
- virtual void draw (Sprite& sprite, const CL_Vector& pos, int frame) =0;
- virtual void draw (CL_Surface& sur, const CL_Vector& pos) =0;
- virtual void draw (CL_Surface& sur, const CL_Vector& pos, int frame) =0;
+ virtual void draw (Sprite& sprite, const Vector& pos) =0;
+ virtual void draw (Sprite& sprite, const Vector& pos, int frame) =0;
+ virtual void draw (CL_Surface& sur, const Vector& pos) =0;
+ virtual void draw (CL_Surface& sur, const Vector& pos, int frame) =0;
virtual void draw (CL_Surface& sur, int x_pos, int y_pos) =0;
virtual void draw (CL_Surface& sur, int x_pos, int y_pos, int frame) =0;
@@ -75,7 +75,7 @@
float size_x, float size_y, int frame) =0;
/** Draw a line */
- virtual void draw_line (const CL_Vector& pos1, const CL_Vector& pos2,
+ virtual void draw_line (const Vector& pos1, const Vector& pos2,
float r, float g, float b, float a = 1.0f) =0;
/** Draw a line */
virtual void draw_line (int x1, int y1, int x2, int y2,
Index: input_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input_event.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- input_event.hxx 23 Aug 2002 15:49:49 -0000 1.7
+++ input_event.hxx 28 Sep 2002 11:52:21 -0000 1.8
@@ -23,7 +23,7 @@
#error "Don't used this the moment, its underdevelopment and not compilable"
#include "pingus.hxx"
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "vector.hxx"
/** This will need some^H^H^H^H a lot of work */
typedef enum {
@@ -65,7 +65,7 @@
{
public:
/** Position or movement */
- CL_Vector pos;
+ Vector pos;
/** integer data */
int data;
Index: intro.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/intro.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- intro.cxx 14 Sep 2002 19:06:33 -0000 1.4
+++ intro.cxx 28 Sep 2002 11:52:21 -0000 1.5
@@ -109,8 +109,8 @@
font = PingusResource::load_font ("Fonts/pingus","fonts");
logo = PingusResource::load_surface ("misc/logo", "core");
- velocity = CL_Vector (0, -75);
- pos = CL_Vector (CL_Display::get_width ()/2,
+ velocity = Vector (0, -75);
+ pos = Vector (CL_Display::get_width ()/2,
CL_Display::get_height () + logo.get_height ());
Index: intro.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/intro.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- intro.hxx 27 Sep 2002 11:26:43 -0000 1.5
+++ intro.hxx 28 Sep 2002 11:52:21 -0000 1.6
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_INTRO_HXX
#define HEADER_PINGUS_INTRO_HXX
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "vector.hxx"
#include <ClanLib/Display/Display/surface.h>
class CL_Key;
@@ -34,8 +34,8 @@
{
private:
CL_Surface logo;
- CL_Vector pos;
- CL_Vector velocity;
+ Vector pos;
+ Vector velocity;
unsigned int start_time;
enum { SCROLL_UP, SLOWDOWN, WAITING, FINISHED } stage;
CL_Font* font;
Index: multiplayer_client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- multiplayer_client.cxx 14 Sep 2002 19:06:33 -0000 1.4
+++ multiplayer_client.cxx 28 Sep 2002 11:52:21 -0000 1.5
@@ -30,7 +30,7 @@
gui_objs[1] = child2;
gui_objs[2] = child3;
gui_objs[3] = child4;
- // gui_objs[4] = new SmallMapImage (s, CL_Vector (CL_Display::get_width
()/2 - 100,
+ // gui_objs[4] = new SmallMapImage (s, Vector (CL_Display::get_width ()/2 -
100,
// CL_Display::get_height ()/2 - 75), 200, 150);
}
Index: multiplayer_client_child.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- multiplayer_client_child.cxx 14 Sep 2002 19:06:33 -0000 1.11
+++ multiplayer_client_child.cxx 28 Sep 2002 11:52:21 -0000 1.12
@@ -81,7 +81,7 @@
playfield->scroll (scroll_vec * delta);
}
-void MultiplayerClientChild::on_left_press (const CL_Vector& pos)
+void MultiplayerClientChild::on_left_press (const Vector& pos)
{
CL_Key key;
key.id = CL_MOUSE_LEFTBUTTON;
@@ -101,70 +101,70 @@
*/
}
-void MultiplayerClientChild::on_right_press (const CL_Vector& /*pos*/)
+void MultiplayerClientChild::on_right_press (const Vector& /*pos*/)
{
}
-void MultiplayerClientChild::on_right_release (const CL_Vector& /*pos*/)
+void MultiplayerClientChild::on_right_release (const Vector& /*pos*/)
{
}
void
-MultiplayerClientChild::on_scroll_left_press (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_scroll_left_press (const Vector& /*pos*/)
{
- scroll_vec += CL_Vector (450.0f, 0.0f);
+ scroll_vec += Vector (450.0f, 0.0f);
}
void
-MultiplayerClientChild::on_scroll_right_press (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_scroll_right_press (const Vector& /*pos*/)
{
- scroll_vec += CL_Vector (-450.0f, 0.0f);
+ scroll_vec += Vector (-450.0f, 0.0f);
}
void
-MultiplayerClientChild::on_scroll_left_release (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_scroll_left_release (const Vector& /*pos*/)
{
- scroll_vec -= CL_Vector (450.0f,0.0f);
+ scroll_vec -= Vector (450.0f,0.0f);
}
void
-MultiplayerClientChild::on_scroll_right_release (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_scroll_right_release (const Vector& /*pos*/)
{
- scroll_vec -= CL_Vector (-450.0f, 0.0f);
+ scroll_vec -= Vector (-450.0f, 0.0f);
}
void
-MultiplayerClientChild::on_scroll_up_press (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_scroll_up_press (const Vector& /*pos*/)
{
- scroll_vec += CL_Vector (0.0f, 450.0f);
+ scroll_vec += Vector (0.0f, 450.0f);
}
void
-MultiplayerClientChild::on_scroll_up_release (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_scroll_up_release (const Vector& /*pos*/)
{
- scroll_vec -= CL_Vector (0.0f, 450.0f);
+ scroll_vec -= Vector (0.0f, 450.0f);
}
void
-MultiplayerClientChild::on_scroll_down_press (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_scroll_down_press (const Vector& /*pos*/)
{
- scroll_vec += CL_Vector (0.0f, -450.0f);
+ scroll_vec += Vector (0.0f, -450.0f);
}
void
-MultiplayerClientChild::on_scroll_down_release (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_scroll_down_release (const Vector& /*pos*/)
{
- scroll_vec -= CL_Vector (0.0f, -450.0f);
+ scroll_vec -= Vector (0.0f, -450.0f);
}
void
-MultiplayerClientChild::on_next_action_press (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_next_action_press (const Vector& /*pos*/)
{
button_panel->next_action ();
}
void
-MultiplayerClientChild::on_previous_action_press (const CL_Vector& /*pos*/)
+MultiplayerClientChild::on_previous_action_press (const Vector& /*pos*/)
{
button_panel->previous_action ();
}
Index: multiplayer_client_child.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- multiplayer_client_child.hxx 27 Sep 2002 11:26:43 -0000 1.6
+++ multiplayer_client_child.hxx 28 Sep 2002 11:52:22 -0000 1.7
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_MULTIPLAYER_CLIENT_CHILD_HXX
#define HEADER_PINGUS_MULTIPLAYER_CLIENT_CHILD_HXX
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "vector.hxx"
#include "cursor.hxx"
#include "button_panel.hxx"
#include "playfield_view.hxx"
@@ -46,7 +46,7 @@
CL_Rect rect;
- CL_Vector scroll_vec;
+ Vector scroll_vec;
public:
MultiplayerClientChild (Server * s, const CL_Rect& arg_rect);
@@ -55,22 +55,22 @@
void draw ();
void update (float delta);
- void on_left_press (const CL_Vector& pos);
- void on_right_press (const CL_Vector& pos);
- void on_right_release (const CL_Vector& pos);
+ void on_left_press (const Vector& pos);
+ void on_right_press (const Vector& pos);
+ void on_right_release (const Vector& pos);
- void on_scroll_left_press (const CL_Vector& pos);
- void on_scroll_right_press (const CL_Vector& pos);
- void on_scroll_up_press (const CL_Vector& pos);
- void on_scroll_down_press (const CL_Vector& pos);
+ void on_scroll_left_press (const Vector& pos);
+ void on_scroll_right_press (const Vector& pos);
+ void on_scroll_up_press (const Vector& pos);
+ void on_scroll_down_press (const Vector& pos);
- void on_scroll_left_release (const CL_Vector& pos);
- void on_scroll_right_release (const CL_Vector& pos);
- void on_scroll_up_release (const CL_Vector& pos);
- void on_scroll_down_release (const CL_Vector& pos);
+ void on_scroll_left_release (const Vector& pos);
+ void on_scroll_right_release (const Vector& pos);
+ void on_scroll_up_release (const Vector& pos);
+ void on_scroll_down_release (const Vector& pos);
- void on_next_action_press (const CL_Vector& pos);
- void on_previous_action_press (const CL_Vector& pos);
+ void on_next_action_press (const Vector& pos);
+ void on_previous_action_press (const Vector& pos);
private:
MultiplayerClientChild (const MultiplayerClientChild&);
Index: multiplayer_game.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_game.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- multiplayer_game.cxx 22 Aug 2002 02:24:59 -0000 1.9
+++ multiplayer_game.cxx 28 Sep 2002 11:52:22 -0000 1.10
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Display/Input/input.h>
#include <ClanLib/Display/Display/display.h>
#include "path_manager.hxx"
Index: option_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/option_menu.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- option_menu.cxx 27 Sep 2002 11:26:43 -0000 1.6
+++ option_menu.cxx 28 Sep 2002 11:52:22 -0000 1.7
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Core/System/system.h>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
Index: pingu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- pingu.cxx 16 Sep 2002 23:49:56 -0000 1.27
+++ pingu.cxx 28 Sep 2002 11:52:22 -0000 1.28
@@ -37,7 +37,7 @@
int Pingu::id_counter = 0;
// Init a pingu at the given position while falling
-Pingu::Pingu (const CL_Vector& arg_pos, int owner)
+Pingu::Pingu (const Vector& arg_pos, int owner)
: action(0),
countdown_action (0),
wall_action(0),
@@ -48,7 +48,7 @@
status(PS_ALIVE),
pos_x(arg_pos.x),
pos_y(arg_pos.y),
- velocity(new CL_Vector(0, 0, 0))
+ velocity(new Vector(0, 0, 0))
{
direction.left ();
set_action(Faller);
@@ -94,14 +94,14 @@
}
void
-Pingu::set_pos (const CL_Vector& arg_pos)
+Pingu::set_pos (const Vector& arg_pos)
{
set_x (arg_pos.x);
set_y (arg_pos.y);
}
void
-Pingu::set_velocity (const CL_Vector& velocity_)
+Pingu::set_velocity (const Vector& velocity_)
{
*velocity = velocity_;
}
@@ -273,7 +273,7 @@
bool
Pingu::is_over (int x, int y)
{
- CL_Vector center = get_center_pos ();
+ Vector center = get_center_pos ();
return (center.x + 16 > x && center.x - 16 < x &&
center.y + 16 > y && center.y - 16 < y);
@@ -294,7 +294,7 @@
double
Pingu::dist (int x, int y)
{
- CL_Vector p = get_center_pos ();
+ Vector p = get_center_pos ();
return sqrt(((p.x - x) * (p.x - x) + (p.y - y) * (p.y - y)));
}
@@ -394,7 +394,7 @@
}
void
-Pingu::apply_force (CL_Vector arg_v)
+Pingu::apply_force (Vector arg_v)
{
*velocity += arg_v;
// Moving the pingu on pixel up, so that the force can take effect
@@ -402,16 +402,16 @@
--pos_y;
}
-CL_Vector
+Vector
Pingu::get_pos () const
{
- return CL_Vector(pos_x, pos_y, 0);
+ return Vector(pos_x, pos_y, 0);
}
-CL_Vector
+Vector
Pingu::get_center_pos () const
{
- return CL_Vector(pos_x, pos_y) + CL_Vector (0, -16);
+ return Vector(pos_x, pos_y) + Vector (0, -16);
}
int
Index: pingu.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pingu.hxx 27 Sep 2002 11:26:43 -0000 1.17
+++ pingu.hxx 28 Sep 2002 11:52:22 -0000 1.18
@@ -24,7 +24,7 @@
#include "pingu_enums.hxx"
// Forward declarations
-class CL_Vector;
+class Vector;
class ActionHolder;
class PinguAction;
class GraphicContext;
@@ -65,7 +65,7 @@
float pos_x;
float pos_y;
- CL_Vector* const velocity;
+ Vector* const velocity;
public:
@@ -79,7 +79,7 @@
/** Creates a new Pingu at the given coordinates
@param pos The start position of the pingu
@param owner The owner id of the pingu (used for multiplayer) */
- Pingu (const CL_Vector& pos, int owner);
+ Pingu (const Vector& pos, int owner);
/** Destruct the pingu... */
~Pingu ();
@@ -87,11 +87,11 @@
/** Return the logical pingus position, this is the position which
is used for collision detection to the ground (the pingus
feet) */
- CL_Vector get_pos () const;
+ Vector get_pos () const;
/** Returns the visible position of the pingu, the graphical center
of the pingu. */
- CL_Vector get_center_pos () const;
+ Vector get_center_pos () const;
/** Returns the x position of the pingu
* For backward comp. only
@@ -129,11 +129,11 @@
void set_y (float y);
/// Set the pingu to the given coordinates
- void set_pos (const CL_Vector& arg_pos);
+ void set_pos (const Vector& arg_pos);
- const CL_Vector& get_velocity () const { return *velocity; }
+ const Vector& get_velocity () const { return *velocity; }
- void set_velocity (const CL_Vector& velocity_);
+ void set_velocity (const Vector& velocity_);
// Set the pingu in the gives direction
void set_direction (Direction d);
@@ -174,7 +174,7 @@
bool need_catch ();
void draw (GraphicContext& gc);
- void apply_force (CL_Vector);
+ void apply_force (Vector);
void update (float delta);
Index: pingu_holder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_holder.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pingu_holder.cxx 18 Sep 2002 12:07:13 -0000 1.9
+++ pingu_holder.cxx 28 Sep 2002 11:52:22 -0000 1.10
@@ -53,7 +53,7 @@
}
Pingu*
-PinguHolder::create_pingu (const CL_Vector& pos, int owner_id)
+PinguHolder::create_pingu (const Vector& pos, int owner_id)
{
Pingu* pingu = new Pingu (pos, owner_id);
// This list will get evaluated and deleted and destruction
Index: pingu_holder.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_holder.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingu_holder.hxx 27 Sep 2002 11:26:44 -0000 1.7
+++ pingu_holder.hxx 28 Sep 2002 11:52:22 -0000 1.8
@@ -24,7 +24,7 @@
#include <vector>
#include "worldobj.hxx"
-class CL_Vector;
+class Vector;
class Pingu;
typedef std::list<Pingu*>::iterator PinguIter;
@@ -65,7 +65,7 @@
/** Return a reference to a newly create Pingu, the PinguHolder will
take care of the deletion. The caller *must* not delete the
Pingu */
- Pingu* create_pingu (const CL_Vector& pos, int owner_id);
+ Pingu* create_pingu (const Vector& pos, int owner_id);
float get_z_pos() const;
Index: pingus_menu_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pingus_menu_manager.cxx 14 Sep 2002 19:06:33 -0000 1.13
+++ pingus_menu_manager.cxx 28 Sep 2002 11:52:22 -0000 1.14
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include "screen_manager.hxx"
#include "pingus_menu_manager.hxx"
@@ -47,7 +48,7 @@
{
background.draw ();
- gc.draw (unplayable, CL_Vector(CL_Display::get_width ()/2, 30));
+ gc.draw (unplayable, Vector(CL_Display::get_width ()/2, 30));
CL_Display::fill_rect(0, CL_Display::get_height () - 22,
CL_Display::get_width (), CL_Display::get_height (),
Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- playfield.cxx 14 Sep 2002 19:06:33 -0000 1.22
+++ playfield.cxx 28 Sep 2002 11:52:22 -0000 1.23
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h>
+#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include "globals.hxx"
#include "playfield.hxx"
Index: playfield_view.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield_view.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- playfield_view.cxx 14 Sep 2002 19:06:33 -0000 1.3
+++ playfield_view.cxx 28 Sep 2002 11:52:22 -0000 1.4
@@ -44,16 +44,16 @@
}
void
-PlayfieldView::scroll (CL_Vector delta)
+PlayfieldView::scroll (Vector delta)
{
x_offset += (int) delta.x;
y_offset += (int) delta.y;
}
Pingu*
-PlayfieldView::get_pingu (const CL_Vector& pos)
+PlayfieldView::get_pingu (const Vector& pos)
{
- return world->get_pingu (CL_Vector(pos.x - x1 - x_offset,
+ return world->get_pingu (Vector(pos.x - x1 - x_offset,
pos.y - y1 - y_offset));
}
Index: playfield_view.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield_view.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- playfield_view.hxx 27 Sep 2002 11:26:44 -0000 1.6
+++ playfield_view.hxx 28 Sep 2002 11:52:22 -0000 1.7
@@ -24,7 +24,7 @@
#include "gui_obj.hxx"
class CL_Rect;
-class CL_Vector;
+class Vector;
class World;
class Pingu;
@@ -47,10 +47,10 @@
void draw ();
// Scroll the playfield
- void scroll (CL_Vector delta);
+ void scroll (Vector delta);
// Return the pingu at the given *screen* coordinates
- Pingu* get_pingu (const CL_Vector& pos);
+ Pingu* get_pingu (const Vector& pos);
private:
PlayfieldView (const PlayfieldView&);
Index: plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- plf.cxx 16 Sep 2002 20:31:09 -0000 1.9
+++ plf.cxx 28 Sep 2002 11:52:22 -0000 1.10
@@ -17,13 +17,12 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include "xml_plf.hxx"
#include "globals.hxx"
#include "system.hxx"
#include "pingus_error.hxx"
-using namespace std;
-
PLF::PLF()
{
start_x_pos = start_y_pos = 0;
@@ -78,7 +77,7 @@
return number_of_pingus;
}
-vector<ActionData>
+std::vector<ActionData>
PLF::get_actions()
{
// FIXME: we should merge duplicated actions
@@ -91,7 +90,7 @@
return music;
}
-map<std::string, std::string>
+std::map<std::string, std::string>
PLF::get_description()
{
return description;
@@ -103,7 +102,7 @@
return filename;
}
-map<std::string, std::string>
+std::map<std::string, std::string>
PLF::get_levelname()
{
return levelname;
@@ -139,7 +138,7 @@
return comment;
}
-string
+std::string
PLF::get_author()
{
return author;
Index: plt_xml.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plt_xml.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- plt_xml.cxx 10 Sep 2002 21:03:32 -0000 1.7
+++ plt_xml.cxx 28 Sep 2002 11:52:22 -0000 1.8
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include "globals.hxx"
#include "pingus_error.hxx"
#include "xml_helper.hxx"
Index: smallmap_image.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap_image.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smallmap_image.cxx 16 Sep 2002 20:31:09 -0000 1.7
+++ smallmap_image.cxx 28 Sep 2002 11:52:22 -0000 1.8
@@ -24,7 +24,7 @@
#include "col_map.hxx"
#include "server.hxx"
-SmallMapImage::SmallMapImage (Server * s, CL_Vector arg_pos, int width, int
height)
+SmallMapImage::SmallMapImage (Server * s, Vector arg_pos, int width, int
height)
: sur (create_surface (s, width, height)),
pos (arg_pos)
{
Index: smallmap_image.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap_image.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smallmap_image.hxx 27 Sep 2002 11:26:44 -0000 1.7
+++ smallmap_image.hxx 28 Sep 2002 11:52:22 -0000 1.8
@@ -22,7 +22,7 @@
#include "pingus.hxx"
#include <ClanLib/Display/Display/surface.h>
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "vector.hxx"
class Server;
@@ -32,9 +32,9 @@
{
private:
CL_Surface sur;
- CL_Vector pos;
+ Vector pos;
public:
- SmallMapImage (Server * s, CL_Vector pos, int width, int height);
+ SmallMapImage (Server * s, Vector pos, int width, int height);
virtual ~SmallMapImage ();
void draw ();
Index: sprite.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/sprite.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sprite.cxx 27 Sep 2002 11:26:44 -0000 1.6
+++ sprite.cxx 28 Sep 2002 11:52:22 -0000 1.7
@@ -18,11 +18,12 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <assert.h>
-#include <ClanLib/Core/Math/cl_vector.h>
+#include <iostream>
+#include "vector.hxx"
#include "pingus_resource.hxx"
#include "sprite.hxx"
-int round(float f)
+int round (float f)
{
if (f >= 0.0f)
return int(f + 0.5f);
@@ -134,7 +135,7 @@
}
void
-Sprite::put_screen (const CL_Vector& pos)
+Sprite::put_screen (const Vector& pos)
{
put_screen (int(pos.x), int(pos.y));
}
Index: sprite.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/sprite.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sprite.hxx 27 Sep 2002 11:26:44 -0000 1.6
+++ sprite.hxx 28 Sep 2002 11:52:22 -0000 1.7
@@ -23,7 +23,7 @@
#include "pingus.hxx"
#include <ClanLib/Display/Display/surface.h>
-class CL_Vector;
+class Vector;
class ResDescriptor;
class Sprite
@@ -72,13 +72,13 @@
LoopType arg_loop_type = ENDLESS);
/** High level version of put_screen (), it handles the frame count
- and the aligment, might be used when you don't have a CL_Vector
+ and the aligment, might be used when you don't have a Vector
at hand. */
void put_screen (int x, int y);
/** High level version put_screen (), it handles the framecount and
the alignment */
- void put_screen (const CL_Vector& pos);
+ void put_screen (const Vector& pos);
/** Set the alignment (aka offset) of the surface
@param arg_x The x offset by which the surface drawn
Index: story.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/story.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- story.cxx 14 Sep 2002 19:06:33 -0000 1.11
+++ story.cxx 28 Sep 2002 11:52:22 -0000 1.12
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include "fonts.hxx"
#include "pingus_resource.hxx"
Index: string_converter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/string_converter.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- string_converter.hxx 27 Sep 2002 11:26:44 -0000 1.7
+++ string_converter.hxx 28 Sep 2002 11:52:22 -0000 1.8
@@ -34,7 +34,7 @@
#include <strstream>
#endif
-class CL_Vector;
+class Vector;
template <class T>
std::string to_string (const T& any)
Index: theme.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- theme.cxx 5 Sep 2002 12:40:22 -0000 1.7
+++ theme.cxx 28 Sep 2002 11:52:22 -0000 1.8
@@ -17,13 +17,14 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <fstream>
+#include <iostream>
#include <ClanLib/Core/System/error.h>
#include <ClanLib/Core/System/system.h>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
#include <ClanLib/Display/Input/keyboard.h>
#include <ClanLib/Display/Input/key.h>
-#include <fstream>
#include "path_manager.hxx"
#include "system.hxx"
#include "pingus_resource.hxx"
Index: theme_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme_selector.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- theme_selector.cxx 27 Sep 2002 11:26:44 -0000 1.6
+++ theme_selector.cxx 28 Sep 2002 11:52:22 -0000 1.7
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Display/Display/display.h>
#include <ClanLib/Display/Font/font.h>
#include <ClanLib/Display/Input/input.h>
@@ -36,9 +37,7 @@
#include "system.hxx"
#include "theme.hxx"
-using namespace std;
-
-ListBox::ListBox()
+ListBox::ListBox ()
{
}
Index: true_server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/true_server.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- true_server.cxx 24 Sep 2002 14:51:36 -0000 1.9
+++ true_server.cxx 28 Sep 2002 11:52:22 -0000 1.10
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <ClanLib/Core/System/system.h>
#include "globals.hxx"
#include "plf.hxx"
Index: usb_mouse_controller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/usb_mouse_controller.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usb_mouse_controller.cxx 12 Jun 2002 19:09:38 -0000 1.1
+++ usb_mouse_controller.cxx 28 Sep 2002 11:52:22 -0000 1.2
@@ -49,10 +49,10 @@
return mouse.y;
}
-CL_Vector
+Vector
USBMouseController::get_pos ()
{
- return CL_Vector (mouse.x, mouse.y);
+ return Vector (mouse.x, mouse.y);
}
void
Index: usb_mouse_controller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/usb_mouse_controller.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- usb_mouse_controller.hxx 23 Aug 2002 15:49:51 -0000 1.5
+++ usb_mouse_controller.hxx 28 Sep 2002 11:52:22 -0000 1.6
@@ -67,7 +67,7 @@
int get_x ();
int get_y ();
- CL_Vector get_pos ();
+ Vector get_pos ();
void keep_alive ();
};
Index: view.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/view.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- view.cxx 17 Sep 2002 22:52:36 -0000 1.12
+++ view.cxx 28 Sep 2002 11:52:22 -0000 1.13
@@ -178,10 +178,10 @@
current_pingu = p;
}
-CL_Vector
+Vector
View::get_center ()
{
- return CL_Vector (-x_offset + get_width ()/2, -y_offset + get_height ()/2);
+ return Vector (-x_offset + get_width ()/2, -y_offset + get_height ()/2);
}
void
Index: view.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/view.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- view.hxx 27 Sep 2002 11:26:44 -0000 1.9
+++ view.hxx 28 Sep 2002 11:52:22 -0000 1.10
@@ -86,7 +86,7 @@
void shift_y_offset(int);
/** Returns the current center of the screen in World coordinates. */
- CL_Vector get_center ();
+ Vector get_center ();
int get_width () { return x2_pos - x1_pos; }
int get_height () { return y2_pos - y1_pos; }
Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- world.cxx 18 Sep 2002 10:50:57 -0000 1.26
+++ world.cxx 28 Sep 2002 11:52:22 -0000 1.27
@@ -19,6 +19,7 @@
#include <algorithm>
#include <assert.h>
+#include <iostream>
#include "force_vector.hxx"
#include "plf.hxx"
#include "pingu_holder.hxx"
@@ -30,7 +31,6 @@
#include "pingu.hxx"
#include "game_time.hxx"
-using namespace std;
using Actions::Bomber;
static
@@ -82,9 +82,9 @@
void
World::init_worldobjs(PLF* plf)
{
- vector<WorldObjData*> worldobj_d = plf->get_worldobjs_data ();
+ std::vector<WorldObjData*> worldobj_d = plf->get_worldobjs_data();
- for (vector<WorldObjData*>::iterator i = worldobj_d.begin ();
+ for (std::vector<WorldObjData*>::iterator i = worldobj_d.begin();
i != worldobj_d.end ();
++i)
{
@@ -165,7 +165,7 @@
&& pingus->size() == 0)
{
if (verbose)
- std::cout << "World: world finished, going down in the next seconds..."
<< endl;
+ std::cout << "World: world finished, going down in the next seconds..."
<< std::endl;
exit_world = true;
shutdown_time = game_time->get_ticks() + 75;
@@ -299,11 +299,11 @@
}
void
-World::play_wav (std::string name, const CL_Vector& pos, float volume)
+World::play_wav (std::string name, const Vector& pos, float volume)
{
if (view)
{
- CL_Vector center = view->get_center ();
+ Vector center = view->get_center ();
float panning = pos.x - center.x;
panning /= view->get_width ()/2;
@@ -328,7 +328,7 @@
}
Pingu*
-World::get_pingu (const CL_Vector& pos)
+World::get_pingu (const Vector& pos)
{
Pingu* current_pingu = 0;
double distance = -1.0;
Index: world.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- world.hxx 27 Sep 2002 11:26:44 -0000 1.13
+++ world.hxx 28 Sep 2002 11:52:22 -0000 1.14
@@ -26,7 +26,7 @@
#include <string>
// Forward declarations
-class CL_Vector;
+class Vector;
class ActionHolder;
class Entrance;
class Exit;
@@ -169,7 +169,7 @@
going to be ignored) void play_wav (std::string name, const
@param volume The volume of the sound
*/
- void play_wav (std::string name, const CL_Vector& pos, float volume = 0.5f);
+ void play_wav (std::string name, const Vector& pos, float volume = 0.5f);
/** Sets the main view, it is needed to play stereo wave and for
other screen orientated effects
@@ -183,7 +183,7 @@
/** @return the pingu at the given word coordinates, an empty
shared_ptr is returned if none is there */
- Pingu* get_pingu (const CL_Vector& pos);
+ Pingu* get_pingu (const Vector& pos);
/** Return a pointer to the GameTime object of this World */
GameTime* get_game_time ();
Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- worldobj_data_factory.cxx 27 Sep 2002 16:01:55 -0000 1.25
+++ worldobj_data_factory.cxx 28 Sep 2002 11:52:22 -0000 1.26
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include "pingus_error.hxx"
#include "worldobj_data_factory.hxx"
#include "xml_helper.hxx"
Index: xml_helper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- xml_helper.cxx 14 Sep 2002 19:06:33 -0000 1.17
+++ xml_helper.cxx 28 Sep 2002 11:52:22 -0000 1.18
@@ -17,8 +17,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <fstream>
-#include <ClanLib/Core/Math/cl_vector.h>
+#include <iostream>
+#include "vector.hxx"
#include "string_converter.hxx"
#include "color.hxx"
#include "res_descriptor.hxx"
@@ -72,10 +72,10 @@
return str;
}
-CL_Vector
+Vector
XMLhelper::parse_vector(xmlDocPtr doc, xmlNodePtr cur)
{
- CL_Vector pos;
+ Vector pos;
cur = cur->children;
while (cur)
{
@@ -355,7 +355,7 @@
}
void
-XMLhelper::write_vector_xml(std::ostream& xml, const CL_Vector& pos)
+XMLhelper::write_vector_xml(std::ostream& xml, const Vector& pos)
{
xml << " <position>\n"
<< " <x-pos>" << pos.x << "</x-pos>\n"
Index: xml_helper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- xml_helper.hxx 27 Sep 2002 11:26:44 -0000 1.11
+++ xml_helper.hxx 28 Sep 2002 11:52:22 -0000 1.12
@@ -53,7 +53,7 @@
int xmlIsBlankNode(xmlNodePtr node);
#endif
-class CL_Vector;
+class Vector;
class Color;
class ResDescriptor;
@@ -78,7 +78,7 @@
/// 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 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);
@@ -89,8 +89,8 @@
//@{
/** Writes the given res_desc to the ofstream */
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);
+ /** Write a Vector to an xml stream */
+ static void write_vector_xml (std::ostream& xml, const Vector& pos);
//@}
private:
Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- xml_plf.cxx 27 Sep 2002 16:01:55 -0000 1.25
+++ xml_plf.cxx 28 Sep 2002 11:52:22 -0000 1.26
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include "xml_helper.hxx"
#include "xml_plf.hxx"
#include "globals.hxx"
@@ -30,7 +31,6 @@
#include "worldobjsdata/liquid_data.hxx"
#include "worldobjsdata/worldobj_group_data.hxx"
-using namespace std;
using Actions::action_from_string;
XMLPLF::XMLPLF (const std::string& filename)
@@ -245,7 +245,7 @@
if (XMLhelper::equal_str(cur->name, "position"))
{
- CL_Vector pos = XMLhelper::parse_vector(doc, cur);
+ Vector pos = XMLhelper::parse_vector(doc, cur);
start_x_pos = static_cast<int>(pos.x);
start_y_pos = static_cast<int>(pos.y);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src vector.cxx,NONE,1.1 vector.hxx,NONE,1.1 Makefile.am,1.110,1.111 action_button.hxx,1.12,1.13 button_panel.cxx,1.14,1.15 capture_rectangle.cxx,1.7,1.8 client.cxx,1.23,1.24 client.hxx,1.18,1.19 col_map.cxx,1.10,1.11 display_graphic_context.cxx,1.4,1.5 display_graphic_context.hxx,1.3,1.4 exit_menu.cxx,1.9,1.10 force_vector.cxx,1.6,1.7 force_vector.hxx,1.5,1.6 game_session.cxx,1.10,1.11 graphic_context.hxx,1.2,1.3 input_event.hxx,1.7,1.8 intro.cxx,1.4,1.5 intro.hxx,1.5,1.6 multiplayer_client.cxx,1.4,1.5 multiplayer_client_child.cxx,1.11,1.12 multiplayer_client_child.hxx,1.6,1.7 multiplayer_game.cxx,1.9,1.10 option_menu.cxx,1.6,1.7 pingu.cxx,1.27,1.28 pingu.hxx,1.17,1.18 pingu_holder.cxx,1.9,1.10 pingu_holder.hxx,1.7,1.8 pingus_menu_manager.cxx,1.13,1.14 playfield.cxx,1.22,1.23 playfield_view.cxx,1.3,1.4 playfield_view.hxx,1.6,1.7 plf.cxx,1.9,1.10 plt_xml.cxx,1.7,1.8 smallmap_image.cxx,1.7,1.8 smallmap_image.hxx,1.7,1.8 sprite.cxx,1.6,1.7 sprite.hxx,1.6,1.7 story.cxx,1.11,1.12 string_converter.hxx,1.7,1.8 theme.cxx,1.7,1.8 theme_selector.cxx,1.6,1.7 true_server.cxx,1.9,1.10 usb_mouse_controller.cxx,1.1,1.2 usb_mouse_controller.hxx,1.5,1.6 view.cxx,1.12,1.13 view.hxx,1.9,1.10 world.cxx,1.26,1.27 world.hxx,1.13,1.14 worldobj_data_factory.cxx,1.25,1.26 xml_helper.cxx,1.17,1.18 xml_helper.hxx,1.11,1.12 xml_plf.cxx,1.25,1.26,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.34,1.35 editor_event.cxx,1.36,1.37 editor_view.cxx,1.3,1.4 editor_view.hxx,1.6,1.7 editorobj.hxx,1.16,1.17 editorobj_group.cxx,1.5,1.6 editorobj_group.hxx,1.11,1.12 entrance_window.cxx,1.5,1.6 object_manager.cxx,1.34,1.35 object_manager.hxx,1.20,1.21 object_selector.cxx,1.28,1.29 object_selector.hxx,1.12,1.13 rect_editorobj.cxx,1.6,1.7 rect_editorobj.hxx,1.6,1.7 scroll_map.cxx,1.4,1.5 selection.cxx,1.14,1.15 selection.hxx,1.11,1.12 sprite_editorobj.cxx,1.7,1.8 sprite_editorobj.hxx,1.8,1.9 start_pos.cxx,1.6,1.7 start_pos.hxx,1.7,1.8 status_line.cxx,1.8,1.9 weather_obj.cxx,1.10,1.11 weather_obj.hxx,1.9,1.10
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_groundpiece_obj.cxx,1.13,NONE editor_groundpiece_obj.hxx,1.10,NONE
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.34,1.35 editor_event.cxx,1.36,1.37 editor_view.cxx,1.3,1.4 editor_view.hxx,1.6,1.7 editorobj.hxx,1.16,1.17 editorobj_group.cxx,1.5,1.6 editorobj_group.hxx,1.11,1.12 entrance_window.cxx,1.5,1.6 object_manager.cxx,1.34,1.35 object_manager.hxx,1.20,1.21 object_selector.cxx,1.28,1.29 object_selector.hxx,1.12,1.13 rect_editorobj.cxx,1.6,1.7 rect_editorobj.hxx,1.6,1.7 scroll_map.cxx,1.4,1.5 selection.cxx,1.14,1.15 selection.hxx,1.11,1.12 sprite_editorobj.cxx,1.7,1.8 sprite_editorobj.hxx,1.8,1.9 start_pos.cxx,1.6,1.7 start_pos.hxx,1.7,1.8 status_line.cxx,1.8,1.9 weather_obj.cxx,1.10,1.11 weather_obj.hxx,1.9,1.10
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_groundpiece_obj.cxx,1.13,NONE editor_groundpiece_obj.hxx,1.10,NONE
- Index(es):