aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/DataStores
diff options
context:
space:
mode:
authorShocker <shocker@freakz.ro>2011-04-29 22:24:26 +0300
committerShocker <shocker@freakz.ro>2011-04-29 22:24:26 +0300
commit0fb8f057974cdf3107084be65005956efb5191dc (patch)
tree8fe211ecee643625c01ec3970038e345ec44c5f0 /src/server/shared/DataStores
parentf96e1ce1d7b10074750da761ff9b219a24d0f09f (diff)
parent1b1d7507f1c3ea768f3fdaf4e1729b66fe590a68 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/shared/DataStores')
-rwxr-xr-xsrc/server/shared/DataStores/DBCFileLoader.cpp4
-rwxr-xr-xsrc/server/shared/DataStores/DBCFileLoader.h2
-rwxr-xr-xsrc/server/shared/DataStores/DBCStore.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/shared/DataStores/DBCFileLoader.cpp b/src/server/shared/DataStores/DBCFileLoader.cpp
index d6fbbc1b86a..998724f84ce 100755
--- a/src/server/shared/DataStores/DBCFileLoader.cpp
+++ b/src/server/shared/DataStores/DBCFileLoader.cpp
@@ -38,7 +38,7 @@ bool DBCFileLoader::Load(const char* filename, const char* fmt)
data = NULL;
}
- FILE* f = fopen(filename,"rb");
+ FILE* f = fopen(filename, "rb");
if (!f)
return false;
@@ -177,7 +177,7 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char* format, int32* index_pos)
char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**& indexTable, uint32 sqlRecordCount, uint32 sqlHighestIndex, char*& sqlDataTable)
{
/*
- format STRING, NA, FLOAT,NA,INT <=>
+ format STRING, NA, FLOAT, NA, INT <=>
struct{
char* field0,
float field1,
diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h
index 4534c761188..b2d99e9302f 100755
--- a/src/server/shared/DataStores/DBCFileLoader.h
+++ b/src/server/shared/DataStores/DBCFileLoader.h
@@ -31,7 +31,7 @@ enum
FT_INT='i', //uint32
FT_BYTE='b', //uint8
FT_SORT='d', //sorted by this field, field is not included
- FT_IND='n', //the same,but parsed to data
+ FT_IND='n', //the same, but parsed to data
FT_LOGIC='l', //Logical (boolean)
FT_SQL_PRESENT='p', //Used in sql format to mark column present in sql dbc
FT_SQL_ABSENT='a' //Used in sql format to mark column absent in sql dbc
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index d3a707780e6..0a7059ffa21 100755
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -117,9 +117,9 @@ class DBCStorage
}
char * sqlDataTable;
fieldCount = dbc.GetCols();
- m_dataTable = (T*)dbc.AutoProduceData(fmt,nCount,(char**&)indexTable, sqlRecordCount, sqlHighestIndex, sqlDataTable);
+ m_dataTable = (T*)dbc.AutoProduceData(fmt, nCount, (char**&)indexTable, sqlRecordCount, sqlHighestIndex, sqlDataTable);
- m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt,(char*)m_dataTable));
+ m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)m_dataTable));
// Insert sql data into arrays
if (result)
@@ -236,7 +236,7 @@ class DBCStorage
if(!dbc.Load(fn, fmt))
return false;
- m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt,(char*)m_dataTable));
+ m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)m_dataTable));
return true;
}