Changeset 245 for trunk/lingosource/castlib2/aleXtrasMovieScript.ls

Timestamp:

03/21/10 11:39:48 (2 years ago)

Author:

alex

Message:

cleanup

File:

• trunk/lingosource/castlib2/aleXtrasMovieScript.ls (modified) (4 diffs)

trunk/lingosource/castlib2/aleXtrasMovieScript.ls

@@ -56 +56 @@
     end if
     
-    alextras = rawnew(cms.script)
+    alextras = new(cms.script)
     if ilk(alextras) <> #instance then
       alert "Script" & QUOTE & "commonMovieScript" & QUOTE && "is missing. This movie can't proceed!"
@@ -109 +109 @@
   if scrName = "commonMovieScript" then return alextras
   
-  inst = alextras.mGetInstance(scrName, 1)
+  str_scrName = alextras.mSymb2String(scrName)
+  inst = alextras.mGetInstance(str_scrName, 1)
   if ilk(inst) <> #instance then
     if the runmode contains "aut" then
-      put "Script" && QUOTE & scrName & QUOTE && "is missing! This may cause unwanted behavior"
-    end if
-      inst = []
-    end if
+      put "Script" && QUOTE & str_scrName & QUOTE && "is missing! This may cause unwanted behavior"
+    end if
+    inst = []
+  end if
+  if ilk(inst) = #instance then
+    if inst.handler(#new) = 1 then inst.new()
+  end if
   return inst
   ----------------------
   
   
-  scrName = symbol(scrName)
+  scrName = alextras.mSymbolify(scrName)
   if ilk(scrName) <> #symbol then scrName = #commonmoviescript
   scri = (mGetAleXtras()).getaprop(#scripts)
@@ -233 +237 @@
   end repeat
   includes.deleteOne(#commonMovieScript)
-    globs[#gParentScriptInstances] = includes
+  globs[#gParentScriptInstances] = includes
   
   exit
@@ -280 +284 @@
   if not(objectP(incl)) then
     put "No scriptinstances stored"
-  exit
+    exit
   end if