fix and unify message showing for goals and rules in F menu

planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c

@@ -1,11 +1,11 @@
-/*--
+/**
 	Goal control
-	Author: Sven2
-	
-	Include this to all C4D_Goal objects
-	Functions to be overloaded:
-		bool IsFullfilled(); - is the goal fulfilled?
---*/
+	Include this to all C4D_Goal objects. Functions to be overloaded:
+	 * bool IsFullfilled(); - is the goal fulfilled?
+	 * string GetDescription(int plr); - description of the goal
+		
+	@author Sven2
+*/
 
 local EditorPlacementLimit = 1; // Goals are to be placed only once (unless overloaded by the goal)
 
@@ -142,11 +142,11 @@ public func GetDescription(int plr)
 protected func Activate(plr)
 {
 	if (IsFulfilled())
-		return(MessageWindow("$MsgGoalFulfilled$", plr));
-	return MessageWindow(this->GetDescription(plr));
+		return MessageWindow("$MsgGoalFulfilled$", plr);
+	return MessageWindow(this->GetDescription(plr), plr);
 }
 
-// Scenario sacing
+// Scenario saving.
 func SaveScenarioObject(props)
 {
 	if (!inherited(props, ...)) return false;

planet/Objects.ocd/Rules.ocd/BuyAtFlagpole.ocd/Script.c

@@ -11,9 +11,9 @@ public func Construction(...)
 	return _inherited(...);
 }
 
-protected func Activate(int iByPlayer)
+public func Activate(int by_plr)
 {
-	MessageWindow(GetProperty("Description"), iByPlayer);
+	MessageWindow(this.Description, by_plr);
 	return true;
 }
 

planet/Objects.ocd/Rules.ocd/FastPump.ocd/Script.c

@@ -48,9 +48,9 @@ public func SetPumpSpeed(int speed)
 
 public func GetPumpSpeed() { return pump_speed; }
 
-public func Activate(int plr)
+public func Activate(int by_plr)
 {
-	MessageWindow(this.Description, plr);
+	MessageWindow(this.Description, by_plr);
 	return true;
 }
 

planet/Objects.ocd/Rules.ocd/Gravestones.ocd/Script.c

@@ -69,9 +69,9 @@ local FxAddGravestone = new Effect
 	}
 };
 
-protected func Activate(int by_plr)
+public func Activate(int by_plr)
 {
-	MessageWindow(GetProperty("Description"), by_plr);
+	MessageWindow(this.Description, by_plr);
 	return true;
 }
 

planet/Objects.ocd/Rules.ocd/Killlogs.ocd/Script.c

@@ -7,9 +7,9 @@ func Initialize()
 		return RemoveObject();
 }
 
-public func Activate(int plr)
+public func Activate(int by_plr)
 {
-	MessageWindow(GetProperty("Description"), plr);
+	MessageWindow(this.Description, by_plr);
 	return true;
 }
 

planet/Objects.ocd/Rules.ocd/NoEnergy.ocd/Script.c

@@ -33,9 +33,9 @@ protected func Destruction()
 	return;
 }
 
-protected func Activate(int plr)
+public func Activate(int by_plr)
 {
-	MessageWindow(GetProperty("Description"), plr);
+	MessageWindow(this.Description, by_plr);
 	return true;
 }
 

planet/Objects.ocd/Rules.ocd/NoFriendlyFire.ocd/Script.c

@@ -161,9 +161,9 @@ public func NoFF_IsProjectileTarget(object projectile, object shooter, ...)
 
 /*-- Description --*/
 
-public func Activate(int plr)
+public func Activate(int by_plr)
 {
-	MessageWindow(this.Description, plr);
+	MessageWindow(this.Description, by_plr);
 	return true;
 }
 

planet/Objects.ocd/Rules.ocd/ObjectFade.ocd/Script.c

@@ -10,9 +10,9 @@
 
 local fade_time = 18;
 
-protected func Activate(int plr)
+public func Activate(int by_plr)
 {
-	MessageWindow(GetProperty("Description"), plr);
+	MessageWindow(this.Description, by_plr);
 	return true;
 }
 

planet/Objects.ocd/Rules.ocd/TeamAccount.ocd/Script.c

@@ -79,10 +79,10 @@ protected func OnHostilityChange(int plr, int plr2, bool hostility, bool old_hos
 	return;
 }
 
-protected func Activate(int byplr)
+public func Activate(int by_plr)
 {
-	MessageWindow("$Description$", byplr);
-	return;
+	MessageWindow(this.Description, by_plr);
+	return true;
 }
 
 /*-- Proplist --*/