diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-05 20:27:25 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-05 20:27:25 +0400 |
commit | 5a3c6ccadb8925d6e2b1da2b2861de35b33f939f (patch) | |
tree | ee9b2a9e66c60f10f963399f198a9268b2cc5bc6 /source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h | |
parent | 4393df93202198b5eaaff438e18060c66b98928d (diff) | |
parent | 59dbd53e72ae25edf247e49ea1e291af277fecc4 (diff) |
Merging r39847 through r39930 from trunk into vgroup_modifiers.
Diffstat (limited to 'source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h')
-rw-r--r-- | source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h index ff9131f464e..405e2d52989 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h @@ -43,7 +43,7 @@ class KX_NetworkEventManager : public SCA_EventManager public: KX_NetworkEventManager(class SCA_LogicManager* logicmgr, - class NG_NetworkDeviceInterface *ndi); + class NG_NetworkDeviceInterface *ndi); virtual ~KX_NetworkEventManager (); virtual void NextFrame(); @@ -51,7 +51,7 @@ public: SCA_LogicManager* GetLogicManager() { return m_logicmgr; } class NG_NetworkDeviceInterface* GetNetworkDevice() { - return m_ndi; } + return m_ndi; } }; #endif //KX_NETWORK_EVENTMANAGER_H |