quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* applied patch by StefanV (from mailinglist) that fixes an error in config.py (broke compilation) and some string conversion warnings

Browse Source 
* fixes some more string conversions warnings in bobtoolz
* fixed unresolved symbols in bobtoolz and gtkgensurf (due to the above mentioned patch where the prototypes were not updated)


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@320 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
mattn
2008-09-06 08:35:17 +00:00
parent cc4e44e31a
commit 204566e81e
17 changed files with 167 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/bobtoolz/DMap.cpp
View File

@@ -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)