From: Rudolf Polzer Date: Sun, 5 Jun 2011 17:18:08 +0000 (+0200) Subject: fix some compile errors X-Git-Tag: xonotic-v0.5.0~17 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22bb91a57d4921af9e93a5e75eea830c1cda8396;p=xonotic%2Fnetradiant.git fix some compile errors --- diff --git a/libs/picomodel.h b/libs/picomodel.h index 1e6f8920..a771e943 100644 --- a/libs/picomodel.h +++ b/libs/picomodel.h @@ -258,7 +258,7 @@ void PicoSetShaderShininess( picoShader_t *shader, float value ); void PicoSetSurfaceData( picoSurface_t *surface, void *data ); void PicoSetSurfaceType( picoSurface_t *surface, picoSurfaceType_t type ); -void PicoSetSurfaceName( picoSurface_t *surface, char *name ); +void PicoSetSurfaceName( picoSurface_t *surface, const char *name ); void PicoSetSurfaceShader( picoSurface_t *surface, picoShader_t *shader ); void PicoSetSurfaceXYZ( picoSurface_t *surface, int num, picoVec3_t xyz ); void PicoSetSurfaceNormal( picoSurface_t *surface, int num, picoVec3_t normal ); @@ -341,7 +341,7 @@ void PicoFixSurfaceNormals( picoSurface_t *surface ); int PicoRemapModel( picoModel_t *model, char *remapFile ); -void PicoAddTriangleToModel( picoModel_t *model, picoVec3_t** xyz, picoVec3_t** normals, int numSTs, picoVec2_t **st, int numColors, picoColor_t **colors, picoShader_t* shader, picoIndex_t* smoothingGroup); +void PicoAddTriangleToModel( picoModel_t *model, picoVec3_t** xyz, picoVec3_t** normals, int numSTs, picoVec2_t **st, int numColors, picoColor_t **colors, picoShader_t* shader, const char *name, picoIndex_t* smoothingGroup); /* end marker */ #ifdef __cplusplus diff --git a/libs/picomodel/picomodel.c b/libs/picomodel/picomodel.c index 26146225..86ec08bd 100644 --- a/libs/picomodel/picomodel.c +++ b/libs/picomodel/picomodel.c @@ -912,7 +912,7 @@ void PicoSetSurfaceType( picoSurface_t *surface, picoSurfaceType_t type ) -void PicoSetSurfaceName( picoSurface_t *surface, char *name ) +void PicoSetSurfaceName( picoSurface_t *surface, const char *name ) { if( surface == NULL || name == NULL ) return;