Merge pull request #4 from Redex-Developers/cogStreetBuildings

Add DNA functions for Cog Buildings

Author: DevvyDont

panda/src/toontown/dna/dnaStorage.I

@@ -98,6 +98,7 @@ INLINE void DNAStorage::reset_hood() {
   reset_place_nodes();
   reset_suit_points();
   reset_battle_cells();
+  reset_suit_blocks();
 }
 
 
@@ -145,6 +146,16 @@ INLINE void DNAStorage::reset_battle_cells() {
 }
 
 
+////////////////////////////////////////////////////////////////////
+//     Function: reset_suit_blocks
+//       Access: Public
+//  Description: clear out the dict
+////////////////////////////////////////////////////////////////////
+INLINE void DNAStorage::reset_suit_blocks() {
+  _suit_blocks_map.clear();
+}
+
+
 ////////////////////////////////////////////////////////////////////
 //     Function: reset_DNAGroups
 //       Access: Public

panda/src/toontown/dna/dnaStorage.cxx

@@ -378,6 +378,50 @@ int DNAStorage::remove_suit_point(PT(DNASuitPoint) point) {
 }
 
 
+////////////////////////////////////////////////////////////////////
+//     Function: store_suit_block
+//       Access: Public
+//  Description: Store a block number in the SuitBlocks map
+////////////////////////////////////////////////////////////////////
+void DNAStorage::store_suit_block(const int block_number, const std::string& dept) {
+  _suit_blocks_map[block_number] = dept;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: get_suit_blocks
+//       Access: Public
+//  Description: Return the SuitBlocks map
+////////////////////////////////////////////////////////////////////
+SuitBlockMap DNAStorage::get_suit_blocks() const {
+  return _suit_blocks_map;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: is_suit_block
+//       Access: Public
+//  Description: Check if block number is in the SuitBlocks map
+////////////////////////////////////////////////////////////////////
+bool DNAStorage::is_suit_block(int block_number) const {
+  return _suit_blocks_map.find(block_number) != _suit_blocks_map.end();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: get_suit_block_track
+//       Access: Public
+//  Description: Get the department that's stored in the block number
+////////////////////////////////////////////////////////////////////
+std::string DNAStorage::get_suit_block_track(int block_number) const {
+  // Try to find this code in the map
+  SuitBlockMap::const_iterator i = _suit_blocks_map.find(block_number);
+  if (i == _suit_blocks_map.end()) {
+    dna_cat.error()
+      << "block number: " << block_number << " not found in SuitBlocks map" << std::endl;
+    return "";
+  }
+  return (*i).second;
+}
+
+
 ////////////////////////////////////////////////////////////////////
 //     Function: store_block_number
 //       Access: Public
@@ -487,7 +531,6 @@ int DNAStorage::get_num_block_door_pos_hprs() const {
   return _block_door_pos_hpr_map.size();
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: get_door_pos_hpr_block_at
 //       Access: Public

panda/src/toontown/dna/dnaStorage.h

@@ -47,6 +47,7 @@ typedef pmap< std::string, PT(TextFont) > FontMap;
 typedef pmap< int, int > BlockToZoneMap;
 typedef pmap< int, PosHpr > BlockToPosHprMap;
 typedef pmap< int, LMatrix4f > BlockToTransformMap;
+typedef pmap< int, std::string > SuitBlockMap;
 typedef pmap< int, std::string > BlockToTitleMap;
 typedef pmap< int, std::string > BlockToArticleMap;
 typedef pmap< int, std::string > BlockToBuildingTypeMap;
@@ -95,6 +96,7 @@ class EXPCL_TOONTOWN DNAStorage {
   int store_suit_point(PT(DNASuitPoint));
   int get_highest_suit_point_index();
   int remove_suit_point(PT(DNASuitPoint));
+  void store_suit_block(const int block_number,  std::string& dept);
   void store_block_number(const std::string& block, const std::string& zone_id);
   void store_block_door_pos_hpr(const std::string& block, const LPoint3f& pos, const LPoint3f& hpr);
   void store_block_sign_transform(const std::string& block, const LMatrix4f& mat);
@@ -121,6 +123,7 @@ class EXPCL_TOONTOWN DNAStorage {
   INLINE void reset_suit_points();
   INLINE void reset_battle_cells();
   INLINE void reset_block_numbers();
+  INLINE void reset_suit_blocks();
   INLINE void reset_block_door_pos_hprs();
   INLINE void reset_block_sign_transforms();
   INLINE void reset_block_title();
@@ -144,6 +147,11 @@ class EXPCL_TOONTOWN DNAStorage {
   PT(DNAGroup)     find_DNAGroup(PT(PandaNode)) const;
   PT(PandaNode) find_PandaNode(PT(DNAGroup)) const;
 
+  // Suit street functions
+  SuitBlockMap get_suit_blocks() const;
+  bool is_suit_block(int block_number) const;
+  std::string get_suit_block_track(int block_number) const;
+
   // Block number functions
   int get_zone_from_block_number(int block_number) const;
   int get_block_number_at(unsigned int index) const;
@@ -154,6 +162,7 @@ class EXPCL_TOONTOWN DNAStorage {
   int get_door_pos_hpr_block_at(unsigned int index) const;
   int get_num_block_door_pos_hprs() const;
 
+
   // Block sign pos hpr functions
   const LMatrix4f& get_sign_transform_from_block_number(int block_number) const;
   int get_sign_transform_block_at(unsigned int index) const;
@@ -253,6 +262,7 @@ class EXPCL_TOONTOWN DNAStorage {
   BlockToZoneMap _block_map;
   BlockToPosHprMap _block_door_pos_hpr_map;
   BlockToTransformMap _block_sign_transform_map;
+  SuitBlockMap _suit_blocks_map;
   BlockToTitleMap _block_title_map;
   BlockToArticleMap _block_article_map;
   BlockToBuildingTypeMap _block_building_type_map;