[Igarden-commit] Garden/source/SourceMaterialDB AttributeDictionary.cpp, 1.41, 1.41.2.1 SourceMaterialFile.cpp, 1.22, 1.22.2.1

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/SourceMaterialDB
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28977

Modified Files:
      Tag: Release_branch_v1
	AttributeDictionary.cpp SourceMaterialFile.cpp 
Log Message:
Add new non-plant material types

Index: AttributeDictionary.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/AttributeDictionary.cpp,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -C2 -d -r1.41 -r1.41.2.1
*** AttributeDictionary.cpp	17 Jun 2006 02:40:16 -0000	1.41
--- AttributeDictionary.cpp	2 Nov 2006 23:47:32 -0000	1.41.2.1
***************
*** 317,321 ****
  			break;
  		case kMaterialTypeStructure:
! 			result = "Structure";
  			break;
  		case kMaterialTypeSteps:
--- 317,321 ----
  			break;
  		case kMaterialTypeStructure:
! 			result = "Struct";
  			break;
  		case kMaterialTypeSteps:
***************
*** 325,328 ****
--- 325,349 ----
  			result = "Background";
  			break;
+ 		case kMaterialTypeWalks:
+ 			result = "Walks";
+ 			break;
+ 		case kMaterialTypeDeckPatio:
+ 			result = "Deck";
+ 			break;
+ 		case kMaterialTypeWallsFences:
+ 			result = "Wall";
+ 			break;
+ 		case kMaterialTypeAccents:
+ 			result = "Accent";
+ 			break;
+ 		case kMaterialTypeWaterFeature:
+ 			result = "Water";
+ 			break;
+ 		case kMaterialTypeNaturalItems:
+ 			result = "Natural";
+ 			break;
+ 		case kMaterialTypeHardscape:
+ 			result = "Hardscape";
+ 			break;
  		default:
  			result = "????";
***************
*** 601,610 ****
  	else if(strcmp(txt, "Vegetable") == 0)
  		val = kMaterialTypeVegetable;
! 	else if(strcmp(txt, "Structure") == 0)
! 		val = kMaterialTypeStructure;
  	else if(strcmp(txt, "Steps") == 0)
  		val = kMaterialTypeSteps;
  	else if(strcmp(txt, "Background") == 0)
  		val = kMaterialTypeBackground;
  	else
  		sscanf(txt, "%08lx", &val);
--- 622,645 ----
  	else if(strcmp(txt, "Vegetable") == 0)
  		val = kMaterialTypeVegetable;
! 	else if(strcmp(txt, "Structure") == 0 || strcmp(txt, "Hardscape") == 0)
! 		val = kMaterialTypeHardscape;
  	else if(strcmp(txt, "Steps") == 0)
  		val = kMaterialTypeSteps;
  	else if(strcmp(txt, "Background") == 0)
  		val = kMaterialTypeBackground;
+ 	else if(strcmp(txt, "Walks") == 0)
+ 		val = kMaterialTypeWalks;
+ 	else if(strcmp(txt, "Deck") == 0)
+ 		val = kMaterialTypeDeckPatio;
+ 	else if(strcmp(txt, "Wall") == 0)
+ 		val = kMaterialTypeWallsFences;
+ 	else if(strcmp(txt, "Accent") == 0)
+ 		val = kMaterialTypeAccents;
+ 	else if(strcmp(txt, "Water") == 0)
+ 		val = kMaterialTypeWaterFeature;
+ 	else if(strcmp(txt, "Natural") == 0)
+ 		val = kMaterialTypeNaturalItems;
+ 	else if(strcmp(txt, "Struct") == 0)
+ 		val = kMaterialTypeStructure;
  	else
  		sscanf(txt, "%08lx", &val);

Index: SourceMaterialFile.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/SourceMaterialFile.cpp,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** SourceMaterialFile.cpp	21 Jun 2006 02:16:18 -0000	1.22
--- SourceMaterialFile.cpp	2 Nov 2006 23:47:32 -0000	1.22.2.1
***************
*** 558,561 ****
--- 558,562 ----
  	Variant			*variant;
  	Material		*mat;
+ 	materialType_t	oldType;
  
  	done = false;
***************
*** 579,583 ****
  			}
  		}
! 
  		if(mat->CanAttributesBeMerged(sub2))
  		{
--- 580,591 ----
  			}
  		}
! 		oldType = mat->GetMaterialType();
! 		if(oldType == kMaterialTypeHardscape)
! 		{
! 			mat->SetMaterialType(kMaterialTypeUnspecified);	// Force to take new type
! 			if(!mat->CanAttributesBeMerged(sub2))
! 				mat->SetMaterialType(oldType);				// If still can't be merged, leave alone.
! 		}
! 		
  		if(mat->CanAttributesBeMerged(sub2))
  		{