[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4022 - in trunk/pingus/src: display editor input pingus sc
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4022 - in trunk/pingus/src: display editor input pingus screen worldmap worldobjs |
|
Date: |
Wed, 4 Nov 2009 19:34:23 +0100 |
Author: grumbel
Date: 2009-11-04 19:34:19 +0100 (Wed, 04 Nov 2009)
New Revision: 4022
Modified:
trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp
trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp
trunk/pingus/src/editor/checkbox.cpp
trunk/pingus/src/editor/minimap.hpp
trunk/pingus/src/input/core_driver.cpp
trunk/pingus/src/input/core_driver.hpp
trunk/pingus/src/input/sdl_driver.hpp
trunk/pingus/src/pingus/level_menu.cpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingu.hpp
trunk/pingus/src/pingus/pingus_level_impl.hpp
trunk/pingus/src/pingus/pingus_main.cpp
trunk/pingus/src/pingus/pingus_menu.cpp
trunk/pingus/src/pingus/pingus_options.hpp
trunk/pingus/src/pingus/resource_manager.cpp
trunk/pingus/src/pingus/result_screen.cpp
trunk/pingus/src/pingus/result_screen.hpp
trunk/pingus/src/pingus/savegame.cpp
trunk/pingus/src/pingus/savegame_manager.cpp
trunk/pingus/src/pingus/server.cpp
trunk/pingus/src/pingus/server_event.cpp
trunk/pingus/src/pingus/smallmap_image.cpp
trunk/pingus/src/pingus/sprite.cpp
trunk/pingus/src/pingus/sprite_impl.cpp
trunk/pingus/src/pingus/start_screen.cpp
trunk/pingus/src/pingus/stat_manager.cpp
trunk/pingus/src/pingus/state_sprite.cpp
trunk/pingus/src/pingus/story_screen.cpp
trunk/pingus/src/screen/screen_manager.cpp
trunk/pingus/src/worldmap/drawable.hpp
trunk/pingus/src/worldmap/worldmap_story.cpp
trunk/pingus/src/worldmap/worldmap_story.hpp
trunk/pingus/src/worldobjs/conveyor_belt.cpp
trunk/pingus/src/worldobjs/entrance.hpp
trunk/pingus/src/worldobjs/exit.cpp
trunk/pingus/src/worldobjs/fake_exit.cpp
trunk/pingus/src/worldobjs/fake_exit.hpp
trunk/pingus/src/worldobjs/groundpiece.cpp
trunk/pingus/src/worldobjs/guillotine.cpp
trunk/pingus/src/worldobjs/guillotine.hpp
trunk/pingus/src/worldobjs/hammer.cpp
trunk/pingus/src/worldobjs/hammer.hpp
trunk/pingus/src/worldobjs/hotspot.cpp
trunk/pingus/src/worldobjs/hotspot.hpp
trunk/pingus/src/worldobjs/laser_exit.cpp
trunk/pingus/src/worldobjs/rain_generator.cpp
trunk/pingus/src/worldobjs/rain_generator.hpp
trunk/pingus/src/worldobjs/smasher.cpp
trunk/pingus/src/worldobjs/solid_color_background.cpp
trunk/pingus/src/worldobjs/spike.cpp
trunk/pingus/src/worldobjs/spike.hpp
trunk/pingus/src/worldobjs/starfield_background.cpp
trunk/pingus/src/worldobjs/surface_background.cpp
trunk/pingus/src/worldobjs/switch_door.cpp
Log:
More -Weffc++ cleanup
Modified: trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp 2009-11-04
14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp 2009-11-04
18:34:19 UTC (rev 4022)
@@ -17,7 +17,8 @@
#include <stdexcept>
#include "display/sdl_framebuffer_surface_impl.hpp"
-SDLFramebufferSurfaceImpl::SDLFramebufferSurfaceImpl(SDL_Surface* src)
+SDLFramebufferSurfaceImpl::SDLFramebufferSurfaceImpl(SDL_Surface* src) :
+ surface()
{
if (src->format->Amask != 0 || (src->flags & SDL_SRCCOLORKEY))
surface = SDL_DisplayFormatAlpha(src);
Modified: trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp 2009-11-04
14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp 2009-11-04
18:34:19 UTC (rev 4022)
@@ -36,6 +36,10 @@
SDL_Surface* get_surface() const { return surface; }
Surface to_surface() const;
+
+private:
+ SDLFramebufferSurfaceImpl(const SDLFramebufferSurfaceImpl&);
+ SDLFramebufferSurfaceImpl & operator=(const SDLFramebufferSurfaceImpl&);
};
#endif
Modified: trunk/pingus/src/editor/checkbox.cpp
===================================================================
--- trunk/pingus/src/editor/checkbox.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/editor/checkbox.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -23,7 +23,8 @@
Checkbox::Checkbox(const Rect& rect_, const std::string& label_)
: RectComponent(rect_),
checked(false),
- label(label_)
+ label(label_),
+ on_change()
{
}
Modified: trunk/pingus/src/editor/minimap.hpp
===================================================================
--- trunk/pingus/src/editor/minimap.hpp 2009-11-04 14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/editor/minimap.hpp 2009-11-04 18:34:19 UTC (rev 4022)
@@ -43,6 +43,10 @@
void on_pointer_move(int x, int y);
void update_layout();
+
+private:
+ Minimap(const Minimap&);
+ Minimap & operator=(const Minimap&);
};
} // namespace Editor
Modified: trunk/pingus/src/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/input/core_driver.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/input/core_driver.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -81,6 +81,10 @@
notify_parent();
}
}
+
+private:
+ AxisPointer(const AxisPointer&);
+ AxisPointer & operator=(const AxisPointer&);
};
class AxisScroller : public Scroller
@@ -134,6 +138,10 @@
notify_parent();
}
+
+private:
+ AxisScroller(const AxisScroller&);
+ AxisScroller & operator=(const AxisScroller&);
};
class ButtonScroller : public Scroller
@@ -196,6 +204,10 @@
notify_parent();
}
+
+private:
+ ButtonScroller(const ButtonScroller&);
+ ButtonScroller & operator=(const ButtonScroller&);
};
Button*
Modified: trunk/pingus/src/input/core_driver.hpp
===================================================================
--- trunk/pingus/src/input/core_driver.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/input/core_driver.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -41,6 +41,10 @@
Scroller* create_scroller(const FileReader& reader, Control* parent);
Pointer* create_pointer (const FileReader& reader, Control* parent);
Keyboard* create_keyboard(const FileReader& reader, Control* parent);
+
+private:
+ CoreDriver(const CoreDriver&);
+ CoreDriver & operator=(const CoreDriver&);
};
} // namespace Input
Modified: trunk/pingus/src/input/sdl_driver.hpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/input/sdl_driver.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -27,9 +27,7 @@
class FileReader;
namespace Input {
-
-/** */
class SDLDriver : public Driver
{
private:
@@ -95,6 +93,10 @@
void update(float delta);
std::string get_name() const { return "sdl"; }
+
+private:
+ SDLDriver(const SDLDriver&);
+ SDLDriver & operator=(const SDLDriver&);
};
} // namespace Input
Modified: trunk/pingus/src/pingus/level_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/level_menu.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/level_menu.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -241,6 +241,8 @@
LevelSelector(LevelMenu* level_menu_, const Rect& rect_)
: RectComponent(rect_),
level_menu(level_menu_),
+ marker(),
+ marker_locked(),
levelset(0),
current_level(-1),
page(0)
@@ -359,7 +361,13 @@
x_pos((Display::get_width() - default_screen_width)/2),
y_pos((Display::get_height() - default_screen_height)/2),
background("core/menu/wood"),
- blackboard("core/menu/blackboard")
+ blackboard("core/menu/blackboard"),
+ ok_button(),
+ level_selector(),
+ levelset_selector(),
+ abort_button(),
+ next_button(),
+ prev_button()
{
ok_button = Sprite("core/start/ok");
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-04 14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-04 18:34:19 UTC (rev 4022)
@@ -59,6 +59,10 @@
// Init a pingu at the given position while falling
Pingu::Pingu (int arg_id, const Vector3f& arg_pos, int owner) :
+ action(),
+ countdown_action(),
+ wall_action(),
+ fall_action(),
previous_action(FALLER),
id(arg_id),
action_time(-1),
@@ -66,7 +70,8 @@
status(PS_ALIVE),
pos_x(arg_pos.x),
pos_y(arg_pos.y),
- velocity(0, 0, 0)
+ velocity(0, 0, 0),
+ direction()
{
direction.left ();
Modified: trunk/pingus/src/pingus/pingu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu.hpp 2009-11-04 14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/pingus/pingu.hpp 2009-11-04 18:34:19 UTC (rev 4022)
@@ -65,6 +65,7 @@
Vector3f velocity;
+private:
bool request_set_action(boost::shared_ptr<PinguAction>);
void set_action(boost::shared_ptr<PinguAction>);
Modified: trunk/pingus/src/pingus/pingus_level_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -26,16 +26,22 @@
class PingusLevelImpl
{
public:
-
// Set defaults in constructor
PingusLevelImpl() :
+ resname(),
+ levelname(),
+ description(),
ambient_light(255, 255, 255, 255),
- number_of_pingus(0), number_to_save(0),
- time(0), difficulty(0),
- music("none")
- {
- // Do nothing
- }
+ size(),
+ number_of_pingus(0),
+ number_to_save(0),
+ actions(),
+ time(0),
+ difficulty(0),
+ author(),
+ music("none"),
+ objects()
+ {}
std::string resname;
Modified: trunk/pingus/src/pingus/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/pingus_main.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -132,7 +132,8 @@
throw "crash";
}
-PingusMain::PingusMain()
+PingusMain::PingusMain() :
+ cmd_options()
{
}
Modified: trunk/pingus/src/pingus/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_menu.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/pingus_menu.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -37,7 +37,17 @@
#include "pingus/layer_manager.hpp"
#include "pingus/pingus_menu.hpp"
-PingusMenu::PingusMenu()
+PingusMenu::PingusMenu() :
+ is_init(),
+ hint(),
+ help(),
+ text_scroll_offset(),
+ background(),
+ logo(),
+ start_button(),
+ quit_button(),
+ editor_button(),
+ contrib_button()
{
is_init = false;
Modified: trunk/pingus/src/pingus/pingus_options.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_options.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/pingus_options.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -91,6 +91,33 @@
Value<int> speed;
Value<float> desiredfps;
Value<int> tile_size;
+
+ PingusOptions() :
+ rest(),
+ list_languages(),
+ editor(),
+ credits(),
+ font(),
+ save(),
+ fullscreen(),
+ resize(),
+ swcursor(),
+ geometry(),
+ disable_sound(),
+ disable_music(),
+ language(),
+ datadir(),
+ userdir(),
+ auto_scrolling(),
+ no_config_file(),
+ config_file(),
+ controller(),
+ maintainer_mode(),
+ debug(),
+ speed(),
+ desiredfps(),
+ tile_size()
+ {}
};
#endif
Modified: trunk/pingus/src/pingus/resource_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/pingus/resource_manager.cpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -24,7 +24,9 @@
#include "util/sexpr_file_reader.hpp"
#include "pingus/resource_manager.hpp"
-ResourceManager::ResourceManager()
+ResourceManager::ResourceManager() :
+ resources(),
+ aliases()
{
}
Modified: trunk/pingus/src/pingus/result_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/result_screen.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/result_screen.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -115,6 +115,7 @@
{
private:
ResultScreen* parent;
+
public:
ResultScreenRetryButton(ResultScreen* p, int x, int y)
: GUI::SurfaceButton(x, y,
@@ -155,7 +156,8 @@
ResultScreenComponent::ResultScreenComponent(Result arg_result) :
result(arg_result),
background("core/menu/wood"),
- blackboard("core/menu/blackboard")
+ blackboard("core/menu/blackboard"),
+ time_str()
{
if (result.max_time == -1)
time_str = "-";
@@ -245,8 +247,11 @@
gc.print_right(Fonts::chalk_normal, Vector2i(right_x, y), time_str);
}
-ResultScreen::ResultScreen(Result arg_result)
- : result(arg_result)
+ResultScreen::ResultScreen(Result arg_result) :
+ result(arg_result),
+ ok_button(),
+ abort_button(),
+ retry_button()
{
ResultScreenComponent* comp = new ResultScreenComponent(result);
gui_manager->add(comp);
Modified: trunk/pingus/src/pingus/result_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/result_screen.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/result_screen.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -30,8 +30,8 @@
private:
Result result;
GUI::SurfaceButton* ok_button;
- GUI::SurfaceButton* abort_button;
- GUI::SurfaceButton* retry_button;
+ GUI::SurfaceButton* abort_button;
+ GUI::SurfaceButton* retry_button;
public:
ResultScreen(Result result);
Modified: trunk/pingus/src/pingus/savegame.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/savegame.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -59,7 +59,11 @@
{
}
-Savegame::Savegame(FileReader reader)
+Savegame::Savegame(FileReader reader) :
+ filename(),
+ status(),
+ needed_time(),
+ saved_pingus()
{
read_sexpr(reader);
}
Modified: trunk/pingus/src/pingus/savegame_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -43,7 +43,8 @@
}
SavegameManager::SavegameManager(const std::string& arg_filename)
- : filename(System::get_userdir() + arg_filename)
+ : filename(System::get_userdir() + arg_filename),
+ savegames()
{
boost::shared_ptr<lisp::Lisp> sexpr;
Modified: trunk/pingus/src/pingus/server.cpp
===================================================================
--- trunk/pingus/src/pingus/server.cpp 2009-11-04 14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/pingus/server.cpp 2009-11-04 18:34:19 UTC (rev 4022)
@@ -69,12 +69,12 @@
}
}
-Server::Server(const PingusLevel& arg_plf,
- bool record_demo)
- : plf(arg_plf),
- world(new World (plf)),
- action_holder (plf),
- goal_manager(new GoalManager(this))
+Server::Server(const PingusLevel& arg_plf, bool record_demo) :
+ plf(arg_plf),
+ world(new World (plf)),
+ action_holder (plf),
+ goal_manager(new GoalManager(this)),
+ demostream()
{
if (record_demo)
{
Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/server_event.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -26,15 +26,21 @@
#include "pingus/pingu.hpp"
#include "util/string_util.hpp"
-ServerEvent::ServerEvent()
- : type(PINGU_ACTION_EVENT),
- time_stamp(0),
- pingu_id(0),
- pingu_action(Actions::WALKER)
+ServerEvent::ServerEvent() :
+ type(PINGU_ACTION_EVENT),
+ time_stamp(0),
+ pingu_id(0),
+ pos(),
+ pingu_action(Actions::WALKER)
{
}
-ServerEvent::ServerEvent(FileReader reader)
+ServerEvent::ServerEvent(FileReader reader) :
+ type(PINGU_ACTION_EVENT),
+ time_stamp(0),
+ pingu_id(0),
+ pos(),
+ pingu_action(Actions::WALKER)
{
if (reader.get_name() == "armageddon")
{
Modified: trunk/pingus/src/pingus/smallmap_image.cpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -23,6 +23,7 @@
SmallMapImage::SmallMapImage(Server* s, int width, int height)
: server(s),
canvas(width, height),
+ sur(),
update_count(0),
colmap_serial(0)
{
Modified: trunk/pingus/src/pingus/sprite.cpp
===================================================================
--- trunk/pingus/src/pingus/sprite.cpp 2009-11-04 14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/pingus/sprite.cpp 2009-11-04 18:34:19 UTC (rev 4022)
@@ -30,11 +30,13 @@
#include "pingus/sprite_impl.hpp"
#include "pingus/sprite_description.hpp"
-Sprite::Sprite()
+Sprite::Sprite() :
+ impl()
{
}
-Sprite::Sprite(const std::string& name)
+Sprite::Sprite(const std::string& name) :
+ impl()
{
SpriteDescription* desc = Resource::load_sprite_desc(name);
if (desc)
@@ -49,7 +51,8 @@
}
}
-Sprite::Sprite(const ResDescriptor& res_desc)
+Sprite::Sprite(const ResDescriptor& res_desc) :
+ impl()
{
SpriteDescription* desc = Resource::load_sprite_desc(res_desc.res_name);
if (desc)
@@ -64,7 +67,8 @@
}
}
-Sprite::Sprite(const Pathname& name)
+Sprite::Sprite(const Pathname& name) :
+ impl()
{
SpriteDescription desc;
desc.filename = name;
Modified: trunk/pingus/src/pingus/sprite_impl.cpp
===================================================================
--- trunk/pingus/src/pingus/sprite_impl.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/sprite_impl.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -67,15 +67,35 @@
}
}
-SpriteImpl::SpriteImpl()
+SpriteImpl::SpriteImpl() :
+ filename(),
+ framebuffer_surface(),
+ offset(),
+ frame_pos(),
+ frame_size(),
+ frame_delay(),
+ array(),
+ loop(),
+ loop_last_cycle(),
+ finished(),
+ frame(),
+ tick_count()
{
}
-SpriteImpl::SpriteImpl(const SpriteDescription& desc,
ResourceModifierNS::ResourceModifier mod)
- : filename(desc.filename),
- finished(false),
- frame(0),
- tick_count(0)
+SpriteImpl::SpriteImpl(const SpriteDescription& desc,
ResourceModifierNS::ResourceModifier mod) :
+ filename(desc.filename),
+ framebuffer_surface(),
+ offset(),
+ frame_pos(),
+ frame_size(),
+ frame_delay(),
+ array(),
+ loop(),
+ loop_last_cycle(),
+ finished(false),
+ frame(0),
+ tick_count(0)
{
framebuffer_surface = load_framebuffer_surface(filename, mod);
@@ -95,18 +115,19 @@
}
-SpriteImpl::SpriteImpl(const Surface& surface)
- : framebuffer_surface(Display::get_framebuffer().create_surface(surface)),
- offset(0,0),
- frame_pos(0,0),
- frame_size(surface.get_width(), surface.get_height()),
- frame_delay(0),
- array(1,1),
- loop(true),
- loop_last_cycle(false),
- finished(false),
- frame(0),
- tick_count(0)
+SpriteImpl::SpriteImpl(const Surface& surface) :
+ filename(),
+ framebuffer_surface(Display::get_framebuffer().create_surface(surface)),
+ offset(0,0),
+ frame_pos(0,0),
+ frame_size(surface.get_width(), surface.get_height()),
+ frame_delay(0),
+ array(1,1),
+ loop(true),
+ loop_last_cycle(false),
+ finished(false),
+ frame(0),
+ tick_count(0)
{
}
Modified: trunk/pingus/src/pingus/start_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/start_screen.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/start_screen.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -132,10 +132,12 @@
StartScreenAbortButton & operator=(const StartScreenAbortButton&);
};
-StartScreenComponent::StartScreenComponent(const PingusLevel& p)
- : plf(p),
- background("core/menu/wood"),
- blackboard("core/menu/blackboard")
+StartScreenComponent::StartScreenComponent(const PingusLevel& p) :
+ plf(p),
+ background("core/menu/wood"),
+ blackboard("core/menu/blackboard"),
+ time_str(),
+ description()
{
time_str = GameTime::ticks_to_realtime_string(plf.get_time());
}
@@ -204,8 +206,10 @@
return description;
}
-StartScreen::StartScreen(const PingusLevel& arg_plf)
- : plf(arg_plf)
+StartScreen::StartScreen(const PingusLevel& arg_plf) :
+ plf(arg_plf),
+ abort_button(),
+ ok_button()
{
StartScreenComponent* comp = new StartScreenComponent(plf);
gui_manager->add(comp);
Modified: trunk/pingus/src/pingus/stat_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/stat_manager.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/stat_manager.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -68,7 +68,8 @@
}
StatManager::StatManager(const std::string& arg_filename)
- : statfilename(System::get_userdir() + arg_filename)
+ : statfilename(System::get_userdir() + arg_filename),
+ stats()
{
load(statfilename);
}
Modified: trunk/pingus/src/pingus/state_sprite.cpp
===================================================================
--- trunk/pingus/src/pingus/state_sprite.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/state_sprite.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -19,7 +19,8 @@
#include "pingus/state_sprite.hpp"
-StateSprite::StateSprite()
+StateSprite::StateSprite() :
+ sprites()
{
}
Modified: trunk/pingus/src/pingus/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/story_screen.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/pingus/story_screen.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -63,6 +63,10 @@
/** starts to display the next text page */
void next_text();
WorldmapNS::WorldmapStory* get_story() const { return story; }
+
+private:
+ StoryScreenComponent(const StoryScreenComponent&);
+ StoryScreenComponent & operator=(const StoryScreenComponent&);
};
class StoryScreenContinueButton : public GUI::SurfaceButton
@@ -89,12 +93,17 @@
{
story_comp->next_text();
}
+
+private:
+ StoryScreenContinueButton(const StoryScreenContinueButton&);
+ StoryScreenContinueButton & operator=(const StoryScreenContinueButton&);
};
class StoryScreenSkipButton : public GUI::SurfaceButton
{
private:
StoryScreenComponent* story_comp;
+
public:
StoryScreenSkipButton(StoryScreenComponent* arg_story_comp, int x, int y)
: GUI::SurfaceButton(x, y, "", "", ""), // FIXME: Little fugly way to do a
text button
@@ -122,6 +131,10 @@
{
story_comp->skip_story();
}
+
+private:
+ StoryScreenSkipButton(const StoryScreenSkipButton&);
+ StoryScreenSkipButton & operator=(const StoryScreenSkipButton&);
};
StoryScreen::StoryScreen(FileReader reader)
Modified: trunk/pingus/src/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/screen/screen_manager.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -140,10 +140,16 @@
ScreenManager* ScreenManager::instance_ = 0;
-ScreenManager::ScreenManager()
- : display_gc(new DrawingContext()),
- record_input(false),
- playback_input(false)
+ScreenManager::ScreenManager() :
+ input_manager(),
+ input_controller(),
+ display_gc(new DrawingContext()),
+ fps_counter(),
+ cursor(),
+ screens(),
+ mouse_pos(),
+ record_input(false),
+ playback_input(false)
{
assert(instance_ == 0);
instance_ = this;
Modified: trunk/pingus/src/worldmap/drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/drawable.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldmap/drawable.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -36,19 +36,21 @@
bool visible;
public:
- Drawable()
- :visible(true)
+ Drawable() :
+ name(),
+ visible(true)
{
}
- Drawable(std::string arg_name)
- : name(arg_name),
- visible(true)
+ Drawable(std::string arg_name) :
+ name(arg_name),
+ visible(true)
{
}
- Drawable(FileReader reader)
- : visible(true)
+ Drawable(FileReader reader) :
+ name(),
+ visible(true)
{
reader.read_string("name", name);
}
Modified: trunk/pingus/src/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -27,7 +27,10 @@
namespace WorldmapNS {
-WorldmapStory::WorldmapStory(const FileReader &reader)
+WorldmapStory::WorldmapStory(const FileReader &reader) :
+ title(),
+ music(),
+ pages()
{
reader.read_string("title", title);
title = _(title);
@@ -43,14 +46,14 @@
const std::vector<FileReader>& childs = all_pages.get_sections();
for(std::vector<FileReader>::const_iterator i = childs.begin();
i != childs.end(); ++i)
- {
- page_name = i->get_name();
- i->read_desc("surface", desc);
- i->read_string("text", text);
- // Translate the text and break it up.
- text = StringFormat::break_line(_(text), 570, Fonts::chalk_normal);
- pages.push_back(StoryPage(desc, text, page_name));
- }
+ {
+ page_name = i->get_name();
+ i->read_desc("surface", desc);
+ i->read_string("text", text);
+ // Translate the text and break it up.
+ text = StringFormat::break_line(_(text), 570, Fonts::chalk_normal);
+ pages.push_back(StoryPage(desc, text, page_name));
+ }
std::reverse(pages.begin(), pages.end());
if (pages.empty())
Modified: trunk/pingus/src/worldmap/worldmap_story.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.hpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/worldmap/worldmap_story.hpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -57,7 +57,6 @@
std::string title;
std::string music;
std::vector<StoryPage> pages;
-
};
} // namespace WorldmapNS
Modified: trunk/pingus/src/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -24,10 +24,14 @@
namespace WorldObjs {
-ConveyorBelt::ConveyorBelt(const FileReader& reader)
- : left_sur (Sprite ("worldobjs/conveyorbelt_left")),
- right_sur (Sprite ("worldobjs/conveyorbelt_right")),
- middle_sur(Sprite ("worldobjs/conveyorbelt_middle"))
+ConveyorBelt::ConveyorBelt(const FileReader& reader) :
+ left_sur (Sprite ("worldobjs/conveyorbelt_left")),
+ right_sur (Sprite ("worldobjs/conveyorbelt_right")),
+ middle_sur(Sprite ("worldobjs/conveyorbelt_middle")),
+ pos(),
+ width(),
+ speed(),
+ counter()
{
reader.read_vector("position", pos);
reader.read_int ("width", width);
@@ -40,12 +44,12 @@
gc.color().draw(left_sur, pos);
for (int i=0; i < width; ++i)
gc.color().draw(middle_sur,
- Vector3f(static_cast<float>(pos.x + left_sur.get_width() + i *
middle_sur.get_width()),
- static_cast<float>(pos.y)));
+ Vector3f(static_cast<float>(pos.x + left_sur.get_width() +
i * middle_sur.get_width()),
+ static_cast<float>(pos.y)));
gc.color().draw(right_sur,
- Vector3f(static_cast<float>(pos.x + left_sur.get_width() + width *
middle_sur.get_width()),
- static_cast<float>(pos.y)));
+ Vector3f(static_cast<float>(pos.x + left_sur.get_width() +
width * middle_sur.get_width()),
+ static_cast<float>(pos.y)));
}
void
@@ -63,23 +67,23 @@
void
ConveyorBelt::update ()
{
- left_sur.update();
- middle_sur.update();
- right_sur.update();
+ left_sur.update();
+ middle_sur.update();
+ right_sur.update();
PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin(); pingu != holder->end(); ++pingu)
+ {
+ if ( (*pingu)->get_pos().x > pos.x
+ && (*pingu)->get_pos().x < pos.x + 15 * (width + 2)
+ && (*pingu)->get_pos().y > pos.y - 2
+ && (*pingu)->get_pos().y < pos.y + 10)
{
- if ( (*pingu)->get_pos().x > pos.x
- && (*pingu)->get_pos().x < pos.x + 15 * (width + 2)
- && (*pingu)->get_pos().y > pos.y - 2
- && (*pingu)->get_pos().y < pos.y + 10)
- {
- Vector3f pos_ = (*pingu)->get_pos();
- pos_.x -= speed * 0.025f;
- (*pingu)->set_pos(pos_);
- }
+ Vector3f pos_ = (*pingu)->get_pos();
+ pos_.x -= speed * 0.025f;
+ (*pingu)->set_pos(pos_);
}
+ }
}
float
Modified: trunk/pingus/src/worldobjs/entrance.hpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/entrance.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -36,6 +36,7 @@
{
public:
enum EntranceDirection { LEFT, RIGHT, MISC };
+
protected:
EntranceDirection direction;
Vector3f pos;
Modified: trunk/pingus/src/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.cpp 2009-11-04 14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/worldobjs/exit.cpp 2009-11-04 18:34:19 UTC (rev 4022)
@@ -28,8 +28,13 @@
namespace WorldObjs {
-Exit::Exit(const FileReader& reader)
- : smallmap_symbol("core/misc/smallmap_exit")
+Exit::Exit(const FileReader& reader) :
+ desc(),
+ pos(),
+ owner_id(),
+ sprite(),
+ flag(),
+ smallmap_symbol("core/misc/smallmap_exit")
{
reader.read_vector("position", pos);
reader.read_desc ("surface", desc);
@@ -78,25 +83,25 @@
PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin(); pingu != holder->end(); ++pingu)
+ {
+ // Make sure this particular exit is allowed for this pingu
+ if ((*pingu)->get_owner() == owner_id)
{
- // Make sure this particular exit is allowed for this pingu
- if ((*pingu)->get_owner() == owner_id)
+ // Now, make sure the pingu is within range
+ if ( (*pingu)->get_pos().x > pos.x - 1 && (*pingu)->get_pos().x <
pos.x + 1
+ && (*pingu)->get_pos().y > pos.y - 5 && (*pingu)->get_pos().y <
pos.y + 2)
+ {
+ // Now, make sure the pingu isn't already exiting, gone, or dead
+ if ( (*pingu)->get_status() != PS_EXITED
+ && (*pingu)->get_status() != PS_DEAD
+ && (*pingu)->get_action() != Actions::EXITER)
{
- // Now, make sure the pingu is within range
- if ( (*pingu)->get_pos().x > pos.x - 1 && (*pingu)->get_pos().x <
pos.x + 1
- && (*pingu)->get_pos().y > pos.y - 5 && (*pingu)->get_pos().y
< pos.y + 2)
- {
- // Now, make sure the pingu isn't already exiting, gone, or dead
- if ( (*pingu)->get_status() != PS_EXITED
- && (*pingu)->get_status() != PS_DEAD
- && (*pingu)->get_action() != Actions::EXITER)
- {
- // Pingu actually exits
- (*pingu)->set_action(Actions::EXITER);
- }
- }
+ // Pingu actually exits
+ (*pingu)->set_action(Actions::EXITER);
}
+ }
}
+ }
}
float
Modified: trunk/pingus/src/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -24,10 +24,11 @@
namespace WorldObjs {
-FakeExit::FakeExit(const FileReader& reader)
- : surface("traps/fake_exit"),
- smallmap_symbol("core/misc/smallmap_exit"),
- smashing(false)
+FakeExit::FakeExit(const FileReader& reader) :
+ surface("traps/fake_exit"),
+ smallmap_symbol("core/misc/smallmap_exit"),
+ pos(),
+ smashing(false)
{
reader.read_vector("position", pos);
pos -= Vector3f((float)surface.get_width ()/2, (float)surface.get_height ());
Modified: trunk/pingus/src/worldobjs/fake_exit.hpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/fake_exit.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -37,9 +37,9 @@
Sprite surface;
Sprite smallmap_symbol;
- Vector3f pos;
+ Vector3f pos;
- bool smashing;
+ bool smashing;
public:
FakeExit(const FileReader& reader);
Modified: trunk/pingus/src/worldobjs/groundpiece.cpp
===================================================================
--- trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -23,7 +23,10 @@
namespace WorldObjs {
-Groundpiece::Groundpiece(const FileReader& reader)
+Groundpiece::Groundpiece(const FileReader& reader) :
+ pos(),
+ desc(),
+ gptype()
{
reader.read_vector("position", pos);
reader.read_desc ("surface", desc);
Modified: trunk/pingus/src/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -23,11 +23,13 @@
namespace WorldObjs {
-Guillotine::Guillotine(const FileReader& reader)
- : sprite_kill_right("traps/guillotinekill/right"),
- sprite_kill_left("traps/guillotinekill/left"),
- sprite_idle("traps/guillotineidle"),
- killing(false)
+Guillotine::Guillotine(const FileReader& reader) :
+ sprite_kill_right("traps/guillotinekill/right"),
+ sprite_kill_left("traps/guillotinekill/left"),
+ sprite_idle("traps/guillotineidle"),
+ pos(),
+ direction(),
+ killing(false)
{
reader.read_vector("position", pos);
Modified: trunk/pingus/src/worldobjs/guillotine.hpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/guillotine.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -32,11 +32,11 @@
class Guillotine : public WorldObj
{
private:
- Sprite sprite_kill_right;
- Sprite sprite_kill_left;
- Sprite sprite_idle;
- Vector3f pos;
- Direction direction;
+ Sprite sprite_kill_right;
+ Sprite sprite_kill_left;
+ Sprite sprite_idle;
+ Vector3f pos;
+ Direction direction;
bool killing;
Modified: trunk/pingus/src/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/hammer.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -23,8 +23,9 @@
namespace WorldObjs {
-Hammer::Hammer(const FileReader& reader)
- : sprite("traps/hammer")
+Hammer::Hammer(const FileReader& reader) :
+ sprite("traps/hammer"),
+ pos()
{
reader.read_vector("position", pos);
}
Modified: trunk/pingus/src/worldobjs/hammer.hpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/hammer.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -32,7 +32,7 @@
{
private:
Sprite sprite;
- Vector3f pos;
+ Vector3f pos;
public:
Hammer(const FileReader& reader);
Modified: trunk/pingus/src/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -22,7 +22,10 @@
namespace WorldObjs {
-Hotspot::Hotspot(const FileReader& reader)
+Hotspot::Hotspot(const FileReader& reader) :
+ sprite(),
+ para(),
+ pos()
{
ResDescriptor desc;
Modified: trunk/pingus/src/worldobjs/hotspot.hpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/hotspot.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -28,9 +28,9 @@
class Hotspot : public WorldObj
{
private:
- Sprite sprite;
- float para;
- Vector3f pos;
+ Sprite sprite;
+ float para;
+ Vector3f pos;
public:
Hotspot(const FileReader& reader);
Modified: trunk/pingus/src/worldobjs/laser_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -22,8 +22,10 @@
namespace WorldObjs {
-LaserExit::LaserExit(const FileReader& reader)
- : killing(false)
+LaserExit::LaserExit(const FileReader& reader) :
+ surface(),
+ pos(),
+ killing(false)
{
reader.read_vector("position", pos);
}
@@ -51,7 +53,7 @@
if (killing) {
if (surface.is_finished()) {
- surface.restart();
+ surface.restart();
killing = false;
} else {
surface.update();
@@ -63,17 +65,17 @@
LaserExit::catch_pingu (Pingu* pingu)
{
if (!killing)
+ {
+ if ( pingu->get_x () < pos.x + 34 + 10 && pingu->get_x () > pos.x + 34
+ && pingu->get_y () < pos.y + 43 + 20 && pingu->get_y () > pos.y +
43)
{
- if ( pingu->get_x () < pos.x + 34 + 10 && pingu->get_x () > pos.x + 34
- && pingu->get_y () < pos.y + 43 + 20 && pingu->get_y () > pos.y +
43)
- {
- if (pingu->get_action() != Actions::LASERKILL)
- {
- killing = true;
- pingu->set_action(Actions::LASERKILL);
- }
- }
+ if (pingu->get_action() != Actions::LASERKILL)
+ {
+ killing = true;
+ pingu->set_action(Actions::LASERKILL);
+ }
}
+ }
}
} // namespace WorldObjs
Modified: trunk/pingus/src/worldobjs/rain_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -25,7 +25,8 @@
RainGenerator::RainGenerator (const FileReader& reader) :
do_thunder(false),
- thunder_count (0)
+ thunder_count (0),
+ waiter_count()
{
}
Modified: trunk/pingus/src/worldobjs/rain_generator.hpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.hpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/worldobjs/rain_generator.hpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -27,6 +27,7 @@
bool do_thunder;
float thunder_count;
float waiter_count;
+
public:
RainGenerator(const FileReader& reader);
~RainGenerator();
Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/smasher.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -29,11 +29,12 @@
namespace WorldObjs {
-Smasher::Smasher(const FileReader& reader)
- : surface("traps/smasher"),
- smashing(false),
- downwards(false),
- count(0)
+Smasher::Smasher(const FileReader& reader) :
+ surface("traps/smasher"),
+ pos(),
+ smashing(false),
+ downwards(false),
+ count(0)
{
reader.read_vector("position", pos);
}
Modified: trunk/pingus/src/worldobjs/solid_color_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-04
14:44:14 UTC (rev 4021)
+++ trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-04
18:34:19 UTC (rev 4022)
@@ -20,7 +20,8 @@
namespace WorldObjs {
-SolidColorBackground::SolidColorBackground(const FileReader& reader)
+SolidColorBackground::SolidColorBackground(const FileReader& reader) :
+ color()
{
reader.read_color("color", color);
}
Modified: trunk/pingus/src/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/spike.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -23,9 +23,10 @@
namespace WorldObjs {
-Spike::Spike (const FileReader& reader)
- : surface("traps/spike"),
- killing(false)
+Spike::Spike (const FileReader& reader) :
+ surface("traps/spike"),
+ pos(),
+ killing(false)
{
reader.read_vector("position", pos);
}
Modified: trunk/pingus/src/worldobjs/spike.hpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.hpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/spike.hpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -32,8 +32,8 @@
{
private:
Sprite surface;
- Vector3f pos;
- bool killing;
+ Vector3f pos;
+ bool killing;
public:
Spike(const FileReader& reader);
Modified: trunk/pingus/src/worldobjs/starfield_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/worldobjs/starfield_background.cpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -20,12 +20,12 @@
namespace WorldObjs {
-StarfieldBackground::StarfieldBackground(const FileReader& reader)
+StarfieldBackground::StarfieldBackground(const FileReader& reader) :
+ small_stars_count(100),
+ middle_stars_count(50),
+ large_stars_count(25),
+ stars()
{
- small_stars_count = 100;
- middle_stars_count = 50;
- large_stars_count = 25;
-
reader.read_int("small-stars", small_stars_count);
reader.read_int("middle-stars", middle_stars_count);
reader.read_int("large-stars", large_stars_count);
Modified: trunk/pingus/src/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-04 14:44:14 UTC
(rev 4021)
+++ trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-04 18:34:19 UTC
(rev 4022)
@@ -26,17 +26,19 @@
namespace WorldObjs {
-SurfaceBackground::SurfaceBackground(const FileReader& reader)
- : para_x(0.5),
- para_y(0.5),
- scroll_x(0.0),
- scroll_y(0.0),
- color(0,0,0,0),
- stretch_x(false),
- stretch_y(false),
- keep_aspect(false),
- scroll_ox(0),
- scroll_oy(0)
+SurfaceBackground::SurfaceBackground(const FileReader& reader) :
+ para_x(0.5),
+ para_y(0.5),
+ pos(),
+ scroll_x(0.0),
+ scroll_y(0.0),
+ color(0,0,0,0),
+ stretch_x(false),
+ stretch_y(false),
+ keep_aspect(false),
+ bg_sprite(),
+ scroll_ox(0),
+ scroll_oy(0)
{
if (!reader.read_vector("position", pos))
pos = Vector3f(0.f, 0.f, -150.f);
@@ -63,33 +65,33 @@
// Scaling Code
if (stretch_x && stretch_y)
+ {
+ surface = surface.scale(world->get_width(), world->get_height());
+ }
+ else if (stretch_x && !stretch_y)
+ {
+ if (keep_aspect)
{
- surface = surface.scale(world->get_width(), world->get_height());
+ float aspect = surface.get_height()/float(surface.get_width());
+ surface = surface.scale(world->get_width(),
int(world->get_width()*aspect));
}
- else if (stretch_x && !stretch_y)
+ else
{
- if (keep_aspect)
- {
- float aspect = surface.get_height()/float(surface.get_width());
- surface = surface.scale(world->get_width(),
int(world->get_width()*aspect));
- }
- else
- {
- surface = surface.scale(world->get_width(), surface.get_height());
- }
+ surface = surface.scale(world->get_width(), surface.get_height());
}
+ }
else if (!stretch_x && stretch_y)
+ {
+ if (keep_aspect)
{
- if (keep_aspect)
- {
- float aspect = float(surface.get_width())/surface.get_height();
- surface = surface.scale(int(world->get_height() * aspect),
world->get_height());
- }
- else
- {
- surface = surface.scale(surface.get_width(), world->get_height());
- }
+ float aspect = float(surface.get_width())/surface.get_height();
+ surface = surface.scale(int(world->get_height() * aspect),
world->get_height());
}
+ else
+ {
+ surface = surface.scale(surface.get_width(), world->get_height());
+ }
+ }
bg_sprite = Sprite(surface);
}
@@ -107,24 +109,24 @@
return;
if (scroll_x)
- {
- scroll_ox += scroll_x;
+ {
+ scroll_ox += scroll_x;
- if (scroll_ox > bg_sprite.get_width())
- scroll_ox -= bg_sprite.get_width();
- else if (-scroll_ox > bg_sprite.get_width())
- scroll_ox += bg_sprite.get_width();
- }
+ if (scroll_ox > bg_sprite.get_width())
+ scroll_ox -= bg_sprite.get_width();
+ else if (-scroll_ox > bg_sprite.get_width())
+ scroll_ox += bg_sprite.get_width();
+ }
if (scroll_y)
- {
- scroll_oy += scroll_y;
+ {
+ scroll_oy += scroll_y;
- if (scroll_oy > bg_sprite.get_height())
- scroll_oy -= bg_sprite.get_height();
- else if (-scroll_oy > bg_sprite.get_height())
- scroll_oy += bg_sprite.get_height();
- }
+ if (scroll_oy > bg_sprite.get_height())
+ scroll_oy -= bg_sprite.get_height();
+ else if (-scroll_oy > bg_sprite.get_height())
+ scroll_oy += bg_sprite.get_height();
+ }
}
void
@@ -150,14 +152,14 @@
for(int y = start_y;
y < world->get_height();
y += bg_sprite.get_height())
+ {
+ for(int x = start_x;
+ x < world->get_width();
+ x += bg_sprite.get_width())
{
- for(int x = start_x;
- x < world->get_width();
- x += bg_sprite.get_width())
- {
- gc.color().draw(bg_sprite, Vector2i(x - offset.x, y - offset.y),
pos.z);
- }
+ gc.color().draw(bg_sprite, Vector2i(x - offset.x, y - offset.y), pos.z);
}
+ }
}
} // namespace WorldObjs
Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-04 14:44:14 UTC (rev
4021)
+++ trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-04 18:34:19 UTC (rev
4022)
@@ -33,7 +33,8 @@
door_tile ("worldobjs/switchdoor_tile"),
door_tile_cmap("worldobjs/switchdoor_tile_cmap"),
switch_sur ("worldobjs/switchdoor_switch"),
- is_opening(false)
+ is_opening(false),
+ current_door_height()
{
FileReader subreader;
reader.read_section("switch", subreader);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4022 - in trunk/pingus/src: display editor input pingus screen worldmap worldobjs,
grumbel at BerliOS <=