Changeset 163 for trunk/lingosource/castlib2/commonMovieScript.ls

Timestamp:

04/06/08 11:11:43 (4 years ago)

Author:

alex

Message:

now with version checking

File:

• trunk/lingosource/castlib2/commonMovieScript.ls (modified) (8 diffs)

trunk/lingosource/castlib2/commonMovieScript.ls

@@ -91 +91 @@
     pGList = [:]
     scr = mGetXScript(#regisx)
-    if not voidP(scr) then
+    if not listP(scr) then
       if mCheckForXtra(me, "BudAPI") = 1 then call(#regisb, scr)
       if mCheckForXtra(me, "vList") = 1 then call(#regisv, scr)
@@ -496 +496 @@
 on mGetThisMovieName me
   glob = mGetGlobalList(me)
-  return string(glob.getaprop(#movieIdentifier))
+  str = string(glob.getaprop(#movieIdentifier))
+  if length(str) > 0 then return str
+  str = mSplitPath(me, the moviename).basename
+  mSetThisMovieName me, str
+  return str
 end
 
@@ -1196 +1200 @@
 -- xxxxxxxxxxxxxxxxxx stored script instances:
 
-on mGetInstance me, instName
+on mGetInstance me, instName, useRawNew
+  
   theGlobs = mGetGlobalList(me)
   gParentScriptInstances = theGlobs.getaprop(#gParentScriptInstances)
@@ -1209 +1214 @@
   
   if mGetMemType(me, member(instName)) = #script then
-    saveScr = new(script instName)
+    if useRawNew = 1 then saveScr = rawnew(script instName)
+    else saveScr = new(script instName)
     gParentScriptInstances.setaprop(instName, saveScr)
     return saveScr
   end if
   
-  
+  if saveScr = -1 then return 0
+  gParentScriptInstances.setaprop(instName, -1)
   inst = mGetXScript(symbol(instName))
-  if objectP(inst) then
-    saveScr = new(inst)
+  if not(listP(inst)) then
+    if ilk(inst) = #instance then inst = inst.script
+    if useRawNew = 1 then saveScr = rawnew(inst)
+    else saveScr = new(inst)
     gParentScriptInstances.setaprop(instName, saveScr)
     return saveScr
@@ -1356 +1365 @@
     delim =  the last char of the moviepath
     if length(delim) < 1 then
-      delim = the last char of the applicationpath
+      
+      if the runmode contains "plug" then
+        delim = "/"
+      else
+        delim = the last char of the applicationpath
+      end if
+      
+      
       if length(delim) < 1 then delim = "/"
     end if
@@ -1396 +1412 @@
     mp = the moviepath
     if length(mp) < 1 then
+      if the runmode contains "plug" then
+        mp = ""
+      else
       mp = the applicationpath
+      end if
       if length(mp) < 1 then
         mp = "@/"
@@ -1412 +1432 @@
     delim =  the last char of the moviepath
     if length(delim) < 1 then
-      delim = the last char of the applicationpath
+      
+      if the runmode contains "plug" then
+        mp = ""
+      else
+        delim = the last char of the applicationpath
+      end if
+      
+      
       if length(delim) < 1 then delim = "/"
     end if
@@ -1482 +1509 @@
     delim = the last char of the moviepath
     if length(delim) < 1 then
-      delim = the last char of the applicationpath
+      if not(the runmode contains "plug") then
+        delim = the last char of the applicationpath
+      end if
       if length(delim) < 1 then delim = "/"
     end if