diff -Nur a/trunk/source/graphics/MapReader.cpp b/trunk/source/graphics/MapReader.cpp
a
|
b
|
|
1454 | 1454 | // If we have graphics, get rest of settings |
1455 | 1455 | if (pWaterMan) |
1456 | 1456 | { |
1457 | | std::wstring waterType; |
| 1457 | // std::wstring waterType; |
1458 | 1458 | // TODO: Water type not implemented |
1459 | 1459 | //GET_ENVIRONMENT_PROPERTY(waterBodyObj.get(), Type, waterType) |
1460 | 1460 | |
diff -Nur a/trunk/source/gui/GUItext.cpp b/trunk/source/gui/GUItext.cpp
a
|
b
|
|
59 | 59 | for (itTextChunk=m_TextChunks.begin(); itTextChunk!=m_TextChunks.end(); ++itTextChunk) |
60 | 60 | { |
61 | 61 | // - GL - Temp |
62 | | TextChunk tc = *itTextChunk; |
| 62 | // TextChunk tc = *itTextChunk; |
63 | 63 | // -- GL |
64 | 64 | |
65 | 65 | // Get the area that is overlapped by both the TextChunk and |
diff -Nur a/trunk/source/renderer/TerrainRenderer.cpp b/trunk/source/renderer/TerrainRenderer.cpp
a
|
b
|
|
761 | 761 | glGenTextures(1, &renderedTexture); |
762 | 762 | WaterMgr->m_waveTT = renderedTexture; |
763 | 763 | |
764 | | glBindTexture(GL_TEXTURE_2D, WaterMgr->m_waveTT); |
765 | | int size = (int)round_up_to_pow2((unsigned)g_Renderer.GetHeight()); |
766 | | if(size > g_Renderer.GetHeight()) size /= 2; |
767 | | |
| 764 | glBindTexture(GL_TEXTURE_2D, WaterMgr->m_waveTT); |
768 | 765 | glTexImage2D(GL_TEXTURE_2D, 0,GL_RGBA, (float)g_Renderer.GetWidth(), (float)g_Renderer.GetHeight(), 0,GL_RGBA, GL_UNSIGNED_BYTE, 0); |
769 | | |
770 | 766 | } |
771 | 767 | glBindTexture(GL_TEXTURE_2D, WaterMgr->m_waveTT); |
772 | 768 | |
diff -Nur a/trunk/source/scriptinterface/DebuggingServer.cpp b/trunk/source/scriptinterface/DebuggingServer.cpp
a
|
b
|
|
45 | 45 | if ((*itr)->GetIsInBreak()) |
46 | 46 | { |
47 | 47 | stream.str(""); |
48 | | std::string str = stream.str(); |
| 48 | stream.str(); |
49 | 49 | (*itr)->GetCallstack(stream); |
50 | | str = stream.str(); |
| 50 | stream.str(); |
51 | 51 | if (stream.str() != "") |
52 | 52 | { |
53 | 53 | if (nbrCallstacksWritten != 0) |
… |
… |
|
187 | 187 | void CDebuggingServer::EnumVfsJSFiles(std::stringstream& response) |
188 | 188 | { |
189 | 189 | VfsPath path = L""; |
190 | | VfsPaths pathnames; |
191 | 190 | response.str(""); |
192 | 191 | |
193 | 192 | std::vector<std::string> templates; |
diff -Nur a/trunk/source/scriptinterface/ThreadDebugger.cpp b/trunk/source/scriptinterface/ThreadDebugger.cpp
a
|
b
|
|
645 | 645 | |
646 | 646 | JSStackFrame *fp; |
647 | 647 | JSStackFrame *iter = 0; |
648 | | std::string functionName; |
649 | 648 | jsint counter = 0; |
650 | 649 | |
651 | 650 | JSObject* jsArray; |
diff -Nur a/trunk/source/simulation2/components/CCmpAIManager.cpp b/trunk/source/simulation2/components/CCmpAIManager.cpp
a
|
b
|
|
911 | 911 | |
912 | 912 | // Get the territory data |
913 | 913 | // Since getting the territory grid can trigger a recalculation, we check NeedUpdate first |
914 | | bool territoryMapDirty = false; |
915 | 914 | Grid<u8> dummyGrid2; |
916 | 915 | const Grid<u8>* territoryMap = &dummyGrid2; |
917 | 916 | CmpPtr<ICmpTerritoryManager> cmpTerritoryManager(GetSimContext(), SYSTEM_ENTITY); |
918 | 917 | if (cmpTerritoryManager && cmpTerritoryManager->NeedUpdate(&m_TerritoriesDirtyID)) |
919 | 918 | { |
920 | 919 | territoryMap = &cmpTerritoryManager->GetTerritoryGrid(); |
921 | | territoryMapDirty = true; |
922 | 920 | } |
923 | 921 | |
924 | 922 | LoadPathfinderClasses(state); |
diff -Nur a/trunk/source/simulation2/system/ComponentManagerSerialization.cpp b/trunk/source/simulation2/system/ComponentManagerSerialization.cpp
a
|
b
|
|
61 | 61 | |
62 | 62 | // We want the output to be grouped by entity ID, so invert the CComponentManager data structures |
63 | 63 | std::map<entity_id_t, std::map<ComponentTypeId, IComponent*> > components; |
64 | | std::map<ComponentTypeId, std::string> names; |
65 | 64 | |
66 | 65 | std::map<ComponentTypeId, std::map<entity_id_t, IComponent*> >::const_iterator ctit = m_ComponentsByTypeId.begin(); |
67 | 66 | for (; ctit != m_ComponentsByTypeId.end(); ++ctit) |
diff -Nur a/trunk/source/tools/atlas/GameInterface/MessagePasserImpl.cpp b/trunk/source/tools/atlas/GameInterface/MessagePasserImpl.cpp
a
|
b
|
|
165 | 165 | // while (0 != (err = sem_timedwait(psem, &abs_timeout))) |
166 | 166 | // #endif |
167 | 167 | |
168 | | int err; |
169 | | while (0 != (err = sem_wait(m_Semaphore))) |
| 168 | while (0 != sem_wait(m_Semaphore)) |
170 | 169 | { |
171 | 170 | // If timed out, call callback and try again |
172 | 171 | // if (errno == ETIMEDOUT) |