diff options
| author | oy <Tom_Adams@web.de> | 2011-04-13 20:37:12 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-04-13 20:37:12 +0200 |
| commit | 06115dd49dca2f8eb5f14606437e8fd20037cc4d (patch) | |
| tree | 5ec4bca6158319b3f5285d7689c5f94ae8da8c93 /src/game/mapitems.h | |
| parent | 63e059b8fff6498e42b765a1dca000e53005ea77 (diff) | |
| download | zcatch-06115dd49dca2f8eb5f14606437e8fd20037cc4d.tar.gz zcatch-06115dd49dca2f8eb5f14606437e8fd20037cc4d.zip | |
added "Whitespace and line Endings cleanup" by GreYFoX
Diffstat (limited to 'src/game/mapitems.h')
| -rw-r--r-- | src/game/mapitems.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/game/mapitems.h b/src/game/mapitems.h index 31f7299f..d99d6724 100644 --- a/src/game/mapitems.h +++ b/src/game/mapitems.h @@ -10,7 +10,7 @@ enum LAYERTYPE_GAME, // not used LAYERTYPE_TILES, LAYERTYPE_QUADS, - + MAPITEMTYPE_VERSION=0, MAPITEMTYPE_INFO, MAPITEMTYPE_IMAGE, @@ -18,7 +18,7 @@ enum MAPITEMTYPE_GROUP, MAPITEMTYPE_LAYER, MAPITEMTYPE_ENVPOINTS, - + CURVETYPE_STEP=0, CURVETYPE_LINEAR, @@ -26,7 +26,7 @@ enum CURVETYPE_FAST, CURVETYPE_SMOOTH, NUM_CURVETYPES, - + // game layer tiles ENTITY_NULL=0, ENTITY_SPAWN, @@ -41,19 +41,19 @@ enum ENTITY_POWERUP_NINJA, ENTITY_WEAPON_RIFLE, NUM_ENTITIES, - + TILE_AIR=0, TILE_SOLID, TILE_DEATH, TILE_NOHOOK, - + TILEFLAG_VFLIP=1, TILEFLAG_HFLIP=2, TILEFLAG_OPAQUE=4, TILEFLAG_ROTATE=8, - + LAYERFLAG_DETAIL=1, - + ENTITY_OFFSET=255-16*4, }; @@ -72,10 +72,10 @@ struct CQuad CPoint m_aPoints[5]; CColor m_aColors[4]; CPoint m_aTexcoords[4]; - + int m_PosEnv; int m_PosEnvOffset; - + int m_ColorEnv; int m_ColorEnvOffset; }; @@ -115,7 +115,7 @@ struct CMapItemGroup_v1 struct CMapItemGroup : public CMapItemGroup_v1 { enum { CURRENT_VERSION=2 }; - + int m_UseClipping; int m_ClipX; int m_ClipY; @@ -134,15 +134,15 @@ struct CMapItemLayerTilemap { CMapItemLayer m_Layer; int m_Version; - + int m_Width; int m_Height; int m_Flags; - + CColor m_Color; int m_ColorEnv; int m_ColorEnvOffset; - + int m_Image; int m_Data; } ; @@ -151,7 +151,7 @@ struct CMapItemLayerQuads { CMapItemLayer m_Layer; int m_Version; - + int m_NumQuads; int m_Data; int m_Image; @@ -167,7 +167,7 @@ struct CEnvPoint int m_Time; // in ms int m_Curvetype; int m_aValues[4]; // 1-4 depending on envelope (22.10 fixed point) - + bool operator<(const CEnvPoint &Other) { return m_Time < Other.m_Time; } } ; |