[Xconq-cvs] xconq/kernel init.c, BRANCH_MCAMPO_PATH, 1.11, 1.11.2.1 mkrivers.c, BRANCH_MCAMPO_PATH, 1.1.1.1, 1.1.1.1.8.1 mkroads.c, BRANCH_MCAMPO_PATH, 1.1.1.1, 1.1.1.1.8.1

[Eric M. <eri...@us...>]

Update of /cvsroot/xconq/xconq/kernel
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5559/kernel

Modified Files:
      Tag: BRANCH_MCAMPO_PATH
	init.c mkrivers.c mkroads.c 
Log Message:
Ensure that aux_terrain layers are allocated, and note this where appropriate.


Index: init.c
===================================================================
RCS file: /cvsroot/xconq/xconq/kernel/init.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** init.c	10 Jul 2005 13:28:37 -0000	1.11
--- init.c	8 Apr 2007 19:03:58 -0000	1.11.2.1
***************
*** 710,713 ****
--- 710,724 ----
          }
      }
+ 
+     /* Make sure that auxterrain is allocated properly.
+        Massimo, 16 March 2007 */
+     {
+ 	int t;
+ 	for_all_terrain_types(t) {
+ 	    if (t_subtype(t) != cellsubtype) {
+ 		allocate_area_aux_terrain(t);
+ 	    }
+ 	}
+     }
  }
  

Index: mkrivers.c
===================================================================
RCS file: /cvsroot/xconq/xconq/kernel/mkrivers.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.8.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.8.1
*** mkrivers.c	21 Nov 2004 03:01:10 -0000	1.1.1.1
--- mkrivers.c	8 Apr 2007 19:03:58 -0000	1.1.1.1.8.1
***************
*** 47,51 ****
      keyval = c_number(symbol_value(intern_symbol(keyword_name(K_RIVER_X))));
      for_all_terrain_types(t) {
! 	if (t_subtype_x(t) == keyval && !aux_terrain_defined(t)) {
  	    if (t_is_border(t)) {
  		make_up_river_borders(t);
--- 47,54 ----
      keyval = c_number(symbol_value(intern_symbol(keyword_name(K_RIVER_X))));
      for_all_terrain_types(t) {
! 	if (t_subtype_x(t) == keyval
! 	    /* See init.c:721; Massimo, 19 March 2007 */
! 	    /* && !aux_terrain_defined(t) */
! 	    ) {
  	    if (t_is_border(t)) {
  		make_up_river_borders(t);

Index: mkroads.c
===================================================================
RCS file: /cvsroot/xconq/xconq/kernel/mkroads.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.8.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.8.1
*** mkroads.c	21 Nov 2004 03:01:10 -0000	1.1.1.1
--- mkroads.c	8 Apr 2007 19:03:58 -0000	1.1.1.1.8.1
***************
*** 46,50 ****
      for_all_terrain_types(t) {
  	if (t_is_connection(t)
! 	    && !aux_terrain_defined(t)
  	    && t_subtype_x(t) == keyval) {
  	    roadtype = t;
--- 46,51 ----
      for_all_terrain_types(t) {
  	if (t_is_connection(t)
! 	    /* See init.c:721; Massimo, 19 March 2007 */
! 	    /* && !aux_terrain_defined(t) */
  	    && t_subtype_x(t) == keyval) {
  	    roadtype = t;