Ticket #1852: remove-unused.patch

trunk/source/graphics/MapReader.cpp

@@ -1454 +1454 @@
     // If we have graphics, get rest of settings
     if (pWaterMan)
     {
-        std::wstring waterType;
+        // std::wstring waterType;
         // TODO: Water type not implemented
         //GET_ENVIRONMENT_PROPERTY(waterBodyObj.get(), Type, waterType)
 

trunk/source/gui/GUItext.cpp

@@ -59 +59 @@
     for (itTextChunk=m_TextChunks.begin(); itTextChunk!=m_TextChunks.end(); ++itTextChunk)
     {
         // - GL - Temp
-        TextChunk tc = *itTextChunk;
+        // TextChunk tc = *itTextChunk;
         // -- GL
 
         // Get the area that is overlapped by both the TextChunk and

trunk/source/renderer/TerrainRenderer.cpp

@@ -761 +761 @@
             glGenTextures(1, &renderedTexture);
             WaterMgr->m_waveTT = renderedTexture;
             
-            glBindTexture(GL_TEXTURE_2D, WaterMgr->m_waveTT);
-            int size = (int)round_up_to_pow2((unsigned)g_Renderer.GetHeight());
-            if(size > g_Renderer.GetHeight()) size /= 2;
-            
+            glBindTexture(GL_TEXTURE_2D, WaterMgr->m_waveTT);           
             glTexImage2D(GL_TEXTURE_2D, 0,GL_RGBA, (float)g_Renderer.GetWidth(), (float)g_Renderer.GetHeight(), 0,GL_RGBA, GL_UNSIGNED_BYTE, 0);
-
         }
         glBindTexture(GL_TEXTURE_2D, WaterMgr->m_waveTT);
         

trunk/source/scriptinterface/DebuggingServer.cpp

@@ -45 +45 @@
             if ((*itr)->GetIsInBreak())
             {
                 stream.str("");
-                std::string str = stream.str();
+                stream.str();
                 (*itr)->GetCallstack(stream);
-                str = stream.str();
+                stream.str();
                 if (stream.str() != "")
                 {
                     if (nbrCallstacksWritten != 0)
@@ -187 +187 @@
 void CDebuggingServer::EnumVfsJSFiles(std::stringstream& response)
 {
     VfsPath path = L"";
-    VfsPaths pathnames;
     response.str("");
     
     std::vector<std::string> templates;

trunk/source/scriptinterface/ThreadDebugger.cpp

@@ -645 +645 @@
     
     JSStackFrame *fp;
     JSStackFrame *iter = 0;
-    std::string functionName;
     jsint counter = 0;
     
     JSObject* jsArray;

trunk/source/simulation2/components/CCmpAIManager.cpp

@@ -911 +911 @@
         
         // Get the territory data
         //  Since getting the territory grid can trigger a recalculation, we check NeedUpdate first
-        bool territoryMapDirty = false;
         Grid<u8> dummyGrid2;
         const Grid<u8>* territoryMap = &dummyGrid2;
         CmpPtr<ICmpTerritoryManager> cmpTerritoryManager(GetSimContext(), SYSTEM_ENTITY);
         if (cmpTerritoryManager && cmpTerritoryManager->NeedUpdate(&m_TerritoriesDirtyID))
         {
             territoryMap = &cmpTerritoryManager->GetTerritoryGrid();
-            territoryMapDirty = true;
         }
         
         LoadPathfinderClasses(state);

trunk/source/simulation2/system/ComponentManagerSerialization.cpp

@@ -61 +61 @@
 
     // We want the output to be grouped by entity ID, so invert the CComponentManager data structures
     std::map<entity_id_t, std::map<ComponentTypeId, IComponent*> > components;
-    std::map<ComponentTypeId, std::string> names;
 
     std::map<ComponentTypeId, std::map<entity_id_t, IComponent*> >::const_iterator ctit = m_ComponentsByTypeId.begin();
     for (; ctit != m_ComponentsByTypeId.end(); ++ctit)

trunk/source/tools/atlas/GameInterface/MessagePasserImpl.cpp

@@ -165 +165 @@
 //  while (0 != (err = sem_timedwait(psem, &abs_timeout)))
 // #endif
 
-    int err;
-    while (0 != (err = sem_wait(m_Semaphore)))
+    while (0 != sem_wait(m_Semaphore))
     {
         // If timed out, call callback and try again
 //      if (errno == ETIMEDOUT)