[Pingus-CVS] CVS: Games/Pingus/data/data global.scr,1.59,1.60

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/data/data
In directory dark:/tmp/cvs-serv1737/data/data

Modified Files:
        global.scr 
Log Message:
- fixed hammer
- added line numbers to a xml error message
- fixed trap parsing code


Index: global.scr
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/data/data/global.scr,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- global.scr  11 Feb 2002 00:11:58 -0000      1.59
+++ global.scr  1 Oct 2002 23:10:40 -0000       1.60
@@ -321,9 +321,8 @@
                greenjellybaby = 
../images/groundpieces/ground/sweets/greenjellybaby.png (type=surface, x=0, 
y=0, width=64, height=84);
                icecream          = 
../images/groundpieces/ground/sweets/icecream.png (type=surface, x=0, y=0, 
width=114,  height=273);
                icecream = ../images/groundpieces/ground/sweets/icecream.png 
(type=surface, x=0, y=0, width=114, height=273);
-//             jellybaby = ../images/groundpieces/ground/sweets/jellybaby.png 
(type=surface, x=0, y=0, width=64, height=83);
-//             jellybaby2 = 
../images/groundpieces/ground/sweets/jellybaby2.png (type=surface, x=0, y=0, 
width=85, height=63);
-//             jellybaby2 = 
../images/groundpieces/ground/sweets/jellybaby2.png (type=surface, x=0, y=0, 
width=85, height=63);
+               jellybaby = 
../images/groundpieces/ground/sweets/greenjellybaby.png (type=surface);
+               jellybaby2 = 
../images/groundpieces/ground/sweets/redjellybaby.png (type=surface);
                jube1 = ../images/groundpieces/ground/sweets/jube1.png 
(type=surface, x=0, y=0, width=49, height=42);
                jube2 = ../images/groundpieces/ground/sweets/jube2.png 
(type=surface, x=0, y=0, width=45, height=48);
                lollipop = ../images/groundpieces/ground/sweets/lollipop.png 
(type=surface, x=0, y=0, width=42, height=238);