summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbpodgursky <bpodgursky@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-06-29 21:53:38 +0000
committerbpodgursky <bpodgursky@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-06-29 21:53:38 +0000
commit5455dae058cfaba5e16368878bcaf8d3409a437e (patch)
treeef0ff5d687e5ae63d1b20ba78f38e9aceed219e7
parent400303c26b3f45a36e6e8574ba676d30d4e92e38 (diff)
downloadATCD-5455dae058cfaba5e16368878bcaf8d3409a437e.tar.gz
Mon Jun 29 21:52:33 UTC 2009 Ben Podgursky <bpodgursky@gmail.com>
-rw-r--r--ChangeLog9
-rw-r--r--SA_PlanCommands.cpp2
-rw-r--r--SA_WorkingPlan.cpp6
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d66f97a2c2f..5cb142de6da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 29 21:52:33 UTC 2009 Ben Podgursky <bpodgursky@gmail.com>
+
+ * SA_PlanCommands.cpp:
+ * SA_WorkingPlan.cpp:
+
+ Added ability to use 20 again if it is undone once.
+
Mon Jun 29 21:02:05 UTC 2009 Ben Podgursky <bpodgursky@gmail.com>
* PlanCommands.h:
@@ -8,7 +15,7 @@ Mon Jun 29 21:02:05 UTC 2009 Ben Podgursky <bpodgursky@gmail.com>
* SA_SchedStrategy.cpp:
* SA_WorkingPlan.cpp:
- Decision points numbered wrong
+ Decision points numbered wrong
Mon Jun 29 16:59:21 UTC 2009 Ben Podgursky <bpodgursky@gmail.com>
diff --git a/SA_PlanCommands.cpp b/SA_PlanCommands.cpp
index 8679591772a..8c0804f06b8 100644
--- a/SA_PlanCommands.cpp
+++ b/SA_PlanCommands.cpp
@@ -218,6 +218,8 @@ void SA_AddTaskCmd::undo (void)
if (this->last_task_ == SA_POP::NULL_TASK_ID)
return;
+
+
this->working_plan_->undo (this);
if (this->tasks_.empty ()) {
diff --git a/SA_WorkingPlan.cpp b/SA_WorkingPlan.cpp
index 1a071a09536..045655b30ef 100644
--- a/SA_WorkingPlan.cpp
+++ b/SA_WorkingPlan.cpp
@@ -928,8 +928,10 @@ void SA_WorkingPlan::execute (SA_AddTaskCmd *cmd)
void SA_WorkingPlan::undo (SA_AddTaskCmd *cmd)
{
-
-
+ if(cmd->last_task_ == 20)
+ {
+ planner_->init_added = false;
+ }
if(cmd->used_task_insts_.empty())
{