? input/input_controller.cxx
cvs server: Diffing .
Index: action_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_data.hxx,v
retrieving revision 1.4
diff -r1.4 action_data.hxx
23d22
< #include <vector>
24a24
> #include <vector>
Index: action_holder.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_holder.hxx,v
retrieving revision 1.3
diff -r1.3 action_holder.hxx
22a23
> #include "pingu_enums.hxx"
25c26
< #include "pingu_enums.hxx"
---
> 
Index: algo.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/algo.hxx,v
retrieving revision 1.2
diff -r1.2 algo.hxx
24d23
< #include <string>
32a32,33
> 
> #include <string>
Index: controller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Attic/controller.cxx,v
retrieving revision 1.2
diff -r1.2 controller.cxx
24c24
< #include "controller.hxx"
---
> #include "controller.hxx" 
Index: demo_player.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_player.cxx,v
retrieving revision 1.2
diff -r1.2 demo_player.cxx
1,80c1,87
< //  $Id: demo_player.cxx,v 1.2 2002/06/13 14:25:12 torangan 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 <iostream>
< #include "pingus_error.hxx"
< #include "demo_player.hxx"
< #include "my_gettext.hxx"
< 
< using namespace std;
< 
< DemoPlayer::DemoPlayer()
< {
< }
< 
< DemoPlayer::~DemoPlayer()
< {
< }
< 
< std::string 
< DemoPlayer::get_levelname()
< {
<   return levelname;
< }
< 
< void
< DemoPlayer::load(const std::string& arg_filename)
< {
<   const int buffer_size = 256;
<   char buffer[buffer_size];
<   std::string filename;
<   ifstream in;
<   
<   filename = arg_filename;
< 
<   in.open(filename.c_str());
< 
<   if (!in)
<     throw PingusError(_("DemoPlayer: Couldn't load ") + filename);
< 
<   in >> levelname; 
<   in.get(); // \n ueberlesen
<   std::cout << "DemoPlayer: LevelName=" << levelname << std::endl;
< 
<   while(!(in.getline(buffer, buffer_size).eof()))
<     {
<       cout << "Readline: " << buffer << endl;
<       event_queue.push(PingusEvent(buffer));
<       std::cout << "Parsed: " << event_queue.back().game_time << ":" << event_queue.back().str << std::endl;
<     }
< }
< 
< const PingusEvent& 
< DemoPlayer::peek_event()
< {
<   return event_queue.front();
< }
< 
< void
< DemoPlayer::dequeue_event()
< {
<   event_queue.pop();
< }
< 
< /* EOF */
---
> //  $Id: demo_player.cxx,v 1.2 2002/06/13 14:25:12 torangan 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 "pingus_error.hxx"
> #include "demo_player.hxx"
> #include "my_gettext.hxx"
> #include <iostream>
> 
> 
> using namespace std;
> 
> 
> 
> DemoPlayer::DemoPlayer()
> {
> }
> 
> 
> DemoPlayer::~DemoPlayer()
> {
> }
> 
> 
> std::string 
> DemoPlayer::get_levelname()
> {
>   return levelname;
> }
> 
> 
> void
> DemoPlayer::load(const std::string& arg_filename)
> {
>   const int buffer_size = 256;
>   char buffer[buffer_size];
>   std::string filename;
>   ifstream in;
>   
>   filename = arg_filename;
> 
>   in.open(filename.c_str());
> 
>   if (!in)
>     throw PingusError(_("DemoPlayer: Couldn't load ") + filename);
> 
>   in >> levelname; 
>   in.get(); // \n ueberlesen
>   std::cout << "DemoPlayer: LevelName=" << levelname << std::endl;
> 
>   while(!(in.getline(buffer, buffer_size).eof()))
>     {
>       cout << "Readline: " << buffer << endl;
>       event_queue.push(PingusEvent(buffer));
>       std::cout << "Parsed: " << event_queue.back().game_time << ":" << event_queue.back().str << std::endl;
>     }
> }
> 
> const PingusEvent& 
> DemoPlayer::peek_event()
> {
>   return event_queue.front();
> }
> 
> void
> DemoPlayer::dequeue_event()
> {
>   event_queue.pop();
> }
> 
> /* EOF */
Index: globals.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/globals.hxx,v
retrieving revision 1.3
diff -r1.3 globals.hxx
23a24,28
> #ifdef WIN32
> #pragma warning (disable : 4786)
> #endif
> 
> 
30a36
> 
Index: groundpiece_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/groundpiece_data.hxx,v
retrieving revision 1.9
diff -r1.9 groundpiece_data.hxx
23d22
< #include <iosfwd>
28a28,29
> #include <iosfwd>
> 
Index: multiplayer_client_child.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.cxx,v
retrieving revision 1.6
diff -r1.6 multiplayer_client_child.cxx
22d21
< #include "multiplayer_client_child.hxx"
25a25,28
> #include "string_converter.hxx"
> #include "multiplayer_client_child.hxx"
> #include "pingu_enums.hxx"
> 
101c104
< 	      action_to_string(button_panel->get_action_name()).c_str());
---
> 		  Pingus::Actions::action_to_string(button_panel->get_action_name()).c_str());
Index: multiplayer_client_child.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiplayer_client_child.hxx,v
retrieving revision 1.2
diff -r1.2 multiplayer_client_child.hxx
28a29
> #include <string>
Index: pingu_action_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action_factory.hxx,v
retrieving revision 1.3
diff -r1.3 pingu_action_factory.hxx
22a23
> #include "pingu.hxx"
25c26
< #include "pingu.hxx"
---
> 
Index: pingus_resource.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_resource.cxx,v
retrieving revision 1.14
diff -r1.14 pingus_resource.cxx
313,314c313,314
<       if (i->first.type == ResDescriptor::RD_FILE
< 	  && i->second.get_reference_count () == 1)
---
> 		   if ((i->first.type == ResDescriptor::RD_FILE)
> 	  && (i->second.get_reference_count () == 1))
Index: pingus_resource.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_resource.hxx,v
retrieving revision 1.6
diff -r1.6 pingus_resource.hxx
23d22
< #include <map>
27a27,28
> 
> #include <map>
Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.13
diff -r1.13 playfield.cxx
29a30
> #include "pingu_enums.hxx"
208c209
< 	      action_to_string(buttons->get_action_name()).c_str());
---
> 		  Pingus::Actions::action_to_string(buttons->get_action_name()).c_str());
Index: plf.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.hxx,v
retrieving revision 1.2
diff -r1.2 plf.hxx
23c23
< #include <map>
---
> 
26a27
> #include <map>
Index: res_descriptor.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/res_descriptor.hxx,v
retrieving revision 1.5
diff -r1.5 res_descriptor.hxx
23d22
< #include <string>
24a24
> #include <string>
Index: specs_reader.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/specs_reader.cxx,v
retrieving revision 1.1
diff -r1.1 specs_reader.cxx
20d19
< #include <iostream>
22d20
< #include "pingus_error.hxx"
24a23,26
> #include "pingus_error.hxx"
> 
> #include <iostream>
> 
Index: trap_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/trap_data.hxx,v
retrieving revision 1.5
diff -r1.5 trap_data.hxx
23c23
< #include <config.h>
---
> #include <win32/config.h>
Index: world.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.hxx,v
retrieving revision 1.4
diff -r1.4 world.hxx
44a45,47
> 
> using std::list;
> using std::string;
Index: worldobj_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data.hxx,v
retrieving revision 1.4
diff -r1.4 worldobj_data.hxx
23d22
< #include <vector>
25a25,26
> 
> #include <vector>
Index: worldobj_group_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_group_data.hxx,v
retrieving revision 1.4
diff -r1.4 worldobj_group_data.hxx
23c23
< #include <vector>
---
> 
25a26
> #include <vector>
Index: xml_helper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.hxx,v
retrieving revision 1.5
diff -r1.5 xml_helper.hxx
23c23
< #include <config.h>
---
> #include <win32/config.h>
cvs server: Diffing actions
Index: actions/angel.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/angel.hxx,v
retrieving revision 1.4
diff -r1.4 angel.hxx
22a23,31
> //
> // Necessary for Windows environment
> //
> // Does it work really on Linux?
> //
> #ifdef WIN32
> #include <math.h>
> #endif
> 
Index: actions/faller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/faller.hxx,v
retrieving revision 1.7
diff -r1.7 faller.hxx
22a23,26
> #ifdef WIN32
> #include <math.h>
> #endif
> 
cvs server: Diffing backgrounds
cvs server: Diffing boost
cvs server: Diffing caimagemanipulation
cvs server: Diffing editor
Index: editor/editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.22
diff -r1.22 editor.cxx
20,21c20,22
< #include <cstdio>
< #include <string>
---
> #ifdef WIN32
> #pragma warning(disable:4786)
> #endif
31d31
< #include "../algo.hxx"
36d35
< #include "editor.hxx"
45a45,49
> #include "../algo.hxx"
> #include "editor.hxx"
> 
> #include <cstdio>
> #include <string>
Index: editor/level_property_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/level_property_window.cxx,v
retrieving revision 1.4
diff -r1.4 level_property_window.cxx
19a20,23
> #ifdef WIN32
> #pragma warning(disable:4786)
> #endif
> 
Index: editor/object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.24
diff -r1.24 object_manager.cxx
20d19
< #include <algorithm>
22,24d20
< #include "../globals.hxx"
< #include "../system.hxx"
< #include "../plf_plf.hxx"
30d25
< #include "object_manager.hxx"
31a27,31
> #include "../globals.hxx"
> #include "../system.hxx"
> #include "../plf_plf.hxx"
> #include "object_manager.hxx"
> #include <algorithm>
Index: editor/object_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.15
diff -r1.15 object_manager.hxx
23d22
< #include <map>
26a26,27
> #include <map>
> 
Index: editor/selection.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.cxx,v
retrieving revision 1.10
diff -r1.10 selection.cxx
19a20,23
> #ifdef WIN32
> #pragma warning(disable:4786)
> #endif
> 
cvs server: Diffing entrances
cvs server: Diffing generic
cvs server: Diffing gui
cvs server: Diffing input
Index: input/axis_pointer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axis_pointer.cxx,v
retrieving revision 1.5
diff -r1.5 axis_pointer.cxx
20a21
> #include <assert.h>
cvs server: cannot find input/controller.cxx
Index: input/multiple_pointer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/multiple_pointer.cxx,v
retrieving revision 1.3
diff -r1.3 multiple_pointer.cxx
85,86c85,86
<     for (unsigned int i = 0; i < pointers.size(); i++)
<       pointers[i]->set_pos(x_pos, y_pos);
---
>     for (unsigned int n = 0; n < pointers.size(); n++)
>       pointers[n]->set_pos(x_pos, y_pos);
cvs server: Diffing particles
cvs server: Diffing traps
Index: traps/hammer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/hammer.cxx,v
retrieving revision 1.4
diff -r1.4 hammer.cxx
20c20
< #include "../world.hxx"
---
> 
25a26,27
> #include "../world.hxx"
> 
cvs server: Diffing war
cvs server: Diffing win32
cvs server: Diffing worldmap
Index: worldmap/pingus.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/pingus.hxx,v
retrieving revision 1.2
diff -r1.2 pingus.hxx
23c23,26
< #include <queue>
---
> #ifdef WIN32
> #include <math.h>
> #endif
> 
24a28,29
> #include <queue>
> 
cvs server: Diffing worldobjs