Ticket #9225: miscflags-final.patch

script_v0.cpp

@@ -829 +829 @@
         // This flag causes the actor to stop moving (used by script #158, Green Tentacle 'Oomph!')
         if (a->_miscflags & 0x40)
                 a->stopActorMoving();
+        if (a->_miscflags & 0x80)
+                a->setActorCostume(0);
 
         debug(0, "o_setActorBitVar(%d, %d, %d)", act, mask, mod);
 }

verbs.cpp

@@ -168 +168 @@
                 return;
 
         // verbs disabled for the current actor
-        ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "switchActor");
-        if (a->_miscflags & 0x40)
-                return;
+        // Should no longer be required...
+        //ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "switchActor");
+        //if (a->_miscflags & 0x40)
+        //      return;
 
         VAR(VAR_EGO) = VAR(97 + slot);
         resetVerbs();
@@ -727 +728 @@
 }
 
 void ScummEngine_v0::runObject(int obj, int entry) {
-        int prev = _v0ObjectInInventory;
+        bool prev = _v0ObjectInInventory;
 
         if (getVerbEntrypoint(obj, entry) == 0) {
                 // If nothing was found, attempt to find the 'WHAT-IS' verb script
@@ -978 +979 @@
         // We acted on an inventory item
         if (_activeInventory && verbExecutes(_activeInventory, true) && _activeVerb != 3) {
                 _v0ObjectInInventory = true;
+                _activeObject = _activeInventory;
                 runObject(_activeInventory, _activeVerb);
 
                 _verbExecuting = false;
@@ -1036 +1038 @@
 }
 
 void ScummEngine_v0::checkExecVerbs() {
-        Actor *a = derefActor(VAR(VAR_EGO), "checkExecVerbs");
+        ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkExecVerbs");
         VirtScreen *zone = findVirtScreen(_mouse.y);
 
         // Is a verb currently executing
@@ -1151 +1153 @@
                                 obj = 0;
                                 objIdx = 0;
                         }
+                        
+                        if (a->_miscflags & 0x80) {
+                                if (_activeVerb != 7 && over != 7) {
+                                        _activeVerb = 0;
+                                        over = 0;
+                                }
+                        }
 
                         // Handle New Kid verb options
                         if (_activeVerb == 7 || over == 7) {
                                 // Disable New-Kid (in the secret lab)
                                 if (_currentMode == 2 || _currentMode == 0)
                                         return;
-                                
-                                if (!(((ActorC64 *)a)->_miscflags & 0x80)) {
-                                        if (_activeVerb != 7) {
-                                                _activeVerb = over;
-                                                over = 0;
-                                        }
-                                }
 
-                                if (over) {
+                                if (_activeVerb == 7 && over) {
                                         _activeVerb = 13;
                                         switchActor(_verbs[over].verbid - 1);
                                         return;
                                 }
 
                                 setNewKidVerbs();
+                                _activeVerb = 7;
 
                                 return;
                         }
@@ -1187 +1190 @@
 
                                 if (zone->number == kMainVirtScreen) {
                                         // Ignore verbs?
-                                        if (((ActorC64 *)a)->_miscflags & 0x40) {
+                                        if (a->_miscflags & 0x40) {
                                                 resetSentence(false);
                                                 return;
                                         }