--- trunk/src/selection/SelectionEvaluator.cpp	2005/02/07 19:13:18	295
+++ trunk/src/selection/SelectionEvaluator.cpp	2005/02/15 19:36:07	351
@@ -102,7 +102,7 @@ bool SelectionEvaluator::loadScriptFileInternal(const 
 }
 
 bool SelectionEvaluator::loadScriptFileInternal(const  std::string & filename) {
-    ifstream ifs(filename.c_str());
+  std::ifstream ifs(filename.c_str());
     if (!ifs.is_open()) {
         return false;
     }
@@ -300,7 +300,7 @@ void SelectionEvaluator::define() {
 
     std::string variable = boost::any_cast<std::string>(statement[1].value);
 
-    variables.insert(std::make_pair(variable, expression(statement, 2)));
+    variables.insert(VariablesType::value_type(variable, expression(statement, 2)));
 }
 
 
@@ -319,7 +319,7 @@ void SelectionEvaluator::predefine(const std::string& 
             int tok = statement[1].tok;
             if (tok == Token::identifier || (tok & Token::predefinedset) == Token::predefinedset) {
                 std::string variable = boost::any_cast<std::string>(statement[1].value);
-                variables.insert(std::make_pair(variable, statement));
+                variables.insert(VariablesType::value_type(variable, statement));
 
             } else {
                 evalError("invalid variable name:" + script);
@@ -386,6 +386,7 @@ BitSet SelectionEvaluator::evaluate() {
 BitSet SelectionEvaluator::evaluate() {
     BitSet bs(nStuntDouble);
     if (isLoaded_) {
+        pc = 0;
         instructionDispatchLoop(bs);
     }