[Pingus-CVS] r2522 - trunk/src

[grumbel at BerliOS]

Author: grumbel
Date: 2005-12-01 22:24:04 +0100 (Thu, 01 Dec 2005)
New Revision: 2522

Removed:
   trunk/src/menu_background.cxx
   trunk/src/menu_background.hxx
Modified:
   trunk/src/SConscript
   trunk/src/pingus_menu_manager.cxx
   trunk/src/pingus_menu_manager.hxx
Log:
- removed some more useless code

Modified: trunk/src/SConscript
===================================================================
--- trunk/src/SConscript        2005-12-01 21:15:33 UTC (rev 2521)
+++ trunk/src/SConscript        2005-12-01 21:24:04 UTC (rev 2522)
@@ -164,7 +164,6 @@
 'level_interrupt.cxx', 
 'loading.cxx', 
 'main_menu.cxx', 
-'menu_background.cxx', 
 'components/menu_button.cxx', 
 'mover.cxx', 
 'movers/linear_mover.cxx', 

Deleted: trunk/src/menu_background.cxx
===================================================================
--- trunk/src/menu_background.cxx       2005-12-01 21:15:33 UTC (rev 2521)
+++ trunk/src/menu_background.cxx       2005-12-01 21:24:04 UTC (rev 2522)
@@ -1,53 +0,0 @@
-//  $Id: menu_background.cxx,v 1.12 2003/12/14 00:30:04 grumbel Exp $
-//
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "display/drawing_context.hxx"
-#include "menu_background.hxx"
-#include "resource.hxx"
-
-namespace Pingus {
-
-MenuBackground::MenuBackground ()
-{
-  layer_manager.add_layer (Resource::load_sprite("core/menu/layer1"),  0, 0, 
12, 0);
-  layer_manager.add_layer (Resource::load_sprite("core/menu/layer2"),  0, 150, 
25, 0);
-  layer_manager.add_layer (Resource::load_sprite("core/menu/layer3"), 0, 200, 
50, 0);
-  layer_manager.add_layer (Resource::load_sprite("core/menu/layer4"), 0, 600 - 
171, 100, 0);
-  layer_manager.add_layer (Resource::load_sprite("core/menu/layer5"), 0, 500, 
200, 0);
-}
-
-MenuBackground::~MenuBackground ()
-{
-}
-
-void
-MenuBackground::draw (DrawingContext& gc)
-{
-  layer_manager.draw (gc);
-}
-
-void
-MenuBackground::update (float delta)
-{
-  layer_manager.update (delta);
-}
-
-} // namespace Pingus
-
-/* EOF */

Deleted: trunk/src/menu_background.hxx
===================================================================
--- trunk/src/menu_background.hxx       2005-12-01 21:15:33 UTC (rev 2521)
+++ trunk/src/menu_background.hxx       2005-12-01 21:24:04 UTC (rev 2522)
@@ -1,49 +0,0 @@
-//  $Id: menu_background.hxx,v 1.9 2003/10/18 23:17:27 grumbel Exp $
-//
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HEADER_PINGUS_MENU_BACKGROUND_HXX
-#define HEADER_PINGUS_MENU_BACKGROUND_HXX
-
-#include "layer_manager.hxx"
-
-namespace Pingus {
-
-class DrawingContext;
-
-class MenuBackground
-{
-private:
-  LayerManager layer_manager;
-public:
-  MenuBackground ();
-  ~MenuBackground ();
-
-  void draw (DrawingContext& gc);
-  void update (float delta);
-
-private:
-  MenuBackground (const MenuBackground&);
-  MenuBackground& operator= (const MenuBackground&);
-};
-
-} // namespace Pingus
-
-#endif
-
-/* EOF */

Modified: trunk/src/pingus_menu_manager.cxx
===================================================================
--- trunk/src/pingus_menu_manager.cxx   2005-12-01 21:15:33 UTC (rev 2521)
+++ trunk/src/pingus_menu_manager.cxx   2005-12-01 21:24:04 UTC (rev 2522)
@@ -32,6 +32,12 @@
     exitmenu (this),
                filedialog (0)
 {
+  background.add_layer (Resource::load_sprite("core/menu/layer1"),  0, 0, 12, 
0);
+  background.add_layer (Resource::load_sprite("core/menu/layer2"),  0, 150, 
25, 0);
+  background.add_layer (Resource::load_sprite("core/menu/layer3"), 0, 200, 50, 
0);
+  background.add_layer (Resource::load_sprite("core/menu/layer4"), 0, 600 - 
171, 100, 0);
+  background.add_layer (Resource::load_sprite("core/menu/layer5"), 0, 500, 
200, 0);
+
   push_menu (&mainmenu);
 }
 

Modified: trunk/src/pingus_menu_manager.hxx
===================================================================
--- trunk/src/pingus_menu_manager.hxx   2005-12-01 21:15:33 UTC (rev 2521)
+++ trunk/src/pingus_menu_manager.hxx   2005-12-01 21:24:04 UTC (rev 2522)
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_PINGUS_MENU_MANAGER_HXX
 #define HEADER_PINGUS_PINGUS_MENU_MANAGER_HXX
 
-#include "menu_background.hxx"
+#include "layer_manager.hxx"
 #include "exit_menu.hxx"
 #include "pingus_menu.hxx"
 #include "file_dialog.hxx"
@@ -46,9 +46,9 @@
 public:
   /* Menu's FIXME: These shouldn't get exported to the outsite,
      instead only handles (enum's) should be visible */
-  PingusMenu mainmenu;
-  MenuBackground background;
-  ExitMenu exitmenu;
+  PingusMenu     mainmenu;
+  LayerManager background;
+  ExitMenu       exitmenu;
        FileDialog* filedialog;
 
   virtual ~PingusMenuManager();