zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 23:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	src/dthinker.cpp
This commit is contained in:
Christoph Oelckers 2019-01-13 13:40:13 +01:00
commit 7b61965197
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.cpp
View file

@ -2066,7 +2066,7 @@ void G_ReadSnapshots(FResourceFile *resf)
if (ptr != nullptr) if (ptr != nullptr)
{ {
ptrdiff_t maplen = ptr - resl->FullName.GetChars(); ptrdiff_t maplen = ptr - resl->FullName.GetChars();
FName mapname(resl->FullName.GetChars(), (size_t)maplen); FName mapname(resl->FullName.GetChars(), (size_t)maplen, false);
currentSession->Snapshots.Insert(mapname, resl->GetRawData()); currentSession->Snapshots.Insert(mapname, resl->GetRawData());
} }
} }

2
src/maploader/polyobjects.cpp
View file

@ -315,7 +315,7 @@ void MapLoader::TranslateToStartSpot (int tag, const DVector2 &origin)
} }
po->CalcCenter(); po->CalcCenter();
// For compatibility purposes // For compatibility purposes
po->CenterSubsector = R_PointInSubsector(po->GetLevel(), po->CenterSpot.pos); po->CenterSubsector = R_PointInSubsector(Level, po->CenterSpot.pos);
} }
//========================================================================== //==========================================================================