[colobot] 71/100: Make UraniumOre not destroyable, closes #777

Didier Raboud odyx at moszumanska.debian.org
Thu Jun 1 18:10:20 UTC 2017


This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 7b328fbfc3252133ff7838317fa8629059026e51
Author: krzys-h <krzys_h at interia.pl>
Date:   Sun May 21 21:45:43 2017 +0200

    Make UraniumOre not destroyable, closes #777
    
    This was likely a mistake during object interface refactoring
---
 src/object/old_object.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp
index 0930f02..dbbb389 100644
--- a/src/object/old_object.cpp
+++ b/src/object/old_object.cpp
@@ -355,6 +355,7 @@ bool COldObject::DamageObject(DamageType type, float force, CObject* killer)
     else if ( Implements(ObjectInterfaceType::Fragile) )
     {
         if ( m_type == OBJECT_BOMB && type != DamageType::Explosive ) return false; // Mine can't be destroyed by shooting
+        if ( m_type == OBJECT_URANIUM ) return false; // UraniumOre is not destroyable (see #777)
 
         DestroyObject(DestructionType::Explosion, killer);
         return true;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git



More information about the Pkg-games-commits mailing list