From bdd673f0627d3a622d2df716aa1039d71a19a39f Mon Sep 17 00:00:00 2001
From: Justin Butler <jlbutler@users.sourceforge.net>
Date: Mon, 13 Oct 2008 22:22:44 +0000
Subject: [PATCH] Additional needed files to fix POTCO-5271

---
 direct/src/distributed/DistributedSmoothNodeAI.py     |  9 +++++++--
 direct/src/distributed/cDistributedSmoothNodeBase.cxx | 10 ++++++++--
 direct/src/distributed/cDistributedSmoothNodeBase.h   |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/direct/src/distributed/DistributedSmoothNodeAI.py b/direct/src/distributed/DistributedSmoothNodeAI.py
index 8db1e4deab..68613508c1 100755
--- a/direct/src/distributed/DistributedSmoothNodeAI.py
+++ b/direct/src/distributed/DistributedSmoothNodeAI.py
@@ -99,6 +99,11 @@ class DistributedSmoothNodeAI(DistributedNodeAI.DistributedNodeAI,
     def getComponentR(self):
         return self.getR()
     def getComponentL(self):
-        pass
+        if (self.zoneId):
+            return self.zoneId
+        else:
+            # we can't send None over the wire which self.zoneId can sometimes be
+            return 0
     def getComponentT(self):
-        pass
+        return 0
+
diff --git a/direct/src/distributed/cDistributedSmoothNodeBase.cxx b/direct/src/distributed/cDistributedSmoothNodeBase.cxx
index a5c2b87810..c79affe1fb 100644
--- a/direct/src/distributed/cDistributedSmoothNodeBase.cxx
+++ b/direct/src/distributed/cDistributedSmoothNodeBase.cxx
@@ -78,8 +78,9 @@ initialize(const NodePath &node_path, DCClass *dclass, CHANNEL_TYPE do_id) {
 ////////////////////////////////////////////////////////////////////
 void CDistributedSmoothNodeBase::
 send_everything() {
-  d_setSmPosHpr(_store_xyz[0], _store_xyz[1], _store_xyz[2], 
-                _store_hpr[0], _store_hpr[1], _store_hpr[2]);
+  _currL[0] = _currL[1];
+  d_setSmPosHprL(_store_xyz[0], _store_xyz[1], _store_xyz[2], 
+                 _store_hpr[0], _store_hpr[1], _store_hpr[2], _currL[0]);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -370,3 +371,8 @@ set_curr_l(PN_uint64 l) {
   _currL[1] = l;
 }
 
+void CDistributedSmoothNodeBase::
+print_curr_l() {
+  cout << "printCurrL: sent l: " << _currL[1] << " last set l: " << _currL[0] << "\n";
+}
+
diff --git a/direct/src/distributed/cDistributedSmoothNodeBase.h b/direct/src/distributed/cDistributedSmoothNodeBase.h
index 395f5e63d9..31e6f70563 100644
--- a/direct/src/distributed/cDistributedSmoothNodeBase.h
+++ b/direct/src/distributed/cDistributedSmoothNodeBase.h
@@ -55,6 +55,7 @@ PUBLISHED:
   void broadcast_pos_hpr_xy();
 
   void set_curr_l(PN_uint64 l);
+  void print_curr_l();
 
 private:
   INLINE static bool only_changed(int flags, int compare);