4c4,6
< #include "list.h"
---
> 
> #include "init.h"
> 
6c8,9
< #include "util.h"
---
> //#include "list.h"
> //#include "util.h"
8c11
< #include "hash.h"
---
> //#include "hash.h"
14c17
< 	CLASS	*class;
---
> 	TIMBER_CLASS	*timber_class;
26,31c29,34
< 			class = (CLASS *)list_next(au->classlist);
< 			while (class!=NULL) {
< 				if (class->class_type!=NONCONTRIBUTING) {
< 					if ((class->age-class->width+1)<au->table->AdjacencyAge) {
< 						class->parent_block->Neighbours = (LIST_PTR *)list_reset(class->parent_block->Neighbours);
< 						neighbour = (BLOCK *)list_next(class->parent_block->Neighbours);
---
> 			timber_class = (TIMBER_CLASS *)list_next(au->classlist);
> 			while (timber_class!=NULL) {
> 				if (timber_class->class_type!=NONCONTRIBUTING) {
> 					if ((timber_class->age-timber_class->width+1)<au->table->AdjacencyAge) {
> 						timber_class->parent_block->Neighbours = (LIST_PTR *)list_reset(timber_class->parent_block->Neighbours);
> 						neighbour = (BLOCK *)list_next(timber_class->parent_block->Neighbours);
33c36
< 							AdjacencyDelay = au->table->AdjacencyAge-(class->age-class->width+1);
---
> 							AdjacencyDelay = au->table->AdjacencyAge-(timber_class->age-timber_class->width+1);
37c40
< 							neighbour = (BLOCK *)list_next(class->parent_block->Neighbours);
---
> 							neighbour = (BLOCK *)list_next(timber_class->parent_block->Neighbours);
41c44
< 				class = (CLASS *)list_next(au->classlist);
---
> 				timber_class = (TIMBER_CLASS *)list_next(au->classlist);
63c66
< 			if (strcmp(gd->zone,NULLSTR)!=0) {	
---
> 			if (strcmp(gd->zone,NULLSTR)!=0) {
148c151
< 	
---
> 
283c286
< 	TABLE		*table;
---
> //	TABLE		*table;
536c539
< CLASS
---
> TIMBER_CLASS
538c541
< 	CLASS		*class;
---
> 	TIMBER_CLASS		*timber_class;
540c543
< 	char		label[20];
---
> //	char		label[20];
560,563c563,566
< 	/* create new class and add to au->classlist */
< 	class = (CLASS *)malloc(sizeof(CLASS));
< 	if (class == NULL) {
< 		printf("\n\nERROR: init_make_class(): Could not allocate memory for new CLASS structure\n\n");
---
> 	/* create new timber_class and add to au->classlist */
> 	timber_class = (TIMBER_CLASS *)malloc(sizeof(TIMBER_CLASS));
> 	if (timber_class == NULL) {
> 		printf("\n\nERROR: init_make_class(): Could not allocate memory for new TIMBER_CLASS structure\n\n");
566,578c569,581
< 	class->parent_zone = zone;
< 	class->parent_au = au;
< 	class->parent_block = block;
< 	class->age = age;
< 	class->width = width;
< 	class->ReEntryLag = ReEntryLag;
< 	class->area = area;
< 	class->MerchArea = 0.0;
< 	class->class_type = class_type;
< 	class->reversion_age = reversion_age;
< 	class->roaded = roaded;
< 	class->transferred = FALSE;
< 	class->floatgrouplist = NULL;
---
> 	timber_class->parent_zone = zone;
> 	timber_class->parent_au = au;
> 	timber_class->parent_block = block;
> 	timber_class->age = age;
> 	timber_class->width = width;
> 	timber_class->ReEntryLag = ReEntryLag;
> 	timber_class->area = area;
> 	timber_class->MerchArea = 0.0;
> 	timber_class->class_type = class_type;
> 	timber_class->reversion_age = reversion_age;
> 	timber_class->roaded = roaded;
> 	timber_class->transferred = FALSE;
> 	timber_class->floatgrouplist = NULL;
580c583
< 		class->floatgrouplist = NULL;
---
> 		timber_class->floatgrouplist = NULL;
585c588
< 			class->floatgrouplist = (LIST_PTR *)list_insert(class->floatgrouplist, group, group->id);
---
> 			timber_class->floatgrouplist = (LIST_PTR *)list_insert(timber_class->floatgrouplist, group, group->id);
589c592
< 	class->staticgrouplist = NULL;
---
> 	timber_class->staticgrouplist = NULL;
591c594
< 		class->staticgrouplist = NULL;
---
> 		timber_class->staticgrouplist = NULL;
596c599
< 			class->staticgrouplist = (LIST_PTR *)list_insert(class->staticgrouplist, group, group->id);
---
> 			timber_class->staticgrouplist = (LIST_PTR *)list_insert(timber_class->staticgrouplist, group, group->id);
601c604
< 		class->RandValue = rand();
---
> 		timber_class->RandValue = rand();
603c606
< 		class->RandValue = 0;
---
> 		timber_class->RandValue = 0;
606,607c609,610
< 	au->classlist = (LIST_PTR *)list_insert(au->classlist, class, class->age);
< 	return(class);
---
> 	au->classlist = (LIST_PTR *)list_insert(au->classlist, timber_class, timber_class->age);
> 	return(timber_class);
688,695c691,698
< init_delete_class(CLASS *class) {
< 	if (class==NULL) return;
< 	list_done(class->floatgrouplist);
< 	class->floatgrouplist=NULL;
< 	list_done(class->staticgrouplist);
< 	class->staticgrouplist=NULL;
< 	free(class);
< 	class=NULL;
---
> init_delete_class(TIMBER_CLASS *timber_class) {
> 	if (timber_class==NULL) return;
> 	list_done(timber_class->floatgrouplist);
> 	timber_class->floatgrouplist=NULL;
> 	list_done(timber_class->staticgrouplist);
> 	timber_class->staticgrouplist=NULL;
> 	free(timber_class);
> 	timber_class=NULL;
700c703
< 	CLASS	*class;
---
> 	TIMBER_CLASS	*timber_class;
702c705
< 	ROADREC	*road;
---
> //	ROADREC	*road;
708,711c711,714
< 	class = (CLASS *)list_next(au->classlist);
< 	while (class != NULL) {
< 		init_delete_class(class);
< 		class = (CLASS *)list_next(au->classlist);
---
> 	timber_class = (TIMBER_CLASS *)list_next(au->classlist);
> 	while (timber_class != NULL) {
> 		init_delete_class(timber_class);
> 		timber_class = (TIMBER_CLASS *)list_next(au->classlist);