[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] [pingus] 2 new revisions pushed by address@hidden on 2011-1
|
From: |
pingus |
|
Subject: |
[Pingus-CVS] [pingus] 2 new revisions pushed by address@hidden on 2011-10-11 14:01 GMT |
|
Date: |
Tue, 11 Oct 2011 14:01:44 +0000 |
2 new revisions:
Revision: f37c29c3c00f
Author: Ingo Ruhnke <address@hidden>
Date: Tue Oct 11 06:49:37 2011
Log: Minor cleanup
http://code.google.com/p/pingus/source/detail?r=f37c29c3c00f
Revision: 2decd076c93b
Author: Ingo Ruhnke <address@hidden>
Date: Tue Oct 11 07:00:51 2011
Log: Use std::make_shared<> instead of new, use shared_ptr<> in
ScreenManag...
http://code.google.com/p/pingus/source/detail?r=2decd076c93b
==============================================================================
Revision: f37c29c3c00f
Author: Ingo Ruhnke <address@hidden>
Date: Tue Oct 11 06:49:37 2011
Log: Minor cleanup
http://code.google.com/p/pingus/source/detail?r=f37c29c3c00f
Modified:
/src/engine/screen/screen_manager.cpp
/src/pingus/resource.cpp
/src/pingus/resource.hpp
=======================================
--- /src/engine/screen/screen_manager.cpp Sat Oct 1 05:55:58 2011
+++ /src/engine/screen/screen_manager.cpp Tue Oct 11 06:49:37 2011
@@ -309,11 +309,12 @@
}
void
-ScreenManager::push_screen (Screen* screen)
+ScreenManager::push_screen(Screen* screen)
{
screens.push_back(ScreenPtr(screen));
screen->on_startup();
}
+
void
ScreenManager::pop_screen()
{
@@ -334,7 +335,7 @@
}
void
-ScreenManager::replace_screen (Screen* screen)
+ScreenManager::replace_screen(Screen* screen)
{
screens.back() = ScreenPtr(screen);
=======================================
--- /src/pingus/resource.cpp Sun Sep 18 15:46:58 2011
+++ /src/pingus/resource.cpp Tue Oct 11 06:49:37 2011
@@ -26,7 +26,7 @@
ResourceManager Resource::resmgr;
void
-Resource::init(bool load_obsolete)
+Resource::init()
{
resmgr.add_resources_from_directory(Pathname("images",
Pathname::DATA_PATH));
}
=======================================
--- /src/pingus/resource.hpp Sat Sep 3 07:49:44 2011
+++ /src/pingus/resource.hpp Tue Oct 11 06:49:37 2011
@@ -29,7 +29,7 @@
static ResourceManager resmgr;
public:
- static void init(bool load_obsolete = false);
+ static void init();
static void deinit();
/** Loads a 48x48 size thumbnail of a sprite */
==============================================================================
Revision: 2decd076c93b
Author: Ingo Ruhnke <address@hidden>
Date: Tue Oct 11 07:00:51 2011
Log: Use std::make_shared<> instead of new, use shared_ptr<> in
ScreenManager
http://code.google.com/p/pingus/source/detail?r=2decd076c93b
Modified:
/src/editor/editor_screen.cpp
/src/engine/screen/screen_manager.cpp
/src/engine/screen/screen_manager.hpp
/src/pingus/global_event.cpp
/src/pingus/pingus_main.cpp
/src/pingus/screens/demo_session.cpp
/src/pingus/screens/game_session.cpp
/src/pingus/screens/level_menu.cpp
/src/pingus/screens/pingus_menu.cpp
/src/pingus/screens/result_screen.cpp
/src/pingus/screens/start_screen.cpp
/src/pingus/screens/story_screen.cpp
/src/pingus/worldmap/level_dot.cpp
/src/pingus/worldmap/story_dot.cpp
/src/pingus/worldmap/worldmap_screen.cpp
=======================================
--- /src/editor/editor_screen.cpp Sat Sep 24 16:38:50 2011
+++ /src/editor/editor_screen.cpp Tue Oct 11 07:00:51 2011
@@ -373,7 +373,7 @@
Pathname tmp(System::get_userdir() + "backup/editortmpfile.pingus",
Pathname::SYSTEM_PATH);
plf->save_level(tmp.get_sys_path());
PingusLevel level(tmp);
- ScreenManager::instance()->push_screen(new GameSession(level, false));
+
ScreenManager::instance()->push_screen(std::make_shared<GameSession>(level,
false));
}
void
=======================================
--- /src/engine/screen/screen_manager.cpp Tue Oct 11 06:49:37 2011
+++ /src/engine/screen/screen_manager.cpp Tue Oct 11 07:00:51 2011
@@ -309,9 +309,9 @@
}
void
-ScreenManager::push_screen(Screen* screen)
-{
- screens.push_back(ScreenPtr(screen));
+ScreenManager::push_screen(ScreenPtr screen)
+{
+ screens.push_back(screen);
screen->on_startup();
}
@@ -335,15 +335,16 @@
}
void
-ScreenManager::replace_screen(Screen* screen)
-{
- screens.back() = ScreenPtr(screen);
+ScreenManager::replace_screen(ScreenPtr screen)
+{
+ screens.back() = screen;
if (screens.back()->get_size() != Display::get_size())
+ {
screens.back()->resize(Display::get_size());
+ }
screens.back()->on_startup();
-
}
void
=======================================
--- /src/engine/screen/screen_manager.hpp Sat Oct 1 05:55:58 2011
+++ /src/engine/screen/screen_manager.hpp Tue Oct 11 07:00:51 2011
@@ -75,10 +75,10 @@
void update(float delta, const std::vector<Input::Event>& events);
/** Replace the current screen */
- void replace_screen(Screen*);
+ void replace_screen(ScreenPtr screen);
/** Add a screen on top of another screen */
- void push_screen(Screen*);
+ void push_screen(ScreenPtr screen);
/** Remove the current screen and fall back to the last one */
void pop_screen();
=======================================
--- /src/pingus/global_event.cpp Sun Oct 9 07:34:37 2011
+++ /src/pingus/global_event.cpp Tue Oct 11 07:00:51 2011
@@ -66,14 +66,14 @@
case SDLK_F5:
if
(!dynamic_cast<OptionMenu*>(ScreenManager::instance()->get_current_screen().get()))
- ScreenManager::instance()->push_screen(new OptionMenu());
+
ScreenManager::instance()->push_screen(std::make_shared<OptionMenu>());
break;
case SDLK_o:
if (keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL])
{
if
(!dynamic_cast<OptionMenu*>(ScreenManager::instance()->get_current_screen().get()))
- ScreenManager::instance()->push_screen(new OptionMenu());
+
ScreenManager::instance()->push_screen(std::make_shared<OptionMenu>());
}
break;
@@ -81,7 +81,7 @@
if (globals::developer_mode)
{
if
(!dynamic_cast<AddOnMenu*>(ScreenManager::instance()->get_current_screen().get()))
- ScreenManager::instance()->push_screen(new AddOnMenu());
+
ScreenManager::instance()->push_screen(std::make_shared<AddOnMenu>());
}
break;
=======================================
--- /src/pingus/pingus_main.cpp Tue Oct 4 06:03:00 2011
+++ /src/pingus/pingus_main.cpp Tue Oct 11 07:00:51 2011
@@ -525,7 +525,7 @@
if (cmd_options.editor.is_set() && cmd_options.editor.get())
{ // Editor
- Editor::EditorScreen* editor = new Editor::EditorScreen();
+ std::shared_ptr<Editor::EditorScreen> editor =
std::make_shared<Editor::EditorScreen>();
// optionally load a map in the editor if it was given
if (cmd_options.rest.is_set())
editor->load(Pathname(cmd_options.rest.get(),
Pathname::SYSTEM_PATH));
@@ -537,42 +537,42 @@
if (StringUtil::has_suffix(cmd_options.rest.get(), ".pingus-demo"))
{ // Demo file
screen_manager.push_screen
- (new DemoSession(Pathname(cmd_options.rest.get(),
Pathname::SYSTEM_PATH)));
+ (std::make_shared<DemoSession>(Pathname(cmd_options.rest.get(),
Pathname::SYSTEM_PATH)));
}
else if (StringUtil::has_suffix(cmd_options.rest.get(), ".font"))
{
Pathname filename(cmd_options.rest.get(), Pathname::SYSTEM_PATH);
- screen_manager.push_screen(new FontTestScreen(filename));
+
screen_manager.push_screen(std::make_shared<FontTestScreen>(filename));
}
else if (StringUtil::has_suffix(cmd_options.rest.get(), ".credits"))
{
Pathname filename(cmd_options.rest.get(), Pathname::SYSTEM_PATH);
- screen_manager.push_screen(new Credits(filename));
+ screen_manager.push_screen(std::make_shared<Credits>(filename));
}
else if (StringUtil::has_suffix(cmd_options.rest.get(), ".worldmap"))
{
Pathname filename(cmd_options.rest.get(), Pathname::SYSTEM_PATH);
- std::unique_ptr<WorldmapNS::WorldmapScreen> worldmap_screen(new
WorldmapNS::WorldmapScreen());
+ std::shared_ptr<WorldmapNS::WorldmapScreen> worldmap_screen =
std::make_shared<WorldmapNS::WorldmapScreen>();
worldmap_screen->load(filename);
- ScreenManager::instance()->push_screen(worldmap_screen.release());
+ ScreenManager::instance()->push_screen(worldmap_screen);
}
else if (StringUtil::has_suffix(cmd_options.rest.get(), ".story"))
{
- screen_manager.push_screen(new
StoryScreen(FileReader::parse(Pathname(cmd_options.rest.get(),
-
Pathname::SYSTEM_PATH))));
+
screen_manager.push_screen(std::make_shared<StoryScreen>(FileReader::parse(Pathname(cmd_options.rest.get(),
+
Pathname::SYSTEM_PATH))));
}
else
{ // Level file
screen_manager.push_screen
- (new
StartScreen(PLFResMgr::load_plf_from_filename(Pathname(cmd_options.rest.get(),
-
Pathname::SYSTEM_PATH))));
+
(std::make_shared<StartScreen>(PLFResMgr::load_plf_from_filename(Pathname(cmd_options.rest.get(),
+
Pathname::SYSTEM_PATH))));
}
}
else // start a normal game
{
log_info("starting normal game");
- screen_manager.push_screen(new PingusMenu());
+ screen_manager.push_screen(std::make_shared<PingusMenu>());
log_info("done: starting normal game");
}
=======================================
--- /src/pingus/screens/demo_session.cpp Tue Sep 20 14:18:01 2011
+++ /src/pingus/screens/demo_session.cpp Tue Oct 11 07:00:51 2011
@@ -259,7 +259,7 @@
void
DemoSession::restart()
{
- ScreenManager::instance()->replace_screen(new DemoSession(pathname));
+
ScreenManager::instance()->replace_screen(std::make_shared<DemoSession>(pathname));
}
void
=======================================
--- /src/pingus/screens/game_session.cpp Wed Sep 28 09:41:01 2011
+++ /src/pingus/screens/game_session.cpp Tue Oct 11 07:00:51 2011
@@ -34,7 +34,7 @@
#include "pingus/world.hpp"
#include "util/log.hpp"
-GameSession::GameSession (const PingusLevel& arg_plf, bool
arg_show_result_screen) :
+GameSession::GameSession(const PingusLevel& arg_plf, bool
arg_show_result_screen) :
plf(arg_plf),
show_result_screen(arg_show_result_screen),
server(),
@@ -92,7 +92,7 @@
gui_manager->add(pause_button);
}
-GameSession::~GameSession ()
+GameSession::~GameSession()
{
}
@@ -124,7 +124,7 @@
}
if (show_result_screen)
- ScreenManager::instance()->replace_screen(new ResultScreen(result));
+
ScreenManager::instance()->replace_screen(std::make_shared<ResultScreen>(result));
else
ScreenManager::instance()->pop_screen();
=======================================
--- /src/pingus/screens/level_menu.cpp Fri Sep 30 06:14:48 2011
+++ /src/pingus/screens/level_menu.cpp Tue Oct 11 07:00:51 2011
@@ -412,7 +412,7 @@
{
if (levelset->get_level(current_level)->accessible)
{
- ScreenManager::instance()->push_screen(new
StartScreen(levelset->get_level(current_level)->plf));
+
ScreenManager::instance()->push_screen(std::make_shared<StartScreen>(levelset->get_level(current_level)->plf));
}
}
}
=======================================
--- /src/pingus/screens/pingus_menu.cpp Mon Oct 3 05:02:20 2011
+++ /src/pingus/screens/pingus_menu.cpp Tue Oct 11 07:00:51 2011
@@ -96,7 +96,8 @@
void
PingusMenu::show_credits()
{
- ScreenManager::instance()->push_screen(new
Credits(Pathname("credits/pingus.credits", Pathname::DATA_PATH)));
+ ScreenManager::instance()
+
->push_screen(std::make_shared<Credits>(Pathname("credits/pingus.credits",
Pathname::DATA_PATH)));
}
void
@@ -110,16 +111,16 @@
{ // Start the story or worldmap mode
Sound::PingusSound::play_sound ("letsgo");
- std::unique_ptr<WorldmapNS::WorldmapScreen> worldmap_screen(new
WorldmapNS::WorldmapScreen());
+ std::shared_ptr<WorldmapNS::WorldmapScreen> worldmap_screen =
std::make_shared<WorldmapNS::WorldmapScreen>();
worldmap_screen->load(Pathname(filename, Pathname::DATA_PATH));
- ScreenManager::instance()->push_screen(worldmap_screen.release());
+ ScreenManager::instance()->push_screen(worldmap_screen);
bool story_seen = false;
StatManager::instance()->get_bool("tutorial-startstory-seen",
story_seen); // FIXME: Hardcoding tutorial is evil
if (!story_seen)
{
FileReader reader =
FileReader::parse(Pathname("stories/tutorial_intro.story",
Pathname::DATA_PATH));
- ScreenManager::instance()->push_screen(new StoryScreen(reader));
+
ScreenManager::instance()->push_screen(std::make_shared<StoryScreen>(reader));
StatManager::instance()->set_bool("tutorial-startstory-seen", true);
}
}
@@ -128,13 +129,13 @@
{ // Launch the specified level - don't bother checking for it, it has to
exist
Sound::PingusSound::play_sound ("letsgo");
ScreenManager::instance()->push_screen
- (new StartScreen(PLFResMgr::load_plf_from_filename(Pathname(levelfile,
Pathname::SYSTEM_PATH))));
+
(std::make_shared<StartScreen>(PLFResMgr::load_plf_from_filename(Pathname(levelfile,
Pathname::SYSTEM_PATH))));
}
void PingusMenu::do_edit()
{ // Launch the level editor
Sound::PingusSound::stop_music();
- ScreenManager::instance()->push_screen (new Editor::EditorScreen());
+
ScreenManager::instance()->push_screen(std::make_shared<Editor::EditorScreen>());
}
void
@@ -194,11 +195,11 @@
}
else if (button == contrib_button)
{
- ScreenManager::instance()->push_screen(new LevelMenu);
+ ScreenManager::instance()->push_screen(std::make_shared<LevelMenu>());
}
else if (button == options_button)
{
- ScreenManager::instance()->push_screen(new OptionMenu);
+ ScreenManager::instance()->push_screen(std::make_shared<OptionMenu>());
}
}
=======================================
--- /src/pingus/screens/result_screen.cpp Mon Oct 3 15:52:59 2011
+++ /src/pingus/screens/result_screen.cpp Tue Oct 11 07:00:51 2011
@@ -287,7 +287,7 @@
void
ResultScreen::retry_level()
{
- ScreenManager::instance()->replace_screen(new GameSession (result.plf,
true));
+
ScreenManager::instance()->replace_screen(std::make_shared<GameSession>(result.plf,
true));
}
void
=======================================
--- /src/pingus/screens/start_screen.cpp Wed Sep 28 13:38:58 2011
+++ /src/pingus/screens/start_screen.cpp Tue Oct 11 07:00:51 2011
@@ -236,8 +236,7 @@
void
StartScreen::start_game()
{
- GameSession* game_session = new GameSession(plf, true);
- ScreenManager::instance()->replace_screen(game_session);
+
ScreenManager::instance()->replace_screen(std::make_shared<GameSession>(plf,
true));
}
void
=======================================
--- /src/pingus/screens/story_screen.cpp Mon Oct 3 05:23:38 2011
+++ /src/pingus/screens/story_screen.cpp Tue Oct 11 07:00:51 2011
@@ -269,7 +269,7 @@
if (m_credits)
{
ScreenManager::instance()->replace_screen
- (new Credits(Pathname("credits/pingus.credits",
Pathname::DATA_PATH)));
+ (std::make_shared<Credits>(Pathname("credits/pingus.credits",
Pathname::DATA_PATH)));
}
else
{
=======================================
--- /src/pingus/worldmap/level_dot.cpp Mon Oct 3 14:44:30 2011
+++ /src/pingus/worldmap/level_dot.cpp Tue Oct 11 07:00:51 2011
@@ -92,7 +92,7 @@
LevelDot::on_click()
{
//log_info("Starting level: " << levelname);
- ScreenManager::instance()->push_screen(new StartScreen(plf));
+
ScreenManager::instance()->push_screen(std::make_shared<StartScreen>(plf));
}
bool
=======================================
--- /src/pingus/worldmap/story_dot.cpp Mon Oct 3 05:23:38 2011
+++ /src/pingus/worldmap/story_dot.cpp Tue Oct 11 07:00:51 2011
@@ -70,7 +70,7 @@
try
{
FileReader reader = FileReader::parse(Pathname(m_story,
Pathname::DATA_PATH));
- ScreenManager::instance()->push_screen(new StoryScreen(reader,
m_credits));
+
ScreenManager::instance()->push_screen(std::make_shared<StoryScreen>(reader,
m_credits));
}
catch(const std::exception& err)
{
=======================================
--- /src/pingus/worldmap/worldmap_screen.cpp Sun Oct 2 12:41:34 2011
+++ /src/pingus/worldmap/worldmap_screen.cpp Tue Oct 11 07:00:51 2011
@@ -202,13 +202,13 @@
void
WorldmapScreen::show_intro_story()
{
- ScreenManager::instance()->push_screen(new
StoryScreen(worldmap->get_worldmap().get_intro_story()));
+
ScreenManager::instance()->push_screen(std::make_shared<StoryScreen>(worldmap->get_worldmap().get_intro_story()));
}
void
WorldmapScreen::show_end_story()
{
- ScreenManager::instance()->push_screen(new
StoryScreen(worldmap->get_worldmap().get_end_story()));
+
ScreenManager::instance()->push_screen(std::make_shared<StoryScreen>(worldmap->get_worldmap().get_end_story()));
}
void
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] [pingus] 2 new revisions pushed by address@hidden on 2011-10-11 14:01 GMT,
pingus <=