Merge branch 'script'

apps/openmw/mwgui/console.cpp

@@ -17,6 +17,8 @@ namespace MWGui
 
             ConsoleInterpreterContext (Console& console, MWWorld::Environment& environment,
                 MWWorld::Ptr reference);
+
+            virtual void report (const std::string& message);
     };
 
     ConsoleInterpreterContext::ConsoleInterpreterContext (Console& console,
@@ -26,6 +28,11 @@ namespace MWGui
       mConsole (console)
     {}
 
+    void ConsoleInterpreterContext::report (const std::string& message)
+    {
+        mConsole.printOK (message);
+    }
+
     bool Console::compile (const std::string& cmd, Compiler::Output& output)
     {
         try

apps/openmw/mwrender/mwscene.cpp

@@ -191,7 +191,7 @@ void MWScene::scaleObject (const std::string& handle, float scale)
 
 }
 
-void MWScene::toggleCollisionMode()
+bool MWScene::toggleCollisionMode()
 {
     for(std::map<std::string,OEngine::Physic::PhysicActor*>::iterator it = eng->PhysicActorMap.begin(); it != eng->PhysicActorMap.end();it++)
     {
@@ -203,6 +203,7 @@ void MWScene::toggleCollisionMode()
             act->setGravity(0.);
             act->setVerticalVelocity(0);
             mFreeFly = true;
+            return false;
         }
         else
         {
@@ -210,11 +211,15 @@ void MWScene::toggleCollisionMode()
             act->enableCollisions(true);
             act->setGravity(4.);
             act->setVerticalVelocity(0);
+            return true;
         }
     }
+
+    return false; // This should never happen, but it shall not bother us now, since
+                    // this part of the code needs a rewrite anyway.
 }
 
-void MWScene::toggleRenderMode (int mode)
+bool MWScene::toggleRenderMode (int mode)
 {
     switch (mode)
     {
@@ -223,6 +228,8 @@ void MWScene::toggleRenderMode (int mode)
             // TODO use a proper function instead of accessing the member variable
             // directly.
             eng->setDebugRenderingMode (!eng->isDebugCreated);
-            break;
+            return eng->isDebugCreated;
     }
+
+    return false;
 }

apps/openmw/mwrender/mwscene.hpp

@@ -91,12 +91,14 @@ namespace MWRender
 
         /// Toggle collision mode for player. If disabled player object should ignore
         /// collisions and gravity.
-        void toggleCollisionMode();
+        /// \return Resulting mode
+        bool toggleCollisionMode();
 
         /// Toggle render mode
         /// \todo Using an int instead of a enum here to avoid cyclic includes. Will be fixed
         /// when the mw*-refactoring is done.
-        void toggleRenderMode (int mode);
+        /// \return Resulting mode
+        bool toggleRenderMode (int mode);
     };
 }
 

apps/openmw/mwscript/cellextensions.cpp

@@ -102,10 +102,42 @@ namespace MWScript
                 }
         };
 
+        class OpGetPCCell : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    InterpreterContext& context
+                        = static_cast<InterpreterContext&> (runtime.getContext());
+
+                    std::string name = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    const ESM::Cell *cell = context.getWorld().getPlayer().getPlayer().getCell()->cell;
+
+                    std::string current = cell->name;
+
+                    if (!(cell->data.flags & ESM::Cell::Interior) && current.empty())
+                    {
+                        const ESM::Region *region =
+                            context.getWorld().getStore().regions.find (cell->region);
+
+                        current = region->name;
+                    }
+
+                    bool match = current.length()>=name.length() &&
+                        current.substr (0, name.length())==name;
+
+                    runtime.push (match ? 1 : 0);
+                }
+        };
+
         const int opcodeCellChanged = 0x2000000;
         const int opcodeCOC = 0x2000026;
         const int opcodeCOE = 0x200008e;
         const int opcodeGetInterior = 0x2000131;
