Changeset 314 for trunk/game/maps


Ignore:
Timestamp:
10/11/09 10:34:47 (10 years ago)
Author:
eliedebrauwer
Message:

Ticket #66: Patch by saritor, eliedebrauwer & kaydeth cross map teleporting is now possible, we extended the objects within gamestate to make use of double hashing (f(obj_id,map_id)->object). Going back to a previously loaded map is still broken (camera issue). Also extended map.xml and map2.xml in order to make it possible to go back and forth between these two maps. comment[s:trac, t:66]

Location:
trunk/game/maps
Files:
2 edited

Legend:

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

    r310 r314  
    19751975                        <!-- A sample door --> 
    19761976                        <i x="-2.0" o="shanty-door" z="0.0" y="6.0" r="0" id="shanty-door01" object_type="ShantyDoor" is_open="False" 
    1977                                 name="Shanty Door" text="Looks like the entrance to the building." target_map_name="main-map" target_map="maps/map.xml" 
     1977                                name="Shanty Door" text="Looks like the entrance to the building." target_map_name="map2" target_map="maps/map2.xml" 
    19781978                                target_x="10.0" target_y="10.0"></i> 
    19791979 
  • trunk/game/maps/map2.xml

    r147 r314  
    10221022            <i x="7" o="windmilld" z="0.0" y="-2" r="0"></i> 
    10231023            <i x="8" o="windmille" z="0.0" y="-2" r="0"></i> 
    1024                 </instances> 
    1025         </layer> 
    10261024 
     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 
     1035            <!-- There must be one and one only PC character --> 
     1036            <i x="0.0" o="PC" z="0.0" y="0.0" r="0" id="PC" object_type="PlayerCharacter"></i> 
     1037 
     1038            <!-- A sample door --> 
     1039            <i x="-2.0" o="shanty-door" z="0.0" y="6.0" r="0" id="shanty-door01" object_type="ShantyDoor" is_open="False" 
     1040                name="Shanty Door" text="Looks like the entrance to the building." target_map_name="main-map" target_map="maps/map.xml" 
     1041                target_x="0.0" target_y="0.0"></i> 
     1042 
     1043        </instances> 
     1044    </layer> 
    10271045        <camera ref_cell_width="72" zoom="1.0" tilt="-60.0" id="main" ref_layer_id="ObjectLayer" ref_cell_height="38" rotation="45.0"> 
    10281046        </camera> 
Note: See TracChangeset for help on using the changeset viewer.