diff --git a/engine/client/application/Miff/src/lex_yy.c b/engine/client/application/Miff/src/lex_yy.c index df6de76d..bdf2e3fa 100644 --- a/engine/client/application/Miff/src/lex_yy.c +++ b/engine/client/application/Miff/src/lex_yy.c @@ -49,11 +49,11 @@ typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; #else typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; +typedef short short int flex_int16_t; +typedef short int flex_int32_t; typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; +typedef unsigned short short int flex_uint16_t; +typedef unsigned short int flex_uint32_t; /* Limits of integral types. */ #ifndef INT8_MIN diff --git a/engine/client/application/Miff/src/linux/parser.yac b/engine/client/application/Miff/src/linux/parser.yac index 25feaf7e..647b4e76 100644 --- a/engine/client/application/Miff/src/linux/parser.yac +++ b/engine/client/application/Miff/src/linux/parser.yac @@ -29,6 +29,7 @@ #include /* for wide character (16bit) strings */ #include /* for strtoupper and strtolower */ #include +#include /* for standard types - i.e. uint32_t */ /*----------------------------------------------------------------** ** debug options, turn these on to TEST ONLY! don't leave these ** @@ -66,11 +67,11 @@ void checkPragmas(void); void includeBinary(char *fname); -void write32(long i32); -void write16(short i16); +void write32(int32_t i32); +void write16(int16_t i16); void write8(char i8); -void writeU32(unsigned long ui32); -void writeU16(unsigned short ui16); +void writeU32(uint32_t ui32); +void writeU16(uint16_t ui16); void writeU8(unsigned char u8); void writeDouble(double d); void writeFloat(float f); @@ -627,14 +628,14 @@ void checkArgs(void) /*----------------------------** ** Write to FILE functions... ** **----------------------------*/ -void write32(long i32) +void write32(int32_t i32) { - MIFFinsertChunkData(&i32, sizeof(long)); + MIFFinsertChunkData(&i32, sizeof(int32_t)); } -void write16(short i16) +void write16(int16_t i16) { - MIFFinsertChunkData(&i16, sizeof(short)); + MIFFinsertChunkData(&i16, sizeof(int16_t)); } void write8(char i8) @@ -642,14 +643,14 @@ void write8(char i8) MIFFinsertChunkData(&i8, sizeof(char)); } -void writeU32(unsigned long ui32) +void writeU32(uint32_t ui32) { - MIFFinsertChunkData(&ui32, sizeof(long)); + MIFFinsertChunkData(&ui32, sizeof(uint32_t)); } -void writeU16(unsigned short ui16) +void writeU16(uint16_t ui16) { - MIFFinsertChunkData(&ui16, sizeof(short)); + MIFFinsertChunkData(&ui16, sizeof(uint16_t)); } void writeU8(unsigned char ui8) diff --git a/engine/client/application/Miff/src/parser.c b/engine/client/application/Miff/src/parser.c index 22fdd21e..90a23d7c 100644 --- a/engine/client/application/Miff/src/parser.c +++ b/engine/client/application/Miff/src/parser.c @@ -134,11 +134,11 @@ void checkPragmas(void); void includeBinary(char *fname); -void write32(long i32); -void write16(short i16); +void write32(int32_t i32); +void write16(int16_t i16); void write8(char i8); -void writeU32(unsigned long ui32); -void writeU16(unsigned short ui16); +void writeU32(uint32_t ui32); +void writeU16(uint16_t ui16); void writeU8(unsigned char u8); void writeDouble(double d); void writeFloat(float f); @@ -2829,14 +2829,14 @@ void checkArgs(void) /*----------------------------** ** Write to FILE functions... ** **----------------------------*/ -void write32(long i32) +void write32(int32_t i32) { - MIFFinsertChunkData(&i32, sizeof(long)); + MIFFinsertChunkData(&i32, sizeof(int32_t)); } -void write16(short i16) +void write16(int16_t i16) { - MIFFinsertChunkData(&i16, sizeof(short)); + MIFFinsertChunkData(&i16, sizeof(int16_t)); } void write8(char i8) @@ -2844,14 +2844,14 @@ void write8(char i8) MIFFinsertChunkData(&i8, sizeof(char)); } -void writeU32(unsigned long ui32) +void writeU32(uint32_t ui32) { - MIFFinsertChunkData(&ui32, sizeof(long)); + MIFFinsertChunkData(&ui32, sizeof(uint32_t)); } -void writeU16(unsigned short ui16) +void writeU16(uint16_t ui16) { - MIFFinsertChunkData(&ui16, sizeof(short)); + MIFFinsertChunkData(&ui16, sizeof(uint16_t)); } void writeU8(unsigned char ui8) diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/linux/Types.h b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/linux/Types.h index a5eb0413..ea2b9625 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/linux/Types.h +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/linux/Types.h @@ -31,8 +31,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef signed short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/engine/shared/library/sharedFile/src/shared/Iff.cpp b/engine/shared/library/sharedFile/src/shared/Iff.cpp index 48eaeed1..5eb06ec7 100755 --- a/engine/shared/library/sharedFile/src/shared/Iff.cpp +++ b/engine/shared/library/sharedFile/src/shared/Iff.cpp @@ -744,10 +744,10 @@ void Iff::insertForm(Tag name, bool shouldEnterForm) void Iff::insertChunk(Tag name, bool shouldEnterChunk) { - const int CHUNK_OVERHEAD = sizeof(Tag) + sizeof(uint32); + const int32 CHUNK_OVERHEAD = sizeof(Tag) + sizeof(uint32); Tag t; - int offset; + int32 offset; NOT_NULL(data); IFF_DEBUG_FATAL(inChunk, "inside chunk"); diff --git a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp index ab00efba..d9855c03 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp @@ -14,6 +14,7 @@ #include "sharedFoundation/ConstCharCrcString.h" #include +#include // ====================================================================== @@ -164,6 +165,26 @@ ConstCharCrcString const CrcStringTable::lookUp(uint32 crc) const high = mid - 1; } + WARNING(true,("\n=========== Could not find entry 0x%08x with %d entries!!\n", crc, m_numberOfEntries)); + + low = 0; + high = m_numberOfEntries - 1; + + while (low <= high) + { + int const mid = (low + high) / 2; + uint32 const entry = m_crcTable[mid]; + + WARNING(true, ("Checking 0x%08x against entry value 0x%08x at index %d", crc, entry, mid)); + if (crc == entry) + return ConstCharCrcString(m_strings + m_stringsOffsetTable[mid], crc); + else + if (crc > entry) + low = mid + 1; + else + high = mid - 1; + } + return ConstCharCrcString("", 0); } diff --git a/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.cpp b/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.cpp index 82362906..2b6484a8 100755 --- a/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.cpp @@ -16,6 +16,7 @@ #include "sharedObject/Object.h" #include "sharedFoundation/ConstCharCrcString.h" #include "sharedFoundation/CrcStringTable.h" +#include "sharedFoundation/Crc.h" #include "sharedFoundation/DataResourceList.h" #include @@ -174,7 +175,7 @@ void ObjectTemplateList::loadCrcStringTable(const char *fileName) ConstCharCrcString const ObjectTemplateList::lookUp(const char * string) { ConstCharCrcString result = ms_crcStringTable.lookUp(string); - WARNING(result.isEmpty(), ("ObjectTemplateList::lookUp objectTemplate %s not found in table", string)); + WARNING(result.isEmpty(), ("ObjectTemplateList::lookUp objectTemplate %s (CRC 0x%08x) not found in table", string, Crc::calculate(string))); return result; } diff --git a/engine/shared/library/sharedUtility/src/shared/DataTable.cpp b/engine/shared/library/sharedUtility/src/shared/DataTable.cpp index 2a0974c7..4cdd7f03 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTable.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTable.cpp @@ -185,7 +185,7 @@ int DataTable::getIntValue(const std::string & column, int row) const //---------------------------------------------------------------------------- -int DataTable::getIntValue(int column, int row) const +int32 DataTable::getIntValue(int column, int row) const { DEBUG_FATAL(row < 0 || row >= getNumRows(), ("DataTable [%s] getIntValue(): Invalid row number [%d]. Rows=[%d]\n", m_name.c_str(), row, getNumRows())); DEBUG_FATAL(column < 0 || column >= getNumColumns(), ("DataTable [%s] getIntValue(): Invalid col number [%d]. Cols=[%d]\n", m_name.c_str(), column, getNumColumns())); @@ -210,7 +210,7 @@ int DataTable::getIntValue(int column, int row) const //---------------------------------------------------------------------------- -int DataTable::getIntDefaultForColumn(const std::string & column) const +int32 DataTable::getIntDefaultForColumn(const std::string & column) const { int const columnIndex = findColumnNumber(column); DEBUG_FATAL(columnIndex < 0 || columnIndex >= getNumColumns(), ("DataTable [%s] getIntDefaultForColumn(): Invalid col number [%d]. Cols=[%d]\n", m_name.c_str(), columnIndex, getNumColumns())); @@ -219,7 +219,7 @@ int DataTable::getIntDefaultForColumn(const std::string & column) const //---------------------------------------------------------------------------- -int DataTable::getIntDefaultForColumn(int column) const +int32 DataTable::getIntDefaultForColumn(int column) const { DEBUG_FATAL(column < 0 || column >= getNumColumns(), ("DataTable [%s] getIntDefaultForColumn(): Invalid col number [%d]. Cols=[%d]\n", m_name.c_str(), column, getNumColumns())); DEBUG_FATAL(m_types[static_cast(column)]->getBasicType() != DataTableColumnType::DT_Int, ("Wrong data type for column %d.", column)); @@ -405,7 +405,7 @@ void DataTable::_readCell(Iff & iff, int column, int row) { case DataTableColumnType::DT_Int: { - int tmp = iff.read_int32(); + int32 tmp = iff.read_int32(); new (cell) DataTableCell(tmp); break; @@ -677,7 +677,7 @@ int DataTable::searchColumnFloat( int column, float searchValue ) const // ---------- -int DataTable::searchColumnInt( int column, int searchValue ) const +int DataTable::searchColumnInt( int column, int32 searchValue ) const { DEBUG_FATAL(column < 0 || column >= getNumColumns(), ("DataTable [%s] searchColumnInt(): Invalid col number [%d]. Cols=[%d]\n", m_name.c_str(), column, getNumColumns())); diff --git a/engine/shared/library/sharedUtility/src/shared/DataTable.h b/engine/shared/library/sharedUtility/src/shared/DataTable.h index ef9c3fe3..13b3988d 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTable.h +++ b/engine/shared/library/sharedUtility/src/shared/DataTable.h @@ -31,10 +31,10 @@ public: DataTableColumnType const &getDataTypeForColumn(const std::string& column) const; DataTableColumnType const &getDataTypeForColumn(int column) const; - int getIntValue(const std::string & column, int row) const; - int getIntValue(int column, int row) const; - int getIntDefaultForColumn(const std::string & column) const; - int getIntDefaultForColumn(int column) const; + int32 getIntValue(const std::string & column, int row) const; + int32 getIntValue(int column, int row) const; + int32 getIntDefaultForColumn(const std::string & column) const; + int32 getIntDefaultForColumn(int column) const; float getFloatValue(const std::string & column, int row) const; float getFloatValue(int column, int row) const; float getFloatDefaultForColumn(const std::string & column) const; @@ -63,7 +63,7 @@ public: int searchColumnString(int column, const std::string & searchValue) const; int searchColumnFloat(int column, float searchValue) const; - int searchColumnInt(int column, int searchValue) const; + int searchColumnInt(int column, int32 searchValue) const; std::string const & getName() const; diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableCell.cpp b/engine/shared/library/sharedUtility/src/shared/DataTableCell.cpp index 62573069..c0b9f8fa 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTableCell.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTableCell.cpp @@ -55,7 +55,7 @@ void DataTableCell::operator delete(void *pointer) // ---------------------------------------------------------------------- -DataTableCell::DataTableCell(int value) +DataTableCell::DataTableCell(int32 value) : m_type(CT_int) { m_value.m_i=value; diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableCell.h b/engine/shared/library/sharedUtility/src/shared/DataTableCell.h index 5021b5f8..1cd4b616 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTableCell.h +++ b/engine/shared/library/sharedUtility/src/shared/DataTableCell.h @@ -31,16 +31,16 @@ public: ,CT_float }; - explicit DataTableCell(int value); + explicit DataTableCell(int32 value); explicit DataTableCell(float value); explicit DataTableCell(const char *value); ~DataTableCell(); - CellType getType() const { return m_type; } - int getIntValue() const { return m_value.m_i; } - float getFloatValue() const { return m_value.m_f; } - const char *getStringValue() const; - int getStringValueCrc() const { return m_value.m_s.m_crc; } + CellType getType() const { return m_type; } + int32 getIntValue() const { return m_value.m_i; } + float getFloatValue() const { return m_value.m_f; } + const char *getStringValue() const; + int32 getStringValueCrc() const { return m_value.m_s.m_crc; } private: const CellType m_type; @@ -48,12 +48,12 @@ private: { union { - int m_i; + int32 m_i; float m_f; struct { const char *m_sz; - int m_crc; + int32 m_crc; } m_s; }; } m_value; diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp b/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp index 795c8696..5d3d6e6d 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp @@ -728,7 +728,7 @@ DataTableCell *DataTableWriter::_getNewCell(DataTableColumnType const &columnTyp switch (columnType.getBasicType()) { case DataTableColumnType::DT_Int: - return new DataTableCell(static_cast(strtol(value.c_str(), nullptr, 0))); + return new DataTableCell(static_cast(strtol(value.c_str(), nullptr, 0))); break; case DataTableColumnType::DT_Float: return new DataTableCell(static_cast(atof(value.c_str()))); @@ -859,7 +859,7 @@ void DataTableWriter::_saveRows(NamedDataTable * ndt, Iff& iff) const iff.insertChunk(TAG(R,O,W,S)); int numRows = static_cast(ndt->m_rows.size()); - iff.insertChunkData(&numRows, sizeof(int)); + iff.insertChunkData(&numRows, sizeof(int32)); std::vector::iterator i = ndt->m_rows.begin(); for (; i!= ndt->m_rows.end(); ++i) { @@ -873,8 +873,8 @@ void DataTableWriter::_saveRows(NamedDataTable * ndt, Iff& iff) const { const DataTableCell * cell = *j; NOT_NULL(cell); - int tmp = cell->getIntValue(); - iff.insertChunkData(&tmp, sizeof(int)); + int32 tmp = cell->getIntValue(); + iff.insertChunkData(&tmp, sizeof(int32)); break; } case DataTableColumnType::DT_Float: diff --git a/external/3rd/library/platform/utils/Base/linux/Types.h b/external/3rd/library/platform/utils/Base/linux/Types.h index a685807d..574ee5ca 100755 --- a/external/3rd/library/platform/utils/Base/linux/Types.h +++ b/external/3rd/library/platform/utils/Base/linux/Types.h @@ -28,8 +28,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef signed short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/external/3rd/library/platform/utils/Base/win32/Types.h b/external/3rd/library/platform/utils/Base/win32/Types.h index aa9ba015..10905cc1 100755 --- a/external/3rd/library/platform/utils/Base/win32/Types.h +++ b/external/3rd/library/platform/utils/Base/win32/Types.h @@ -25,8 +25,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Types.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Types.h index a5eb0413..ea2b9625 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Types.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Types.h @@ -31,8 +31,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef signed short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/win32/Types.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/win32/Types.h index aa9ba015..10905cc1 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/win32/Types.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/win32/Types.h @@ -25,8 +25,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Types.h b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Types.h index a5eb0413..ea2b9625 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Types.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Types.h @@ -31,8 +31,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef signed short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/win32/Types.h b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/win32/Types.h index aa9ba015..10905cc1 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/win32/Types.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/win32/Types.h @@ -25,8 +25,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h index a685807d..574ee5ca 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h @@ -28,8 +28,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef signed short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/win32/Types.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/win32/Types.h index aa9ba015..10905cc1 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/win32/Types.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/win32/Types.h @@ -25,8 +25,8 @@ namespace Base typedef signed char int8; typedef unsigned char uint8; -typedef short int16; -typedef unsigned short uint16; +typedef int16_t int16; +typedef uint16_t uint16; typedef int32_t int32; typedef uint32_t uint32; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/types.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/types.h index 389d8a49..19d20d13 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/types.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/types.h @@ -35,8 +35,8 @@ namespace soe { typedef char int8; typedef unsigned char uint8; - typedef short int16; - typedef unsigned short uint16; + typedef int16_t int16; + typedef uint16_t uint16; #ifdef WIN32 typedef int32_t int32; diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp index f4653cd9..54b181fe 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp @@ -32,7 +32,7 @@ bool TaskObjectTemplateListUpdater::process(DB::Session *session) int i_lines = 0; while(1) { - int i_id; + uint32 i_id; char s_name[4096]; int i_retval = 0;