[Avida-cvs] [avida-svn] r424 - trunk/source/viewers

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2005-12-19 15:36:45 -0500 (Mon, 19 Dec 2005)
New Revision: 424

Modified:
   trunk/source/viewers/zoom_screen.cc
Log:
Fix viewer usage of cHeadCPU so that it will compile.

Modified: trunk/source/viewers/zoom_screen.cc
===================================================================
--- trunk/source/viewers/zoom_screen.cc	2005-12-19 20:28:54 UTC (rev 423)
+++ trunk/source/viewers/zoom_screen.cc	2005-12-19 20:36:45 UTC (rev 424)
@@ -1099,7 +1099,10 @@
   // Finally, act on the edit method!
   switch (edit_method) {
   case INST_EDIT_BREAKPOINT:
-    ToggleBool( edit_head.FlagBreakpoint() );
+    if (edit_head.GetMemory().FlagBreakpoint(edit_head.GetPosition()))
+      edit_head.SetFlagBreakpoint();
+    else
+      edit_head.ClearFlagBreakpoint();
     break;
   case INST_EDIT_JUMP_IP:
     hardware.IP() = edit_head;
@@ -1211,19 +1214,19 @@
   window->Print(6, 14, "%3d", inst_set.GetRedundancy(cInstruction(inst_id)) );
   window->Print(7, 14, "%3d", inst_set.GetCost(cInstruction(inst_id)) );
 
-  if (inst_ptr.FlagCopied() == true) window->SetBoldColor(COLOR_CYAN);
+  if (inst_ptr.GetMemory().FlagCopied(inst_ptr.GetPosition()) == true) window->SetBoldColor(COLOR_CYAN);
   else window->SetColor(COLOR_CYAN);
   window->Print(4, 25, "Copied");
 
-  if (inst_ptr.FlagMutated() == true) window->SetBoldColor(COLOR_CYAN);
+  if (inst_ptr.GetMemory().FlagMutated(inst_ptr.GetPosition()) == true) window->SetBoldColor(COLOR_CYAN);
   else window->SetColor(COLOR_CYAN);
   window->Print(5, 25, "Mutated");
 
-  if (inst_ptr.FlagExecuted() == true) window->SetBoldColor(COLOR_CYAN);
+  if (inst_ptr.GetMemory().FlagExecuted(inst_ptr.GetPosition()) == true) window->SetBoldColor(COLOR_CYAN);
   else window->SetColor(COLOR_CYAN);
   window->Print(6, 25, "Executed");
 
-  if (inst_ptr.FlagBreakpoint() == true) window->SetBoldColor(COLOR_CYAN);
+  if (inst_ptr.GetMemory().FlagBreakpoint(inst_ptr.GetPosition()) == true) window->SetBoldColor(COLOR_CYAN);
   else window->SetColor(COLOR_CYAN);
   window->Print(7, 25, "Breakpoint");