瀏覽代碼

BAM Serialization done

Ashwini Jha 5 年之前
父節點
當前提交
b37d8e1908
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      panda/src/navigation/navMeshNode.cxx
  2. 1 1
      panda/src/navigation/navMeshNode.h

+ 2 - 2
panda/src/navigation/navMeshNode.cxx

@@ -73,8 +73,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
 //  */
 //  */
 TypedWritable *NavMeshNode::
 TypedWritable *NavMeshNode::
 make_from_bam(const FactoryParams &params) {
 make_from_bam(const FactoryParams &params) {
-  string s = "FromBam"
-  NavMeshNode *param = new NavMeshNode(s);
+  std::string name = "FromBam";
+  NavMeshNode *param = new NavMeshNode(name);
   DatagramIterator scan;
   DatagramIterator scan;
   BamReader *manager;
   BamReader *manager;
 
 

+ 1 - 1
panda/src/navigation/navMeshNode.h

@@ -57,7 +57,7 @@ public:
                                 BamReader *manager);
                                 BamReader *manager);
 
 
 protected:
 protected:
-  //static TypedWritable *make_from_bam(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 
 };
 };