Changeset 20 for trunk/src/hearthstone-world/ObjectMgr.cpp

Timestamp:

09/20/09 20:13:24 (3 years ago)

Author:

valroft

Message:

- Reduced the memory overhead of achievements significantly.
- Changed the number of possibly criteria per achievement to be completely dependent on how many there actually are.
- To save memory, achievement counters will not be loaded for achievements that are already completed. This affects nothing in-game.
- Run the SQL update 2009_09_20_achievements.sql, or large achievements will not save!

Files:

• trunk/src/hearthstone-world/ObjectMgr.cpp (modified) (3 diffs)

trunk/src/hearthstone-world/ObjectMgr.cpp

@@ -189 +189 @@
                 delete (itr->second);
 
-        Log.Notice("ObjectMgr", "Deleting Achievement Quest Map...");
-        for(map<uint32,set<Quest*>*>::iterator qitr = ZoneToQuestMap.begin(); qitr != ZoneToQuestMap.end(); ++qitr)
-                delete qitr->second;
+        AchievementEntry* ae;
+        for(uint32 i = 0; i < dbcAchivementCriteria.GetNumRows(); ++i)
+        {
+                ae = dbcAchievement.LookupRow(i);
+                if( ae )
+                {
+                        delete ae->AssociatedCriteria;
+                }
+        }
 }
 void ObjectMgr::LoadAchievements()
@@ -200 +206 @@
                 if(ae)
                 {
+                        ae->AssociatedCriteria = new vector<uint32>;
                         ae->AssociatedCriteriaCount = 0;
                 }
@@ -227 +234 @@
                         if( ae )
                         {
-                                if(ae->AssociatedCriteriaCount >= 32) continue;
-                                ae->AssociatedCriteria[ ae->AssociatedCriteriaCount ] = ace->ID;
+                                //if(ae->AssociatedCriteriaCount >= 32) continue;
+                                ae->AssociatedCriteria->push_back( ace->ID );
+                                //ae->AssociatedCriteria[ ae->AssociatedCriteriaCount ] = ace->ID;
                                 ae->AssociatedCriteriaCount++;
                         }
-                }
-        }
-
-        // For Achievements: Complete Quest by Zone Id
-        StorageContainerIterator<Quest> * itr = QuestStorage.MakeIterator();
-        for(; !itr->AtEnd(); itr->Inc() )
-        {
-                Quest * pQuest = itr->Get();
-                if(!pQuest) continue;
-
-                uint32 QuestZone = pQuest->zone_id;
-                map<uint32,set<Quest*>*>::iterator qitr = ZoneToQuestMap.find( QuestZone );
-                if( qitr == ZoneToQuestMap.end() )
-                {
-                        // We don't have any entries for this zone yet.
-                        set<Quest*>* mySet = new set<Quest*>;
-                        mySet->insert( pQuest );
-                        ZoneToQuestMap.insert( make_pair( QuestZone, mySet ) );
-                }
-                else
-                {
-                        set<Quest*>* thisSet = qitr->second;
-                        thisSet->insert( pQuest );
                 }
         }