+        const int opcodeGetPCCell = 0x2000136;
 
         void registerExtensions (Compiler::Extensions& extensions)
         {
@@ -115,6 +147,7 @@ namespace MWScript
             extensions.registerInstruction ("coe", "ll", opcodeCOE);
             extensions.registerInstruction ("centeronexterior", "ll", opcodeCOE);
             extensions.registerFunction ("getinterior", 'l', "", opcodeGetInterior);
+            extensions.registerFunction ("getpccell", 'l', "c", opcodeGetPCCell);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
@@ -123,6 +156,7 @@ namespace MWScript
             interpreter.installSegment5 (opcodeCOC, new OpCOC);
             interpreter.installSegment5 (opcodeCOE, new OpCOE);
             interpreter.installSegment5 (opcodeGetInterior, new OpGetInterior);
+            interpreter.installSegment5 (opcodeGetPCCell, new OpGetPCCell);
         }
     }
 }

apps/openmw/mwscript/controlextensions.cpp

@@ -46,7 +46,9 @@ namespace MWScript
                     InterpreterContext& context
                         = static_cast<InterpreterContext&> (runtime.getContext());
 
-                    context.getWorld().toggleCollisionMode();
+                    bool enabled = context.getWorld().toggleCollisionMode();
+
+                    context.report (enabled ? "Collsion -> On" : "Collision -> Off");
                 }
         };
 
@@ -74,6 +76,7 @@ namespace MWScript
             }
 
             extensions.registerInstruction ("togglecollision", "", opcodeToggleCollision);
+            extensions.registerInstruction ("tcl", "", opcodeToggleCollision);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)

apps/openmw/mwscript/docs/vmformat.txt

@@ -107,4 +107,5 @@ op 0x2000132: ToggleCollsionDebug
 op 0x2000133: Journal
 op 0x2000134: SetJournalIndex
 op 0x2000135: GetJournalIndex
-opcodes 0x2000136-0x3ffffff unused
+op 0x2000136: GetPCCell
+opcodes 0x2000137-0x3ffffff unused

apps/openmw/mwscript/interpretercontext.cpp

@@ -110,6 +110,11 @@ namespace MWScript
         mEnvironment.mWindowManager->messageBox (message, buttons);
     }
 
+    void InterpreterContext::report (const std::string& message)
+    {
+        messageBox (message);
+    }
+
     bool InterpreterContext::menuMode()
     {
         return mEnvironment.mWindowManager->isGuiMode();

apps/openmw/mwscript/interpretercontext.hpp

@@ -57,9 +57,13 @@ namespace MWScript
             virtual void setLocalFloat (int index, float value);
 
             using Interpreter::Context::messageBox;
+
             virtual void messageBox (const std::string& message,
                 const std::vector<std::string>& buttons);
 
+            virtual void report (const std::string& message);
+            ///< By default echo via messageBox.
+
             virtual bool menuMode();
 
             virtual int getGlobalShort (const std::string& name) const;

apps/openmw/mwscript/miscextensions.cpp

@@ -99,7 +99,11 @@ namespace MWScript
                     InterpreterContext& context =
                         static_cast<InterpreterContext&> (runtime.getContext());
 
-                    context.getWorld().toggleRenderMode (MWWorld::World::Render_CollisionDebug);
+                    bool enabled =
+                        context.getWorld().toggleRenderMode (MWWorld::World::Render_CollisionDebug);
+
+                    context.report (enabled ?
+                        "Collsion Mesh Rendering -> On" : "Collision Mesh Rendering -> Off");
                 }
         };
 

apps/openmw/mwscript/skyextensions.cpp

@@ -16,68 +16,70 @@ namespace MWScript
         class OpToggleSky : public Interpreter::Opcode0
         {
             public:
-            
+
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     InterpreterContext& context =
                         static_cast<InterpreterContext&> (runtime.getContext());
-                    
+
-                    context.getWorld().toggleSky();
+                    bool enabled = context.getWorld().toggleSky();
-                } 
+
-        };      
+                    context.report (enabled ? "Sky -> On" : "Sky -> Off");
-        
+                }
+        };
+
         class OpTurnMoonWhite : public Interpreter::Opcode0
         {
             public:
-            
+
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     InterpreterContext& context =
                         static_cast<InterpreterContext&> (runtime.getContext());
-                    
+
                     context.getWorld().setMoonColour (false);
-                } 
+                }
-        };          
+        };
 
         class OpTurnMoonRed : public Interpreter::Opcode0
         {
             public:
-            
+
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     InterpreterContext& context =
                         static_cast<InterpreterContext&> (runtime.getContext());
-                    
+
                     context.getWorld().setMoonColour (true);
-                } 
+                }
-        };     
+        };
-        
+
         class OpGetMasserPhase : public Interpreter::Opcode0
         {
             public:
-            
+
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     InterpreterContext& context =
                         static_cast<InterpreterContext&> (runtime.getContext());
-         
+
                     runtime.push (context.getWorld().getMasserPhase());
-                } 
+                }
-        };               
+        };
 
         class OpGetSecundaPhase : public Interpreter::Opcode0
         {
             public:
-            
+
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     InterpreterContext& context =
                         static_cast<InterpreterContext&> (runtime.getContext());
-         
+
                     runtime.push (context.getWorld().getSecundaPhase());
-                } 
+                }
-        };               
+        };
-    
+
         const int opcodeToggleSky = 0x2000021;
         const int opcodeTurnMoonWhite = 0x2000022;
         const int opcodeTurnMoonRed = 0x2000023;
