X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fpicomodel%2Fpm_3ds.c;h=c27644b247f999f3b514de34b11c42825c6ebb08;hb=0ae4329330f964c0e5af3742e365d71bb7d607fd;hp=e72454a170a6d851599d15ac2f4c38f3d2863e5f;hpb=4f80165b29510dac0d86a230993a04717143e542;p=xonotic%2Fnetradiant.git

diff --git a/libs/picomodel/pm_3ds.c b/libs/picomodel/pm_3ds.c
index e72454a1..c27644b2 100644
--- a/libs/picomodel/pm_3ds.c
+++ b/libs/picomodel/pm_3ds.c
@@ -35,9 +35,6 @@
 /* dependencies */
 #include "picointernal.h"
 
-/* ydnar */
-static picoColor_t white = { 255,255,255,255 };
-
 /* remarks:
  * - 3ds file version is stored in pico special field 0 on load (ydnar: removed)
  * todo:
@@ -294,7 +291,7 @@ static int GetMeshVertices( T3dsLoaderPers *pers ){
 
 		/* add current vertex */
 		PicoSetSurfaceXYZ( pers->surface,i,v );
-		PicoSetSurfaceColor( pers->surface,0,i,white ); /* ydnar */
+		PicoSetSurfaceColor( pers->surface, 0, i, picoColor_white );
 
 #ifdef DEBUG_PM_3DS_EX
 		printf( "Vertex: x: %f y: %f z: %f\n",v[0],v[1],v[2] );
@@ -403,17 +400,15 @@ static int GetMeshShader( T3dsLoaderPers *pers ){
 
 	/* we've found a matching shader */
 	if ( ( shader != NULL ) && pers->surface ) {
-		char mapName[1024 + 1];
-		char *mapNamePtr;
-		memset( mapName,0,sizeof( mapName ) );
-
 		/* get ptr to shader's map name */
-		mapNamePtr = PicoGetShaderMapName( shader );
-
+		const char* mapNamePtr = PicoGetShaderMapName( shader );
 		/* we have a valid map name ptr */
 		if ( mapNamePtr != NULL ) {
+#if 0
 			char temp[128];
 			const char *name;
+			char mapName[1024 + 1];
+			memset( mapName,0,sizeof( mapName ) );
 
 			/* copy map name to local buffer */
 			strcpy( mapName,mapNamePtr );
@@ -423,7 +418,7 @@ static int GetMeshShader( T3dsLoaderPers *pers ){
 			strncpy( temp, name, sizeof( temp ) );
 
 			/* remove file extension */
-			/* name = _pico_setfext( name,"" ); */
+			/* name = _pico_setfext( name, NULL ); */
 
 			/* assign default name if no name available */
 			if ( strlen( temp ) < 1 ) {
@@ -436,7 +431,7 @@ static int GetMeshShader( T3dsLoaderPers *pers ){
 
 			/* set shader name */
 			/* PicoSetShaderName( shader,mapName ); */	/* ydnar: this will screw up the named shader */
-
+#endif
 			/* set surface's shader index */
 			PicoSetSurfaceShader( pers->surface, shader );
 
@@ -727,9 +722,9 @@ static picoModel_t *_3ds_load( PM_PARAMS_LOAD ){
 		return NULL;
 	}
 	/* get model's base name (eg. jeep from c:\models\jeep.3ds) */
-	memset( basename,0,sizeof( basename ) );
-	strncpy( basename,_pico_nopath( fileName ),sizeof( basename ) );
-	_pico_setfext( basename,"" );
+	memset( basename, 0, sizeof( basename ) );
+	strncpy( basename, _pico_nopath( fileName ), sizeof( basename ) - 1 );
+	_pico_setfext( basename, NULL );
 
 	/* initialize persistant vars (formerly static) */
 	pers.model    =  model;