GetEnergy() offers exact energy value optionally (Bug #2043)

openclonk · Dec 20, 2018 · 6351fe7 · lluchs · Dec 21, 2018 · gitMarky
1 parent 11cfcdd
commit 6351fe7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/docs/sdk/script/fn/GetEnergy.xml b/docs/sdk/script/fn/GetEnergy.xml
@@ -7,12 +7,23 @@
     <title>GetEnergy</title>
     <category>Objects</category>
     <version>1.0 OC</version>
-    <syntax><rtype>int</rtype></syntax>
+    <syntax>
+      <rtype>int</rtype>
+      <params>
+        <param>
+          <type>bool</type>
+          <name>exact</name>
+          <desc>If <code>true</code>, the exact energy value is returned.</desc>
+          <optional />
+        </param>
+      </params>
+    </syntax>
     <desc>Returns the current energy value of an object. 100% representing the maximum physical value of 100,000</desc>
     <remark>For living beings, \"energy\" stands for health, in buildings it stands for electrical charge.</remark>
     <related>
       <funclink>DoEnergy</funclink>
     </related>
   </func>
   <author>jwk</author><date>2002-06</date>
+  <author>Marky</author><date>2018-12</date>
 </funcs>
diff --git a/src/object/C4ObjectScript.cpp b/src/object/C4ObjectScript.cpp
@@ -558,9 +558,16 @@ static long FnGetPhase(C4Object *Obj)
 	return Obj->Action.Phase;
 }
 
-static long FnGetEnergy(C4Object *Obj)
+static long FnGetEnergy(C4Object *Obj, bool fExact)
 {
-	return 100*Obj->Energy/C4MaxPhysical;
+	if (fExact)
+	{
+		return Obj->Energy;
+	}
+	else
+	{
+		return 100*Obj->Energy/C4MaxPhysical;
+	}
 }
 
 static long FnGetBreath(C4Object *Obj)