@@ -93,7 +95,7 @@ namespace MWScript
             extensions.registerFunction ("getmasserphase", 'l', "", opcodeGetMasserPhase);
             extensions.registerFunction ("getsecundaphase", 'l', "", opcodeGetSecundaPhase);
         }
-            
+
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5 (opcodeToggleSky, new OpToggleSky);
@@ -101,7 +103,6 @@ namespace MWScript
             interpreter.installSegment5 (opcodeTurnMoonRed, new OpTurnMoonRed);
             interpreter.installSegment5 (opcodeGetMasserPhase, new OpGetMasserPhase);
             interpreter.installSegment5 (opcodeGetSecundaPhase, new OpGetSecundaPhase);
-        }    
+        }
     }
 }
-

apps/openmw/mwworld/world.cpp

@@ -650,12 +650,13 @@ namespace MWWorld
         mSkyManager->setDate (mGlobalVariables->getInt ("day"), month);
     }
 
-    void World::toggleSky()
+    bool World::toggleSky()
     {
         if (mSky)
         {
             mSky = false;
             mSkyManager->disable();
+            return false;
         }
         else
         {
@@ -665,6 +666,7 @@ namespace MWWorld
             mSkyManager->setDate (mGlobalVariables->getInt ("day"),
                 mGlobalVariables->getInt ("month"));
             mSkyManager->enable();
+            return true;
         }
     }
 
@@ -858,13 +860,13 @@ namespace MWWorld
         mScene.doPhysics (duration, *this, actors);
     }
 
-    void World::toggleCollisionMode()
+    bool World::toggleCollisionMode()
     {
-        mScene.toggleCollisionMode();
+        return mScene.toggleCollisionMode();
     }
 
-    void World::toggleRenderMode (RenderMode mode)
+    bool World::toggleRenderMode (RenderMode mode)
     {
-        mScene.toggleRenderMode (mode);
+        return mScene.toggleRenderMode (mode);
     }
 }

apps/openmw/mwworld/world.hpp

@@ -149,7 +149,8 @@ namespace MWWorld
 
             void setDay (int day);
 
-            void toggleSky();
+            bool toggleSky();
+            ///< \return Resulting mode
 
             int getMasserPhase() const;
 
@@ -187,12 +188,14 @@ namespace MWWorld
                 float duration);
             ///< Run physics simulation and modify \a world accordingly.
 
-            void toggleCollisionMode();
+            bool toggleCollisionMode();
             ///< Toggle collision mode for player. If disabled player object should ignore
             /// collisions and gravity.
+            ///< \return Resulting mode
 
-            void toggleRenderMode (RenderMode mode);
+            bool toggleRenderMode (RenderMode mode);
             ///< Toggle a render mode.
+            ///< \return Resulting mode
     };
 }
 

components/compiler/generator.cpp

@@ -125,6 +125,11 @@ namespace
         code.push_back (Compiler::Generator::segment3 (0, buttons));
     }
 
+    void opReport (Compiler::Generator::CodeContainer& code)
+    {
+        code.push_back (Compiler::Generator::segment5 (58));
+    }
+
     void opFetchLocalShort (Compiler::Generator::CodeContainer& code)
     {
         code.push_back (Compiler::Generator::segment5 (21));
@@ -516,6 +521,14 @@ namespace Compiler
             opMessageBox (code, buttons);
         }
 
