This commit is contained in:
parent
cd80039a6c
commit
efafaba4ba
28 changed files with 246 additions and 188 deletions
|
@ -8,6 +8,16 @@
|
|||
#include "MkLevelLayer.h"
|
||||
#include "MkLevelLayerCollision.h"
|
||||
|
||||
/*
|
||||
0 - Blank
|
||||
1 - Solid block (no flips)
|
||||
2 - slope0
|
||||
3 - slope0 flip x
|
||||
4 - slope1
|
||||
5 - slope1 flip x
|
||||
6 - slope2
|
||||
7 - slope2 flip x
|
||||
*/
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
|
@ -76,14 +86,26 @@ int Height=Map.GetHeight();
|
|||
sExpColTile &ThisElem=Map.Get(X,Y);
|
||||
u8 OutElem;
|
||||
|
||||
OutElem=ThisElem.Flags<<COLLISION_TYPE_FLAG_SHIFT;
|
||||
OutElem|=ThisElem.Tile;
|
||||
OutElem=ThisElem.Tile;
|
||||
OutElem|=ThisElem.Flags<<COLLISION_TYPE_FLAG_SHIFT;
|
||||
/*
|
||||
OutElem=0;
|
||||
if (ThisElem.Tile || ThisElem.Flags)
|
||||
{
|
||||
int FF=ThisElem.Tile & 1;
|
||||
int T=(ThisElem.Tile>>1)+1;
|
||||
OutElem=((T-1)*4)+1;
|
||||
OutElem+=FF;
|
||||
OutElem|=ThisElem.Flags<<COLLISION_TYPE_FLAG_SHIFT;
|
||||
|
||||
if (ThisElem.Tile>(u16)COLLISION_MASK)
|
||||
}
|
||||
|
||||
*/
|
||||
/* if (ThisElem.Tile>(u16)COLLISION_MASK)
|
||||
{
|
||||
printf("COLLISION OVERFLOW %s: %i,%i=(%i,%i)!!\n",MapName,X,Y,ThisElem.Tile,ThisElem.Flags);
|
||||
}
|
||||
|
||||
*/
|
||||
fwrite(&OutElem,sizeof(u8),1,File);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue