diff --git a/src/tools/accc/ac3dgroup.cpp b/src/tools/accc/ac3dgroup.cpp index 2b6ad7ff7..e1967ef87 100644 --- a/src/tools/accc/ac3dgroup.cpp +++ b/src/tools/accc/ac3dgroup.cpp @@ -38,7 +38,7 @@ extern mat_t * root_material; extern void smoothTriNorm(ob_t * object); void reorder(ob_t * ob, ob_t * ob2, double *textarray, tcoord_t *vertexarray); void collapseTextures(ob_t * ob0, ob_t * ob1, ob_t * ob2, ob_t * ob3); -void loadAndGroup(char *OutputFileName) +void loadAndGroup(const char *OutputFileName) { ob_t * ob0 = NULL; ob_t * ob1 = NULL; diff --git a/src/tools/accc/ac3dload.cpp b/src/tools/accc/ac3dload.cpp index f22f1e44f..06815befd 100644 --- a/src/tools/accc/ac3dload.cpp +++ b/src/tools/accc/ac3dload.cpp @@ -288,12 +288,12 @@ int doRefs(char *Line, ob_t *object, mat_t *material); int doCrease(char *Line, ob_t *object, mat_t *material); #ifdef _3DS -void saveObin3DS( char * OutputFilename, ob_t * object); +void saveObin3DS(const char * OutputFilename, ob_t * object); #endif -void computeSaveAC3D(char * OutputFilename, ob_t * object); -void computeSaveOBJ(char * OutputFilename, ob_t * object); -void computeSaveAC3DM(char * OutputFilename, ob_t * object); -void computeSaveAC3DStrip(char * OutputFilename, ob_t * object); +void computeSaveAC3D(const char * OutputFilename, ob_t * object); +void computeSaveOBJ(const char * OutputFilename, ob_t * object); +void computeSaveAC3DM(const char * OutputFilename, ob_t * object); +void computeSaveAC3DStrip(const char * OutputFilename, ob_t * object); void stripifyOb(ob_t * object, int writeit); verbaction_t verbTab[] = @@ -1462,7 +1462,7 @@ ob_t * splitObjects(ob_t* object) return newob; } -int loadAC(char * inputFilename, char * outputFilename) +int loadAC(const char * inputFilename, const char * outputFilename) { /* saveIn : 0= 3ds , 1= obj , 2=ac3d grouped (track) , 3 = ac3d strips (cars) */ char Line[256]; @@ -2670,7 +2670,7 @@ void smoothObjectTriNorm(ob_t * object) return; } -void computeSaveAC3D(char * OutputFilename, ob_t * object) +void computeSaveAC3D(const char * OutputFilename, ob_t * object) { int i = 0; @@ -3020,7 +3020,7 @@ void computeSaveAC3D(char * OutputFilename, ob_t * object) fclose(ofile); } -void computeSaveOBJ(char * OutputFilename, ob_t * object) +void computeSaveOBJ(const char * OutputFilename, ob_t * object) { int i = 0; @@ -3690,7 +3690,7 @@ void stripifyOb(ob_t * object, int writeit) } } -void computeSaveAC3DM(char * OutputFilename, ob_t * object) +void computeSaveAC3DM(const char * OutputFilename, ob_t * object) { int i = 0; @@ -4487,7 +4487,7 @@ void normalMap01(ob_t * object) } } -void computeSaveAC3DStrip(char * OutputFilename, ob_t * object) +void computeSaveAC3DStrip(const char * OutputFilename, ob_t * object) { diff --git a/src/tools/accc/accc.h b/src/tools/accc/accc.h index c53780998..52089e548 100644 --- a/src/tools/accc/accc.h +++ b/src/tools/accc/accc.h @@ -28,8 +28,6 @@ #define FALSE 0 #define TRUE 1 -extern char *OutputFileName; -extern char *ReliefFileName; extern char * fileL0; extern char * fileL1; extern char * fileL2; @@ -47,14 +45,14 @@ extern int normalMapping; extern char *OrderString; extern int collapseObject; -extern void loadAndGroup(char *OutputFileName); +extern void loadAndGroup(const char *OutputFileName); /** Loads the file with inputFilename to the global root_ob and root_material * variables and optionally outputs the loaded object to outputFilename * based on the current value of the global typeConvertion variable. * * @returns 0 on success, a value != 0 on failure */ -int loadAC(char * inputFilename, char * outputFilename = NULL); +int loadAC(const char * inputFilename, const char * outputFilename = NULL); #define _AC3DTO3DS 1 #define _3DSTOAC3D 2 diff --git a/src/tools/accc/mainaccc.cpp b/src/tools/accc/mainaccc.cpp index 78f8c6900..10ec31de1 100644 --- a/src/tools/accc/mainaccc.cpp +++ b/src/tools/accc/mainaccc.cpp @@ -35,8 +35,8 @@ /* -g g-track-2.ac -l0 g2.ac -d3 200900 -d2 200 -d1 100 -S 200 >t */ /* +es 80 p-gt1.ac porsche-gt1.ac>t */ int distSplit = 0; -char *InputFileName = NULL; -char *OutputFileName = NULL; +static char *InputFileName = NULL; +static char *OutputFileName = NULL; char * fileL0 = NULL; char * fileL1 = NULL; char * fileL2 = NULL; @@ -343,7 +343,7 @@ int main(int argc, char **argv) init_args(argc, argv); #ifdef _3DS - extern int load3ds( char * inputFilename, char * outputFilename); + extern int load3ds(const char * inputFilename, const char * outputFilename); #endif if (typeConvertion == _AC3DTOAC3DGROUP) @@ -353,7 +353,7 @@ int main(int argc, char **argv) #ifdef _3DS else if (typeConvertion == _3DSTOAC3D) { - load3ds( InputFileName, OutputFileName); + load3ds(InputFileName, OutputFileName); } #endif else