SourceForge has been redesigned. Learn more.
Close

Diff of /variables.cpp [5641a0] .. [e36367]  Maximize  Restore

Switch to side-by-side view

--- a/variables.cpp
+++ b/variables.cpp
@@ -211,6 +211,7 @@
 {
   CString tmp;
   loc_entry dummyloc;
+  CPoint dummypoint;
   int cnt;
   int i;
   int sf;
@@ -396,7 +397,7 @@
     }
     if(varname!="LOCALS" && varname!="GLOBAL" && varname !="MYAREA")
     {
-      log("Invalid scope: %s",varname);
+      log("Invalid scope: %s (%s)",varname, tmp);
       return 1;
     }
     varname2=varname;
@@ -416,11 +417,23 @@
     /// no idea yet
     return 0;
   case ENTRY_POINT:
-    if(CheckDestination(varname2,varname) )
+    if(varname2.IsEmpty())
+    {
+      log("Missing area! (%s)", tmp);
+      return 1;
+    }
+    if(!entries.Lookup(varname2+"/"+varname, dummypoint))
     {
       log("Invalid entrance '%s' for area '%s' (%s)",varname,varname2,tmp);
       return 1;
-    }    
+    }
+    /*
+    if(CheckDestination(varname2,varname) )
+    {
+      log("Invalid entrance '%s' for area '%s' (%s)",varname,varname2,tmp);
+      return 1;
+    }
+    */
     return 0;
   case CHECK_XPLIST:
     varname.MakeUpper();