(mirror-action "left"))
(action (name "flat-left")
- (anim-fps 64.0)
+ (fps 64.0)
(hitbox 2 3 31.8 31.8)
(images
"snowsnail_flip1.png"
))
(action (name "flat-right")
+ (fps 64.0)
(hitbox 2 3 31.8 31.8)
(mirror-action "flat-left")))
(fullbox #t)
(next-tile 84)
(data 1)
- (anim-fps 2)
+ (fps 2)
)
(tiles
(width 3)
"objects/coin/coin-7.png"
)
(coin #t)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 47)
"tiles/water/waves-2.png"
)
(water #t)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 77)
"tiles/doodads/flag-0.png"
"tiles/doodads/flag-1.png"
)
- (anim-fps 10)
+ (fps 10)
)
(tile
; dupe of tile 26, this one will be kept.
(fullbox #t)
(next-tile 84)
(data 1)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 84)
(next-tile 84)
(editor-images "objects/bonus_block/bonus-fire_flower.png")
(data 2)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 103)
(next-tile 84)
(editor-images "objects/bonus_block/bonus-herring.png")
(data 3)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 104)
(next-tile 84)
(editor-images "objects/bonus_block/bonus-1up.png")
(data 4)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 129)
"tiles/goal/goal1-1.png"
"tiles/goal/goal1-1.png"
)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 130)
"tiles/goal/goal2-1.png"
"tiles/goal/goal2-1.png"
)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 131)
(next-tile 84)
(editor-images "objects/bonus_block/bonus-ice_flower.png")
(data 5)
- (anim-fps 2)
+ (fps 2)
)
(tiles
(water #t)
(hurts #t)
(fire #t)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 174)
(water #t)
(hurts #t)
(fire #t)
- (anim-fps 10)
+ (fps 10)
)
(tiles
(width 4)
"tiles/waterfall/trans-3.png"
"tiles/waterfall/trans-4.png"
)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 195)
"tiles/waterfall/waterfall1-0-4.png"
)
(water #t)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 196)
"tiles/waterfall/waterfall1-5-4.png"
)
(water #t)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 197)
"tiles/waterfall/waterfall0-0-4.png"
)
(water #t)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 198)
"tiles/waterfall/waterfall0-1-4.png"
)
(water #t)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 199)
"tiles/waterfall/waterfall0-2-4.png"
)
(water #t)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 200)
"tiles/water/waves-trans-2.png"
)
(water #t)
- (anim-fps 10)
+ (fps 10)
)
(tiles
(width 1)
"tiles/waterfall/waterfall-3.png"
"tiles/waterfall/waterfall-4.png"
)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 295)
"tiles/jungle/jungle12-2.png"
)
(solid #t)
- (anim-fps 10)
+ (fps 10)
)
(tiles
(width 2)
"objects/particles/rainsplash-3.png"
"objects/particles/rainsplash-4.png"
"tiles/auxiliary/blank.png")
- (anim-fps 18)
+ (fps 18)
)
(tile
(id 1314)
"objects/particles/rainsplash-4.png"
"tiles/auxiliary/blank.png"
"objects/particles/rainsplash-1.png")
- (anim-fps 20)
+ (fps 20)
)
(tile
(id 1315)
"tiles/auxiliary/blank.png"
"objects/particles/rainsplash-1.png"
"objects/particles/rainsplash-2.png")
- (anim-fps 22)
+ (fps 22)
)
(tile
(id 1316)
"objects/particles/rainsplash-1.png"
"objects/particles/rainsplash-2.png"
"objects/particles/rainsplash-3.png")
- (anim-fps 24)
+ (fps 24)
)
(tile
(id 1317)
"objects/particles/rainsplash-vertical-3.png"
"objects/particles/rainsplash-vertical-4.png"
"tiles/auxiliary/blank.png")
- (anim-fps 21)
+ (fps 21)
)
(tile
(id 1318)
"objects/particles/rainsplash-vertical-4.png"
"tiles/auxiliary/blank.png"
"objects/particles/rainsplash-vertical-1.png")
- (anim-fps 19)
+ (fps 19)
)
(tile
(id 1319)
"tiles/auxiliary/blank.png"
"objects/particles/rainsplash-vertical-1.png"
"objects/particles/rainsplash-vertical-2.png")
- (anim-fps 17)
+ (fps 17)
)
(tile
(id 1320)
"objects/particles/rainsplash-vertical-1.png"
"objects/particles/rainsplash-vertical-2.png"
"objects/particles/rainsplash-vertical-3.png")
- (anim-fps 15)
+ (fps 15)
)
(tiles
(width 4)
"tiles/water/electrified-0.png"
"tiles/water/electrified-1.png"
)
- (anim-fps 10)
+ (fps 10)
(hurts #t)
(water #t)
)
"tiles/water/electrified_waves-0.png"
"tiles/water/electrified_waves-1.png"
)
- (anim-fps 10)
+ (fps 10)
(hurts #t)
(water #t)
)
"tiles/castle/walltorch/flame-6.png"
"tiles/castle/walltorch/flame-6.png"
)
- (anim-fps 10)
+ (fps 10)
)
(tile
(id 1518)
"tiles/forest/pogonia/pogonia-4.png")
(hurts #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tiles
"tiles/forest/pogonia/pogonia-4-flip.png")
(hurts #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tiles
(width 2)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1701)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1702)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1703)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1704)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1705)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1706)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1707)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1708)
"tiles/lava/zone/surface-1-3.png"
"tiles/lava/zone/surface-1-4.png")
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1709)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1710)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1711)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1712)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1713)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1714)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(id 1715)
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tile
(hurts #t)
(fire #t)
(solid #f)
- (anim-fps 2)
+ (fps 2)
)
(tiles
(width 5)
)
(hurts #f)
(solid #f)
- (anim-fps 2))
+ (fps 2))
(tile
(id 1736)
(images
)
(hurts #t)
(solid #f)
- (anim-fps 2))
+ (fps 2))
(tiles
(width 1)
(height 3)
"tiles/water/antarctic-7.png"
"tiles/water/antarctic-8.png"
)
- (anim-fps 16)
+ (fps 16)
)
(tile
(id 2020)
"tiles/lava/lava-7.png"
"tiles/lava/lava-8.png"
)
- (anim-fps 16)
+ (fps 16)
)
(tiles
images(),
attributes(0),
data(0),
- anim_fps(1)
+ fps(1)
{
}
Tile::Tile(const TileSet& new_tileset, const std::vector<ImageSpec>& imagespecs_,
- uint32_t attributes, uint32_t data, float animfps) :
+ uint32_t attributes, uint32_t data, float fps) :
tileset(new_tileset),
imagespecs(imagespecs_),
images(),
attributes(attributes),
data(data),
- anim_fps(animfps)
+ fps(fps)
{
correct_attributes();
}
Tile::draw(DrawingContext& context, const Vector& pos, int z_pos) const
{
if(images.size() > 1) {
- size_t frame = size_t(game_time * anim_fps) % images.size();
+ size_t frame = size_t(game_time * fps) % images.size();
context.draw_surface(images[frame], pos, z_pos);
} else if (images.size() == 1) {
context.draw_surface(images[0], pos, z_pos);
/** General purpose data attached to a tile (content of a box, type of coin)*/
int data;
- float anim_fps;
+ float fps;
public:
Tile(const TileSet& tileset);
Tile(const TileSet& tileset, const std::vector<ImageSpec>& images,
- uint32_t attributes, uint32_t data, float animfps);
+ uint32_t attributes, uint32_t data, float fps);
~Tile();
/** load Surfaces, if not already loaded */
uint32_t data = 0;
std::vector<Tile::ImageSpec> imagespecs;
- float anim_fps = 10;
+ float fps = 10;
bool value = false;
if(reader.get("solid", value) && value)
data |= Tile::WORLDMAP_STOP;
reader.get("data", data);
- reader.get("anim-fps", anim_fps);
+ reader.get("fps", fps);
if(reader.get("slope-type", data))
{
}
#endif
- std::auto_ptr<Tile> tile(new Tile(m_tileset, imagespecs, attributes, data, anim_fps));
+ std::auto_ptr<Tile> tile(new Tile(m_tileset, imagespecs, attributes, data, fps));
if (id >= m_tileset.tiles.size())
m_tileset.tiles.resize(id+1, 0);
reader.get("width", width);
reader.get("height", height);
- float animfps = 10;
- reader.get("anim-fps", animfps);
+ float fps = 10;
+ reader.get("fps", fps);
if (images.size() <= 0)
{
throw std::runtime_error("No images in tile.");
}
- else if (animfps < 0)
+ else if (fps < 0)
{
throw std::runtime_error("Negative fps.");
}
}
std::auto_ptr<Tile> tile(new Tile(m_tileset, imagespecs,
- (has_attributes ? attributes[i] : 0), (has_datas ? datas[i] : 0), animfps));
+ (has_attributes ? attributes[i] : 0), (has_datas ? datas[i] : 0), fps));
if (m_tileset.tiles[ids[i]] == 0) {
m_tileset.tiles[ids[i]] = tile.release();
} else {
projects / supertux.git / commitdiff