Guest User

Untitled

a guest
Mar 30th, 2010
237
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.81 KB | None | 0 0
  1. diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
  2. index ed8a059..95a94b6 100644
  3. --- a/src/game/AuctionHouseMgr.cpp
  4. +++ b/src/game/AuctionHouseMgr.cpp
  5. @@ -35,6 +35,11 @@
  6.  
  7. #include "Policies/SingletonImp.h"
  8.  
  9. +#ifdef WIN32
  10. +#include "ServiceWin32.h"
  11. +extern int m_ServiceStatus;
  12. +#endif
  13. +
  14. INSTANTIATE_SINGLETON_1( AuctionHouseMgr );
  15.  
  16. AuctionHouseMgr::AuctionHouseMgr()
  17. @@ -47,6 +52,40 @@ AuctionHouseMgr::~AuctionHouseMgr()
  18. delete itr->second;
  19. }
  20.  
  21. +void AuctionHouseMgr::run()
  22. +{
  23. + ACE_DEBUG
  24. + ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n")));
  25. +
  26. + runUpdate = false;
  27. + initLoading = false;
  28. +
  29. + LoadAuctionItems();
  30. + LoadAuctions();
  31. +
  32. + initLoading = true;
  33. +
  34. + while (!World::IsStopped())
  35. + {
  36. + if (runUpdate)
  37. + {
  38. + Update();
  39. + runUpdate = false;
  40. + }
  41. +
  42. + #ifdef WIN32
  43. + ACE_Based::Thread::Sleep(50);
  44. + #else
  45. + ACE_Based::Thread::Sleep(100);
  46. + #endif
  47. +
  48. + #ifdef WIN32
  49. + if (m_ServiceStatus == 0) World::StopNow(SHUTDOWN_EXIT_CODE);
  50. + while (m_ServiceStatus == 2) Sleep(1000);
  51. + #endif
  52. + }
  53. +}
  54. +
  55. AuctionHouseObject * AuctionHouseMgr::GetAuctionsMap( uint32 factionTemplateId )
  56. {
  57. if(sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
  58. @@ -278,6 +317,8 @@ void AuctionHouseMgr::SendAuctionExpiredMail( AuctionEntry * auction )
  59.  
  60. void AuctionHouseMgr::LoadAuctionItems()
  61. {
  62. + ACE_DEBUG
  63. + ((LM_DEBUG, ACE_TEXT ("(%t) LoadAuctionItems Thread running\n")));
  64. // data needs to be at first place for Item::LoadFromDB
  65. QueryResult *result = CharacterDatabase.Query( "SELECT data,itemguid,item_template FROM auctionhouse JOIN item_instance ON itemguid = guid" );
  66.  
  67. @@ -331,6 +372,8 @@ void AuctionHouseMgr::LoadAuctionItems()
  68.  
  69. void AuctionHouseMgr::LoadAuctions()
  70. {
  71. + ACE_DEBUG
  72. + ((LM_DEBUG, ACE_TEXT ("(%t) LoadAuctions Thread running\n")));
  73. QueryResult *result = CharacterDatabase.Query("SELECT COUNT(*) FROM auctionhouse");
  74. if( !result )
  75. {
  76. diff --git a/src/game/AuctionHouseMgr.h b/src/game/AuctionHouseMgr.h
  77. index 2775838..164f637 100644
  78. --- a/src/game/AuctionHouseMgr.h
  79. +++ b/src/game/AuctionHouseMgr.h
  80. @@ -114,7 +114,7 @@ class AuctionHouseObject
  81. AuctionEntryMap AuctionsMap;
  82. };
  83.  
  84. -class AuctionHouseMgr
  85. +class AuctionHouseMgr : public ACE_Based::Runnable
  86. {
  87. public:
  88. AuctionHouseMgr();
  89. @@ -152,7 +152,12 @@ class AuctionHouseMgr
  90.  
  91. void Update();
  92.  
  93. + bool runUpdate;
  94. + bool initLoading;
  95. +
  96. private:
  97. + void run();
  98. +
  99. AuctionHouseObject mHordeAuctions;
  100. AuctionHouseObject mAllianceAuctions;
  101. AuctionHouseObject mNeutralAuctions;
  102. diff --git a/src/game/World.cpp b/src/game/World.cpp
  103. index bf20ccf..7bf2501 100644
  104. --- a/src/game/World.cpp
  105. +++ b/src/game/World.cpp
  106. @@ -1309,8 +1309,13 @@ void World::SetInitialWorldSettings()
  107. ///- Load dynamic data tables from the database
  108. sLog.outString( "Loading Auctions..." );
  109. sLog.outString();
  110. - auctionmgr.LoadAuctionItems();
  111. - auctionmgr.LoadAuctions();
  112. + ACE_DEBUG
  113. + ((LM_DEBUG, ACE_TEXT ("(%t) Main Thread running\n")));
  114. + ACE_Based::Thread t(*new AuctionHouseMgr);
  115. + while(auctionmgr.initLoading == false)
  116. + ACE_Based::Thread::Sleep(100);
  117. + //auctionmgr.LoadAuctionItems();
  118. + //auctionmgr.LoadAuctions();
  119. sLog.outString( ">>> Auctions loaded" );
  120. sLog.outString();
  121.  
  122. @@ -1529,7 +1534,8 @@ void World::Update(uint32 diff)
  123. }
  124.  
  125. ///- Handle expired auctions
  126. - auctionmgr.Update();
  127. + auctionmgr.runUpdate = true;
  128. + //auctionmgr.Update();
  129. }
  130.  
  131. /// <li> Handle session updates when the timer has passed
Advertisement
Add Comment
Please, Sign In to add comment