[Avida-SVN] r2835 - branches/hjg-dev/source/cpu

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-10-11 17:32:31 -0400 (Sat, 11 Oct 2008)
New Revision: 2835

Modified:
   branches/hjg-dev/source/cpu/cHardwareCPU.cc
Log:
bug fix

Modified: branches/hjg-dev/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/hjg-dev/source/cpu/cHardwareCPU.cc	2008-10-11 21:08:56 UTC (rev 2834)
+++ branches/hjg-dev/source/cpu/cHardwareCPU.cc	2008-10-11 21:32:31 UTC (rev 2835)
@@ -6822,9 +6822,10 @@
 bool cHardwareCPU::Inst_PunishNeighbor(cAvidaContext& ctx) 
 {
 	cOrganism * neighbor = organism->GetNeighbor();
+	if (neighbor == NULL) return true;
 
 	// improve neighbor reputation
-	if (neighbor != NULL && neighbor->HasOpinion()) {
+	if (neighbor->HasOpinion()) {
 		int opinion = neighbor->GetOpinion().first - 1;
 		neighbor->SetOpinion(opinion);
 	} else {
@@ -6837,9 +6838,10 @@
 bool cHardwareCPU::Inst_PraiseNeighbor(cAvidaContext& ctx) 
 {
 	cOrganism * neighbor = organism->GetNeighbor();
-
+	if (neighbor == NULL) return true;
+	
 	// improve neighbor reputation
-	if (neighbor != NULL && neighbor->HasOpinion()) {
+	if (neighbor->HasOpinion()) {
 		int opinion = neighbor->GetOpinion().first + 1;
 		neighbor->SetOpinion(opinion);
 	} else {