Skip to content

Commit ef02d4f

Browse files
committed
Implement collision cell viewing
1 parent e2097b2 commit ef02d4f

20 files changed

Lines changed: 1438 additions & 62 deletions

Hacktice/Config.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public class Config
5454
public byte[] customText;
5555

5656
// since version 1.5
57-
public byte _pad1;
5857
public byte _pad0;
58+
public byte showCollision;
5959
public byte softReset;
6060
public byte showCustomText;
6161

@@ -143,7 +143,8 @@ public bool Equals(Config o)
143143
&& warpWheel == o.warpWheel
144144
&& Enumerable.SequenceEqual(customText, o.customText)
145145
&& softReset == o.softReset
146-
&& showCustomText == o.showCustomText;
146+
&& showCustomText == o.showCustomText
147+
&& showCollision == o.showCollision;
147148
}
148149
}
149150
}

Hacktice/Emulator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,11 @@ public Config ReadConfig()
379379
Marshal.FreeHGlobal(ptr);
380380

381381
int hackticeConfigSize = BitConverter.ToInt32(configBytes, 4);
382-
if (hackticeConfigSize <= (int) Marshal.OffsetOf<Config>("_pad1"))
382+
if (hackticeConfigSize <= (int) Marshal.OffsetOf<Config>("showCustomText"))
383383
{
384384
config.SetCustomText("PRACTICE");
385-
config._pad1 = 0;
386385
config._pad0 = 0;
386+
config.showCollision = 0;
387387
config.softReset = 0;
388388
config.showCustomText = 0;
389389
}

Hacktice/Tool.Designer.cs

Lines changed: 62 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Hacktice/Tool.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ private Config MakeConfig()
555555
warpWheel = Convert.ToByte(checkBoxWarpWheel.Checked),
556556
softReset = Convert.ToByte(checkBoxSoftReset.Checked),
557557
showCustomText = Convert.ToByte(checkBoxShowCustomText.Checked),
558+
showCollision = Convert.ToByte(checkBoxShowCollision.Checked),
558559

559560
checkpointWallkick = Convert.ToByte(checkBoxMTWallkick.Checked),
560561
checkpointDoor = Convert.ToByte(checkBoxMTDoor.Checked),
@@ -597,6 +598,7 @@ private void UpdateUIFromConfig(Config config)
597598
checkBoxWarpWheel.Checked = 0 != config.warpWheel;
598599
checkBoxSoftReset.Checked = 0 != config.softReset;
599600
checkBoxShowCustomText.Checked = 0 != config.showCustomText;
601+
checkBoxShowCollision.Checked = 0 != config.showCollision;
600602
if (config.customText is object)
601603
textBoxCustomText.Text = config.GetCustomText();
602604

Hacktice/Tool.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@
126126
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127127
<value>17, 17</value>
128128
</metadata>
129-
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130-
<value>17, 17</value>
131-
</metadata>
132129
<data name="labelExpl.ToolTip" xml:space="preserve">
133130
<value>Act Select - resets to the act select.
134131
Level Reset - resets the level to the last taken warp

0 commit comments

Comments
 (0)