[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.95,1.96 plf.cxx,1.4,1.5 theme.cxx,1.6,1.7 plf_plf.cxx,1.8,NONE plf_plf.hxx,1.3,NONE

[grumbel]

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

Modified Files:
        Makefile.am plf.cxx theme.cxx 
Removed Files:
        plf_plf.cxx plf_plf.hxx 
Log Message:
bye, bye good old .plf/.psm support...

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- Makefile.am 5 Sep 2002 11:26:34 -0000       1.95
+++ Makefile.am 5 Sep 2002 12:40:22 -0000       1.96
@@ -261,8 +261,6 @@
 plf.hxx \
 plf_parser.cxx \
 plf_parser.hxx \
-plf_plf.cxx \
-plf_plf.hxx \
 plf_preview.cxx \
 plf_preview.hxx \
 plt_parser.cxx \

Index: plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plf.cxx     23 Aug 2002 15:49:50 -0000      1.4
+++ plf.cxx     5 Sep 2002 12:40:22 -0000       1.5
@@ -18,9 +18,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "xml_plf.hxx"
-#include "plf_plf.hxx"
 #include "globals.hxx"
 #include "system.hxx"
+#include "pingus_error.hxx"
 
 using namespace std;
 
@@ -231,7 +231,10 @@
   if (extension == "xml")
     return new XMLPLF (pathname);
   else if (extension == "plf")
-    return new PLFPLF (pathname);
+    {
+      PingusError::raise ("Loading of plf's no longer supported");
+      return 0;
+    }
   else // filename does not have an extension, default to xml
     return new XMLPLF (pathname);
 }

Index: theme.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- theme.cxx   23 Aug 2002 15:49:51 -0000      1.6
+++ theme.cxx   5 Sep 2002 12:40:22 -0000       1.7
@@ -23,6 +23,7 @@
 #include <ClanLib/Display/Font/font.h>
 #include <ClanLib/Display/Input/keyboard.h>
 #include <ClanLib/Display/Input/key.h>
+#include <fstream>
 #include "path_manager.hxx"
 #include "system.hxx"
 #include "pingus_resource.hxx"
@@ -31,7 +32,6 @@
 #include "message_box.hxx"
 #include "globals.hxx"
 #include "theme.hxx"
-#include "plf_plf.hxx"
 #include "xml_plf.hxx"
 #include "screen_manager.hxx"
 
@@ -333,8 +333,7 @@
        {
          if (filename.substr(filename.size() - 4) == ".plf")
            {
-             PLFPLF plf(filename);
-             levelnames.push_back(System::translate(plf.get_levelname()));
+             PingusError::raise ("Loading of plf's no longer supported");
            }
          else
            {

--- plf_plf.cxx DELETED ---

--- plf_plf.hxx DELETED ---