# HG changeset patch
# User KarstenBock@gmx.net
# Date 1321727318 -3600
# Node ID cf6345ec89884a2cdb780759d9360d33c4ffbfe6
# Parent  7e51bae477f71bcea0e5901f6c8b2eb7af22725b
Small fixes.

diff -r 7e51bae477f7 -r cf6345ec8988 src/parpg/entities/action.py
--- a/src/parpg/entities/action.py	Sat Nov 19 16:12:56 2011 +0100
+++ b/src/parpg/entities/action.py	Sat Nov 19 19:28:38 2011 +0100
@@ -450,11 +450,8 @@
         @param commands: Special commands that are executed
         @type commands: Dictionary 
         """
-        self.commands = commands or ()
-        self.controller = controller
-        self.model = controller.model
+        Action.__init__(self, controller, commands)
         self.script = script
-        self.executed = False
     
     def execute(self):
         self.controller.systems.scripting.runScript(self.script)
diff -r 7e51bae477f7 -r cf6345ec8988 src/parpg/systems/scriptingsystem.py
--- a/src/parpg/systems/scriptingsystem.py	Sat Nov 19 16:12:56 2011 +0100
+++ b/src/parpg/systems/scriptingsystem.py	Sat Nov 19 19:28:38 2011 +0100
@@ -52,7 +52,10 @@
                                           self.system.funcs, 
                                           self.system.vals
                                           ) 
-                self.cur_action = action(self.system.world, action_params)
+                if not (isinstance(action_params, list) 
+                        or isinstance(action_params, tuple)):
+                    action_params = [action_params]
+                self.cur_action = action(self.system.world, *action_params)
                 self.wait = action_data[2]
                 if len(action_data) >= 4:
                     vals = (