[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am, 1.154, 1.155 blitter.cxx
|
From: |
Ingo Ruhnke |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am, 1.154, 1.155 blitter.cxx, 1.31, 1.32 blitter.hxx, 1.11, 1.12 blitter_impl.hxx, 1.13, 1.14 indexed_canvas.hxx, 1.4, 1.5 loading.hxx, 1.7, 1.8 menu_button.hxx, 1.4, 1.5 pingu_map.cxx, 1.8, 1.9 pingus_counter.hxx, 1.11, 1.12 pingus_counter_bar.cxx, 1.7, 1.8 pingus_main.cxx, 1.99, 1.100 pingus_map_manager.cxx, 1.4, 1.5 pingus_menu.cxx, 1.21, 1.22 pingus_menu_manager.cxx, 1.26, 1.27 pingus_resource.hxx, 1.16, 1.17 playfield.cxx, 1.36, 1.37 playfield_view.hxx, 1.9, 1.10 plt_xml.cxx, 1.12, 1.13 prefab.cxx, 1.7, 1.8 resource_modifier.cxx, 1.3, 1.4 screenshot.cxx, 1.15, 1.16 smallmap.hxx, 1.19, 1.20 theme_selector.hxx, 1.7, 1.8 vector.cxx, 1.5, 1.6 view.cxx, 1.14, 1.15 view.hxx, 1.13, 1.14 worldobj.cxx, 1.12, 1.13 worldobj_data_factory.hxx, 1.9, 1.10 xml_plf.cxx, 1.39, 1.40 |
|
Date: |
Sun, 19 Oct 2003 14:25:49 +0200 |
Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv19578
Modified Files:
Makefile.am blitter.cxx blitter.hxx blitter_impl.hxx
indexed_canvas.hxx loading.hxx menu_button.hxx pingu_map.cxx
pingus_counter.hxx pingus_counter_bar.cxx pingus_main.cxx
pingus_map_manager.cxx pingus_menu.cxx pingus_menu_manager.cxx
pingus_resource.hxx playfield.cxx playfield_view.hxx
plt_xml.cxx prefab.cxx resource_modifier.cxx screenshot.cxx
smallmap.hxx theme_selector.hxx vector.cxx view.cxx view.hxx
worldobj.cxx worldobj_data_factory.hxx xml_plf.cxx
Log Message:
- some more stuff, still not much useable
Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.am,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- Makefile.am 18 Oct 2003 12:11:30 -0000 1.154
+++ Makefile.am 19 Oct 2003 12:25:47 -0000 1.155
@@ -91,6 +91,8 @@
blitter_impl.hxx \
button_panel.cxx \
button_panel.hxx \
+canvas.hxx \
+canvas.cxx \
capture_rectangle.cxx \
capture_rectangle.hxx \
cheat.hxx \
@@ -158,8 +160,6 @@
hurry_up.cxx \
hurry_up.hxx \
input_event.hxx \
-indexed_canvas.hxx \
-indexed_canvas.cxx \
layer_manager.cxx \
layer_manager.hxx \
libxmlfwd.hxx \
Index: blitter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/blitter.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- blitter.cxx 18 Oct 2003 23:17:27 -0000 1.31
+++ blitter.cxx 19 Oct 2003 12:25:47 -0000 1.32
@@ -20,6 +20,8 @@
#include <config.h>
#include <stdio.h>
#include <assert.h>
+#include <ClanLib/Display/pixel_buffer.h>
+
#include "pingus_error.hxx"
#include "color.hxx"
#include "string_converter.hxx"
@@ -37,7 +39,7 @@
namespace Pingus {
void
-Blitter::put_surface(CL_Canvas* canvas, const CL_Surface& sur,
+Blitter::put_surface(CL_PixelBuffer* canvas, const CL_Surface& sur,
int x, int y)
{
//Blitter::put_surface(canvas, sur->get_provider(), x, y);
@@ -50,7 +52,7 @@
}
void
-Blitter::put_surface(CL_Canvas* canvas, CL_PixelBuffer* provider,
+Blitter::put_surface(CL_PixelBuffer* canvas, CL_PixelBuffer* provider,
int x, int y)
{
assert (provider);
@@ -70,7 +72,7 @@
}
void
-Blitter::put_surface_8bit(CL_Canvas* provider, CL_PixelBuffer* sprovider,
+Blitter::put_surface_8bit(CL_PixelBuffer* provider, CL_PixelBuffer* sprovider,
int x, int y)
{
assert (provider);
@@ -168,7 +170,7 @@
}
#if COMPILE_WITH_MEMORY_HOLE
-#warning "FIXME: Blitter::put_surface_8bit(CL_Canvas* provider,
CL_PixelBuffer* sprovider, int x, int y) contains memory hole"
+#warning "FIXME: Blitter::put_surface_8bit(CL_PixelBuffer* provider,
CL_PixelBuffer* sprovider, int x, int y) contains memory hole"
#else
sprovider->unlock();
provider->unlock();
@@ -176,7 +178,7 @@
}
void
-Blitter::put_surface_32bit(CL_Canvas* canvas, CL_PixelBuffer* provider,
+Blitter::put_surface_32bit(CL_PixelBuffer* canvas, CL_PixelBuffer* provider,
const int x_pos, const int y_pos)
{
assert (canvas);
@@ -224,7 +226,7 @@
}
#if COMPILE_WITH_MEMORY_HOLE
-#warning "FIXME: Blitter::put_surface_32bit(CL_Canvas* canvas, CL_PixelBuffer*
provider, const int x_pos, const int y_pos) contains memory hole"
+#warning "FIXME: Blitter::put_surface_32bit(CL_PixelBuffer* canvas,
CL_PixelBuffer* provider, const int x_pos, const int y_pos) contains memory
hole"
#else
provider->unlock();
canvas->unlock();
@@ -232,7 +234,7 @@
}
void
-Blitter::put_alpha_surface(CL_Canvas* provider, CL_PixelBuffer* sprovider,
+Blitter::put_alpha_surface(CL_PixelBuffer* provider, CL_PixelBuffer* sprovider,
int x, int y)
{
assert (provider);
@@ -255,7 +257,7 @@
{
// FIXME: memory hole
#if COMPILE_WITH_MEMORY_HOLE
-#warning "FIXME: Blitter::put_alpha_surface(CL_Canvas* provider,
CL_PixelBuffer* sprovider, int x, int y) contains memory hole"
+#warning "FIXME: Blitter::put_alpha_surface(CL_PixelBuffer* provider,
CL_PixelBuffer* sprovider, int x, int y) contains memory hole"
#else
sprovider->unlock ();
provider->unlock ();
@@ -300,15 +302,15 @@
}
#if COMPILE_WITH_MEMORY_HOLE
-#warning "FIXME: Blitter::put_alpha_surface(CL_Canvas* provider,
CL_PixelBuffer* sprovider, int x, int y) contains memory hole"
+#warning "FIXME: Blitter::put_alpha_surface(CL_PixelBuffer* provider,
CL_PixelBuffer* sprovider, int x, int y) contains memory hole"
#else
sprovider->unlock();
provider->unlock();
#endif
}
-CL_Canvas*
-Blitter::clear_canvas(CL_Canvas* canvas)
+CL_PixelBuffer*
+Blitter::clear_canvas(CL_PixelBuffer* canvas)
{
assert (canvas);
unsigned char* buffer;
@@ -322,18 +324,18 @@
return canvas;
}
-CL_Canvas*
+CL_PixelBuffer*
Blitter::create_canvas(const CL_Surface& sur)
{
assert (sur);
return create_canvas(sur.get_provider());
}
-CL_Canvas*
+CL_PixelBuffer*
Blitter::create_canvas(CL_PixelBuffer* prov)
{
assert (prov);
- CL_Canvas* canvas = new CL_Canvas(prov->get_width(), prov->get_height());
+ CL_PixelBuffer* canvas = new CL_PixelBuffer(prov->get_width(),
prov->get_height());
switch (prov->get_bytes_per_pixel())
{
@@ -385,14 +387,14 @@
return CL_Surface(Blitter::scale_surface_to_canvas(sur, width, height),
true);
}
-CL_Canvas*
+CL_PixelBuffer*
Blitter::scale_surface_to_canvas (const CL_Surface& sur, int width, int height)
{
assert (sur);
Color color;
CL_PixelBuffer* provider = sur.get_provider ();
- CL_Canvas* canvas = new CL_Canvas (width, height);
+ CL_PixelBuffer* canvas = new CL_PixelBuffer (width, height);
provider->lock ();
canvas->lock ();
@@ -500,16 +502,16 @@
CL_Surface
Blitter::convert_to_emptyprovider(CL_Surface ssurf)
{
-CL_Canvas* tprov = convert_to_emptyprovider(ssurf->get_provider());
+CL_PixelBuffer* tprov = convert_to_emptyprovider(ssurf->get_provider());
return CL_Surface::create(tprov, true);
}
// Converts a SurfaceProvider, to an Canvas and returns
// the newly allocated provider, you need to delete it yourself.
-CL_Canvas*
+CL_PixelBuffer*
Blitter::convert_to_emptyprovider(CL_PixelBuffer* sprov)
{
- CL_Canvas* tprov;
+ CL_PixelBuffer* tprov;
CL_Palette* palette;
unsigned char* sbuffer;
unsigned char* tbuffer;
@@ -519,7 +521,7 @@
switch(sprov->get_depth())
{
case 32:
- tprov = new CL_Canvas(sprov->get_width(),
+ tprov = new CL_PixelBuffer(sprov->get_width(),
sprov->get_height());
tprov->lock();
@@ -534,7 +536,7 @@
tprov->unlock();
break;
case 8:
- tprov = new CL_Canvas(sprov->get_width(),
+ tprov = new CL_PixelBuffer(sprov->get_width(),
sprov->get_height());
palette = sprov->get_palette();
tprov->lock();
@@ -614,7 +616,7 @@
}
else
{
- CL_Canvas* canvas = new CL_Canvas (sur.get_height (), sur.get_width ());
+ CL_PixelBuffer* canvas = new CL_PixelBuffer (sur.get_height (),
sur.get_width ());
prov->lock ();
canvas->lock ();
Index: blitter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/blitter.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- blitter.hxx 18 Oct 2003 23:17:27 -0000 1.11
+++ blitter.hxx 19 Oct 2003 12:25:47 -0000 1.12
@@ -22,23 +22,22 @@
#include "pingus.hxx"
-class CL_Canvas;
class CL_Surface;
class CL_PixelBuffer;
namespace Pingus {
/** A bunch of blitting and creation functions to operate on
- CL_Canvas. Some of them a similar to the ones in ClanLib, but
+ CL_PixelBuffer. Some of them a similar to the ones in ClanLib, but
this are slower and work. */
class Blitter
{
private:
///
- static void put_surface_8bit(CL_Canvas*, CL_PixelBuffer*,
+ static void put_surface_8bit(CL_PixelBuffer*, CL_PixelBuffer*,
int x, int y);
///
- static void put_surface_32bit(CL_Canvas*, CL_PixelBuffer*,
+ static void put_surface_32bit(CL_PixelBuffer*, CL_PixelBuffer*,
int x, int y);
public:
/*void put_surface(CL_LockableSurface* provider, CL_Surface surface,
@@ -48,28 +47,28 @@
*/
/// Puts a given surface to a given canvas at position x, y.
- static void put_surface(CL_Canvas*, const CL_Surface&,
+ static void put_surface(CL_PixelBuffer*, const CL_Surface&,
int x, int y);
/// Puts a given surface provider to a given canvas at position x, y.
- static void put_surface(CL_Canvas*, CL_PixelBuffer*,
+ static void put_surface(CL_PixelBuffer*, CL_PixelBuffer*,
int x, int y);
/** Makes all pixels in canvas tranparent, when their indexed value
in provider is larger than zero.*/
- static void put_alpha_surface(CL_Canvas* canvas, CL_PixelBuffer* provider,
+ static void put_alpha_surface(CL_PixelBuffer* canvas, CL_PixelBuffer*
provider,
int x, int y);
/** Returns a newly allocated canvas. The canvas contains the same
image as the given surface. */
- static CL_Canvas* create_canvas(const CL_Surface&);
+ static CL_PixelBuffer* create_canvas(const CL_Surface&);
/** Returns a newly allocated canvas. The canvas contains the same
image as the given surface provider */
- static CL_Canvas* create_canvas(CL_PixelBuffer*);
+ static CL_PixelBuffer* create_canvas(CL_PixelBuffer*);
/** Sets all pixels of a canvas to zero */
- static CL_Canvas* clear_canvas(CL_Canvas*);
+ static CL_PixelBuffer* clear_canvas(CL_PixelBuffer*);
/** Creates a new surface (based on a canvas) with the given width
and height and stretches the source surface onto it
@@ -101,13 +100,13 @@
/** Creates a new canvas with the given width and height and
stretches the source surface onto it, the caller is responsible
- to delete the returned CL_Canvas.
+ to delete the returned CL_PixelBuffer.
@param sur The source surface
@param width The new width of the surface.
@param height The new height of the surface.
@return A newly created surface, the caller is responsible to delete it.
*/
- static CL_Canvas* scale_surface_to_canvas (const CL_Surface& sur, int width,
int height);
+ static CL_PixelBuffer* scale_surface_to_canvas (const CL_Surface& sur, int
width, int height);
private:
Blitter (const Blitter&);
Index: blitter_impl.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/blitter_impl.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- blitter_impl.hxx 18 Oct 2003 23:17:27 -0000 1.13
+++ blitter_impl.hxx 19 Oct 2003 12:25:47 -0000 1.14
@@ -21,9 +21,8 @@
#define HEADER_PINGUS_BLITTER_IMPL_HXX
#include <iostream>
-#include <ClanLib/Display/SurfaceProviders/canvas.h>
+#include <ClanLib/Display/pixel_buffer.h>
#include <ClanLib/Display/surface.h>
-#include "indexed_canvas.hxx"
#include "pingus.hxx"
namespace Pingus {
@@ -231,7 +230,7 @@
}
else
{
- CL_Canvas* canvas = new CL_Canvas (sur.get_height (), sur.get_width ());
+ CL_PixelBuffer* canvas = Canvas::create(sur.get_height(),
sur.get_width());
prov->lock ();
canvas->lock ();
Index: indexed_canvas.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/indexed_canvas.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- indexed_canvas.hxx 18 Oct 2003 23:17:27 -0000 1.4
+++ indexed_canvas.hxx 19 Oct 2003 12:25:47 -0000 1.5
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_INDEXED_CANVAS_HXX
#define HEADER_PINGUS_INDEXED_CANVAS_HXX
-#include <ClanLib/Display/SurfaceProviders/generic_surfaceprovider.h>
+#include <ClanLib/Display/pixel_buffer.h>
#include <ClanLib/Display/palette.h>
/** This class is analog to CL_Canvas, but instead of being true
Index: loading.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/loading.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- loading.hxx 18 Oct 2003 23:17:27 -0000 1.7
+++ loading.hxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -31,7 +31,7 @@
{
private:
CL_Surface sur;
- CL_Font* font;
+ CL_Font font;
bool is_init;
public:
Index: menu_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_button.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- menu_button.hxx 18 Oct 2003 23:17:27 -0000 1.4
+++ menu_button.hxx 19 Oct 2003 12:25:47 -0000 1.5
@@ -36,8 +36,8 @@
{
protected:
CL_Surface surface_p;
- CL_Font* font;
- CL_Font* font_large;
+ CL_Font font;
+ CL_Font font_large;
int x_pos;
int y_pos;
Index: pingu_map.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingu_map.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pingu_map.cxx 18 Oct 2003 23:17:27 -0000 1.8
+++ pingu_map.cxx 19 Oct 2003 12:25:47 -0000 1.9
@@ -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/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
#include "pingu_map.hxx"
namespace Pingus {
Index: pingus_counter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_counter.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pingus_counter.hxx 18 Oct 2003 23:17:27 -0000 1.11
+++ pingus_counter.hxx 19 Oct 2003 12:25:47 -0000 1.12
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_PINGUS_COUNTER_HXX
#define HEADER_PINGUS_PINGUS_COUNTER_HXX
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
#include "gui/component.hxx"
class CL_Font;
Index: pingus_counter_bar.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_counter_bar.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingus_counter_bar.cxx 18 Oct 2003 23:17:27 -0000 1.7
+++ pingus_counter_bar.cxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -28,7 +28,7 @@
PingusCounterBar::PingusCounterBar (Server * s, Orientation o, const CL_Rect&
arg_rect)
: server (s),
orientation (o),
- rect (arg_rect.x1 + 2, arg_rect.y1 + 2, arg_rect.x2 - 2, arg_rect.y2 - 2)
+ rect (arg_rect.left + 2, arg_rect.top + 2, arg_rect.right - 2,
arg_rect.bottom - 2)
{
}
@@ -44,26 +44,26 @@
void
PingusCounterBar::draw ()
{
- int length = rect.y2 - rect.y1;
+ int length = rect.bottom - rect.top;
int complete = server->get_world
()->get_pingus()->get_number_of_allowed();
int current_out = server->get_world
()->get_pingus()->get_number_of_released();
int current_saved = server->get_world
()->get_pingus()->get_number_of_exited();
//std::cout << "Drawing Counterbar: " << rect << std::endl;
- CL_Display::fill_rect (rect.x1, rect.y1, rect.x2, rect.y2,
+ CL_Display::fill_rect (rect.left, rect.top, rect.right, rect.bottom,
0.0, 0.0, 1.0, 0.5);
- int y_pos = rect.y2;
+ int y_pos = rect.bottom;
int tmp_y_pos = y_pos;
y_pos -= (current_saved * length) / complete;
- CL_Display::fill_rect (rect.x1, tmp_y_pos, rect.x2, y_pos,
+ CL_Display::fill_rect (rect.left, tmp_y_pos, rect.right, y_pos,
0.0f, 1.0f, 0.0f, 0.8f);
tmp_y_pos = y_pos;
y_pos -= ((current_out - current_saved) * length) / complete;
- CL_Display::fill_rect (rect.x1, tmp_y_pos, rect.x2, y_pos,
+ CL_Display::fill_rect (rect.left, tmp_y_pos, rect.right, y_pos,
1.0f, 0.0f, 0.0f, 0.8f);
tmp_y_pos = y_pos;
}
Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- pingus_main.cxx 18 Oct 2003 12:11:30 -0000 1.99
+++ pingus_main.cxx 19 Oct 2003 12:25:47 -0000 1.100
@@ -83,10 +83,10 @@
#include "worldmap/manager.hxx"
#include "worldobj_data_factory.hxx"
-using EditorNS::Editor;
-
namespace Pingus {
+using EditorNS::Editor;
+
void
signal_handler(int signo)
{
Index: pingus_map_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_map_manager.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pingus_map_manager.cxx 18 Oct 2003 23:17:27 -0000 1.4
+++ pingus_map_manager.cxx 19 Oct 2003 12:25:47 -0000 1.5
@@ -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 <ClanLib/Display/Display/surface.h>
-#include <ClanLib/Display/Display/surfaceprovider.h>
+#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/pixel_buffer.h>
#include "pingus_map_manager.hxx"
std::string PingusMapManager::directory;
Index: pingus_menu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pingus_menu.cxx 18 Oct 2003 23:17:27 -0000 1.21
+++ pingus_menu.cxx 19 Oct 2003 12:25:47 -0000 1.22
@@ -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/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
#include <config.h>
#include "menu_button.hxx"
#include "pingus_resource.hxx"
Index: pingus_menu_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- pingus_menu_manager.cxx 19 Apr 2003 10:23:17 -0000 1.26
+++ pingus_menu_manager.cxx 19 Oct 2003 12:25:47 -0000 1.27
@@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
#include "gui/screen_manager.hxx"
#include "sound/sound.hxx"
#include "pingus_menu_manager.hxx"
Index: pingus_resource.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_resource.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pingus_resource.hxx 18 Oct 2003 23:17:27 -0000 1.16
+++ pingus_resource.hxx 19 Oct 2003 12:25:47 -0000 1.17
@@ -21,7 +21,6 @@
#define HEADER_PINGUS_PINGUS_RESOURCE_HXX
#include <map>
-
#include <ClanLib/display.h>
#include "res_descriptor.hxx"
Index: playfield.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- playfield.cxx 18 Oct 2003 23:17:27 -0000 1.36
+++ playfield.cxx 19 Oct 2003 12:25:47 -0000 1.37
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <iostream>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
#include "globals.hxx"
#include "playfield.hxx"
#include "plf.hxx"
Index: playfield_view.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/playfield_view.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- playfield_view.hxx 19 Apr 2003 10:23:17 -0000 1.9
+++ playfield_view.hxx 19 Oct 2003 12:25:47 -0000 1.10
@@ -24,6 +24,9 @@
#include "gui_obj.hxx"
class CL_Rect;
+
+namespace Pingus {
+
class Vector;
class World;
class Pingu;
@@ -57,6 +60,8 @@
PlayfieldView& operator= (const PlayfieldView&);
};
+} // namespace Pingus
+
#endif
/* EOF */
Index: plt_xml.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/plt_xml.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- plt_xml.cxx 19 Apr 2003 10:23:17 -0000 1.12
+++ plt_xml.cxx 19 Oct 2003 12:25:47 -0000 1.13
@@ -23,6 +23,8 @@
#include "xml_helper.hxx"
#include "plt_xml.hxx"
+namespace Pingus {
+
PLTXML::PLTXML ()
{
}
@@ -207,4 +209,6 @@
return background;
}
+} // namespace Pingus
+
/* EOF */
Index: prefab.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/prefab.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- prefab.cxx 19 Apr 2003 10:23:17 -0000 1.7
+++ prefab.cxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -25,6 +25,8 @@
#include "path_manager.hxx"
#include "pingus_error.hxx"
+namespace Pingus {
+
Prefab::Prefab (const std::string& filename)
: data (0)
{
@@ -132,5 +134,6 @@
return data;
}
+} // namespace Pingus
/* EOF */
Index: resource_modifier.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/resource_modifier.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resource_modifier.cxx 19 Apr 2003 10:23:17 -0000 1.3
+++ resource_modifier.cxx 19 Oct 2003 12:25:47 -0000 1.4
@@ -20,6 +20,7 @@
#include <assert.h>
#include "resource_modifier.hxx"
+namespace Pingus {
namespace ResourceModifierNS {
ResourceModifier horizontal_flip (ResourceModifier modifier)
@@ -178,5 +179,6 @@
}
} // namespace ResourceModifierNS
+} // namespace Pingus
/* EOF */
Index: screenshot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/screenshot.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- screenshot.cxx 16 Aug 2003 16:23:30 -0000 1.15
+++ screenshot.cxx 19 Oct 2003 12:25:47 -0000 1.16
@@ -23,8 +23,8 @@
#include <fstream>
#include <iostream>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Display/target.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/target.h>
#include "system.hxx"
#include "screenshot.hxx"
#include "gettext.h"
Index: smallmap.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/smallmap.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- smallmap.hxx 18 Oct 2003 23:17:27 -0000 1.19
+++ smallmap.hxx 19 Oct 2003 12:25:47 -0000 1.20
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_SMALLMAP_HXX
#define HEADER_PINGUS_SMALLMAP_HXX
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
#include "gui/component.hxx"
class CL_Key;
Index: theme_selector.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/theme_selector.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- theme_selector.hxx 18 Oct 2003 23:17:27 -0000 1.7
+++ theme_selector.hxx 19 Oct 2003 12:25:47 -0000 1.8
@@ -24,7 +24,7 @@
#include <vector>
#include <string>
#include <ClanLib/Signals/slot.h>
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
class CL_Key;
class CL_Font;
Index: vector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/vector.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vector.cxx 18 Oct 2003 23:17:27 -0000 1.5
+++ vector.cxx 19 Oct 2003 12:25:47 -0000 1.6
@@ -21,6 +21,8 @@
#include <iostream>
#include "vector.hxx"
+namespace Pingus {
+
Vector::Vector (float x_, float y_, float z_) : x(x_), y(y_), z(z_)
{
}
@@ -158,6 +160,8 @@
return a + (c * perc);
}
+} // namespace Pingus
+
std::ostream& operator<< (std::ostream& os, const Pingus::Vector& v)
{
return os << v.x << " " << v.y << " " << v.z;
Index: view.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/view.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- view.cxx 19 Apr 2003 10:23:17 -0000 1.14
+++ view.cxx 19 Oct 2003 12:25:47 -0000 1.15
@@ -22,6 +22,8 @@
#include "world.hxx"
#include "client.hxx"
+namespace Pingus {
+
// static variables
World* View::world;
@@ -191,4 +193,6 @@
mouse_y = y;
}
+} // namespace Pingus
+
/* EOF */
Index: view.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/view.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- view.hxx 18 Oct 2003 23:17:27 -0000 1.13
+++ view.hxx 19 Oct 2003 12:25:47 -0000 1.14
@@ -20,7 +20,8 @@
#ifndef HEADER_PINGUS_VIEW_HXX
#define HEADER_PINGUS_VIEW_HXX
-#include <ClanLib/Display/Display/cliprect.h>
+#include <ClanLib/display.h>
+#include <ClanLib/core.h>
#include "range.hxx"
#include "capture_rectangle.hxx"
#include "gui/display_graphic_context.hxx"
Index: worldobj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobj.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- worldobj.cxx 19 Apr 2003 10:23:17 -0000 1.12
+++ worldobj.cxx 19 Oct 2003 12:25:47 -0000 1.13
@@ -23,6 +23,8 @@
#include "worldobj.hxx"
#include "gui/graphic_context.hxx"
+namespace Pingus {
+
World* WorldObj::world;
void
@@ -78,4 +80,6 @@
gc.get_zoom ());
}
+} // namespace Pingus
+
/* EOF */
Index: worldobj_data_factory.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobj_data_factory.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- worldobj_data_factory.hxx 18 Oct 2003 23:17:27 -0000 1.9
+++ worldobj_data_factory.hxx 19 Oct 2003 12:25:47 -0000 1.10
@@ -23,13 +23,13 @@
#include <map>
#include <string>
-class WorldObjData;
-class WorldObjDataAbstractFactory;
-
#include "libxmlfwd.hxx"
namespace Pingus {
+class WorldObjData;
+class WorldObjDataAbstractFactory;
+
/** WorldObjDataFactory which can be used to create all kinds of
WorldObjData's by given its id */
class WorldObjDataFactory
@@ -46,8 +46,8 @@
static WorldObjDataFactory* instance ();
static void deinit();
/** Register a factory for object creation */
- void register_factory (const std::string& id,
- WorldObjDataAbstractFactory* factory);
+ void register_factory(const std::string& id,
+ WorldObjDataAbstractFactory* factory);
/** Create a WorldObjData type from a given piece of xml, use the
'type' property for determinating the object type. */
@@ -69,7 +69,7 @@
{
public:
WorldObjDataAbstractFactory (const std::string& id) {
- WorldObjDataFactory::instance ()-> register_factory (id, this);
+ WorldObjDataFactory::instance ()->register_factory (id, this);
}
virtual WorldObjData* create (xmlDocPtr doc, xmlNodePtr cur) =0;
Index: xml_plf.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- xml_plf.cxx 18 Oct 2003 23:17:27 -0000 1.39
+++ xml_plf.cxx 19 Oct 2003 12:25:47 -0000 1.40
@@ -393,6 +393,6 @@
std::cout << "XMLPLF::parse_traps: Invalid data structure" << std::endl;
}
-} namespace Pingus
+} // namespace Pingus
/* EOF */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src Makefile.am, 1.154, 1.155 blitter.cxx, 1.31, 1.32 blitter.hxx, 1.11, 1.12 blitter_impl.hxx, 1.13, 1.14 indexed_canvas.hxx, 1.4, 1.5 loading.hxx, 1.7, 1.8 menu_button.hxx, 1.4, 1.5 pingu_map.cxx, 1.8, 1.9 pingus_counter.hxx, 1.11, 1.12 pingus_counter_bar.cxx, 1.7, 1.8 pingus_main.cxx, 1.99, 1.100 pingus_map_manager.cxx, 1.4, 1.5 pingus_menu.cxx, 1.21, 1.22 pingus_menu_manager.cxx, 1.26, 1.27 pingus_resource.hxx, 1.16, 1.17 playfield.cxx, 1.36, 1.37 playfield_view.hxx, 1.9, 1.10 plt_xml.cxx, 1.12, 1.13 prefab.cxx, 1.7, 1.8 resource_modifier.cxx, 1.3, 1.4 screenshot.cxx, 1.15, 1.16 smallmap.hxx, 1.19, 1.20 theme_selector.hxx, 1.7, 1.8 vector.cxx, 1.5, 1.6 view.cxx, 1.14, 1.15 view.hxx, 1.13, 1.14 worldobj.cxx, 1.12, 1.13 worldobj_data_factory.hxx, 1.9, 1.10 xml_plf.cxx, 1.39, 1.40,
Ingo Ruhnke <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/input/buttons Makefile.am, 1.3, 1.4 joystick_button.cxx, 1.3, 1.4 key_button.cxx, 1.3, 1.4 mouse_button.cxx, 1.3, 1.4 mouse_button.hxx, 1.5, 1.6
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/caimagemanipulation caimagemanipulation.cpp, 1.6, 1.7 caimagemanipulation.h, 1.6, 1.7
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/input/buttons Makefile.am, 1.3, 1.4 joystick_button.cxx, 1.3, 1.4 key_button.cxx, 1.3, 1.4 mouse_button.cxx, 1.3, 1.4 mouse_button.hxx, 1.5, 1.6
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/caimagemanipulation caimagemanipulation.cpp, 1.6, 1.7 caimagemanipulation.h, 1.6, 1.7
- Index(es):