wip

Author: ChrisLR

src/catalua_bindings_creature.cpp

@@ -30,6 +30,8 @@
 #include "json.h"
 #include "magic/magic.h"
 #include "map.h"
+// The next import seems unused but the build breaks if we remove it
+#include "monfaction.h"
 #include "monster.h"
 #include "mtype.h"
 #include "npc.h"
@@ -232,10 +234,8 @@ void cata::detail::reg_creature( sol::state &lua )
             if( bpid.has_value() )
             {
                 return cr.has_effect( eff, *bpid );
-            } else
-            {
-                return cr.has_effect( eff );
             }
+            return cr.has_effect( eff );
         } );
 
         luna::set_fx( ut, "get_effect", []( Creature & cr, const efftype_id & eff,

src/monster.cpp

@@ -1506,37 +1506,37 @@ item *monster::get_storage_item() const
     return nullptr;
 }
 
-void *monster::attach_saddle( monster &z )
+void monster::attach_saddle( monster &z )
 {
     if( z.has_effect( effect_saddled ) ) {
         z.remove_effect( effect_saddled );
         get_avatar().i_add( z.remove_tack_item() );
     } else {
-        item *loc = tack_loc();
-
-        if( !loc ) {
-            add_msg( _( "Never mind." ) );
-            return;
-        }
-        z.add_effect( effect_saddled, 1_turns );
-        z.set_tack_item( loc->detach() );
+        // item *loc = tack_item;
+        //
+        // if( !loc ) {
+        //     add_msg( _( "Never mind." ) );
+        //     return;
+        // }
+        // z.add_effect( effect_saddled, 1_turns );
+        // z.set_tack_item( loc->detach() );
     }
 }
 
-void *monster::remove_saddle( monster &z )
+void monster::remove_saddle( monster &z )
 {
     if( z.has_effect( effect_saddled ) ) {
         z.remove_effect( effect_saddled );
         get_avatar().i_add( z.remove_tack_item() );
     } else {
-        item *loc = tack_loc();
-
-        if( !loc ) {
-            add_msg( _( "Never mind." ) );
-            return;
-        }
-        z.add_effect( effect_saddled, 1_turns );
-        z.set_tack_item( loc->detach() );
+        // item *loc = tack_loc();
+        //
+        // if( !loc ) {
+        //     add_msg( _( "Never mind." ) );
+        //     return;
+        // }
+        // z.add_effect( effect_saddled, 1_turns );
+        // z.set_tack_item( loc->detach() );
     }
 }
 

src/monster.h

@@ -740,6 +740,11 @@ class monster : public Creature, public location_visitable<monster>
         detached_ptr<item> remove_armor_item( );
 
         item *get_storage_item() const;
+
+        void attach_saddle(monster &z);
+
+        void remove_saddle(monster &z);
+
         detached_ptr<item> set_storage_item( detached_ptr<item> &&to );
         detached_ptr<item> remove_storage_item( );