[svn-upgrade] Integrating new upstream version, ion3 (20070318)

[ion3.git] / ioncore / navi.c

diff --git a/ioncore/navi.c b/ioncore/navi.c
index 7a10e6be580bc709429d7e866852b24c74c92658..71090386bd9364df7999969e88fe6559b5c168d7 100644 (file)
--- a/ioncore/navi.c
+++ b/ioncore/navi.c
@@ -230,12 +230,12 @@ static WRegion *release(WRegionNaviData *data, WRegion *res)
 
 /*EXTL_DOC
  * Find region next from \var{reg} in direction \var{dirstr}
- * (up/down/left/right/next/prev/any). The table param may
+ * (up/down/left/right/next/prev/any). The table \var{param} may
  * contain the boolean field \var{nowrap}, instructing not to wrap 
  * around, and the \type{WRegion}s \var{no_ascend} and \var{no_descend},
- * and functions \var{ascend_filter} and \var{descend_filter} from
- * \var{WRegion}s (\var{to}, \var{from}), used to decide when to descend
- * or ascend into another region. (TODO: more detailed explanation.)
+ * and boolean functions \var{ascend_filter} and \var{descend_filter} 
+ * on \var{WRegion} pairs (\var{to}, \var{from}), are used to decide when
+ * to descend or ascend into another region.
  */
 EXTL_EXPORT
 WRegion *ioncore_navi_next(WRegion *reg, const char *dirstr, ExtlTab param)
@@ -273,10 +273,8 @@ WRegion *ioncore_navi_first(WRegion *reg, const char *dirstr, ExtlTab param)
 {
     WRegionNaviData data;
     
-    if(reg==NULL){
-        /* ??? */
+    if(reg==NULL)
         return NULL;
-    }
     
     if(!get_param(&data, dirstr, param))
         return NULL;
@@ -290,11 +288,9 @@ WRegion *ioncore_navi_first(WRegion *reg, const char *dirstr, ExtlTab param)
 
 static WRegion *do_goto(WRegion *res)
 {
-    if(res!=NULL){
-        /* TODO: deep rqorder? */
-        region_rqorder(res, REGION_ORDER_FRONT);
+    if(res!=NULL)
         region_goto(res);
-    }
+    
     return res;
 }