speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Re #691: removed warnings about unused variables (Boris)

Browse source 
o loadAC() and loadACo(): ret set, but didn't check it and abort apropriately
o mergeSplitted(): numtri used only if specific define set
o main(): fake_argv not used, seems like debugging: commented out
o others: simply not used in any senseful way

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4933 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 0f947ac886893049904834b10c910e62eda93a11
Former-commit-id: d958f00e97f2c63edbfe6ca99f144bac8aa51b27
This commit is contained in:
kmetykog 2012-09-11 21:19:09 +00:00
parent 3ce4482a83
commit 48d4bd7355
3 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/tools/accc/ac3dgroup.cpp
View file

@ -47,14 +47,12 @@ void loadAndGroup(char *OutputFileName)
ob_t * tmpob = NULL;
ob_t * tmpob2 = NULL;
mat_t * tmat = NULL;
int requiredExtraGroup = 0;
extern FILE * ofile;
int num_tkmn = 0;
ob_groups_t * array_groups;
int good_group = 0;
int i = 0;
double dist = 0;
int notinsameorder = FALSE;
/* disable object splitting during load. We split them
* after merging the texture channels.
@ -354,7 +352,6 @@ void loadAndGroup(char *OutputFileName)
{
printf("cannot insert object %s in group %s\n", tmpob->name,
array_groups[i].name);
requiredExtraGroup = 1;
}
/*if (!strnicmp(tmpob->name, "tk",2)){
tmpob2=tmpob;

37
src/tools/accc/ac3dload.cpp
View file

@ -1411,10 +1411,14 @@ int loadAC(char * inputFilename, char * outputFilename, int saveIn)
if (numvertFound == 1 && doVerb == NULL)
{
ret = doGetVertex(Line, current_ob, current_material);
if(ret != 0)
break;
}
else if (numrefsFound == 1 && doVerb == NULL)
{
ret = doGetSurf(Line, current_ob, current_material);
if(ret != 0)
break;
}
else
{
@ -1426,9 +1430,17 @@ int loadAC(char * inputFilename, char * outputFilename, int saveIn)
numvertFound = 0;
numrefsFound = 0;
ret = doVerb(Line, current_ob, current_material);
if(ret != 0)
break;
}
}
fclose(file);
if(ret != 0)
{
freeobject(current_ob);
return ret;
}
root_ob = current_ob;
if(splitObjectsDuringLoad != 0)
@ -1503,10 +1515,14 @@ int loadACo(char * inputFilename, char * outputFilename, int saveIn)
if (numvertFound == 1 && doVerb == NULL)
{
ret = doGetVertex(Line, current_ob, current_material);
if(ret != 0)
break;
}
else if (numrefsFound == 1 && doVerb == NULL)
{
ret = doGetSurf(Line, current_ob, current_material);
if(ret != 0)
break;
}
else
{
@ -1518,9 +1534,18 @@ int loadACo(char * inputFilename, char * outputFilename, int saveIn)
numvertFound = 0;
numrefsFound = 0;
ret = doVerb(Line, current_ob, current_material);
if(ret != 0)
break;
}
}
fclose(file);
if(ret != 0)
{
freeobject(current_ob);
return ret;
}
root_ob = current_ob;
if(splitObjectsDuringLoad != 0)
@ -3009,7 +3034,6 @@ void computeSaveOBJ(char * OutputFilename, ob_t * object)
tmpob = object;
while (tmpob != NULL)
{
int texnofound = 0;
if (tmpob->name == NULL)
{
tmpob = tmpob->next;
@ -3025,7 +3049,6 @@ void computeSaveOBJ(char * OutputFilename, ob_t * object)
tmpob = tmpob->next;
continue;
}
texnofound = 1;
if (tmpob->texture != NULL)
if (*tmpob->texture != '\0')
@ -3287,7 +3310,6 @@ void stripifyOb(ob_t * object, int writeit)
int i = 0;
int debj = 0;
int dege = 0;
int wasdege = 0;
tcoord_t * stripvertexarray;
int k, v1, v2, v0;
k = 0;
@ -3459,7 +3481,6 @@ void stripifyOb(ob_t * object, int writeit)
for (i = 0; i < (int) NumStrips; i++)
{
wasdege = 0;
/* get the first triangle */
v1 = StripPoint[StripStart[i]];
v2 = StripPoint[StripStart[i] + 1];
@ -4674,7 +4695,6 @@ ob_t * mergeObject(ob_t *ob1, ob_t * ob2, char * nameS)
int oldva1[10000];
int oldva2[10000];
int n = 0;
int m = 0;
int i = 0;
int j = 0;
@ -4730,7 +4750,7 @@ ob_t * mergeObject(ob_t *ob1, ob_t * ob2, char * nameS)
ob1->numvert * 2 * sizeof(tcoord_t));
}
m = n = ob1->numvert;
n = ob1->numvert;
for (i = 0; i < ob2->numvert; i++)
{
for (j = 0; j < ob1->numvert; j++)
@ -4843,7 +4863,9 @@ int mergeSplitted(ob_t **object)
ob_t * tob = NULL;
ob_t * tob0 = NULL;
ob_t * tobP = NULL;
#ifdef NEWSRC
int numtri;
#endif
int reduced = 0;
tob = *object;
@ -4888,8 +4910,9 @@ int mergeSplitted(ob_t **object)
p = p + strlen("__split__");
*p = '\0';
k = 0;
numtri = 0;
#ifdef NEWSRC
numtri = tob->numsurf;
#endif
while (tob0)
{
if (tob0->name == NULL)

8
src/tools/accc/mainaccc.cpp
View file

@ -336,10 +336,10 @@ void keyboard(unsigned char, int, int)
int main(int argc, char **argv)
{
const char *fake_argv[3];
fake_argv[0] = "ac3dto3ds";
fake_argv[1] = "converter";
fake_argv[2] = NULL;
// const char *fake_argv[3];
// fake_argv[0] = "ac3dto3ds";
// fake_argv[1] = "converter";
// fake_argv[2] = NULL;
init_args(argc, argv);
extern int loadACo(char * inputFilename, char * outputFilename, int saveIn);