From 9f05d66a81435ff102002333f92e196498b710e4 Mon Sep 17 00:00:00 2001
From: Fabien_HENON <none@none>
Date: Sat, 23 Jul 2011 15:56:32 +0200
Subject: [PATCH] Changed: #1304: Revert modifications for the objectives in
 the mission compiler (i changed the way i will do it)

--HG--
branch : gsoc2011-guildmissions
---
 .../leveldesign/mission_compiler_lib/step.h   |  4 +-
 .../mission_compiler_lib/step_content.cpp     | 42 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h b/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h
index 9d2a053df..fdb1db4be 100644
--- a/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h
+++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h
@@ -194,9 +194,9 @@ protected:
 	bool						_HideObj;
 
 	// Option nb_guild_members_needed, available for each objective
-	int _NbGuildMembersNeeded;
+	/*int _NbGuildMembersNeeded;
 
-	std::string genNbGuildMembersNeededOption(CMissionData &md);
+	std::string genNbGuildMembersNeededOption(CMissionData &md);*/
 	
 public:
 	void init(CMissionData &md, NLLIGO::IPrimitive *prim);
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
index 442ca6fbd..1ff9b3b18 100644
--- a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
+++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
@@ -1762,7 +1762,7 @@ void CContentObjective::init(CMissionData &md, IPrimitive *prim)
 	_RoleplayPhrase.initPhrase(md, prim, _RoleplayObj, numEntry, params);
 
 	// check for the 'nb_guild_members_needed' option and see if it's correct for this mission
-	string nbGuildMembersNeeded = md.getProperty(prim, "nb_guild_members_needed", false, true);
+	/*string nbGuildMembersNeeded = md.getProperty(prim, "nb_guild_members_needed", false, true);
 	if (nbGuildMembersNeeded.empty())
 		nbGuildMembersNeeded = "1";
 	if (!fromString(nbGuildMembersNeeded.c_str(), _NbGuildMembersNeeded))
@@ -1773,7 +1773,7 @@ void CContentObjective::init(CMissionData &md, IPrimitive *prim)
 	{
 		string err = toString("primitive(%s): nb_guild_members_needed != 1 for non guild mission.", prim->getName().c_str());
 		throw EParseException(prim, err.c_str());
-	}
+	}*/
 }
 
 // ---------------------------------------------------------------------------
@@ -1794,7 +1794,7 @@ string CContentObjective::genCode(CMissionData &md)
 }
 
 // ---------------------------------------------------------------------------
-std::string CContentObjective::genNbGuildMembersNeededOption(CMissionData &md)
+/*std::string CContentObjective::genNbGuildMembersNeededOption(CMissionData &md)
 {
 	string ret = "";
 	// If we are in a guild mission we add the 'nb_guild_members_needed' option to the script
@@ -1805,7 +1805,7 @@ std::string CContentObjective::genNbGuildMembersNeededOption(CMissionData &md)
 	}
 
 	return ret;
-}
+}*/
 
 // ---------------------------------------------------------------------------
 string CContentObjective::genPhrase()
@@ -2109,7 +2109,7 @@ public:
 			ret += " : "+_Place;
 
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;
@@ -2166,7 +2166,7 @@ public:
 		if (!_Phrase.isEmpty())
 			ret += " : "+_Phrase.genScript(md);
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 		
 		return ret;
@@ -2242,7 +2242,7 @@ public:
 			ret += ": "+_Place;
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 		
 		return ret;
@@ -2317,7 +2317,7 @@ public:
 				ret += "; ";
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 		
 		return ret;
@@ -2444,7 +2444,7 @@ public:
 				ret += "; ";
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 		
 		return ret;
@@ -2519,7 +2519,7 @@ public:
 				ret += "; ";
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 		
 		return ret;
@@ -2651,7 +2651,7 @@ public:
 		if (!_Place.empty())
 			ret += " : " + _Place;
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;
@@ -2737,7 +2737,7 @@ public:
 			ret += " : "+_Npc;
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 		
 		return ret;
@@ -2820,7 +2820,7 @@ public:
 			ret += " : "+_Npc;
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 		
 		return ret;
@@ -2933,7 +2933,7 @@ public:
 		};
 		ret += " : "+_Npc;
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 		
 		return ret;
@@ -2971,7 +2971,7 @@ public:
 
 		ret += "give_money : "+_Amount+" : "+_Npc;
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;
@@ -3024,7 +3024,7 @@ public:
 			}
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;
@@ -3061,7 +3061,7 @@ public:
 		if (_SaveAll)
 			ret += " : save_all";
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;
@@ -3135,7 +3135,7 @@ public:
 				ret += "; ";
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;
@@ -3174,7 +3174,7 @@ public:
 				ret += "; ";
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;
@@ -3213,7 +3213,7 @@ public:
 				ret += " ";
 		}
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;
@@ -3430,7 +3430,7 @@ public:
 		ret += "ring_scenario : ";
 		ret += _ScenarioTag;
 		// Add the 'nb_guild_members_needed' parameter if needed
-		ret += CContentObjective::genNbGuildMembersNeededOption(md);
+		//ret += CContentObjective::genNbGuildMembersNeededOption(md);
 		ret += NL;
 
 		return ret;