Changeset 356 for trunk/game/maps


Ignore:
Timestamp:
10/31/09 15:11:33 (10 years ago)
Author:
Kaydeth_parpg
Message:

Ticket #73. Patch by Kaydeth. Most of the changes were made to the map loading logic in the Engine, World, and Map classes to make sure it could handle loading maps after the game state has been restored by a load game. Also added a floating door back to both maps so map changing can still be tested in game. fixes[s:trac, t:73]

Location:
trunk/game/maps
Files:
2 edited

Legend:

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

    r355 r356  
    1414        <import file="../objects/agents/player/player.xml" /> 
    1515        <import file="../objects/buildings/container_house/container_house.xml" /> 
     16    <import file="../objects/buildings/shanty/shanty-door.xml" /> 
    1617        <layer grid_type="square" id="GroundLayer" pathing="cell_edges_only" rotation="0.0" transparency="0" x_offset="0.0" x_scale="1.0" y_offset="0.0" y_scale="1.0"> 
    1718                <instances> 
     
    18691870                        <i o="block" r="0" x="-1.0" y="-3.0" z="0.0" /> 
    18701871                        <i o="container_house" r="0" x="0.0" y="0.0" z="0.0" /> 
     1872            <i gfx="shanty-door" id="shanty-door01" is_open="False" name="Shanty Door" o="shanty-door" object_type="ShantyDoor" r="0" target_map="maps/map2.xml" target_map_name="map2" target_x="10.0" target_y="10.0" text="Looks like the entrance to the building." x="-2.0" xpos="-2.0" y="6.0" ypos="6.0" z="0.0" /> 
    18711873                        </instances> 
    18721874        </layer> 
  • trunk/game/maps/map2.xml

    r340 r356  
    1111        <import file="../objects/buildings/windmill/windmilld.xml"></import> 
    1212        <import file="../objects/buildings/windmill/windmille.xml"></import> 
    13  
     13         
     14        <import file="../objects/buildings/shanty/shanty-door.xml" /> 
     15         
    1416        <layer grid_type="square" id="GroundLayer" x_scale="1.0" pathing="cell_edges_only" y_scale="1.0" rotation="0.0" x_offset="0.0" y_offset="0.0"> 
    1517                <instances> 
     
    10231025            <i x="8" o="windmille" z="0.0" y="-2" r="0"></i> 
    10241026 
    1025             <i x="-4" o="shantya" z="0.0" y="3" r="0"></i> 
    1026             <i x="-4" o="shantyb" z="0.0" y="4" r="0"></i> 
    1027             <i x="-4" o="shantyc" z="0.0" y="5" r="0"></i> 
    1028             <i x="-4" o="shantyd" z="0.0" y="6" r="0"></i> 
    1029             <i x="-3" o="shantye" z="0.0" y="6" r="0"></i> 
    1030             <i x="-2" o="shantyf" z="0.0" y="6" r="0"></i> 
    1031             <i x="-1" o="shantyg" z="0.0" y="6" r="0"></i> 
    1032             <i x="-0" o="shantyh" z="0.0" y="6" r="0"></i> 
    1033             <i x="1" o="shantyi" z="0.0" y="6" r="0"></i> 
    1034  
    10351027            <!-- A sample door --> 
    10361028            <i x="-2.0" o="shanty-door" z="0.0" y="6.0" r="0" id="shanty-door01" object_type="ShantyDoor" is_open="False" 
    10371029                name="Shanty Door" text="Looks like the entrance to the building." target_map_name="main-map" target_map="maps/map.xml" 
    1038                 target_x="0.0" target_y="0.0"></i> 
     1030                target_x="5.0" target_y="5.0"></i> 
    10391031 
    10401032        </instances> 
Note: See TracChangeset for help on using the changeset viewer.