Skip to content

O
openjazz
Commit 3abea93d authored by newspaz's avatar newspaz
Browse files
Options

Changes to make the explosive effect better 

eventframe.cpp
*) Explosive effect now is more random
*) Changed positioning of special behavior again slightly
parent 97f10e39
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
src/level/event/eventframe.cpp
View file @ 3abea93d
......@@ -983,7 +983,7 @@ void Event::draw (unsigned int ticks, int change) {
// Correct the position without altering the animation
if (disableAnimOffset) {
changeY += anim->getOffset();
changeY -= anim->getOffset();
}
else if (onlyLAnimOffset && animType == E_RIGHTANIM) {
......@@ -1006,16 +1006,18 @@ void Event::draw (unsigned int ticks, int change) {
// In case of an explosion
// Determine position in a half circle path
fixed xOffset = fSin(level->getEventTime(gridX, gridY) - ticks) * 48;
fixed xOffset = fSin(level->getEventTime(gridX, gridY) - ticks) * 48 - ITOF(16);
fixed yOffset = fCos(level->getEventTime(gridX, gridY) - ticks) * 48;
int val = gridX + gridY;
// Draw the animation in six different positions
anim->draw(changeX - yOffset, changeY - xOffset);
anim->draw(changeX + yOffset, changeY - xOffset);
anim->draw(changeX + ITOF(16) - yOffset, changeY - ITOF(8) - xOffset);
anim->draw(changeX - ITOF(8) + yOffset, changeY - ITOF(16) - xOffset);
anim->draw(changeX + ITOF(12) - yOffset, changeY + ITOF(12) - xOffset);
anim->draw(changeX - ITOF(24) + yOffset, changeY + ITOF(24) - xOffset);
anim->draw(changeX + ITOF(val % 32) - yOffset, changeY - ITOF(val % 8) - xOffset);
anim->draw(changeX - ITOF(val % 16) + yOffset, changeY - ITOF(val % 16) - xOffset);
anim->draw(changeX + ITOF(val % 24) - yOffset, changeY + ITOF(val % 12) - xOffset);
anim->draw(changeX - ITOF(val % 48) + yOffset, changeY + ITOF(val % 24) - xOffset);
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment