Changeset 10473 for code/branches/core7/src/libraries/network/NetworkFunctionIncludes.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/NetworkFunctionIncludes.h (modified) (2 diffs)

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

@@ -51 +51 @@
             NetworkFunctionPointer p1; \
             copyPtr( functionPointer, p1 ); \
-            FunctionCallManager::addCallStatic(NetworkFunctionManager::getFunction(p1)->getNetworkID(), __VA_ARGS__); \
+            FunctionCallManager::addCall(NetworkFunctionManager::getFunction(p1)->getNetworkID(), OBJECTID_UNKNOWN, __VA_ARGS__); \
         }
 
@@ -59 +59 @@
             NetworkFunctionPointer p1; \
             copyPtr( &class::function, p1 ); \
-            FunctionCallManager::addCallMember(NetworkFunctionManager::getFunction(p1)->getNetworkID(), objectID, __VA_ARGS__); \
+            FunctionCallManager::addCall(NetworkFunctionManager::getFunction(p1)->getNetworkID(), objectID, __VA_ARGS__); \
         }