--- trunk/FAS/src/extradata.cpp	2002/08/13 16:02:26	66
+++ trunk/FAS/src/extradata.cpp	2002/08/13 17:07:15	67
@@ -14,12 +14,12 @@ TExtraData &TExtraData::operator =(const TExtraData ex
 	_type = extraData._type;
 }
 
-TExtraData &TExtraData::operator =(const TExtraData extraData)
+TExtraData &TExtraData::operator =(const TExtraData &extraData)
 {
 	if (this == &extraData) 
 		return *this;
 		
-	_indet = extraData._ident;
+	_ident = extraData._ident;
 	_type = extraData._type;
 	return *this;
 }
@@ -36,12 +36,12 @@ TEnergyData &TEnergyData::operator =(TEnergyData &ener
 	_energy = energyData._energy;	
 }
 
-TEnergyData &TEnergyData::operator =(TEnergyData &energyData)
+TEnergyData &TEnergyData::operator =(const TEnergyData &energyData)
 {
 	if (this == &energyData)
 		return *this;
-	TExtraData::operator =(enrgyData);
-	_energy = energyDataType._energy;	
+	TExtraData::operator =(energyData);
+	_energy = energyData._energy;	
 }
 
 TEnergyData::~TEnergyData()
@@ -51,7 +51,7 @@ map<int, float>::iterator TEnergyData::FindEnergy(int 
 
 map<int, float>::iterator TEnergyData::FindEnergy(int energyType)
 {
-	return find(_energy.begin(), _energy.end(), energyType);
+	return _energy.find(energyType);
 }
 
 void TEnergyData::AddEnergy(int energyType, float value)
@@ -66,7 +66,7 @@ void TEnergyData::ReplaceEnergy(int energyType, float 
 	
 	if (i != _energy.end())
 	{
-		*i = value;
+		(*i).second = value;
 	}	
 }
 
@@ -89,7 +89,7 @@ float *TEnergyData::GetEnergy(int energyType)
 
 	if (i != _energy.end())
 	{
-		return *i;
+		return &((*i).second);
 	}
 	else
 	{