From f4c38044c4b95ff3b4a191ccba0d13a6b94c00dd Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Sun, 14 Feb 2010 21:10:29 +0300
Subject: [PATCH] [9384] Resore use uint64 instead time_t in query, some other
 fixes.

---
 src/game/DBCStores.cpp       |  2 +-
 src/game/InstanceSaveMgr.cpp |  2 +-
 src/game/SpellMgr.cpp        | 10 +++++-----
 src/shared/ProgressBar.cpp   |  2 +-
 src/shared/ProgressBar.h     |  2 +-
 src/shared/revision_nr.h     |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp
index d5a07c117..0b9e71997 100644
--- a/src/game/DBCStores.cpp
+++ b/src/game/DBCStores.cpp
@@ -325,7 +325,7 @@ void LoadDBCStores(const std::string& dataPath)
 
     const uint32 DBCFilesCount = 84;
 
-    barGoLink bar( DBCFilesCount );
+    barGoLink bar( (int)DBCFilesCount );
 
     StoreProblemList bad_dbc_files;
 
diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp
index 8aa978ab3..cb8d9d241 100644
--- a/src/game/InstanceSaveMgr.cpp
+++ b/src/game/InstanceSaveMgr.cpp
@@ -639,7 +639,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b
         uint32 period = mapDiff->resetTime * DAY;
         time_t next_reset = ((now + timeLeft + MINUTE) / DAY * DAY) + period + diff;
         // update it in the DB
-        CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%d' AND difficulty = '%d'", next_reset, mapid, difficulty);
+        CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%d' AND difficulty = '%d'", (uint64)next_reset, mapid, difficulty);
     }
 
     // note: this isn't fast but it's meant to be executed very rarely
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 2600d5981..612037267 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2241,7 +2241,7 @@ void SpellMgr::LoadSpellScriptTarget()
         return;
     }
 
-    barGoLink bar(result->GetRowCount());
+    barGoLink bar((int)result->GetRowCount());
 
     do
     {
@@ -2379,7 +2379,7 @@ void SpellMgr::LoadSpellPetAuras()
         return;
     }
 
-    barGoLink bar( result->GetRowCount() );
+    barGoLink bar( (int)result->GetRowCount() );
 
     do
     {
@@ -2717,7 +2717,7 @@ void SpellMgr::LoadSpellAreas()
         return;
     }
 
-    barGoLink bar( result->GetRowCount() );
+    barGoLink bar( (int)result->GetRowCount() );
 
     do
     {
@@ -3042,7 +3042,7 @@ void SpellMgr::LoadSkillLineAbilityMap()
 {
     mSkillLineAbilityMap.clear();
 
-    barGoLink bar( sSkillLineAbilityStore.GetNumRows() );
+    barGoLink bar( (int)sSkillLineAbilityStore.GetNumRows() );
     uint32 count = 0;
 
     for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i)
@@ -3079,7 +3079,7 @@ void SpellMgr::CheckUsedSpells(char const* table)
         return;
     }
 
-    barGoLink bar( result->GetRowCount() );
+    barGoLink bar( (int)result->GetRowCount() );
 
     do
     {
diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp
index 5d0b4e1f1..f277eea16 100644
--- a/src/shared/ProgressBar.cpp
+++ b/src/shared/ProgressBar.cpp
@@ -33,7 +33,7 @@ barGoLink::~barGoLink()
     fflush(stdout);
 }
 
-barGoLink::barGoLink( uint64 row_count )
+barGoLink::barGoLink( int row_count )
 {
     rec_no    = 0;
     rec_pos   = 0;
diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h
index 6c7e63d04..dd4c5b64d 100644
--- a/src/shared/ProgressBar.h
+++ b/src/shared/ProgressBar.h
@@ -33,7 +33,7 @@ class MANGOS_DLL_SPEC barGoLink
     public:
 
         void step( void );
-        barGoLink( uint64 );
+        barGoLink( int );
         ~barGoLink();
 };
 #endif
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index dcd9df021..0ddb4b657 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9383"
+ #define REVISION_NR "9384"
 #endif // __REVISION_NR_H__