Changeset 10473 for code/branches/core7/src/libraries/network/FunctionCall.h

Timestamp:

May 25, 2015, 2:04:43 PM (9 years ago)

Author:

landauf

Message:

bugfix and continuation of the last commit:

• FunctionCall::execute() now returns the correct value (was inverted accidentally)
• FunctionCall::setCall() new calculates the correct callsize (still included the 8bits for isStatic that was removed in the previous commit)
• static and member network functions are now treated equally throughout the whole system (only the macros make a difference)

File:

• code/branches/core7/src/libraries/network/FunctionCall.h (modified) (2 diffs)

code/branches/core7/src/libraries/network/FunctionCall.h

@@ -52 +52 @@
   bool execute();
 
-  void setCallStatic( uint32_t networkID, const MultiType* mt1=0, const MultiType* mt2=0, const MultiType* mt3=0, const MultiType* mt4=0, const MultiType* mt5=0);
-  void setCallMember( uint32_t networkID, uint32_t objectID, const MultiType* mt1=0, const MultiType* mt2=0, const MultiType* mt3=0, const MultiType* mt4=0, const MultiType* mt5=0);
+  void setCall( uint32_t networkID, uint32_t objectID, const MultiType* mt1=0, const MultiType* mt2=0, const MultiType* mt3=0, const MultiType* mt4=0, const MultiType* mt5=0);
   
   void saveData( uint8_t*& mem );
@@ -60 +59 @@
   uint32_t                  nrOfArguments_;
   uint32_t                  functionID_;
-  uint32_t                  objectID_;
+  uint32_t                  objectID_; // equals OBJECTID_UNKNOWN for static functions
   uint32_t                  size_;
   std::vector<MultiType>    arguments_;