[Pingus-CVS] rev 2323 - in trunk: data/data src src/actions

[Ingo Ruhnke]

Author: grumbel
Date: 2004-05-09 19:36:09 +0200 (Sun, 09 May 2004)
New Revision: 2323

Removed:
   trunk/src/resources.cxx
   trunk/src/resources.hxx
Modified:
   trunk/data/data/exits.xml
   trunk/src/Makefile.am
   trunk/src/actions/basher.cxx
Log:
fixed basher crash

Modified: trunk/data/data/exits.xml
===================================================================
--- trunk/data/data/exits.xml   2004-05-09 16:44:16 UTC (rev 2322)
+++ trunk/data/data/exits.xml   2004-05-09 17:36:09 UTC (rev 2323)
@@ -1,17 +1,48 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <resources>
-  <section name="Exits">
-    <surface file="../images/exits/desert_tut.png" height="115" 
name="desert_tut" tcol="0" width="122" x="0" y="0" />
-    <surface file="../images/exits/ice.png" height="64" name="ice" tcol="0" 
width="64" x="0" y="0" />
-    <surface file="../images/exits/ice2.png" name="ice2" x="0" y="0" />
-    <surface file="../images/exits/stone.png" height="60" name="stone" 
tcol="0" width="75" x="0" y="0" />
-    <surface file="../images/exits/desertexit.png" height="100" name="desert" 
tcol="0" width="150" x="0" y="0" />
-    <surface array="4x1" file="../images/exits/space.png" height="118" 
name="space" width="154" x="0" y="0" />
-    <surface file="../images/exits/sweetexit.png" height="121" 
name="sweetexit" tcol="0" width="180" x="0" y="0" />
-    <surface file="../images/exits/sortie.png" height="78" name="sortie" 
tcol="0" width="78" x="0" y="0" />
-    <surface array="11x1" file="../images/exits/sortie_anim.png" height="90" 
name="sortie_anim" width="78" x="0" y="0" />
-    <surface file="../images/exits/industrial.png" height="118" 
name="industrial" tcol="0" width="145" x="0" y="0" />
-    <surface file="../images/exits/crystal.png" height="105" name="crystal" 
tcol="0" width="154" x="0" y="0" />
-    <surface file="../images/exits/ordina.png" name="ordina" />
-    <surface file="../images/exits/mud.png" name="mud" />
+  <section name="exits">
+    <sprite name="desert_tut">
+      <image file="../images/exits/desert_tut.png"/>
+    </sprite>
+    <sprite name="ice">
+      <image file="../images/exits/ice.png"/>
+    </sprite>
+    <sprite name="ice2">
+      <image file="../images/exits/ice2.png"/>
+    </sprite>
+    <sprite name="stone">
+      <image file="../images/exits/stone.png"/>
+    </sprite>
+    <sprite name="desert">
+      <image file="../images/exits/desertexit.png"/>
+    </sprite>
+    <sprite name="space">
+      <image file="../images/exits/space.png">
+        <grid pos="0,0" size="154,118" array="4x1"/>
+      </image>
+    </sprite>
+    <sprite name="sweetexit">
+      <image file="../images/exits/sweetexit.png"/>
+    </sprite>
+    <sprite name="sortie">
+      <image file="../images/exits/sortie.png"/>
+    </sprite>
+    <sprite name="sortie_anim">
+      <image file="../images/exits/sortie_anim.png">
+        <grid pos="0,0" size="78,90" array="11x1"/>
+      </image>
+    </sprite>
+    <sprite name="industrial">
+      <image file="../images/exits/industrial.png"/>
+    </sprite>
+    <sprite name="crystal">
+      <image file="../images/exits/crystal.png"/>
+    </sprite>
+    <sprite name="ordina">
+      <image file="../images/exits/ordina.png"/>
+    </sprite>
+    <sprite name="mud">
+      <image file="../images/exits/mud.png"/>
+    </sprite>
   </section>
 </resources>

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am       2004-05-09 16:44:16 UTC (rev 2322)
+++ trunk/src/Makefile.am       2004-05-09 17:36:09 UTC (rev 2323)
@@ -234,8 +234,6 @@
 range.hxx \
 res_descriptor.cxx \
 res_descriptor.hxx \
-resources.hxx \
-resources.cxx \
 resource_modifier.cxx \
 resource_modifier.hxx \
 result_screen.cxx \

Modified: trunk/src/actions/basher.cxx
===================================================================
--- trunk/src/actions/basher.cxx        2004-05-09 16:44:16 UTC (rev 2322)
+++ trunk/src/actions/basher.cxx        2004-05-09 17:36:09 UTC (rev 2323)
@@ -25,7 +25,6 @@
 #include "../pingus_resource.hxx"
 #include "../pingu.hxx"
 #include "../world.hxx"
-#include "../resources.hxx"
 #include "basher.hxx"
 
 namespace Pingus {
@@ -33,7 +32,7 @@
 
 Basher::Basher (Pingu* p)
   : PinguAction(p),
-    sprite("Pingus/basher0", resources),
+    sprite(PingusResource::load_sprite("Pingus/basher0", "pingus")),
     bash_radius(PingusResource::load_pixelbuffer("Other/bash_radius", 
"pingus")),
     bash_radius_gfx(PingusResource::load_pixelbuffer("Other/bash_radius_gfx", 
"pingus")),
     basher_c(0),

Deleted: trunk/src/resources.cxx
===================================================================
--- trunk/src/resources.cxx     2004-05-09 16:44:16 UTC (rev 2322)
+++ trunk/src/resources.cxx     2004-05-09 17:36:09 UTC (rev 2323)
@@ -1,28 +0,0 @@
-//  $Id: resources.cxx,v 1.1 2004/04/02 18:12:59 grumbel Exp $
-//
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2002 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 "resources.hxx"
-
-namespace Pingus {
-
-CL_ResourceManager* resources;
-
-} // namespace Pingus
-
-/* EOF */

Deleted: trunk/src/resources.hxx
===================================================================
--- trunk/src/resources.hxx     2004-05-09 16:44:16 UTC (rev 2322)
+++ trunk/src/resources.hxx     2004-05-09 17:36:09 UTC (rev 2323)
@@ -1,33 +0,0 @@
-//  $Id: resources.hxx,v 1.1 2004/04/02 18:12:59 grumbel Exp $
-// 
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2002 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_RESOURCES_HXX
-#define HEADER_RESOURCES_HXX
-
-#include <ClanLib/Core/Resources/resource_manager.h>
-
-namespace Pingus {
-
-extern CL_ResourceManager* resources;
-
-} // namespace Pingus
-
-#endif
-
-/* EOF */