Changeset 6702 for 2015


Ignore:
Timestamp:
2015-07-01 17:56:40 (8 years ago)
Author:
sieerinn
Message:

Junahuone lisätty.

Location:
2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • 2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel/LevelCreation.cs

    r6701 r6702  
    124124    void CreateExit(Vector position, double width, double height, Angle angle, Shape shape, string name, Dictionary<string, string> properties) 
    125125    { 
    126         var target = properties["goto"].Split('@'); // Jos peli kaatuu tälle riville niin joltain exitiltä puuttuu goto-property. 
     126        var target = properties["goto"] == "disabled"? null : properties["goto"].Split('@'); // Jos peli kaatuu tälle riville niin joltain exitiltä puuttuu goto-property. 
    127127        var exit = new Exit(width, height); 
    128128        exit.Position = position; 
    129         exit.TargetLevel = target[0]; 
    130         exit.TargetExitName = target[1]; 
     129        if (target != null) 
     130        { 
     131            exit.TargetLevel = target[0]; 
     132            exit.TargetExitName = target[1];    
     133        } 
    131134        exit.Name = name; 
    132135        Add(exit); 

  • 2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel.cs

    r6701 r6702  
    415415    { 
    416416        var oldExit = pExit as Exit; 
    417         if (oldExit == null || transition) 
     417        if (oldExit == null || transition || oldExit.TargetLevel == null) 
    418418            return; 
    419419 

  • 2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabrielContent/TheLegendOfGabrielContent.contentproj

    r6701 r6702  
    285285    </Compile> 
    286286  </ItemGroup> 
     287  <ItemGroup> 
     288    <Compile Include="bossroom.tmx"> 
     289      <Name>bossroom</Name> 
     290      <Importer>TextFileImporter</Importer> 
     291      <Processor>TextFileContentProcessor</Processor> 
     292      <CopyToOutputDirectory>Always</CopyToOutputDirectory> 
     293    </Compile> 
     294  </ItemGroup> 
    287295  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    288296  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  

  • 2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabrielContent/level1.tmx

    r6699 r6702  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <map version="1.0" orientation="orthogonal" renderorder="right-down" width="25" height="40" tilewidth="20" tileheight="20" nextobjectid="41"> 
     2<map version="1.0" orientation="orthogonal" renderorder="right-down" width="25" height="40" tilewidth="20" tileheight="20" nextobjectid="42"> 
    33 <tileset firstgid="1" source="LegendOfGabrielTileset.tsx"/> 
    44 <layer name="base" width="25" height="40"> 
    … …  
    3636   </properties> 
    3737  </object> 
     38  <object id="41" name="debug" x="280" y="780" width="20" height="20"> 
     39   <properties> 
     40    <property name="goto" value="bossroom@enterance"/> 
     41   </properties> 
     42  </object> 
    3843 </objectgroup> 
    3944 <objectgroup name="player"> 
Note: See TracChangeset for help on using the changeset viewer.