[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.15,1.16 Client.
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.15,1.16 Client.cc,1.78,1.79 Client.hh,1.35,1.36 Controller.cc,1.10,1.11 Controller.hh,1.11,1.12 MultiplayerClient.cc,1.4,1.5 MultiplayerClient.hh,1.6,1.7 MultiplayerClientChild.cc,1.9,1.10 MultiplayerClientChild.hh,1.6,1.7 MultiplayerGame.cc,1.5,1.6 PingusCounterBar.cc,1.5,1.6 PingusCounterBar.hh,1.1,1.2 PingusGameSession.cc,1.11,1.12 PingusMenu.hh,1.20,1.21 PingusMenuManager.cc,1.7,1.8 PingusMenuManager.hh,1.3,1.4 PlayfieldView.cc,1.5,1.6 PlayfieldView.hh,1.4,1.5 SmallMapImage.cc,1.7,1.8 SmallMapImage.hh,1.1,1.2 |
Date: |
7 Jun 2002 14:50:39 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv15758
Modified Files:
CaptureRectangle.cc Client.cc Client.hh Controller.cc
Controller.hh MultiplayerClient.cc MultiplayerClient.hh
MultiplayerClientChild.cc MultiplayerClientChild.hh
MultiplayerGame.cc PingusCounterBar.cc PingusCounterBar.hh
PingusGameSession.cc PingusMenu.hh PingusMenuManager.cc
PingusMenuManager.hh PlayfieldView.cc PlayfieldView.hh
SmallMapImage.cc SmallMapImage.hh
Log Message:
removed dummy_ptr - this reduces compile time, footprint and complexity.
There was no point where it was needed and it's even been removed from boost.
Index: CaptureRectangle.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/CaptureRectangle.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CaptureRectangle.cc 10 Feb 2002 22:14:06 -0000 1.15
+++ CaptureRectangle.cc 7 Jun 2002 14:50:34 -0000 1.16
@@ -21,7 +21,6 @@
#include <cstdio>
#include <cassert>
#include <boost/smart_ptr.hpp>
-#include "boost/dummy_ptr.hpp"
#include "globals.hh"
#include "Pingu.hh"
@@ -63,7 +62,7 @@
}
else if (pingu->catchable ())
{
- boost::dummy_ptr<Sprite> sur;
+ Sprite * sur;
if (button_action.get()
&& (button_action->get_environment() & pingu->get_environment()))
Index: Client.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Client.cc,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Client.cc 1 Jun 2002 18:05:34 -0000 1.78
+++ Client.cc 7 Jun 2002 14:50:34 -0000 1.79
@@ -50,8 +50,7 @@
shared_ptr<SmallMap> Client::small_map;
shared_ptr<HurryUp> Client::hurry_up;
-Client::Client(boost::shared_ptr<Controller> arg_controller,
- boost::dummy_ptr<Server> s)
+Client::Client(boost::shared_ptr<Controller> arg_controller, Server * s)
: controller (arg_controller),
cursor (new Cursor ("cursors/animcross", "core", controller))
{
@@ -116,8 +115,8 @@
hurry_up = shared_ptr<HurryUp>(new HurryUp());
gui_is_init = true;
- button_panel->set_server(server.get ());
- time_display->set_server(server.get ());
+ button_panel->set_server(server);
+ time_display->set_server(server);
button_panel->set_client(this);
pcounter->set_client(this);
small_map->set_client(this);
@@ -129,7 +128,7 @@
// Connect the button_panel with the playfield
playfield->set_buttons(button_panel);
- playfield->set_server(server.get ());
+ playfield->set_server(server);
playfield->set_client(this);
// Adding all GuiObj's to the screen
Index: Client.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Client.hh,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Client.hh 22 Nov 2001 20:08:33 -0000 1.35
+++ Client.hh 7 Jun 2002 14:50:34 -0000 1.36
@@ -23,7 +23,6 @@
#include <string>
#include "boost/smart_ptr.hpp"
-#include "boost/dummy_ptr.hpp"
#include "Server.hh"
#include "Result.hh"
@@ -53,7 +52,7 @@
///
Result result;
///
- boost::dummy_ptr<Server> server;
+ Server * server;
///
PingusGameMode mode;
///
@@ -110,13 +109,12 @@
bool enabled;
public:
///
- Client(boost::shared_ptr<Controller> arg_controller,
- boost::dummy_ptr<Server> s);
+ Client(boost::shared_ptr<Controller> arg_controller, Server * s);
///
virtual ~Client();
///
- boost::dummy_ptr<Server> get_server() { return server; }
+ Server * get_server() { return server; }
///
boost::shared_ptr<Playfield> get_playfield() { return playfield; }
Index: Controller.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Controller.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Controller.cc 6 Jun 2002 15:55:02 -0000 1.10
+++ Controller.cc 7 Jun 2002 14:50:34 -0000 1.11
@@ -28,7 +28,7 @@
#include "my_gettext.hh"
-ControllerButton::ControllerButton (boost::dummy_ptr<Controller>
arg_controller)
+ControllerButton::ControllerButton (Controller * arg_controller)
: controller (arg_controller),
pressed (false)
{
@@ -71,7 +71,7 @@
return button->is_pressed ();
}
-KeyboardButton::KeyboardButton (boost::dummy_ptr<Controller> c, int
arg_button_id)
+KeyboardButton::KeyboardButton (Controller * c, int arg_button_id)
: ControllerButton (c),
button_id (arg_button_id)
@@ -85,7 +85,7 @@
}
-MultiplexButton::MultiplexButton (boost::dummy_ptr<Controller> c)
+MultiplexButton::MultiplexButton (Controller * c)
: ControllerButton (c)
{
}
Index: Controller.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Controller.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Controller.hh 6 Jun 2002 15:54:14 -0000 1.11
+++ Controller.hh 7 Jun 2002 14:50:34 -0000 1.12
@@ -22,7 +22,6 @@
#include <ClanLib/core.h>
#include "boost/smart_ptr.hpp"
-#include "boost/dummy_ptr.hpp"
template <class T> class CL_Signal_v1;
class Controller;
@@ -31,12 +30,11 @@
class ControllerButton
{
private:
- // FIXME: Do we really need this?! I guess no...
- boost::dummy_ptr<Controller> controller;
+ Controller * controller;
bool pressed;
public:
- ControllerButton (boost::dummy_ptr<Controller>);
+ ControllerButton (Controller *);
virtual ~ControllerButton () {}
virtual bool is_pressed () =0;
@@ -71,7 +69,7 @@
private:
int button_id;
public:
- KeyboardButton (boost::dummy_ptr<Controller>, int arg_button_id);
+ KeyboardButton (Controller *, int arg_button_id);
virtual bool is_pressed ();
};
@@ -82,7 +80,7 @@
std::list<boost::shared_ptr<ControllerButton> > buttons;
typedef std::list<boost::shared_ptr<ControllerButton> >::iterator ButtonIter;
public:
- MultiplexButton (boost::dummy_ptr<Controller>);
+ MultiplexButton (Controller *);
void add (boost::shared_ptr<ControllerButton> button);
void remove (boost::shared_ptr<ControllerButton> button);
Index: MultiplayerClient.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClient.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MultiplayerClient.cc 4 Jan 2002 01:19:46 -0000 1.4
+++ MultiplayerClient.cc 7 Jun 2002 14:50:34 -0000 1.5
@@ -22,7 +22,7 @@
using boost::shared_ptr;
-MultiplayerClient::MultiplayerClient (boost::dummy_ptr<Server> s,
+MultiplayerClient::MultiplayerClient (Server * s,
boost::shared_ptr<GuiObj> child1,
boost::shared_ptr<GuiObj> child2,
boost::shared_ptr<GuiObj> child3,
@@ -38,7 +38,7 @@
200, 150)));
}
-MultiplayerClient::MultiplayerClient (boost::dummy_ptr<Server> s,
+MultiplayerClient::MultiplayerClient (Server * s,
boost::shared_ptr<GuiObj> child1,
boost::shared_ptr<GuiObj> child2)
: server (s)
Index: MultiplayerClient.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClient.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MultiplayerClient.hh 15 Jan 2002 10:48:49 -0000 1.6
+++ MultiplayerClient.hh 7 Jun 2002 14:50:34 -0000 1.7
@@ -30,13 +30,13 @@
private:
std::vector<boost::shared_ptr<GuiObj> > gui_objs;
typedef std::vector<boost::shared_ptr<GuiObj> >::iterator GuiObjIter;
- boost::dummy_ptr<Server> server;
+ Server * server;
public:
- MultiplayerClient (boost::dummy_ptr<Server> s,
+ MultiplayerClient (Server * s,
boost::shared_ptr<GuiObj> child1,
boost::shared_ptr<GuiObj> child2);
- MultiplayerClient (boost::dummy_ptr<Server> s,
+ MultiplayerClient (Server * s,
boost::shared_ptr<GuiObj> child1,
boost::shared_ptr<GuiObj> child2,
boost::shared_ptr<GuiObj> child3,
Index: MultiplayerClientChild.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClientChild.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MultiplayerClientChild.cc 1 Jun 2002 18:05:34 -0000 1.9
+++ MultiplayerClientChild.cc 7 Jun 2002 14:50:34 -0000 1.10
@@ -17,15 +17,13 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "boost/smart_ptr.hpp"
#include "Display.hh"
#include "MultiplayerClientChild.hh"
using boost::shared_ptr;
-using boost::dummy_ptr;
MultiplayerClientChild::MultiplayerClientChild (boost::shared_ptr<Controller>
arg_controller,
- boost::dummy_ptr<Server> s,
const CL_Rect& arg_rect)
+ Server * s, const CL_Rect& arg_rect)
: Controllable (arg_controller),
server (s),
cursor (new Cursor ("cursors/cross", "core", controller)),
@@ -39,7 +37,7 @@
capture_rect.set_align_center ();
// FIXME: The buttonpanel sucks...
- button_panel->set_server (server.get ());
+ button_panel->set_server (server);
//std::cout << "MultiplayerClientChild: Creating: " << server.get() <<
std::endl;
gui_objs.push_back (playfield.get());
Index: MultiplayerClientChild.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClientChild.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MultiplayerClientChild.hh 4 Jan 2002 01:19:46 -0000 1.6
+++ MultiplayerClientChild.hh 7 Jun 2002 14:50:34 -0000 1.7
@@ -22,7 +22,6 @@
#include "Controller.hh"
#include "boost/smart_ptr.hpp"
-#include "boost/dummy_ptr.hpp"
#include "Server.hh"
#include "GuiObj.hh"
#include "Cursor.hh"
@@ -37,7 +36,7 @@
public GuiObj
{
private:
- boost::dummy_ptr<Server> server;
+ Server * server;
boost::shared_ptr<Cursor> cursor;
boost::shared_ptr<ButtonPanel> button_panel;
Sprite capture_rect;
@@ -54,7 +53,7 @@
public:
MultiplayerClientChild (boost::shared_ptr<Controller> arg_controller,
- boost::dummy_ptr<Server> s, const CL_Rect& arg_rect);
+ Server * s, const CL_Rect& arg_rect);
~MultiplayerClientChild ();
void draw ();
Index: MultiplayerGame.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerGame.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MultiplayerGame.cc 21 Jan 2002 11:13:54 -0000 1.5
+++ MultiplayerGame.cc 7 Jun 2002 14:50:34 -0000 1.6
@@ -19,7 +19,6 @@
#include "DeltaManager.hh"
#include "boost/smart_ptr.hpp"
-#include "boost/dummy_ptr.hpp"
#include "Server.hh"
#include "PathManager.hh"
#include "TrueServer.hh"
@@ -32,7 +31,6 @@
#include "KeyboardController.hh"
#include "MultiplayerGame.hh"
-using boost::dummy_ptr;
using boost::shared_ptr;
MultiplayerGame::MultiplayerGame ()
Index: PingusCounterBar.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounterBar.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PingusCounterBar.cc 1 Jun 2002 18:05:35 -0000 1.5
+++ PingusCounterBar.cc 7 Jun 2002 14:50:34 -0000 1.6
@@ -26,7 +26,7 @@
return s << "[" << rect.x1 << ", " << rect.y1 << ", " << rect.x2 << ", " <<
rect.y2 << "]";
}
-PingusCounterBar::PingusCounterBar (boost::dummy_ptr<Server> s, Orientation o,
const CL_Rect& arg_rect)
+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)
Index: PingusCounterBar.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounterBar.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PingusCounterBar.hh 15 Apr 2001 20:55:03 -0000 1.1
+++ PingusCounterBar.hh 7 Jun 2002 14:50:34 -0000 1.2
@@ -23,18 +23,17 @@
#include <ClanLib/core.h>
#include "Server.hh"
#include "GuiObj.hh"
-#include "boost/dummy_ptr.hpp"
class PingusCounterBar : public GuiObj
{
public:
enum Orientation { VERTICAL, HORIZONTAL };
private:
- boost::dummy_ptr<Server> server;
+ Server * server;
Orientation orientation;
CL_Rect rect;
public:
- PingusCounterBar (boost::dummy_ptr<Server> s, Orientation o, const CL_Rect&
arg_rect);
+ PingusCounterBar (Server * s, Orientation o, const CL_Rect& arg_rect);
virtual ~PingusCounterBar ();
void update(float delta);
Index: PingusGameSession.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusGameSession.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PingusGameSession.cc 2 Jun 2002 21:09:11 -0000 1.11
+++ PingusGameSession.cc 7 Jun 2002 14:50:34 -0000 1.12
@@ -26,7 +26,6 @@
#include "PingusGameSession.hh"
using boost::shared_ptr;
-using boost::dummy_ptr;
PingusGameSession::PingusGameSession (std::string arg_filename)
: filename (arg_filename),
Index: PingusMenu.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMenu.hh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- PingusMenu.hh 1 Jun 2002 18:05:35 -0000 1.20
+++ PingusMenu.hh 7 Jun 2002 14:50:34 -0000 1.21
@@ -23,7 +23,6 @@
#include <list>
#include <ClanLib/core.h>
#include <boost/smart_ptr.hpp>
-#include <boost/dummy_ptr.hpp>
#include "PingusSubMenu.hh"
#include "SurfaceButton.hh"
@@ -43,9 +42,9 @@
///
std::list<boost::shared_ptr<SurfaceButton> > buttons;
///
- boost::dummy_ptr<SurfaceButton> temp_button;
+ SurfaceButton * temp_button;
///
- boost::dummy_ptr<SurfaceButton> current_button;
+ SurfaceButton * current_button;
///
CL_Surface background;
///
Index: PingusMenuManager.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMenuManager.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PingusMenuManager.cc 2 Jun 2002 21:09:11 -0000 1.7
+++ PingusMenuManager.cc 7 Jun 2002 14:50:34 -0000 1.8
@@ -102,9 +102,9 @@
{
if (menu_stack.size () > 2)
pop_menu ();
- else if (menu_stack.size () == 2 && current_menu ().get () != &mainmenu)
+ else if (menu_stack.size () == 2 && current_menu () != &mainmenu)
set_menu (&mainmenu);
- else if (menu_stack.size () == 2 && current_menu ().get () == &mainmenu)
+ else if (menu_stack.size () == 2 && current_menu () == &mainmenu)
push_menu (&exitmenu);
}
else
@@ -167,7 +167,7 @@
}
void
-PingusMenuManager::set_menu (boost::dummy_ptr<PingusSubMenu> menu)
+PingusMenuManager::set_menu (PingusSubMenu * menu)
{
/*if (current_menu.get ())
fadeout ();*/
@@ -178,7 +178,7 @@
}
void
-PingusMenuManager::push_menu (boost::dummy_ptr<PingusSubMenu> menu)
+PingusMenuManager::push_menu (PingusSubMenu * menu)
{
menu->preload ();
menu_stack.push_back (menu);
@@ -191,14 +191,14 @@
menu_stack.pop_back();
}
-boost::dummy_ptr<PingusSubMenu>
+PingusSubMenu *
PingusMenuManager::current_menu ()
{
if (!menu_stack.empty ())
{
MenuStackRIter i = menu_stack.rbegin ();
- if (!i->get ())
- std::cout << "PingusMenuManager: Error: current_menu is " << i->get ()
<< std::endl;
+ if (! *i)
+ std::cout << "PingusMenuManager: Error: current_menu is " << *i <<
std::endl;
return *i;
}
else
Index: PingusMenuManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMenuManager.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PingusMenuManager.hh 17 Jun 2001 17:18:27 -0000 1.3
+++ PingusMenuManager.hh 7 Jun 2002 14:50:34 -0000 1.4
@@ -21,7 +21,6 @@
#define PINGUSMENUMANAGER_HH
#include <list>
-#include "boost/dummy_ptr.hpp"
#include "PingusSubMenu.hh"
#include "MenuBackground.hh"
#include "ExitMenu.hh"
@@ -34,9 +33,9 @@
{
private:
/** Menu stack. the menu on top is .end (), the bottom menu .begin () */
- std::list<boost::dummy_ptr<PingusSubMenu> > menu_stack;
- typedef std::list<boost::dummy_ptr<PingusSubMenu> >::iterator MenuStackIter;
- typedef std::list<boost::dummy_ptr<PingusSubMenu> >::reverse_iterator
MenuStackRIter;
+ std::list<PingusSubMenu *> menu_stack;
+ typedef std::list<PingusSubMenu *>::iterator MenuStackIter;
+ typedef std::list<PingusSubMenu *>::reverse_iterator MenuStackRIter;
bool loop;
@@ -83,18 +82,17 @@
/// Exit the menu manager (which means to exit the while() loop in display
())
void exit ();
- boost::dummy_ptr<PingusSubMenu> current_menu ();
+ PingusSubMenu * current_menu();
// Replace the current menu with a new one
- void set_menu (boost::dummy_ptr<PingusSubMenu> menu);
-
+ void set_menu (PingusSubMenu * menu);
/** Remove the current menu and fall back to the last one.
This is used for yes/no dialoges and such things. */
void pop_menu ();
/** Add's a new menu to the menu stack. This is used for yes/no
dialoges and such things.*/
- void push_menu (boost::dummy_ptr<PingusSubMenu> menu);
+ void push_menu (PingusSubMenu * menu);
};
#endif
Index: PlayfieldView.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PlayfieldView.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PlayfieldView.cc 1 Jun 2002 18:05:35 -0000 1.5
+++ PlayfieldView.cc 7 Jun 2002 14:50:34 -0000 1.6
@@ -20,8 +20,7 @@
#include <ClanLib/display.h>
#include "PlayfieldView.hh"
-PlayfieldView::PlayfieldView (boost::dummy_ptr<World> w,
- const CL_Rect& rect)
+PlayfieldView::PlayfieldView (World * w, const CL_Rect& rect)
: world (w), x_offset (0), y_offset (0)
{
set_clip_rect(rect.x1, rect.y1, rect.x2, rect.y2);
Index: PlayfieldView.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PlayfieldView.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PlayfieldView.hh 18 Nov 2001 00:03:29 -0000 1.4
+++ PlayfieldView.hh 7 Jun 2002 14:50:34 -0000 1.5
@@ -20,7 +20,6 @@
#ifndef PLAYFIELDVIEW_HH
#define PLAYFIELDVIEW_HH
-#include "boost/dummy_ptr.hpp"
#include "GuiObj.hh"
#include "World.hh"
#include "Pingu.hh"
@@ -28,12 +27,11 @@
class PlayfieldView : public GuiObj
{
private:
- boost::dummy_ptr<World> world;
+ World * world;
int x_offset;
int y_offset;
public:
- PlayfieldView (boost::dummy_ptr<World> w,
- const CL_Rect& rect);
+ PlayfieldView (World * w, const CL_Rect& rect);
virtual ~PlayfieldView ();
// Update the playfield
Index: SmallMapImage.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMapImage.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SmallMapImage.cc 1 Jun 2002 18:05:35 -0000 1.7
+++ SmallMapImage.cc 7 Jun 2002 14:50:34 -0000 1.8
@@ -24,10 +24,9 @@
#include "PLF.hh"
#include "ColMap.hh"
-using boost::dummy_ptr;
using boost::shared_ptr;
-SmallMapImage::SmallMapImage (boost::dummy_ptr<Server> s, CL_Vector arg_pos,
int width, int height)
+SmallMapImage::SmallMapImage (Server * s, CL_Vector arg_pos, int width, int
height)
: sur (create_surface (s, width, height)),
pos (arg_pos)
{
@@ -50,7 +49,7 @@
}
CL_Surface
-SmallMapImage::create_surface (dummy_ptr<Server> server, int width, int height)
+SmallMapImage::create_surface (Server * server, int width, int height)
{
CL_Canvas* canvas;
unsigned char* buffer;
Index: SmallMapImage.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMapImage.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SmallMapImage.hh 17 Apr 2001 05:00:04 -0000 1.1
+++ SmallMapImage.hh 7 Jun 2002 14:50:34 -0000 1.2
@@ -21,7 +21,6 @@
#define SMALLMAPIMAGE_HH
#include <ClanLib/display.h>
-#include "boost/dummy_ptr.hpp"
#include "GuiObj.hh"
#include "Server.hh"
@@ -33,13 +32,13 @@
CL_Surface sur;
CL_Vector pos;
public:
- SmallMapImage (boost::dummy_ptr<Server> s, CL_Vector pos, int width, int
height);
+ SmallMapImage (Server * s, CL_Vector pos, int width, int height);
virtual ~SmallMapImage ();
void draw ();
void update (float delta);
- static CL_Surface create_surface (boost::dummy_ptr<Server> server, int
width, int height);
+ static CL_Surface create_surface (Server * server, int width, int height);
};
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.15,1.16 Client.cc,1.78,1.79 Client.hh,1.35,1.36 Controller.cc,1.10,1.11 Controller.hh,1.11,1.12 MultiplayerClient.cc,1.4,1.5 MultiplayerClient.hh,1.6,1.7 MultiplayerClientChild.cc,1.9,1.10 MultiplayerClientChild.hh,1.6,1.7 MultiplayerGame.cc,1.5,1.6 PingusCounterBar.cc,1.5,1.6 PingusCounterBar.hh,1.1,1.2 PingusGameSession.cc,1.11,1.12 PingusMenu.hh,1.20,1.21 PingusMenuManager.cc,1.7,1.8 PingusMenuManager.hh,1.3,1.4 PlayfieldView.cc,1.5,1.6 PlayfieldView.hh,1.4,1.5 SmallMapImage.cc,1.7,1.8 SmallMapImage.hh,1.1,1.2,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.hh,1.12,1.13
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ConveyorBelt.cc,1.30,1.31 ConveyorBelt.hh,1.19,1.20 SwitchDoor.cc,1.25,1.26 SwitchDoor.hh,1.19,1.20 Teleporter.cc,1.33,1.34 Teleporter.hh,1.25,1.26
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.hh,1.12,1.13
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ConveyorBelt.cc,1.30,1.31 ConveyorBelt.hh,1.19,1.20 SwitchDoor.cc,1.25,1.26 SwitchDoor.hh,1.19,1.20 Teleporter.cc,1.33,1.34 Teleporter.hh,1.25,1.26
- Index(es):