[Avida-SVN] r1781 - in development: Avida.xcodeproj source/cpu source/main source/targets/viewer-text

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-07-10 16:51:27 -0400 (Tue, 10 Jul 2007)
New Revision: 1781

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/cpu/cHardwareGX.cc
   development/source/main/cPhenotype.cc
   development/source/targets/viewer-text/cDriver_TextViewer.cc
Log:
Fix a couple of warnings and viewer build errors (in Xcode due to a header file not in the project).

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2007-07-10 20:46:29 UTC (rev 1780)
+++ development/Avida.xcodeproj/project.pbxproj	2007-07-10 20:51:27 UTC (rev 1781)
@@ -794,6 +794,7 @@
 		70DCF57409CFBCA500924128 /* tcmalloc-platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "tcmalloc-platform.h"; sourceTree = "<group>"; };
 		70DCF57F09CFBD3D00924128 /* tcmalloc-logging.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "tcmalloc-logging.cc"; sourceTree = "<group>"; };
 		70DCF58009CFBD3D00924128 /* tcmalloc-logging.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "tcmalloc-logging.h"; sourceTree = "<group>"; };
+		70E130BF0C442B2900CE9249 /* cCoords.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cCoords.h; sourceTree = "<group>"; };
 		70F7DAEF09290468009E311D /* cClassificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cClassificationManager.h; sourceTree = "<group>"; };
 		70F7DAF009290468009E311D /* cClassificationManager.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cClassificationManager.cc; sourceTree = "<group>"; };
 		70F7DC9E09293E6F009E311D /* cGenotype.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cGenotype.cc; sourceTree = "<group>"; };
@@ -825,7 +826,7 @@
 		DCC315CE076253A5008F7A48 /* environment.rotate */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.rotate; sourceTree = "<group>"; };
 		DCC315D0076253A5008F7A48 /* task_event_gen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.cc; sourceTree = "<group>"; };
 		DCC315D1076253A5008F7A48 /* task_event_gen.old.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.old.cc; sourceTree = "<group>"; };
-		DCC3164D07626CF3008F7A48 /* avida */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = avida; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCC3164D07626CF3008F7A48 /* avida */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = avida; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1436,6 +1437,7 @@
 		DCC314D8076253A2008F7A48 /* tools */ = {
 			isa = PBXGroup;
 			children = (
+				70E130BF0C442B2900CE9249 /* cCoords.h */,
 				704368F50C32E6AB00A05ABA /* cFlexVar.h */,
 				7057886F0A21FE8D00E85D8E /* cFixedBlock.cc */,
 				705788700A21FE8D00E85D8E /* cFixedCoords.cc */,

Modified: development/source/cpu/cHardwareGX.cc
===================================================================
--- development/source/cpu/cHardwareGX.cc	2007-07-10 20:46:29 UTC (rev 1780)
+++ development/source/cpu/cHardwareGX.cc	2007-07-10 20:51:27 UTC (rev 1781)
@@ -3842,7 +3842,7 @@
   }
     
   // Activate the child
-  bool parent_alive = organism->ActivateDivide(ctx);
+  organism->ActivateDivide(ctx);
 
   // Mother viability checks could go here.  
   m_just_divided = true;

Modified: development/source/main/cPhenotype.cc
===================================================================
--- development/source/main/cPhenotype.cc	2007-07-10 20:46:29 UTC (rev 1780)
+++ development/source/main/cPhenotype.cc	2007-07-10 20:51:27 UTC (rev 1781)
@@ -49,8 +49,8 @@
   , cur_reaction_add_reward(m_world->GetEnvironment().GetReactionLib().GetSize())
   , cur_inst_count(world->GetHardwareManager().GetInstSet().GetSize())
   , cur_sense_count(m_world->GetStats().GetSenseSize())
+  , sensed_resources(m_world->GetEnvironment().GetResourceLib().GetSize())
   , cur_task_time(m_world->GetEnvironment().GetNumTasks())   // Added for tracking time; WRE 03-18-07
-  , sensed_resources(m_world->GetEnvironment().GetResourceLib().GetSize())
   , promoter_last_inst_terminated(false) 
   , last_task_count(m_world->GetEnvironment().GetNumTasks())
   , last_task_quality(m_world->GetEnvironment().GetNumTasks())

Modified: development/source/targets/viewer-text/cDriver_TextViewer.cc
===================================================================
--- development/source/targets/viewer-text/cDriver_TextViewer.cc	2007-07-10 20:46:29 UTC (rev 1780)
+++ development/source/targets/viewer-text/cDriver_TextViewer.cc	2007-07-10 20:51:27 UTC (rev 1781)
@@ -415,8 +415,9 @@
   // If there is any input in the buffer, process all of it.
   int cur_char = ERR;
   while ((cur_char = GetKeypress()) != ERR || m_info.GetPauseLevel() == cCoreView_Info::PAUSE_ON) {
-    bool found_keypress = ProcessKeypress(cur_char);
+    ProcessKeypress(cur_char);
 
+    //bool found_keypress = ProcessKeypress(cur_char);
     // If we couldn't manage the keypress here, check the current screen.
 //    if (found_keypress == false && cur_screen) cur_screen->DoInput(cur_char);
     m_main_window.Refresh();