+        void report (CodeContainer& code, Literals& literals, const std::string& message)
+        {
+            int index = literals.addString (message);
+
+            opPushInt (code, index);
+            opReport (code);
+        }
+
         void fetchLocal (CodeContainer& code, char localType, int localIndex)
         {
             opPushInt (code, localIndex);

components/compiler/generator.hpp

@@ -81,6 +81,8 @@ namespace Compiler
         void message (CodeContainer& code, Literals& literals, const std::string& message,
             int buttons);
 
+        void report (CodeContainer& code, Literals& literals, const std::string& message);
+
         void fetchLocal (CodeContainer& code, char localType, int localIndex);
 
         void jump (CodeContainer& code, int offset);

components/compiler/lineparser.cpp

@@ -30,12 +30,12 @@ namespace Compiler
         {
             case 'l':
 
-                Generator::message (mCode, mLiterals, "%g", 0);
+                Generator::report (mCode, mLiterals, "%g");
                 break;
 
             case 'f':
 
-                Generator::message (mCode, mLiterals, "%f", 0);
+                Generator::report (mCode, mLiterals, "%f");
                 break;
 
             default:

components/interpreter/context.hpp

@@ -18,21 +18,23 @@ namespace Interpreter
 
             virtual float getLocalFloat (int index) const = 0;
 
-            virtual void setLocalShort (int index, int value) = 0;        
+            virtual void setLocalShort (int index, int value) = 0;
 
-            virtual void setLocalLong (int index, int value) = 0;        
+            virtual void setLocalLong (int index, int value) = 0;
 
             virtual void setLocalFloat (int index, float value) = 0;
-            
+
             virtual void messageBox (const std::string& message,
-                const std::vector<std::string>& buttons) = 0; 
+                const std::vector<std::string>& buttons) = 0;
-                
+
             void messageBox (const std::string& message)
             {
                 std::vector<std::string> empty;
                 messageBox (message, empty);
             }
-            
+
+            virtual void report (const std::string& message) = 0;
+
             virtual bool menuMode() = 0;
 
             virtual int getGlobalShort (const std::string& name) const = 0;
@@ -41,31 +43,29 @@ namespace Interpreter
 
             virtual float getGlobalFloat (const std::string& name) const = 0;
 
-            virtual void setGlobalShort (const std::string& name, int value) = 0;        
+            virtual void setGlobalShort (const std::string& name, int value) = 0;
 
-            virtual void setGlobalLong (const std::string& name, int value) = 0;        
+            virtual void setGlobalLong (const std::string& name, int value) = 0;
+
+            virtual void setGlobalFloat (const std::string& name, float value) = 0;
 
-            virtual void setGlobalFloat (const std::string& name, float value) = 0;     
-            
             virtual bool isScriptRunning (const std::string& name) const = 0;
-            
+
             virtual void startScript (const std::string& name) = 0;
-            
+
             virtual void stopScript (const std::string& name) = 0;
-            
+
             virtual float getDistance (const std::string& name, const std::string& id = "") const
-                 = 0; 
+                 = 0;
-            
+
             virtual float getSecondsPassed() const = 0;
-            
+
             virtual bool isDisabled (const std::string& id = "") const = 0;
-            
+
             virtual void enable (const std::string& id = "") = 0;
-            
+
-            virtual void disable (const std::string& id = "") = 0;    
+            virtual void disable (const std::string& id = "") = 0;
     };
 }
 
 #endif
-
-

components/interpreter/docs/vmformat.txt

@@ -117,5 +117,9 @@ op  55: explicit reference = stack[0]; pop; disable explicit reference
 op  56: explicit reference = stack[0]; pop; push 1, if explicit reference is disabled, 0 else
 op  57: explicit reference = stack[0]; pop;
         replace stack[0] with distance between explicit reference and a reference of ID stack[0]
-opcodes 58-33554431 unused
+op  58: report string literal index in stack[0];
+         additional arguments (if any) in stack[n]..stack[1];
+         n is determined according to the message string
+         all arguments are removed from stack
+opcodes 59-33554431 unused
 opcodes 33554432-67108863 reserved for extensions

components/interpreter/installopcodes.cpp

