edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3082

Browse source 
3082: Set correct value on layer saving (which was recently uninitialized) r=def- a=Patiga

Didn't check out the teeworlds source while setting the value the last time. teeworlds sets those values to 0.

Co-authored-by: Patiga <dev@patiga.eu>
This commit is contained in:
bors[bot] 2020-10-13 08:07:29 +00:00 committed by GitHub
parent 3244eba39d a252097e9a
commit 05fdd021c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/editor/io.cpp
View file

@ -387,7 +387,7 @@ int CEditorMap::Save(class IStorage *pStorage, const char *pFileName)
CMapItemLayerTilemap Item; CMapItemLayerTilemap Item;
Item.m_Version = 3; Item.m_Version = 3;
Item.m_Layer.m_Version = 1; // was previously uninitialized, do not rely on it being 1 Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
Item.m_Layer.m_Flags = pLayer->m_Flags; Item.m_Layer.m_Flags = pLayer->m_Flags;
Item.m_Layer.m_Type = pLayer->m_Type; Item.m_Layer.m_Type = pLayer->m_Type;
@ -475,7 +475,7 @@ int CEditorMap::Save(class IStorage *pStorage, const char *pFileName)
{ {
CMapItemLayerQuads Item; CMapItemLayerQuads Item;
Item.m_Version = 2; Item.m_Version = 2;
Item.m_Layer.m_Version = 1; // was previously uninitialized, do not rely on it being 1 Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
Item.m_Layer.m_Flags = pLayer->m_Flags; Item.m_Layer.m_Flags = pLayer->m_Flags;
Item.m_Layer.m_Type = pLayer->m_Type; Item.m_Layer.m_Type = pLayer->m_Type;
Item.m_Image = pLayer->m_Image; Item.m_Image = pLayer->m_Image;
@ -504,7 +504,7 @@ int CEditorMap::Save(class IStorage *pStorage, const char *pFileName)
{ {
CMapItemLayerSounds Item; CMapItemLayerSounds Item;
Item.m_Version = CMapItemLayerSounds::CURRENT_VERSION; Item.m_Version = CMapItemLayerSounds::CURRENT_VERSION;
Item.m_Layer.m_Version = 1; // was previously uninitialized, do not rely on it being 1 Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
Item.m_Layer.m_Flags = pLayer->m_Flags; Item.m_Layer.m_Flags = pLayer->m_Flags;
Item.m_Layer.m_Type = pLayer->m_Type; Item.m_Layer.m_Type = pLayer->m_Type;
Item.m_Sound = pLayer->m_Sound; Item.m_Sound = pLayer->m_Sound;