Changeset 3520

Timestamp:

12/02/10 21:22:45 (3 years ago)

Author:

helios2000

Message:

• Added an additional flag to the Instance. This protects against unintentional change of Instance blocking. ObjectEdit?, Saver and Loader use the flag.

Location:

branches/active/0.3.3dev

Files:

• engine/core/model/structures/instance.cpp (modified) (2 diffs)
• engine/core/model/structures/instance.h (modified) (2 diffs)
• engine/core/model/structures/instance.i (modified) (1 diff)
• engine/python/fife/extensions/savers.py (modified) (1 diff)
• engine/python/fife/extensions/serializers/xmlmap.py (modified) (1 diff)
• tools/editor/gui/objectedit.xml (modified) (1 diff)
• tools/editor/plugins/ObjectEdit.py (modified) (5 diffs)

branches/active/0.3.3dev/engine/core/model/structures/instance.cpp

@@ -184 +184 @@
                 m_facinglocation(NULL),
                 m_visual(NULL),
-                m_blocking(object->isBlocking()) {
+                m_blocking(object->isBlocking()),
+                m_override_blocking(false) {
         }
 
@@ -247 +248 @@
 
         void Instance::setBlocking(bool blocking) {
-                m_blocking = blocking;
+                if (m_override_blocking) {
+                        m_blocking = blocking;
+                }
         }
 

branches/active/0.3.3dev/engine/core/model/structures/instance.h

@@ -167 +167 @@
                 bool isBlocking() const;
 
+                /** Sets if instance blocking can overriden
+                 */
+                void setOverrideBlocking(bool overblock) { m_override_blocking = overblock; }
+
+                /** Gets if instance blocking can overriden
+                 */
+                bool isOverrideBlocking() const { return m_override_blocking; }
+
                 /** Adds new instance action listener
                  * @param listener to add
@@ -370 +378 @@
                 // instance blocking info
                 bool m_blocking;
+                // allow to override the blocking property
+                bool m_override_blocking;
 
                 Instance(const Instance&);

branches/active/0.3.3dev/engine/core/model/structures/instance.i

@@ -79 +79 @@
                 void setBlocking(bool blocking);
                 bool isBlocking() const;
+                void setOverrideBlocking(bool overblock);
+                bool isOverrideBlocking() const;
                 void addActionListener(InstanceActionListener* listener);
                 void removeActionListener(InstanceActionListener* listener);

branches/active/0.3.3dev/engine/python/fife/extensions/savers.py

@@ -216 +216 @@
                                 attr_names[(None, 'id')] = 'id'
 
-                        if inst.getObject().isBlocking() != inst.isBlocking():
-                                attr_vals[(None, 'blocking')] = str(int(inst.isBlocking()))
-                                attr_names[(None, 'blocking')] = 'blocking'
+                        if inst.isOverrideBlocking():
+                                attr_vals[(None, 'override_blocking')] = str(int(inst.isOverrideBlocking()))
+                                attr_names[(None, 'override_blocking')] = 'override_blocking'
+                                if inst.getObject().isBlocking() is not inst.isBlocking():
+                                        attr_vals[(None, 'blocking')] = str(int(inst.isBlocking()))
+                                        attr_names[(None, 'blocking')] = 'blocking'
 
                         attrs = AttributesNSImpl(attr_vals, attr_names)

branches/active/0.3.3dev/engine/python/fife/extensions/serializers/xmlmap.py

@@ -502 +502 @@
                         inst.setRotation(rotation)
 
-                        blocking = instance.get('blocking')
-                        if blocking is not None:
-                                if bool(blocking) is not object.isBlocking():
-                                        inst.setBlocking(bool(blocking))
+                        over_block = instance.get('override_blocking')
+                        if over_block is not None:
+                                inst.setOverrideBlocking(bool(over_block))
+                                blocking = instance.get('blocking')
+                                if blocking is not None:
+                                        inst.setBlocking(bool(int(blocking)))
 
                         fife.InstanceVisual.create(inst)

branches/active/0.3.3dev/tools/editor/gui/objectedit.xml

@@ -70 +70 @@
         </HBox>
   <HBox>
+    <CheckBox name="override_blocking_toggle" text="Allowed to override blocking"/>
+  </HBox>
+  <HBox>
     <Button name="instance_blocking_toggle" text="Toggle instance blocking"/>
   </HBox>

branches/active/0.3.3dev/tools/editor/plugins/ObjectEdit.py

@@ -330 +330 @@
                         x_offset = unicode( 0 )
                         y_offset = unicode( 0 )
-                
+
+                if self._instances[0].isOverrideBlocking():
+                        self.container.findChild(name="override_blocking_toggle")._setMarked(True)
+                else:
+                        self.container.findChild(name="override_blocking_toggle")._setMarked(False)
+
                 self.container.distributeInitialData({
                         'select_rotations'      : self._avail_rotations,
@@ -413 +418 @@
                 @param  widget: pychan widget
                 """
+                self.check_override_blocking()
                 object = self._instances[0].getObject()
                 object_id = object.getId()
@@ -425 +431 @@
 
                 self._object_blocking = int(blocking)
-                self._instance_blocking = int(blocking)
+                self._instance_blocking = int(self._instances[0].isBlocking())
 
                 self.update_gui()
@@ -437 +443 @@
                 @param  widget: pychan widget
                 """
-
+                self.check_override_blocking()
                 instance = self._instances[0]
                 instance.setBlocking(not instance.isBlocking())
@@ -443 +449 @@
 
                 self.update_gui()
+
+        def check_override_blocking(self):
+                instance = self._instances[0]
+                marked = self.container.findChild(name="override_blocking_toggle")._isMarked()
+                if marked:
+                        instance.setOverrideBlocking(True)
+                else:
+                        instance.setOverrideBlocking(False)
 
         def use_user_data(self):