diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-01 21:55:08 +0200 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-01 21:55:08 +0200 |
| commit | f8d69b2fe61eb40709d98ed227f91e7df29daa14 (patch) | |
| tree | f8eb0199871be9b848aea78d04e41efd692fa2c5 | |
| parent | 48c8a78025389da69f906f357cb079b6f887a56c (diff) | |
| download | zcatch-f8d69b2fe61eb40709d98ed227f91e7df29daa14.tar.gz zcatch-f8d69b2fe61eb40709d98ed227f91e7df29daa14.zip | |
fixed compile errors for osx
| -rw-r--r-- | src/engine/client/text.cpp | 2 | ||||
| -rw-r--r-- | src/engine/shared/datafile.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp index b05d49f8..57e1b43b 100644 --- a/src/engine/client/text.cpp +++ b/src/engine/client/text.cpp @@ -52,7 +52,7 @@ struct CFontSizeData int m_FontSize; FT_Face *m_pFace; - unsigned m_aTextures[2]; + GLuint m_aTextures[2]; int m_TextureWidth; int m_TextureHeight; diff --git a/src/engine/shared/datafile.cpp b/src/engine/shared/datafile.cpp index dcc32ef2..e7905f81 100644 --- a/src/engine/shared/datafile.cpp +++ b/src/engine/shared/datafile.cpp @@ -154,7 +154,7 @@ bool CDataFileReader::Open(class IStorage *pStorage, const char *pFilename) } #if defined(CONF_ARCH_ENDIAN_BIG) - swap_endian(m_pDataFile->m_pData, sizeof(int), Header.Swaplen / sizeof(int)); + swap_endian(m_pDataFile->m_pData, sizeof(int), Header.m_Swaplen / sizeof(int)); #endif //if(DEBUG) @@ -476,7 +476,7 @@ int CDataFileWriter::AddDataSwapped(int Size, void *pData) int Index; mem_copy(pSwapped, pData, Size); swap_endian(&pSwapped, sizeof(int), Size/sizeof(int)); - Index = AddData(Size, Swapped); + Index = AddData(Size, pSwapped); mem_free(pSwapped); return Index; #else |