diff options
| author | Japa Illo | 2012-02-22 00:48:06 +0530 |
|---|---|---|
| committer | Japa Illo | 2012-02-22 00:48:06 +0530 |
| commit | ce5ec6c3f87fe5d0fb2bf5c50f097057e58aa039 (patch) | |
| tree | ca24a2043ba743872b6136ecb39ec933dbc6bace /Block.cpp | |
| parent | ae9dd5511370d8b12354b613f395a20cf86bc461 (diff) | |
| download | stonesense-ce5ec6c3f87fe5d0fb2bf5c50f097057e58aa039.tar.gz stonesense-ce5ec6c3f87fe5d0fb2bf5c50f097057e58aa039.tar.bz2 stonesense-ce5ec6c3f87fe5d0fb2bf5c50f097057e58aa039.tar.xz | |
Added fire effects. also fixed the cursor so it scales with the rest.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'Block.cpp')
| -rw-r--r-- | Block.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -424,7 +424,7 @@ void Block::Draw() {
ALLEGRO_COLOR tint = lookupMaterialColor(Eff_Web.matt.type, Eff_Web.matt.index);
tint.a*=Eff_Web.density/100.0f;
- DrawSpriteFromSheet(rando%5, sprite_webing, tint, drawx, drawy- WALLHEIGHT, this, 4.0f);
+ DrawSpriteFromSheet(rando%5, sprite_webing, tint, drawx, drawy, this, 4.0f);
//al_draw_tinted_bitmap(sprite_webing,tint, drawx, drawy - (WALLHEIGHT), 0);
}
if(Eff_Miasma.density > 0)
@@ -460,12 +460,22 @@ void Block::Draw() if(Eff_Dragonfire.density > 0)
{
ALLEGRO_COLOR tint = lookupMaterialColor(Eff_Dragonfire.matt.type, Eff_Dragonfire.matt.index);
- draw_particle_cloud(Eff_Dragonfire.density, drawx, drawy - (SPRITEHEIGHT/2), SPRITEWIDTH, SPRITEHEIGHT, sprite_dragonfire, tint);
+ tint.a*=Eff_Dragonfire.density/100.0f;
+ tint.g*=Eff_Dragonfire.density/100.0f;
+ tint.b*=Eff_Dragonfire.density/100.0f;
+ DrawSpriteFromSheet((((currentFrameLong+rando)%128)*20), sprite_dragonfire, tint, drawx, drawy, this, 1.0f);
+ //ALLEGRO_COLOR tint = lookupMaterialColor(Eff_Dragonfire.matt.type, Eff_Dragonfire.matt.index);
+ //draw_particle_cloud(Eff_Dragonfire.density, drawx, drawy - (SPRITEHEIGHT/2), SPRITEWIDTH, SPRITEHEIGHT, sprite_dragonfire, tint);
}
if(Eff_Fire.density > 0)
{
ALLEGRO_COLOR tint = lookupMaterialColor(Eff_Fire.matt.type, Eff_Fire.matt.index);
- draw_particle_cloud(Eff_Fire.density, drawx, drawy - (SPRITEHEIGHT/2), SPRITEWIDTH, SPRITEHEIGHT, sprite_fire, tint);
+ tint.a*=Eff_Fire.density/100.0f;
+ tint.g*=Eff_Fire.density/100.0f;
+ tint.b*=Eff_Fire.density/100.0f;
+ DrawSpriteFromSheet((((currentFrameLong+rando)%128)*20), sprite_dragonfire, tint, drawx, drawy, this, 1.0f);
+ //ALLEGRO_COLOR tint = lookupMaterialColor(Eff_Fire.matt.type, Eff_Fire.matt.index);
+ //draw_particle_cloud(Eff_Fire.density, drawx, drawy - (SPRITEHEIGHT/2), SPRITEWIDTH, SPRITEHEIGHT, sprite_fire, tint);
}
if(Eff_MaterialGas.density > 0)
{
@@ -617,7 +627,7 @@ void createEffectSprites() sprite_dust = CreateSpriteFromSheet( 184, IMGObjectSheet);
sprite_magma = CreateSpriteFromSheet( 185, IMGObjectSheet);
sprite_smoke = CreateSpriteFromSheet( 186, IMGObjectSheet);
- sprite_dragonfire = CreateSpriteFromSheet( 187, IMGObjectSheet);
+ sprite_dragonfire = load_bitmap_withWarning("stonesense/Effect_flames.png");
sprite_fire = CreateSpriteFromSheet( 188, IMGObjectSheet);
sprite_webing = load_bitmap_withWarning("stonesense/Effect_web.png");
sprite_boiling = CreateSpriteFromSheet( 190, IMGObjectSheet);
|
