stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-29 23:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Test map from current mouse position now works properly in Hexen/UDMF maps with multiple player starts. Also works in maps without a valid player start now. Fixes #263.

Browse source
This commit is contained in:
biwa 2019-04-16 18:05:21 +02:00
parent 03cb5249af
commit aafe42c88d
1 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Source/Core/Editing/ClassicMode.cs
View file

@ -82,6 +82,7 @@ namespace CodeImp.DoomBuilder.Editing
//mxd. used in "Play From Here" Action //mxd. used in "Play From Here" Action
private Thing playerStart; private Thing playerStart;
private Vector3D playerStartPosition; private Vector3D playerStartPosition;
private bool playerStartIsTempThing;
#endregion #endregion
@ -701,12 +702,28 @@ namespace CodeImp.DoomBuilder.Editing
{ {
if(testFromCurrentPosition) if(testFromCurrentPosition)
{ {
if(!mouseinside) if (!mouseinside)
{ {
General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: mouse is outside editing window!"); General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: mouse is outside editing window!");
return false; return false;
} }
//now check if cursor is located inside a sector
Sector s = General.Map.Map.GetSectorByCoordinates(mousemappos);
if (s == null)
{
General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: mouse cursor must be inside a sector!");
return false;
}
//41 = player's height in Doom. Is that so in all other games as well?
if (s.CeilHeight - s.FloorHeight < 41)
{
General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: sector is too low!");
return false;
}
//find Single Player Start. Should be type 1 in all games //find Single Player Start. Should be type 1 in all games
Thing start = null; Thing start = null;
@ -714,6 +731,11 @@ namespace CodeImp.DoomBuilder.Editing
{ {
if(t.Type == 1) if(t.Type == 1)
{ {
// biwa. In Hexen format and UDMF a map can have multiple valid player starts because of
// hubs. The player by default stats at the player start withe arg0 set to 0
if ((General.Map.HEXEN || General.Map.UDMF) && t.Args[0] != 0)
continue;
//store thing and position //store thing and position
if(start == null) if(start == null)
{ {
@ -729,24 +751,22 @@ namespace CodeImp.DoomBuilder.Editing
if(start == null) if(start == null)
{ {
General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: no Player 1 start found!"); // biwa. If there's no existing valid player start create one
return false; playerStartIsTempThing = true;
} start = General.Map.Map.CreateThing();
//now check if cursor is located inside a sector if (start != null)
Sector s = General.Map.Map.GetSectorByCoordinates(mousemappos); {
General.Settings.ApplyDefaultThingSettings(start);
if(s == null) start.Type = 1;
} else
{
General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: couldn't create player start!");
return false;
}
} else
{ {
General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: mouse cursor must be inside a sector!"); playerStartIsTempThing = false;
return false;
}
//41 = player's height in Doom. Is that so in all other games as well?
if(s.CeilHeight - s.FloorHeight < 41)
{
General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: sector is too low!");
return false;
} }
//store initial position //store initial position
@ -766,6 +786,10 @@ namespace CodeImp.DoomBuilder.Editing
{ {
//restore position //restore position
playerStart.Move(playerStartPosition); playerStart.Move(playerStartPosition);
if (playerStartIsTempThing) // biwa
General.Map.Map.RemoveThing(playerStart.Index);
playerStart = null; playerStart = null;
} }
} }