Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undoing previous commit. shipTakingDamage was already working as intended as per forum thread: http://www.aegidian.org/bb/viewtopic.php?f=4&t=11853

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4860 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2012-04-19 10:33:23 +00:00
parent f229dcd87c
commit d5d43d0f0a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Entities/PlayerEntity.m
View File

@ -4130,9 +4130,8 @@ static GLfloat sBaseMass = 0.0;
energy -= amount;
[self playDirectHit];
ship_temperature += (amount / [self heatInsulation]);
[self noteTakingDamage:amount from:other type:damageType];
}
[self noteTakingDamage:amount from:other type:damageType];
if (cascading) energy = 0.0; // explicitly set energy to zero when cascading, in case an oxp raised the energy in noteTakingDamage.
if (energy <= 0.0) //use normal ship temperature calculations for heat damage