* applied patch by StefanV (from mailinglist) that fixes an error in config.py (broke...

[xonotic/netradiant.git] / contrib / bobtoolz / DMap.cpp

diff --git a/contrib/bobtoolz/DMap.cpp b/contrib/bobtoolz/DMap.cpp
index bc0b0661023ddae470f9b61afdcd16dbf05a241b..0bbaafb8dc7911146dd387814c06dc8163d8e8d3 100644 (file)
--- a/contrib/bobtoolz/DMap.cpp
+++ b/contrib/bobtoolz/DMap.cpp
@@ -40,7 +40,7 @@ DMap::~DMap()
        ClearEntities();
 }
 
-DEntity* DMap::AddEntity(char *classname, int ID)
+DEntity* DMap::AddEntity(const char *classname, int ID)
 {
        DEntity* newEntity;
        if(ID == -1)
@@ -49,7 +49,7 @@ DEntity* DMap::AddEntity(char *classname, int ID)
                newEntity = new DEntity(classname, ID);
 
        entityList.push_back(newEntity);
-       
+
        return newEntity;
 }
 
@@ -131,7 +131,7 @@ int DMap::FixBrushes(bool rebuild)
                else
                {
                        cnt = (*fixEntity)->FixBrushes(FALSE);
-                       
+
                        if(cnt && rebuild)
                                RebuildEntity(*fixEntity);
                }
@@ -142,21 +142,21 @@ int DMap::FixBrushes(bool rebuild)
        return count;
 }
 
-void DMap::ResetTextures( const char* textureName, float fScale[2],      float fShift[2],      int rotation, const char* newTextureName, 
+void DMap::ResetTextures( const char* textureName, float fScale[2],      float fShift[2],      int rotation, const char* newTextureName,
                           int bResetTextureName,  int bResetScale[2],  int bResetShift[2],  int bResetRotation)
 {
        for(list<DEntity *>::const_iterator texEntity=entityList.begin(); texEntity!=entityList.end(); texEntity++)
        {
                if(!stricmp("worldspawn", (*texEntity)->m_Classname))
-                       (*texEntity)->ResetTextures(textureName,        fScale,       fShift,       rotation, newTextureName, 
+                       (*texEntity)->ResetTextures(textureName,        fScale,       fShift,       rotation, newTextureName,
                                   bResetTextureName,  bResetScale,  bResetShift,  bResetRotation, TRUE);
                else
                {
-                       if((*texEntity)->ResetTextures( textureName,        fScale,       fShift,       rotation, newTextureName, 
+                       if((*texEntity)->ResetTextures( textureName,        fScale,       fShift,       rotation, newTextureName,
                                       bResetTextureName,  bResetScale,  bResetShift,  bResetRotation, FALSE))
                                RebuildEntity(*texEntity);
                }
-       }       
+       }
 }
 
 void DMap::RebuildEntity(DEntity *ent)