Skip to content

Commit

Permalink
Allow negative scroll values (#13)
Browse files Browse the repository at this point in the history
* Switch from ushorts to shorts.
Also tweak the LayerManager UI to compensate, re-label a couple of input boxes, and add some extra tooltips.

* Further changes to labels and tooltips to hopefully clear some things up.
  • Loading branch information
OtherworldBob authored Apr 28, 2018
1 parent 2fe8df6 commit c37125f
Show file tree
Hide file tree
Showing 6 changed files with 87 additions and 53 deletions.
4 changes: 2 additions & 2 deletions ManiacEditor/EditorLayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ public byte UnknownByte2
set => _layer.UnknownByte2 = value;
}

public ushort UnknownWord1
public short UnknownWord1
{
get => _layer.UnknownWord1;
set => _layer.UnknownWord1 = value;
}

public ushort UnknownWord2
public short UnknownWord2
{
get => _layer.UnknownWord2;
set => _layer.UnknownWord2 = value;
Expand Down
4 changes: 2 additions & 2 deletions ManiacEditor/HorizontalLayerScroll.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public HorizontalLayerScroll(byte id, ScrollInfo info, IList<ScrollInfoLines> li

public byte UnknownByte1 { get => _scrollInfo.UnknownByte1; set => _scrollInfo.UnknownByte1 = value; }
public byte UnknownByte2 { get => _scrollInfo.UnknownByte2; set => _scrollInfo.UnknownByte2 = value; }
public ushort UnknownWord1 { get => _scrollInfo.UnknownWord1; set => _scrollInfo.UnknownWord1 = value; }
public ushort UnknownWord2 { get => _scrollInfo.UnknownWord2; set => _scrollInfo.UnknownWord2 = value; }
public short UnknownWord1 { get => _scrollInfo.UnknownWord1; set => _scrollInfo.UnknownWord1 = value; }
public short UnknownWord2 { get => _scrollInfo.UnknownWord2; set => _scrollInfo.UnknownWord2 = value; }

public IList<ScrollInfoLines> LinesMapList { get => _linesMapList; }
public ScrollInfo ScrollInfo { get => _scrollInfo; }
Expand Down
110 changes: 72 additions & 38 deletions ManiacEditor/LayerManager.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified ManiacEditor/Resources/LayerManagerWarning.rtf
Binary file not shown.
8 changes: 4 additions & 4 deletions RSDKv5/SceneLayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public class SceneLayer
private ushort _width;
private ushort _height;

public ushort UnknownWord1;
public ushort UnknownWord2;
public short UnknownWord1;
public short UnknownWord2;

public List<ScrollInfo> ScrollingInfo = new List<ScrollInfo>();

Expand Down Expand Up @@ -61,8 +61,8 @@ internal SceneLayer(Reader reader)
Width = reader.ReadUInt16();
Height = reader.ReadUInt16();

UnknownWord1 = reader.ReadUInt16();
UnknownWord2 = reader.ReadUInt16();
UnknownWord1 = reader.ReadInt16();
UnknownWord2 = reader.ReadInt16();

ushort scrolling_info_count = reader.ReadUInt16();
for (int i = 0; i < scrolling_info_count; ++i)
Expand Down
Loading

0 comments on commit c37125f

Please sign in to comment.