aboutsummaryrefslogtreecommitdiff
path: root/src/shared/Database
diff options
context:
space:
mode:
authorQAston <none@none>2009-08-18 20:17:06 +0200
committerQAston <none@none>2009-08-18 20:17:06 +0200
commit5ffa85c858fb721fb5d663431712d173d6b62a15 (patch)
tree2344baec6dfc3bf569b9318d6b278ae02d3c5b9a /src/shared/Database
parentd3d2eb91bbac388f9ffc1e89147c4129e7bcf9af (diff)
*Fix server startup error from 5184.
--HG-- branch : trunk
Diffstat (limited to 'src/shared/Database')
-rw-r--r--src/shared/Database/DBCFileLoader.cpp4
-rw-r--r--src/shared/Database/DBCFileLoader.h2
-rw-r--r--src/shared/Database/DBCStore.h4
3 files changed, 4 insertions, 6 deletions
diff --git a/src/shared/Database/DBCFileLoader.cpp b/src/shared/Database/DBCFileLoader.cpp
index dc968fbce3b..23f602f5c93 100644
--- a/src/shared/Database/DBCFileLoader.cpp
+++ b/src/shared/Database/DBCFileLoader.cpp
@@ -30,7 +30,7 @@ DBCFileLoader::DBCFileLoader()
fieldsOffset = NULL;
}
-bool DBCFileLoader::Load(const char *filename, const char *fmt, uint32 customEntriesCount)
+bool DBCFileLoader::Load(const char *filename, const char *fmt)
{
uint32 header;
@@ -55,8 +55,6 @@ bool DBCFileLoader::Load(const char *filename, const char *fmt, uint32 customEnt
EndianConvert(recordCount);
- recordCount += customEntriesCount;
-
if(fread(&fieldCount,4,1,f)!=1) // Number of fields
return false;
diff --git a/src/shared/Database/DBCFileLoader.h b/src/shared/Database/DBCFileLoader.h
index ebdfef4523c..13562148dfc 100644
--- a/src/shared/Database/DBCFileLoader.h
+++ b/src/shared/Database/DBCFileLoader.h
@@ -41,7 +41,7 @@ class DBCFileLoader
DBCFileLoader();
~DBCFileLoader();
- bool Load(const char *filename, const char *fmt, uint32 customEntriesCount = 0);
+ bool Load(const char *filename, const char *fmt);
class Record
{
diff --git a/src/shared/Database/DBCStore.h b/src/shared/Database/DBCStore.h
index 2906a93edbc..523d5c5a0b3 100644
--- a/src/shared/Database/DBCStore.h
+++ b/src/shared/Database/DBCStore.h
@@ -34,11 +34,11 @@ class DBCStorage
char const* GetFormat() const { return fmt; }
uint32 GetFieldCount() const { return fieldCount; }
- bool Load(char const* fn, uint32 customEntriesCount = 0)
+ bool Load(char const* fn)
{
DBCFileLoader dbc;
// Check if load was sucessful, only then continue
- if(!dbc.Load(fn, fmt, customEntriesCount))
+ if(!dbc.Load(fn, fmt))
return false;
fieldCount = dbc.GetCols();