Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

filename fixes

Browse Source
This commit is contained in:
ejcoumans
2006-09-20 03:48:58 +00:00
parent 1a8db5a00e
commit 7dea1a911c
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Demos/BspDemo/BspDemo.cpp
View File

@@ -267,17 +267,12 @@ char* makeExeToBspFilename(const char* lpCmdLine)
{ {
in++; in++;
} }
if(*(in+1) == ':')
{
// Second character is a :, assume we have a path with a drive letter and add a slash at the beginning
*(out++) = '/';
}
int i; int i;
for(i =0; i<512; i++) for(i =0; i<512; i++)
{ {
//if we get '.' we stop as well, unless it's the first character. Then we add .bsp as extension //if we get '.' we stop as well, unless it's the first character. Then we add .bsp as extension
// If we hit a null or a quote, stop copying. This will get just the first filename. // If we hit a null or a quote, stop copying. This will get just the first filename.
if(i && (*in == '.')) if(i && (in[0] == '.') && (in[1] == 'e') && (in[2] == 'x') && (in[3] == 'e'))
break; break;
// If we hit a null or a quote, stop copying. This will get just the first filename. // If we hit a null or a quote, stop copying. This will get just the first filename.

15
Demos/ColladaDemo/ColladaConverter.cpp
View File

@@ -140,8 +140,19 @@ bool ColladaConverter::load(const char* orgfilename)
if (res != DAE_OK) if (res != DAE_OK)
{ {
printf("DAE/Collada-m_dom: Couldn't load %s\n",filename); //some platforms might require different path, try two additional locations
} else char newname[256];
sprintf(newname,"../../%s",orgfilename);
filename = fixFileName(newname);
res = m_collada->load(filename);
if (res != DAE_OK)
{
printf("DAE/Collada-m_dom: Couldn't load %s\n",filename);
return false;
}
}
if (res == DAE_OK)
{ {
m_dom = m_collada->getDom(filename); m_dom = m_collada->getDom(filename);