[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4021 - in trunk/pingus/src: display editor input pingus wo
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4021 - in trunk/pingus/src: display editor input pingus worldmap worldobjs |
|
Date: |
Wed, 4 Nov 2009 15:44:18 +0100 |
Author: grumbel
Date: 2009-11-04 15:44:14 +0100 (Wed, 04 Nov 2009)
New Revision: 4021
Modified:
trunk/pingus/src/display/opengl_framebuffer.cpp
trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
trunk/pingus/src/editor/level_impl.hpp
trunk/pingus/src/input/control.hpp
trunk/pingus/src/input/evdev_device.hpp
trunk/pingus/src/input/evdev_driver.cpp
trunk/pingus/src/input/usbmouse_driver.cpp
trunk/pingus/src/pingus/game_session.cpp
trunk/pingus/src/pingus/ground_map.cpp
trunk/pingus/src/pingus/level_menu.cpp
trunk/pingus/src/pingus/option_menu.cpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingu_holder.cpp
trunk/pingus/src/pingus/pingus_demo.cpp
trunk/pingus/src/pingus/pingus_level_impl.hpp
trunk/pingus/src/pingus/plf_res_mgr.hpp
trunk/pingus/src/pingus/res_descriptor.cpp
trunk/pingus/src/pingus/result_screen.cpp
trunk/pingus/src/pingus/savegame.cpp
trunk/pingus/src/pingus/sprite_description.hpp
trunk/pingus/src/pingus/start_screen.cpp
trunk/pingus/src/pingus/surface.cpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/worldmap/worldmap.hpp
trunk/pingus/src/worldmap/worldmap_screen.cpp
trunk/pingus/src/worldmap/worldmap_story.hpp
trunk/pingus/src/worldobjs/entrance.cpp
trunk/pingus/src/worldobjs/ice_block.cpp
trunk/pingus/src/worldobjs/liquid.cpp
trunk/pingus/src/worldobjs/rain_generator.cpp
trunk/pingus/src/worldobjs/snow_generator.cpp
trunk/pingus/src/worldobjs/snow_generator.hpp
trunk/pingus/src/worldobjs/starfield_background_stars.cpp
trunk/pingus/src/worldobjs/starfield_background_stars.hpp
trunk/pingus/src/worldobjs/switch_door.cpp
trunk/pingus/src/worldobjs/teleporter.cpp
trunk/pingus/src/worldobjs/teleporter_target.cpp
trunk/pingus/src/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/worldobjs/woodthing.cpp
Log:
A second step to -Weffc++ cleaness
Modified: trunk/pingus/src/display/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer.cpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/display/opengl_framebuffer.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -23,7 +23,9 @@
#include "math/math.hpp"
#include "pingus/surface.hpp"
-OpenGLFramebuffer::OpenGLFramebuffer()
+OpenGLFramebuffer::OpenGLFramebuffer() :
+ screen(),
+ cliprect_stack()
{
}
Modified: trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
2009-11-04 14:07:13 UTC (rev 4020)
+++ trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
2009-11-04 14:44:14 UTC (rev 4021)
@@ -28,8 +28,10 @@
} // namespace
-OpenGLFramebufferSurfaceImpl::OpenGLFramebufferSurfaceImpl(SDL_Surface* src)
- : size(src->w, src->h)
+OpenGLFramebufferSurfaceImpl::OpenGLFramebufferSurfaceImpl(SDL_Surface* src) :
+ handle(),
+ size(src->w, src->h),
+ texture_size()
{
glGenTextures(1, &handle);
Modified: trunk/pingus/src/editor/level_impl.hpp
===================================================================
--- trunk/pingus/src/editor/level_impl.hpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/editor/level_impl.hpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -31,9 +31,20 @@
{
public:
// Set defaults in constructor
- LevelImpl()
- : ambient_light(255, 255, 255),
- music("none")
+ LevelImpl() :
+ resname(),
+ levelname(),
+ description(),
+ ambient_light(255, 255, 255),
+ size(),
+ number_of_pingus(),
+ number_to_save(),
+ actions(),
+ time(),
+ difficulty(),
+ author(),
+ comment(),
+ music("none")
{
// Do nothing
}
Modified: trunk/pingus/src/input/control.hpp
===================================================================
--- trunk/pingus/src/input/control.hpp 2009-11-04 14:07:13 UTC (rev 4020)
+++ trunk/pingus/src/input/control.hpp 2009-11-04 14:44:14 UTC (rev 4021)
@@ -286,6 +286,10 @@
virtual void notify_parent() {
controller->add_axis_event(id, pos);
}
+
+private:
+ ControllerAxis(const ControllerAxis&);
+ ControllerAxis & operator=(const ControllerAxis&);
};
class PointerGroup : public Pointer
@@ -295,7 +299,8 @@
public:
PointerGroup(Control* parent_) :
- Pointer(parent_)
+ Pointer(parent_),
+ pointer()
{}
~PointerGroup()
@@ -354,7 +359,8 @@
public:
ScrollerGroup(Control* parent_) :
- Scroller(parent_)
+ Scroller(parent_),
+ scrollers()
{}
~ScrollerGroup()
@@ -432,7 +438,8 @@
public:
KeyboardGroup(Control* parent_) :
- Keyboard(parent_)
+ Keyboard(parent_),
+ keyboards()
{}
~KeyboardGroup()
Modified: trunk/pingus/src/input/evdev_device.hpp
===================================================================
--- trunk/pingus/src/input/evdev_device.hpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/input/evdev_device.hpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -43,10 +43,12 @@
};
// Relative Input Event
- struct Relative {
+ struct Relative
+ {
Relative(int code_) :
code(code_),
pos(0),
+ binding_axis(),
bindings()
{}
Modified: trunk/pingus/src/input/evdev_driver.cpp
===================================================================
--- trunk/pingus/src/input/evdev_driver.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/input/evdev_driver.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -19,7 +19,8 @@
namespace Input {
-EvdevDriver::EvdevDriver()
+EvdevDriver::EvdevDriver() :
+ devices()
{
}
Modified: trunk/pingus/src/input/usbmouse_driver.cpp
===================================================================
--- trunk/pingus/src/input/usbmouse_driver.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/input/usbmouse_driver.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -44,10 +44,14 @@
std::vector<std::vector<Button*> > button_bindings;
public:
- USBMouse(const std::string& device_)
- : device(device_),
- buttons(5),
- button_bindings(7)
+ USBMouse(const std::string& device_) :
+ fd(),
+ mouse_pos(),
+ device(device_),
+ buttons(5),
+ pointer_bindings(),
+ scroller_bindings(),
+ button_bindings(7)
{
fd = open(device.c_str (), O_RDWR | O_NONBLOCK);
@@ -201,7 +205,8 @@
}
};
-USBMouseDriver::USBMouseDriver()
+USBMouseDriver::USBMouseDriver() :
+ usbmice()
{
}
Modified: trunk/pingus/src/pingus/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/game_session.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/game_session.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -41,12 +41,16 @@
plf(arg_plf),
show_result_screen(arg_show_result_screen),
server(),
+ world_delay(),
is_finished (false),
button_panel (0),
pcounter (0),
playfield (0),
time_display (0),
small_map (0),
+ armageddon_button(),
+ forward_button(),
+ pause_button(),
pause(false),
fast_forward(false)
{
Modified: trunk/pingus/src/pingus/ground_map.cpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/ground_map.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -43,8 +43,10 @@
const Sprite& get_sprite();
};
-MapTile::MapTile ()
- : sprite_needs_update(false)
+MapTile::MapTile () :
+ sprite(),
+ surface(),
+ sprite_needs_update(false)
{
}
@@ -88,7 +90,12 @@
}
GroundMap::GroundMap(int width_, int height_) :
- width(width_), height(height_)
+ colmap(),
+ tiles(),
+ width(width_),
+ height(height_),
+ tile_width(),
+ tile_height()
{
colmap = new CollisionMap(width, height);
Modified: trunk/pingus/src/pingus/level_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/level_menu.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/level_menu.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -110,10 +110,13 @@
int page;
public:
- LevelsetSelector(LevelMenu* level_menu_, const Rect& rect_)
- : RectComponent(rect_),
- level_menu(level_menu_), current_levelset(NULL),
- page(0)
+ LevelsetSelector(LevelMenu* level_menu_, const Rect& rect_) :
+ RectComponent(rect_),
+ level_menu(level_menu_),
+ levelsets(),
+ current_levelset(),
+ marker(),
+ page(0)
{
marker = Sprite("core/menu/marker");
Modified: trunk/pingus/src/pingus/option_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/option_menu.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/option_menu.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -68,9 +68,31 @@
parent->close_screen();
Sound::PingusSound::play_sound("yipee");
}
+
+private:
+ OptionMenuCloseButton(const OptionMenuCloseButton&);
+ OptionMenuCloseButton & operator=(const OptionMenuCloseButton&);
};
-OptionMenu::OptionMenu()
+OptionMenu::OptionMenu() :
+ background(),
+ ok_button(),
+ x_pos(),
+ y_pos(),
+ options(),
+ fullscreen_box(),
+ swcursor_box(),
+ autoscroll_box(),
+ mousegrab_box(),
+ printfps_box(),
+ master_volume_box(),
+ sound_volume_box(),
+ music_volume_box(),
+ defaults_label(),
+ defaults_box(),
+ connections(),
+ language(),
+ language_map()
{
background = Sprite("core/menu/optionmenu");
gui_manager->add(ok_button = new OptionMenuCloseButton(this,
@@ -103,16 +125,16 @@
ChoiceBox* resolution_box = new ChoiceBox(Rect());
for (n = 0; resolutions[n][0] != -1; ++n)
+ {
+ std::ostringstream ostr;
+ ostr << resolutions[n][0] << "x" << resolutions[n][1];
+ resolution_box->add_choice(ostr.str());
+ if (Display::get_width() == resolutions[n][0] &&
+ Display::get_height() == resolutions[n][1])
{
- std::ostringstream ostr;
- ostr << resolutions[n][0] << "x" << resolutions[n][1];
- resolution_box->add_choice(ostr.str());
- if (Display::get_width() == resolutions[n][0] &&
- Display::get_height() == resolutions[n][1])
- {
- current_choice = n;
- }
+ current_choice = n;
}
+ }
resolution_box->add_choice("Custom");
if (current_choice == -1)
current_choice = n;
@@ -127,11 +149,11 @@
std::set<tinygettext::Language> languages =
dictionary_manager.get_languages();
for (std::set<tinygettext::Language>::iterator i = languages.begin(); i !=
languages.end(); ++i)
- {
- language_box->add_choice(i->str());
- if (current_language == *i)
- language_box->set_current_choice(current_choice);
- }
+ {
+ language_box->add_choice(i->str());
+ if (current_language == *i)
+ language_box->set_current_choice(current_choice);
+ }
ChoiceBox* scroll_box = new ChoiceBox(Rect());
scroll_box->add_choice("Drag&Drop");
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-04 14:07:13 UTC (rev 4020)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-04 14:44:14 UTC (rev 4021)
@@ -58,15 +58,15 @@
using namespace Actions;
// Init a pingu at the given position while falling
-Pingu::Pingu (int arg_id, const Vector3f& arg_pos, int owner)
- : previous_action(FALLER),
- id(arg_id),
- action_time(-1),
- owner_id(owner),
- status(PS_ALIVE),
- pos_x(arg_pos.x),
- pos_y(arg_pos.y),
- velocity(0, 0, 0)
+Pingu::Pingu (int arg_id, const Vector3f& arg_pos, int owner) :
+ previous_action(FALLER),
+ id(arg_id),
+ action_time(-1),
+ owner_id(owner),
+ status(PS_ALIVE),
+ pos_x(arg_pos.x),
+ pos_y(arg_pos.y),
+ velocity(0, 0, 0)
{
direction.left ();
Modified: trunk/pingus/src/pingus/pingu_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -21,15 +21,16 @@
#include "pingus/pingu.hpp"
-PinguHolder::PinguHolder(const PingusLevel& plf)
- : number_of_allowed(plf.get_number_of_pingus()),
- number_of_exited(0)
+PinguHolder::PinguHolder(const PingusLevel& plf) :
+ number_of_allowed(plf.get_number_of_pingus()),
+ number_of_exited(0),
+ all_pingus(),
+ pingus()
{
}
PinguHolder::~PinguHolder()
{
- // Deleting all Pingu objects
for(std::vector<Pingu*>::iterator i = all_pingus.begin();
i != all_pingus.end(); ++i)
delete *i;
Modified: trunk/pingus/src/pingus/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -24,7 +24,10 @@
#include "pingus/pingu_enums.hpp"
#include "pingus/pingus_demo.hpp"
-PingusDemo::PingusDemo(const Pathname& pathname)
+PingusDemo::PingusDemo(const Pathname& pathname) :
+ levelname(),
+ checksum(),
+ events()
{
std::vector<FileReader> lines = FileReader::parse_many(pathname);
Modified: trunk/pingus/src/pingus/pingus_level_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -28,11 +28,11 @@
public:
// Set defaults in constructor
- PingusLevelImpl()
- : ambient_light(255, 255, 255, 255),
- number_of_pingus(0), number_to_save(0),
- time(0), difficulty(0),
- music("none")
+ PingusLevelImpl() :
+ ambient_light(255, 255, 255, 255),
+ number_of_pingus(0), number_to_save(0),
+ time(0), difficulty(0),
+ music("none")
{
// Do nothing
}
Modified: trunk/pingus/src/pingus/plf_res_mgr.hpp
===================================================================
--- trunk/pingus/src/pingus/plf_res_mgr.hpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/plf_res_mgr.hpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -26,9 +26,15 @@
class PLFResMgr
{
private:
- struct PLFEntry {
+ struct PLFEntry
+ {
PingusLevel plf;
uint64_t mtime;
+
+ PLFEntry() :
+ plf(),
+ mtime()
+ {}
};
typedef std::map<std::string, PLFEntry> PLFMap;
Modified: trunk/pingus/src/pingus/res_descriptor.cpp
===================================================================
--- trunk/pingus/src/pingus/res_descriptor.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/res_descriptor.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -27,8 +27,9 @@
ResDescriptor(const std::string& uri);
*/
-ResDescriptor::ResDescriptor()
- : modifier(ResourceModifierNS::ROT0)
+ResDescriptor::ResDescriptor() :
+ res_name(),
+ modifier(ResourceModifierNS::ROT0)
{
}
Modified: trunk/pingus/src/pingus/result_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/result_screen.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/result_screen.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -69,6 +69,10 @@
parent->close_screen();
Sound::PingusSound::play_sound("yipee");
}
+
+private:
+ ResultScreenOkButton(const ResultScreenOkButton&);
+ ResultScreenOkButton & operator=(const ResultScreenOkButton&);
};
class ResultScreenAbortButton
@@ -101,6 +105,10 @@
SurfaceButton::on_pointer_enter();
Sound::PingusSound::play_sound ("tick");
}
+
+private:
+ ResultScreenAbortButton(const ResultScreenAbortButton&);
+ ResultScreenAbortButton & operator=(const ResultScreenAbortButton&);
};
class ResultScreenRetryButton : public GUI::SurfaceButton
@@ -138,12 +146,16 @@
SurfaceButton::on_pointer_enter();
Sound::PingusSound::play_sound ("tick");
}
+
+private:
+ ResultScreenRetryButton(const ResultScreenRetryButton&);
+ ResultScreenRetryButton & operator=(const ResultScreenRetryButton&);
};
-ResultScreenComponent::ResultScreenComponent(Result arg_result)
- : result(arg_result),
- background("core/menu/wood"),
- blackboard("core/menu/blackboard")
+ResultScreenComponent::ResultScreenComponent(Result arg_result) :
+ result(arg_result),
+ background("core/menu/wood"),
+ blackboard("core/menu/blackboard")
{
if (result.max_time == -1)
time_str = "-";
Modified: trunk/pingus/src/pingus/savegame.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/savegame.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -51,11 +51,12 @@
return NONE;
}
-Savegame::Savegame()
+Savegame::Savegame() :
+ filename(),
+ status(ACCESSIBLE),
+ needed_time(0),
+ saved_pingus(0)
{
- status = ACCESSIBLE;
- saved_pingus = 0;
- needed_time = 0;
}
Savegame::Savegame(FileReader reader)
Modified: trunk/pingus/src/pingus/sprite_description.hpp
===================================================================
--- trunk/pingus/src/pingus/sprite_description.hpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/pingus/sprite_description.hpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -38,20 +38,26 @@
Vector2i frame_pos;
Size frame_size;
- SpriteDescription()
- : origin(origin_top_left),
- loop(true),
- speed(100),
- array(1, 1),
- frame_size(-1, -1)
+ SpriteDescription() :
+ filename(),
+ offset(),
+ origin(origin_top_left),
+ loop(true),
+ speed(100),
+ array(1, 1),
+ frame_pos(),
+ frame_size(-1, -1)
{}
- SpriteDescription(const FileReader& reader)
- : origin(origin_top_left),
- loop(true),
- speed(100),
- array(1, 1),
- frame_size(-1, -1)
+ SpriteDescription(const FileReader& reader) :
+ filename(),
+ offset(),
+ origin(origin_top_left),
+ loop(true),
+ speed(100),
+ array(1, 1),
+ frame_pos(),
+ frame_size(-1, -1)
{
reader.read_int ("speed", speed);
reader.read_bool ("loop", loop);
Modified: trunk/pingus/src/pingus/start_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/start_screen.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/pingus/start_screen.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -89,6 +89,10 @@
SurfaceButton::on_pointer_enter();
Sound::PingusSound::play_sound ("tick");
}
+
+private:
+ StartScreenOkButton(const StartScreenOkButton&);
+ StartScreenOkButton & operator=(const StartScreenOkButton&);
};
class StartScreenAbortButton
@@ -122,6 +126,10 @@
SurfaceButton::on_pointer_enter();
Sound::PingusSound::play_sound ("tick");
}
+
+private:
+ StartScreenAbortButton(const StartScreenAbortButton&);
+ StartScreenAbortButton & operator=(const StartScreenAbortButton&);
};
StartScreenComponent::StartScreenComponent(const PingusLevel& p)
Modified: trunk/pingus/src/pingus/surface.cpp
===================================================================
--- trunk/pingus/src/pingus/surface.cpp 2009-11-04 14:07:13 UTC (rev 4020)
+++ trunk/pingus/src/pingus/surface.cpp 2009-11-04 14:44:14 UTC (rev 4021)
@@ -41,6 +41,10 @@
if (surface)
SDL_FreeSurface(surface);
}
+
+private:
+ SurfaceImpl(const SurfaceImpl&);
+ SurfaceImpl & operator=(const SurfaceImpl&);
};
Surface::Surface()
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-04 14:07:13 UTC (rev 4020)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-04 14:44:14 UTC (rev 4021)
@@ -43,14 +43,14 @@
return a->get_z_pos () < b->get_z_pos ();
}
-World::World(const PingusLevel& plf)
- : ambient_light(Color(plf.get_ambient_light())),
- gfx_map(new GroundMap(plf.get_size().width, plf.get_size().height)),
- game_time(0),
- do_armageddon(false),
- pingus(new PinguHolder(plf)),
- colmap(gfx_map->get_colmap()),
- gravitational_acceleration(0.25f)
+World::World(const PingusLevel& plf) :
+ ambient_light(Color(plf.get_ambient_light())),
+ gfx_map(new GroundMap(plf.get_size().width, plf.get_size().height)),
+ game_time(0),
+ do_armageddon(false),
+ pingus(new PinguHolder(plf)),
+ colmap(gfx_map->get_colmap()),
+ gravitational_acceleration(0.25f)
{
WorldObj::set_world(this);
Modified: trunk/pingus/src/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.hpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/worldmap/worldmap.hpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -123,6 +123,10 @@
static Worldmap* current_;
public:
static Worldmap* current() { return current_; }
+
+private:
+ Worldmap(const Worldmap&);
+ Worldmap & operator=(const Worldmap&);
};
} // namespace WorldmapNS
Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -48,6 +48,10 @@
void on_click();
void draw (DrawingContext& gc);
void on_pointer_enter();
+
+private:
+ WorldmapScreenCloseButton(const WorldmapScreenCloseButton&);
+ WorldmapScreenCloseButton & operator=(const WorldmapScreenCloseButton&);
};
class WorldmapScreenStoryButton
@@ -60,6 +64,10 @@
void on_click();
void draw (DrawingContext& gc);
void on_pointer_enter();
+
+private:
+ WorldmapScreenStoryButton(const WorldmapScreenStoryButton&);
+ WorldmapScreenStoryButton & operator=(const WorldmapScreenStoryButton&);
};
class WorldmapScreenCreditsButton
@@ -72,6 +80,10 @@
void on_click();
void draw (DrawingContext& gc);
void on_pointer_enter();
+
+private:
+ WorldmapScreenCreditsButton(const WorldmapScreenCreditsButton&);
+ WorldmapScreenCreditsButton & operator=(const WorldmapScreenCreditsButton&);
};
class WorldmapScreenEnterButton
@@ -84,6 +96,10 @@
void on_click();
void draw (DrawingContext& gc);
void on_pointer_enter();
+
+private:
+ WorldmapScreenEnterButton(const WorldmapScreenEnterButton&);
+ WorldmapScreenEnterButton & operator=(const WorldmapScreenEnterButton&);
};
WorldmapScreenCreditsButton::WorldmapScreenCreditsButton(WorldmapScreen*
worldmap_screen_) :
Modified: trunk/pingus/src/worldmap/worldmap_story.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.hpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/worldmap/worldmap_story.hpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -26,7 +26,11 @@
class StoryPage
{
public:
- StoryPage() {}
+ StoryPage() :
+ image(),
+ text(),
+ page_name()
+ {}
StoryPage(ResDescriptor arg_image, std::string arg_text, std::string
arg_name = "")
: image(arg_image), text(arg_text), page_name(arg_name)
Modified: trunk/pingus/src/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/worldobjs/entrance.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -26,13 +26,13 @@
namespace WorldObjs {
-Entrance::Entrance(const FileReader& reader)
- : direction(MISC),
- release_rate(150),
- owner_id(0),
- type("generic"),
- smallmap_symbol("core/misc/smallmap_entrance"),
- last_direction(0)
+Entrance::Entrance(const FileReader& reader) :
+ direction(MISC),
+ release_rate(150),
+ owner_id(0),
+ type("generic"),
+ smallmap_symbol("core/misc/smallmap_entrance"),
+ last_direction(0)
{
reader.read_string("type", type);
reader.read_int ("owner-id", owner_id);
Modified: trunk/pingus/src/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -25,12 +25,14 @@
namespace WorldObjs {
-IceBlock::IceBlock(const FileReader& reader)
- : thickness(1.0),
- is_finished(false),
- last_contact(0),
- block_sur("worldobjs/iceblock"),
- block_sur_cmap("worldobjs/iceblock_cmap")
+IceBlock::IceBlock(const FileReader& reader) :
+ pos(),
+ width(),
+ thickness(1.0),
+ is_finished(false),
+ last_contact(0),
+ block_sur("worldobjs/iceblock"),
+ block_sur_cmap("worldobjs/iceblock_cmap")
{
reader.read_vector("position", pos);
reader.read_int ("width", width);
Modified: trunk/pingus/src/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/worldobjs/liquid.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -23,9 +23,12 @@
namespace WorldObjs {
-Liquid::Liquid(const FileReader& reader)
- : old_width_handling(false),
- width(0)
+Liquid::Liquid(const FileReader& reader) :
+ sur(),
+ pos(),
+ old_width_handling(false),
+ width(0),
+ speed()
{
/*
if (XMLhelper::get_prop(cur, "use-old-width-handling", old_width_handling))
Modified: trunk/pingus/src/worldobjs/rain_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -23,9 +23,9 @@
namespace WorldObjs {
-RainGenerator::RainGenerator (const FileReader& reader)
- : do_thunder (false),
- thunder_count (0)
+RainGenerator::RainGenerator (const FileReader& reader) :
+ do_thunder(false),
+ thunder_count (0)
{
}
Modified: trunk/pingus/src/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -24,9 +24,9 @@
namespace WorldObjs {
-SnowGenerator::SnowGenerator(const FileReader& reader)
+SnowGenerator::SnowGenerator(const FileReader& reader) :
+ intensity(1.0f)
{
- intensity = 1.0f;
reader.read_float("intensity", intensity);
}
Modified: trunk/pingus/src/worldobjs/snow_generator.hpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.hpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/worldobjs/snow_generator.hpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -30,6 +30,7 @@
{
private:
float intensity;
+
public:
SnowGenerator(const FileReader& reader);
~SnowGenerator ();
Modified: trunk/pingus/src/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-04
14:07:13 UTC (rev 4020)
+++ trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-04
14:44:14 UTC (rev 4021)
@@ -22,7 +22,12 @@
namespace WorldObjs {
-StarfieldBackgroundStars::StarfieldBackgroundStars (Type type)
+StarfieldBackgroundStars::StarfieldBackgroundStars (Type type) :
+ sur(),
+ x_pos(),
+ y_pos(),
+ x_add(),
+ y_add()
{
switch (type)
{
Modified: trunk/pingus/src/worldobjs/starfield_background_stars.hpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background_stars.hpp 2009-11-04
14:07:13 UTC (rev 4020)
+++ trunk/pingus/src/worldobjs/starfield_background_stars.hpp 2009-11-04
14:44:14 UTC (rev 4021)
@@ -36,9 +36,16 @@
public:
enum Type { SMALL_STAR, MIDDLE_STAR, LARGE_STAR };
- StarfieldBackgroundStars () {}
- StarfieldBackgroundStars (Type type);
+ StarfieldBackgroundStars() :
+ sur(),
+ x_pos(),
+ y_pos(),
+ x_add(),
+ y_add()
+ {}
+ StarfieldBackgroundStars(Type type);
+
// Never used
float get_z_pos () const { return -100; }
Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -24,13 +24,16 @@
namespace WorldObjs {
-SwitchDoor::SwitchDoor(const FileReader& reader)
- : door_box ("worldobjs/switchdoor_box"),
- door_box_cmap("worldobjs/switchdoor_box"),
- door_tile ("worldobjs/switchdoor_tile"),
- door_tile_cmap("worldobjs/switchdoor_tile_cmap"),
- switch_sur ("worldobjs/switchdoor_switch"),
- is_opening(false)
+SwitchDoor::SwitchDoor(const FileReader& reader) :
+ door_pos(),
+ switch_pos(),
+ door_height(),
+ door_box ("worldobjs/switchdoor_box"),
+ door_box_cmap("worldobjs/switchdoor_box"),
+ door_tile ("worldobjs/switchdoor_tile"),
+ door_tile_cmap("worldobjs/switchdoor_tile_cmap"),
+ switch_sur ("worldobjs/switchdoor_switch"),
+ is_opening(false)
{
FileReader subreader;
reader.read_section("switch", subreader);
Modified: trunk/pingus/src/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -25,8 +25,11 @@
namespace WorldObjs {
-Teleporter::Teleporter(const FileReader& reader)
- : sprite("worldobjs/teleporter")
+Teleporter::Teleporter(const FileReader& reader) :
+ pos(),
+ sprite("worldobjs/teleporter"),
+ target_id(),
+ target()
{
reader.read_vector("position", pos);
reader.read_string("target-id", target_id);
@@ -48,16 +51,16 @@
Teleporter::on_startup()
{
if (target_id.empty())
- {
- std::cout << "Teleporter: target-id is empty" << std::endl;
- }
+ {
+ std::cout << "Teleporter: target-id is empty" << std::endl;
+ }
else
- {
- // FIXME: find the target
- target = dynamic_cast<TeleporterTarget*>(world->get_worldobj(target_id));
- if (!target)
- std::cout << "Teleporter: Couldn't find matching target-id or object
isn't a TeleporterTarget" << std::endl;
- }
+ {
+ // FIXME: find the target
+ target = dynamic_cast<TeleporterTarget*>(world->get_worldobj(target_id));
+ if (!target)
+ std::cout << "Teleporter: Couldn't find matching target-id or object
isn't a TeleporterTarget" << std::endl;
+ }
}
void
@@ -66,19 +69,19 @@
sprite.update();
if (target)
+ {
+ PinguHolder* holder = world->get_pingus();
+ for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu)
{
- PinguHolder* holder = world->get_pingus();
- for (PinguIter pingu = holder->begin (); pingu != holder->end ();
++pingu)
- {
- if ( (*pingu)->get_x() > pos.x - 3 && (*pingu)->get_x() < pos.x +
3
- && (*pingu)->get_y() > pos.y - 52 && (*pingu)->get_y() <
pos.y)
- {
- (*pingu)->set_pos(target->get_pos().x, target->get_pos().y);
- target->teleporter_used();
- sprite.restart();
- }
- }
+ if ( (*pingu)->get_x() > pos.x - 3 && (*pingu)->get_x() < pos.x + 3
+ && (*pingu)->get_y() > pos.y - 52 && (*pingu)->get_y() < pos.y)
+ {
+ (*pingu)->set_pos(target->get_pos().x, target->get_pos().y);
+ target->teleporter_used();
+ sprite.restart();
+ }
}
+ }
}
} // namespace WorldObjs
Modified: trunk/pingus/src/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-04 14:07:13 UTC
(rev 4020)
+++ trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
@@ -24,9 +24,10 @@
namespace WorldObjs {
-TeleporterTarget::TeleporterTarget(const FileReader& reader)
- : WorldObj(reader),
- sprite("worldobjs/teleportertarget")
+TeleporterTarget::TeleporterTarget(const FileReader& reader) :
+ WorldObj(reader),
+ pos(),
+ sprite("worldobjs/teleportertarget")
{
reader.read_vector("position", pos);
}
Modified: trunk/pingus/src/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-04
14:07:13 UTC (rev 4020)
+++ trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-04
14:44:14 UTC (rev 4021)
@@ -20,9 +20,10 @@
namespace WorldObjs {
-ThunderstormBackground:: ThunderstormBackground(const FileReader& reader)
- : clouds_sur("textures/thunderstorm"),
- x_pos(0)
+ThunderstormBackground:: ThunderstormBackground(const FileReader& reader) :
+ pos(),
+ clouds_sur("textures/thunderstorm"),
+ x_pos(0)
{
reader.read_vector("position", pos);
}
Modified: trunk/pingus/src/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-04 14:07:13 UTC (rev
4020)
+++ trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-04 14:44:14 UTC (rev
4021)
@@ -26,7 +26,8 @@
// namespace Entrances {
WoodThing::WoodThing(const FileReader& reader)
- : Entrance(reader)
+ : Entrance(reader),
+ surface2()
{
surface = Sprite("entrances/woodthing_mov");
surface2 = Sprite("entrances/woodthing_nmov");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4021 - in trunk/pingus/src: display editor input pingus worldmap worldobjs,
grumbel at BerliOS <=