Changeset 695


Ignore:
Timestamp:
01/03/11 13:34:58 (8 years ago)
Author:
barra_parpg
Message:

Ticket #281. Patch by mvbarracuda:

  • Removing unneeded duplicated assets introduced by the last commit
  • Fixes to container house object ID on map.xml
Location:
trunk/game
Files:
205 deleted
2 edited
8 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/game/maps/map.xml

    r694 r695  
    95669566                <instances> 
    95679567                        <i o="guard_tower" r="315" x="4.0" y="-17.0" stackpos="0" z="0.0"></i> 
    9568                         <i o="container_house01" r="0" x="-1.0" y="2.0" stackpos="0" z="0.0"></i> 
    9569                         <i o="container_house02" r="0" x="14.0" y="4.0" stackpos="0" z="0.0"></i> 
     9568                        <i o="container_house_01" r="0" x="-1.0" y="2.0" stackpos="0" z="0.0"></i> 
     9569                        <i o="container_house_02" r="0" x="14.0" y="4.0" stackpos="0" z="0.0"></i> 
    95709570                        <i o="block" r="0" x="14.0" y="4.0" stackpos="0" z="0.0"></i> 
    95719571                        <i o="block" r="0" x="12.0" y="0.0" stackpos="0" z="0.0"></i> 
     
    96239623                        <i o="block" r="0" x="1.0" y="-3.0" stackpos="0" z="0.0"></i> 
    96249624                        <i o="block" r="0" x="1.0" y="-2.0" stackpos="0" z="0.0"></i> 
    9625                         <i o="container_house01" r="0" x="3.0" y="-47.0" stackpos="0" z="0.0"></i> 
     9625                        <i o="container_house_01" r="0" x="3.0" y="-47.0" stackpos="0" z="0.0"></i> 
    96269626                        <i o="block" r="0" x="1.0" y="-43.0" stackpos="0" z="0.0"></i> 
    96279627                        <i o="block" r="0" x="2.0" y="-43.0" stackpos="0" z="0.0"></i> 
  • trunk/game/objects/scenery/burning_barrel/burn/000/animation.xml

    r689 r695  
    11<animation delay="50" namespace="PAPRG" id="burning_barrel:burn:000" x_offset="0" y_offset="-38"> 
     2        <frame source="burning_barrel_0.png" /> 
    23        <frame source="burning_barrel_1.png" /> 
    34        <frame source="burning_barrel_2.png" /> 
     
    89        <frame source="burning_barrel_7.png" /> 
    910        <frame source="burning_barrel_8.png" /> 
    10         <frame source="burning_barrel_9.png" /> 
    11         <frame source="burning_barrel_8.png" /> 
    1211        <frame source="burning_barrel_7.png" /> 
    1312        <frame source="burning_barrel_6.png" /> 
     13        <frame source="burning_barrel_5.png" /> 
     14        <frame source="burning_barrel_4.png" /> 
    1415        <frame source="burning_barrel_7.png" /> 
    1516        <frame source="burning_barrel_8.png" /> 
    16         <frame source="burning_barrel_9.png" /> 
    17         <frame source="burning_barrel_7.png" /> 
    18         <frame source="burning_barrel_4.png" /> 
    1917        <frame source="burning_barrel_6.png" /> 
     18        <frame source="burning_barrel_3.png" /> 
    2019        <frame source="burning_barrel_5.png" /> 
    2120        <frame source="burning_barrel_4.png" /> 
     
    2322        <frame source="burning_barrel_2.png" /> 
    2423        <frame source="burning_barrel_1.png" /> 
     24        <frame source="burning_barrel_0.png" /> 
    2525</animation> 
Note: See TracChangeset for help on using the changeset viewer.