[Pingus-CVS] CVS: Games/Pingus/src action_data.cxx,NONE,1.1 Makefile.am,1.82,1.83 action_data.hxx,1.3,1.4 pingus_main.cxx,1.4,1.5 pingus_main.hxx,1.2,1.3

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv10850

Modified Files:
        Makefile.am action_data.hxx pingus_main.cxx pingus_main.hxx 
Added Files:
        action_data.cxx 
Log Message:
- action selection dialog is no working basically
- input bug due to a collision between the edtiors input handling and the gui 
one is still there and will not be that easy to solve

--- NEW FILE: action_data.cxx ---
//  $Id: action_data.cxx,v 1.1 2002/06/29 14:01:32 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 "pingu_enums.hxx"
#include "action_data.hxx"

using namespace Pingus::Actions;

std::vector<ActionData> default_actions; 

void init_default_actions ()
{
  default_actions.push_back (ActionData (Basher, 20));
  default_actions.push_back (ActionData (Blocker, 20));
  default_actions.push_back (ActionData (Boarder, 20));
  default_actions.push_back (ActionData (Bomber, 20));
  default_actions.push_back (ActionData (Bridger, 20));
  default_actions.push_back (ActionData (Climber, 20));
  default_actions.push_back (ActionData (Digger, 20));
  default_actions.push_back (ActionData (Floater, 20));
  default_actions.push_back (ActionData (Jumper, 20));
  default_actions.push_back (ActionData (Miner, 20));
  default_actions.push_back (ActionData (Rocketlauncher, 20));
  default_actions.push_back (ActionData (Slider, 20));
  default_actions.push_back (ActionData (Superman, 0));
  default_actions.push_back (ActionData (Walker, 20));
}

/* EOF */

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- Makefile.am 28 Jun 2002 15:10:48 -0000      1.82
+++ Makefile.am 29 Jun 2002 14:01:32 -0000      1.83
@@ -68,6 +68,7 @@
 action_button.cxx \
 action_button.hxx \
 action_data.hxx \
+action_data.cxx \
 action_holder.cxx \
 action_holder.hxx \
 algo.cxx \

Index: action_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- action_data.hxx     28 Jun 2002 15:12:22 -0000      1.3
+++ action_data.hxx     29 Jun 2002 14:01:32 -0000      1.4
@@ -20,28 +20,22 @@
 #ifndef HEADER_PINGUS_ACTION_DATA_HXX
 #define HEADER_PINGUS_ACTION_DATA_HXX
 
-#include <string>
+#include <vector>
 #include "pingu_enums.hxx"
 
-using Pingus::Actions::ActionName;
-
-///
 class ActionData
 {
 public:
-  ///
   ActionData() {}
+  ActionData(Pingus::Actions::ActionName name_, int i) : name(name_), 
number_of(i)
+  {}
 
-  ///
-  ActionData(ActionName name_, int i) : name(name_), number_of(i)
-  {
-  }
-
-  ///
-  ActionName   name;
-  ///
+  Pingus::Actions::ActionName   name;
   int number_of;
 };
+
+extern std::vector<ActionData> default_actions; 
+void init_default_actions ();
 
 #endif
 

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pingus_main.cxx     24 Jun 2002 12:09:22 -0000      1.4
+++ pingus_main.cxx     29 Jun 2002 14:01:32 -0000      1.5
@@ -73,6 +73,7 @@
 #include "boost/smart_ptr.hpp"
 #include "pingus_menu_manager.hxx"
 #include "sound_dummy.hxx"
+#include "action_data.hxx"
 
 #include "sound_real.hxx"
 
@@ -724,6 +725,8 @@
   PingusMain::quick_check_args(argc, argv);
   PingusMain::read_rc_file();
   PingusMain::check_args(argc, argv);
+
+  init_default_actions ();
 
   // Translate the geometry std::string to some int's
   if (!resolution.empty())

Index: pingus_main.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingus_main.hxx     24 Jun 2002 22:52:55 -0000      1.2
+++ pingus_main.hxx     29 Jun 2002 14:01:32 -0000      1.3
@@ -42,30 +42,20 @@
   CL_Slot on_button_release_slot;
 
 public:
-  ///
   PingusMain();
-  ///
   virtual ~PingusMain();
 
-  ///
   virtual int main(int argc, char** argv);
-  ///
   virtual char* get_title();
 
   void start_game(void);
 
-  ///
   void check_args(int argc, char** argv);
-  ///
   void quick_check_args(int argc, char** argv);
-  ///
   void read_rc_file(void);
 
-  ///
   void get_filenames(void);
-  ///
   void init(int argc, char** argv);
-  ///
   void init_clanlib(void);
   /// void intro(void);
   void init_pingus(void);