mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9384] Resore use uint64 instead time_t in query, some other fixes.

Browse source
This commit is contained in:
VladimirMangos 2010-02-14 21:10:29 +03:00
parent 5beb853bc4
commit f4c38044c4
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/DBCStores.cpp
View file

@ -325,7 +325,7 @@ void LoadDBCStores(const std::string& dataPath)
const uint32 DBCFilesCount = 84; const uint32 DBCFilesCount = 84;
barGoLink bar( DBCFilesCount ); barGoLink bar( (int)DBCFilesCount );
StoreProblemList bad_dbc_files; StoreProblemList bad_dbc_files;

2
src/game/InstanceSaveMgr.cpp
View file

@ -639,7 +639,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b
uint32 period = mapDiff->resetTime * DAY; uint32 period = mapDiff->resetTime * DAY;
time_t next_reset = ((now + timeLeft + MINUTE) / DAY * DAY) + period + diff; time_t next_reset = ((now + timeLeft + MINUTE) / DAY * DAY) + period + diff;
// update it in the DB // 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 // note: this isn't fast but it's meant to be executed very rarely

10
src/game/SpellMgr.cpp
View file

@ -2241,7 +2241,7 @@ void SpellMgr::LoadSpellScriptTarget()
return; return;
} }
barGoLink bar(result->GetRowCount()); barGoLink bar((int)result->GetRowCount());
do do
{ {
@ -2379,7 +2379,7 @@ void SpellMgr::LoadSpellPetAuras()
return; return;
} }
barGoLink bar( result->GetRowCount() ); barGoLink bar( (int)result->GetRowCount() );
do do
{ {
@ -2717,7 +2717,7 @@ void SpellMgr::LoadSpellAreas()
return; return;
} }
barGoLink bar( result->GetRowCount() ); barGoLink bar( (int)result->GetRowCount() );
do do
{ {
@ -3042,7 +3042,7 @@ void SpellMgr::LoadSkillLineAbilityMap()
{ {
mSkillLineAbilityMap.clear(); mSkillLineAbilityMap.clear();
barGoLink bar( sSkillLineAbilityStore.GetNumRows() ); barGoLink bar( (int)sSkillLineAbilityStore.GetNumRows() );
uint32 count = 0; uint32 count = 0;
for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i) for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i)
@ -3079,7 +3079,7 @@ void SpellMgr::CheckUsedSpells(char const* table)
return; return;
} }
barGoLink bar( result->GetRowCount() ); barGoLink bar( (int)result->GetRowCount() );
do do
{ {

2
src/shared/ProgressBar.cpp
View file

@ -33,7 +33,7 @@ barGoLink::~barGoLink()
fflush(stdout); fflush(stdout);
} }
barGoLink::barGoLink( uint64 row_count ) barGoLink::barGoLink( int row_count )
{ {
rec_no = 0; rec_no = 0;
rec_pos = 0; rec_pos = 0;

2
src/shared/ProgressBar.h
View file

@ -33,7 +33,7 @@ class MANGOS_DLL_SPEC barGoLink
public: public:
void step( void ); void step( void );
barGoLink( uint64 ); barGoLink( int );
~barGoLink(); ~barGoLink();
}; };
#endif #endif

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9383" #define REVISION_NR "9384"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__