Raiza.dev/Minicraft3DS
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

All the Changes for 1.2.1

Browse source 
Sorry forgot to commit once again.
Just look in the changelog of the release
This commit is contained in:
Andre Schweiger 2016-02-29 14:19:32 +01:00
parent 9a8c8bc714
commit 73775f875a
9 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/Globals.c
View file

@ -385,6 +385,7 @@ bool ItemVsEntity(Item* item, Entity* e, int dir){
return true;
case ENTITY_MAGIC_PILLAR:
playSound(snd_monsterHurt);
removeEntityFromList(e, e->level, &eManager);
return true;
} break;
@ -402,6 +403,7 @@ bool ItemVsEntity(Item* item, Entity* e, int dir){
return true;
case ENTITY_MAGIC_PILLAR:
playSound(snd_monsterHurt);
removeEntityFromList(e, e->level, &eManager);
return true;
} break;
@ -418,6 +420,7 @@ bool ItemVsEntity(Item* item, Entity* e, int dir){
return true;
case ENTITY_MAGIC_PILLAR:
playSound(snd_monsterHurt);
removeEntityFromList(e, e->level, &eManager);
return true;
} break;
@ -1277,7 +1280,7 @@ void tickEntity(Entity* e){
if (e->hurtTime > 0) e->hurtTime--;
e->dragon.animTimer++;
if(e->dragon.animTimer>=20) {
if(e->dragon.animTimer>=4*4) {
e->dragon.animTimer = 0;
}
@ -1285,8 +1288,8 @@ void tickEntity(Entity* e){
if (e->dragon.attackDelay > 0) {
e->dragon.attackDelay--;
if (e->dragon.attackDelay <= 0) {
e->wizard.attackType = rand()%2;
e->wizard.attackTime = 121;
e->dragon.attackType = rand()%2;
e->dragon.attackTime = 121;
}
return;
}