5,6c5,9
< #include "list.h"
< #include "defs.h"
---
> 
> #include "transfer.h"
> 
> //#include "list.h"
> //#include "defs.h"
10,11c13,14
< void
< revert(int period) {
---
> // extern inline
> void revert(int period) {
14c17
< 	CLASS *class;
---
> 	TIMBER_CLASS *timber_class;
16c19
< 	/* class type reversions */
---
> 	// timber_class type reversions
24,30c27,33
< 			class = (CLASS *)list_next(au->classlist);
< 			while (class!=NULL) {
< 				class->MerchArea = 0.0f;
< 				class->transferred = FALSE;
< 				if ((class->class_type==DEFERRED)||(class->class_type==NONCONTRIBUTING)) {
< 					if (class->age+period_length[period]>=class->reversion_age) {
< 						class->class_type=OPERABLE;
---
> 			timber_class = (TIMBER_CLASS *)list_next(au->classlist);
> 			while (timber_class!=NULL) {
> 				timber_class->MerchArea = 0.0f;
> 				timber_class->transferred = FALSE;
> 				if ((timber_class->class_type==DEFERRED)||(timber_class->class_type==NONCONTRIBUTING)) {
> 					if (timber_class->age+period_length[period]>=timber_class->reversion_age) {
> 						timber_class->class_type=OPERABLE;
33c36
< 				class = (CLASS *)list_next(au->classlist);
---
> 				timber_class = (TIMBER_CLASS *)list_next(au->classlist);
40a44
> 
45c49
< 	CLASS		*class, *newclass;
---
> 	TIMBER_CLASS		*timber_class, *newclass;
77,78c81,82
< 			class = (CLASS *)list_next(au->classlist);
< 			while (class!=NULL) {
---
> 			timber_class = (TIMBER_CLASS *)list_next(au->classlist);
> 			while (timber_class!=NULL) {
84c88
< 				if ((class->class_type!=INACTIVE)&&(class->transferred==FALSE)) {
---
> 				if ((timber_class->class_type!=INACTIVE)&&(timber_class->transferred==FALSE)) {
86,87c90,91
< 					class->floatgrouplist = (LIST_PTR *)list_reset(class->floatgrouplist);
< 					group = (GROUP *)list_next(class->floatgrouplist);
---
> 					timber_class->floatgrouplist = (LIST_PTR *)list_reset(timber_class->floatgrouplist);
> 					group = (GROUP *)list_next(timber_class->floatgrouplist);
101c105
< 						group = (GROUP *)list_next(class->floatgrouplist);
---
> 						group = (GROUP *)list_next(timber_class->floatgrouplist);
103,104c107,108
< 					class->staticgrouplist = (LIST_PTR *)list_reset(class->staticgrouplist);
< 					group = (GROUP *)list_next(class->staticgrouplist);
---
> 					timber_class->staticgrouplist = (LIST_PTR *)list_reset(timber_class->staticgrouplist);
> 					group = (GROUP *)list_next(timber_class->staticgrouplist);
118c122
< 						group = (GROUP *)list_next(class->staticgrouplist);
---
> 						group = (GROUP *)list_next(timber_class->staticgrouplist);
125c129
< 						sprintf(FromZone, "%s", class->parent_zone->label);
---
> 						sprintf(FromZone, "%s", timber_class->parent_zone->label);
128,130c132,134
< 							class->parent_zone->area -= class->area;
< 							class->parent_zone = (ZONE *)func_find_zone(active_transfer->to_zone);
< 							if (class->parent_zone == NULL) {
---
> 							timber_class->parent_zone->area -= timber_class->area;
> 							timber_class->parent_zone = (ZONE *)func_find_zone(active_transfer->to_zone);
> 							if (timber_class->parent_zone == NULL) {
134c138
< 							class->parent_zone->area += class->area;
---
> 							timber_class->parent_zone->area += timber_class->area;
136c140
< 							class->parent_zone = class->parent_zone;
---
> 							timber_class->parent_zone = timber_class->parent_zone;
139c143
< 						sprintf(ToZone, "%s", class->parent_zone->label);
---
> 						sprintf(ToZone, "%s", timber_class->parent_zone->label);
142c146
< 						sprintf(FromAU, "%s", class->parent_au->label);
---
> 						sprintf(FromAU, "%s", timber_class->parent_au->label);
145,147c149,151
< 							class->parent_au = (AU *)func_find_au(class->parent_zone, active_transfer->to_au);
< 							if (class->parent_au == NULL) {
< 								printf("\n\nERROR: transfer(): Could not find specified zone/AU (%s,%s)\n\n", class->parent_zone->label, active_transfer->to_au);
---
> 							timber_class->parent_au = (AU *)func_find_au(timber_class->parent_zone, active_transfer->to_au);
> 							if (timber_class->parent_au == NULL) {
> 								printf("\n\nERROR: transfer(): Could not find specified zone/AU (%s,%s)\n\n", timber_class->parent_zone->label, active_transfer->to_au);
151c155
< 							class->parent_au = class->parent_au;
---
> 							timber_class->parent_au = timber_class->parent_au;
154c158
< 						sprintf(ToAU, "%s", class->parent_au->label);
---
> 						sprintf(ToAU, "%s", timber_class->parent_au->label);
156c160
< 						FromAge = class->age;
---
> 						FromAge = timber_class->age;
158c162
< 							class->age = active_transfer->to_age;
---
> 							timber_class->age = active_transfer->to_age;
160c164
< 							class->age = class->age;
---
> 							timber_class->age = timber_class->age;
162c166
< 						ToAge = class->age;
---
> 						ToAge = timber_class->age;
164c168
< 						FromType = class->class_type;
---
> 						FromType = timber_class->class_type;
166c170
< 							class->class_type = active_transfer->to_ctype;
---
> 							timber_class->class_type = active_transfer->to_ctype;
168c172
< 							class->class_type = class->class_type;
---
> 							timber_class->class_type = timber_class->class_type;
170c174
< 						ToType = class->class_type;
---
> 						ToType = timber_class->class_type;
172c176
< 						FromRAge = class->reversion_age;
---
> 						FromRAge = timber_class->reversion_age;
174c178
< 							class->reversion_age = active_transfer->to_rage;
---
> 							timber_class->reversion_age = active_transfer->to_rage;
176c180
< 							class->reversion_age = class->reversion_age;
---
> 							timber_class->reversion_age = timber_class->reversion_age;
178c182
< 						ToRAge = class->reversion_age;
---
> 						ToRAge = timber_class->reversion_age;
180,181c184,185
< 						class->floatgrouplist = (LIST_PTR *)list_reset(class->floatgrouplist);
< 						group = (GROUP *)list_next(class->floatgrouplist);
---
> 						timber_class->floatgrouplist = (LIST_PTR *)list_reset(timber_class->floatgrouplist);
> 						group = (GROUP *)list_next(timber_class->floatgrouplist);
183,184c187,188
< 							group->area -= class->area;
< 							group = (GROUP *)list_next(class->floatgrouplist);
---
> 							group->area -= timber_class->area;
> 							group = (GROUP *)list_next(timber_class->floatgrouplist);
186,187c190,191
< 						list_done(class->floatgrouplist);
< 						class->floatgrouplist = NULL;
---
> 						list_done(timber_class->floatgrouplist);
> 						timber_class->floatgrouplist = NULL;
196c200
< 							class->area,
---
> 							timber_class->area,
202c206
< 							class->area,
---
> 							timber_class->area,
207,215c211,219
< 							newclass = (CLASS *)init_make_class(class->parent_zone,
< 								class->parent_au,
< 								class->parent_block,
< 								class->age,
< 								class->width,
< 								class->area,
< 								class->class_type,
< 								class->reversion_age,
< 								class->ReEntryLag,
---
> 							newclass = (TIMBER_CLASS *)init_make_class(timber_class->parent_zone,
> 								timber_class->parent_au,
> 								timber_class->parent_block,
> 								timber_class->age,
> 								timber_class->width,
> 								timber_class->area,
> 								timber_class->class_type,
> 								timber_class->reversion_age,
> 								timber_class->ReEntryLag,
217,219c221,223
< 								class->staticgrouplist,
< 								class->roaded);
< 							class->class_type = INACTIVE;
---
> 								timber_class->staticgrouplist,
> 								timber_class->roaded);
> 							timber_class->class_type = INACTIVE;
221,222c225,226
< 							printf("\ncloned class with parent au id: %d, zone au id: %d", class->parent_au->id, class->parent_zone->id);
< 							printf("\new class clone with parent au id: %d, zone au id: %d",
---
> 							printf("\ncloned timber_class with parent au id: %d, zone au id: %d", timber_class->parent_au->id, timber_class->parent_zone->id);
> 							printf("\new timber_class clone with parent au id: %d, zone au id: %d",
226c230
< 							newclass = class;
---
> 							newclass = timber_class;
245c249
< 				class = (CLASS *)list_next(au->classlist);
---
> 				timber_class = (TIMBER_CLASS *)list_next(au->classlist);