X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ftrampoline.cpp;h=73768757c840666927f7af3133939b0a17696571;hb=8a627e73d824b5a14249cfe066dc2fdc643ce28d;hp=ed83793ec9d30d6ffc6b8e5f9fa99410e5be8298;hpb=a174274d695b8b68b93e4c1615499a2305c41401;p=supertux.git diff --git a/src/object/trampoline.cpp b/src/object/trampoline.cpp index ed83793ec..73768757c 100644 --- a/src/object/trampoline.cpp +++ b/src/object/trampoline.cpp @@ -37,7 +37,6 @@ Trampoline::Trampoline(const lisp::Lisp& lisp) : MovingSprite(lisp, "images/objects/trampoline/trampoline.sprite" ) { sound_manager->preload( TRAMPOLINE_SOUND ); - flags |= FLAG_PORTABLE; physic.set_velocity(0, 0); physic.enable_gravity(true); on_ground = false; @@ -46,13 +45,13 @@ Trampoline::Trampoline(const lisp::Lisp& lisp) //Check if this trampoline is not portable if( lisp.get( "portable", portable ) ){ if( !portable ){ - flags ^= FLAG_PORTABLE; //we need another sprite sprite_name = "images/objects/trampoline/trampoline_fix.sprite"; sprite = sprite_manager->create( sprite_name ); sprite->set_action("normal"); } } + set_portable(portable); } void