@@ -95,6 +95,7 @@ namespace Interpreter
         interpreter.installSegment5 (54, new OpEnableExplicit);
         interpreter.installSegment5 (55, new OpDisableExplicit);
         interpreter.installSegment5 (56, new OpGetDisabledExplicit);
+        interpreter.installSegment5 (58, new OpReport);
 
         // script control
         interpreter.installSegment5 (46, new OpScriptRunning);
@@ -106,4 +107,3 @@ namespace Interpreter
         interpreter.installSegment5 (57, new OpGetDistanceExplicit);
     }
 }
-

components/interpreter/miscopcodes.hpp

@@ -13,6 +13,66 @@
 
 namespace Interpreter
 {
+    inline std::string formatMessage (const std::string& message, Runtime& runtime)
+    {
+        std::string formattedMessage;
+
+        for (std::size_t i=0; i<message.size(); ++i)
+        {
+            char c = message[i];
+
+            if (c!='%')
+                formattedMessage += c;
+            else
+            {
+                ++i;
+                if (i<message.size())
+                {
+                    c = message[i];
+
+                    if (c=='S' || c=='s')
+                    {
+                        int index = runtime[0].mInteger;
+                        runtime.pop();
+                        formattedMessage += runtime.getStringLiteral (index);
+                    }
+                    else if (c=='g' || c=='G')
+                    {
+                        Type_Integer value = runtime[0].mInteger;
+                        runtime.pop();
+
+                        std::ostringstream out;
+                        out << value;
+                        formattedMessage += out.str();
+                    }
+                    else if (c=='f' || c=='F' || c=='.')
+                    {
+                        while (c!='f' && i<message.size())
+                        {
+                            ++i;
+                        }
+
+                        float value = runtime[0].mFloat;
+                        runtime.pop();
+
+                        std::ostringstream out;
+                        out << value;
+                        formattedMessage += out.str();
+                    }
+                    else if (c=='%')
+                        formattedMessage += "%";
+                    else
+                    {
+                        formattedMessage += "%";
+                        formattedMessage += c;
+                    }
+                }
+            }
+        }
+
+        return formattedMessage;
+    }
+
     class OpMessageBox : public Opcode1
     {
         public:
@@ -36,66 +96,31 @@ namespace Interpreter
 
                 std::reverse (buttons.begin(), buttons.end());
 
-                // additional parameters
+                // handle additional parameters
-                std::string formattedMessage;
+                std::string formattedMessage = formatMessage (message, runtime);
-
-                for (std::size_t i=0; i<message.size(); ++i)
-                {
-                    char c = message[i];
-
-                    if (c!='%')
-                        formattedMessage += c;
-                    else
-                    {
-                        ++i;
-                        if (i<message.size())
-                        {
-                            c = message[i];
-
-                            if (c=='S' || c=='s')
-                            {
-                                int index = runtime[0].mInteger;
-                                runtime.pop();
-                                formattedMessage += runtime.getStringLiteral (index);
-                            }
-                            else if (c=='g' || c=='G')
-                            {
-                                Type_Integer value = runtime[0].mInteger;
-                                runtime.pop();
-
-                                std::ostringstream out;
-                                out << value;
-                                formattedMessage += out.str();
-                            }
-                            else if (c=='f' || c=='F' || c=='.')
-                            {
-                                while (c!='f' && i<message.size())
-                                {
-                                    ++i;
-                                }
-
-                                float value = runtime[0].mFloat;
-                                runtime.pop();
-
-                                std::ostringstream out;
-                                out << value;
-                                formattedMessage += out.str();
-                            }
-                            else if (c=='%')
-                                formattedMessage += "%";
-                            else
-                            {
-                                formattedMessage += "%";
-                                formattedMessage += c;
-                            }
-                        }
-                    }
-                }
 
                 runtime.getContext().messageBox (formattedMessage, buttons);
             }
     };
 
+    class OpReport : public Opcode0
+    {
+        public:
+
+            virtual void execute (Runtime& runtime)
+            {
+                // message
+                int index = runtime[0].mInteger;
+                runtime.pop();
+                std::string message = runtime.getStringLiteral (index);
+
+                // handle additional parameters
+                std::string formattedMessage = formatMessage (message, runtime);
+
+                runtime.getContext().report (formattedMessage);
+            }
+    };
+
     class OpMenuMode : public Opcode0
     {
         public: