diff options
| author | MainMemory <sonicmike2@yahoo.com> | 2013-12-02 18:59:48 -0600 |
|---|---|---|
| committer | MainMemory <sonicmike2@yahoo.com> | 2013-12-02 18:59:48 -0600 |
| commit | fe3ac19f9154bcf5ad0f0ce888011659c96ca2e7 (patch) | |
| tree | 57381557b3ebafd7aaddb1216fbbf1a436ecfebc | |
| parent | 0f594907a4f563e91d55b28c9ae140b24f6e53cb (diff) | |
Adding .gitignore
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | S1LVL INI Files/S1LVL.rev01.ini | 2 | ||||
| -rw-r--r-- | S1LVL INI Files/SYZ/Block.cs | 8 | ||||
| -rw-r--r-- | S1LVL INI Files/objGHZ.ini | 8 |
4 files changed, 13 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..53babeb --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +S1LVL INI Files/dllcache +S1LVL INI Files/SonLVL.log +sonic.lst +errors.txt diff --git a/S1LVL INI Files/S1LVL.rev01.ini b/S1LVL INI Files/S1LVL.rev01.ini index 7d93aae..3fb56b7 100644 --- a/S1LVL INI Files/S1LVL.rev01.ini +++ b/S1LVL INI Files/S1LVL.rev01.ini @@ -1,5 +1,5 @@ version=S1
-objlst=obj.ini,obj.rev01.ini
+objlst=obj.ini|obj.rev01.ini
levelwidthmax=64
levelheightmax=8
colarr1=../collide/Collision Array (Normal).bin
diff --git a/S1LVL INI Files/SYZ/Block.cs b/S1LVL INI Files/SYZ/Block.cs index 6c39e54..6b899ea 100644 --- a/S1LVL INI Files/SYZ/Block.cs +++ b/S1LVL INI Files/SYZ/Block.cs @@ -46,19 +46,19 @@ namespace S1ObjectDefinitions.SYZ public override Sprite SubtypeImage(byte subtype)
{
- return imgs[(subtype & 0xE) << 1];
+ return imgs[(subtype & 0xE) >> 1];
}
public override Rectangle GetBounds(ObjectEntry obj, Point camera)
{
- return new Rectangle(obj.X + imgs[(obj.SubType & 0xE) << 1].X - camera.X, obj.Y + imgs[(obj.SubType & 0xE) << 1].Y - camera.Y, imgs[(obj.SubType & 0xE) << 1].Width, imgs[(obj.SubType & 0xE) << 1].Height);
+ return new Rectangle(obj.X + SubtypeImage(obj.SubType).X - camera.X, obj.Y + SubtypeImage(obj.SubType).Y - camera.Y, SubtypeImage(obj.SubType).Width, SubtypeImage(obj.SubType).Height);
}
public override Sprite GetSprite(ObjectEntry obj)
{
- BitmapBits bits = new BitmapBits(imgs[(obj.SubType & 0xE) << 1].Image);
+ BitmapBits bits = new BitmapBits(SubtypeImage(obj.SubType).Image);
bits.Flip(obj.XFlip, obj.YFlip);
- return new Sprite(bits, new Point(obj.X + imgs[(obj.SubType & 0xE) << 1].X, obj.Y + imgs[(obj.SubType & 0xE) << 1].Y));
+ return new Sprite(bits, new Point(obj.X + SubtypeImage(obj.SubType).X, obj.Y + SubtypeImage(obj.SubType).Y));
}
private static readonly PropertySpec[] customProperties = new PropertySpec[] {
diff --git a/S1LVL INI Files/objGHZ.ini b/S1LVL INI Files/objGHZ.ini index 0da61b7..9381bf9 100644 --- a/S1LVL INI Files/objGHZ.ini +++ b/S1LVL INI Files/objGHZ.ini @@ -9,7 +9,7 @@ name=Helix of spikes on a pole subtypes=10
defaultsubtype=10
[18]
-xmlfile=GHZ/Platform.cs
+xmlfile=GHZ/Platform.xml
[1A]
name=Collapsing cliff
art=LevelArt
@@ -52,7 +52,7 @@ mapasm=../_maps/Purple Rock.asm frame=0
pal=3
[3C]
-xmlfile=GHZ/BreakableWall.cs
+xmlfile=GHZ/BreakableWall.xml
[40]
name=Moto Bug
art=../artnem/Enemy Motobug.bin
@@ -61,8 +61,8 @@ frame=0 pal=0
rememberstate=True
[42]
-xmlfile=GHZ/Newtron.cs
+xmlfile=GHZ/Newtron.xml
[44]
-xmlfile=GHZ/WallBarrier.cs
+xmlfile=GHZ/WallBarrier.xml
[49]
name=Waterfall sound effect
\ No newline at end of file |