Merge branch 'master' into unofficial-port

This commit is contained in:
spherallic 2022-03-05 13:18:05 +01:00
commit 25ded2b07a
2 changed files with 26 additions and 11 deletions

View File

@ -4037,16 +4037,16 @@ thingtypes
{
title = "Egg Mobile";
sprite = "EGGMA1";
width = 24;
height = 76;
width = 36;
height = 84;
flags4text = "[4] End level on death";
}
201
{
title = "Egg Slimer";
sprite = "EGGNA1";
width = 24;
height = 76;
width = 36;
height = 84;
flags4text = "[4] End level on death";
flags8text = "[8] Speed up when hit";
}
@ -4054,7 +4054,7 @@ thingtypes
{
title = "Sea Egg";
sprite = "EGGOA1";
width = 32;
width = 36;
height = 116;
flags4text = "[4] End level on death";
}
@ -4062,8 +4062,8 @@ thingtypes
{
title = "Egg Colosseum";
sprite = "EGGPA1";
width = 24;
height = 76;
width = 36;
height = 84;
flags4text = "[4] End level on death";
}
204
@ -4140,6 +4140,7 @@ thingtypes
angletext = "No. (Sea Egg)";
fixedrotation = 1;
flagsvaluetext = "No. (Brak)";
parametertext = "Next";
}
293
{
@ -6297,10 +6298,10 @@ thingtypes
}
1602
{
title = "Pian";
sprite = "NTPNALAR";
title = "Nightopian";
sprite = "NTPNA1";
width = 16;
height = 32;
height = 40;
}
}
@ -6879,6 +6880,20 @@ thingtypes
}
}
tutorial
{
color = 10; // Green
title = "Tutorial";
799
{
title = "Tutorial Plant";
sprite = "TUPFH0";
width = 40;
height = 144;
parametertext = "Start frame";
}
flickies
{
color = 10; // Green

View File

@ -1218,7 +1218,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
foreach (Linedef ld in selected)
{
if (ld.Back != null && ld.Front.Sector == ld.Back.Sector && ld.Action != 0)
if (ld.Back != null && ld.Front.Sector == ld.Back.Sector && ld.Action == 0)
counter++;
else
ld.Selected = false;