summaryrefslogtreecommitdiff
path: root/source/gl_models.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2008-04-02 23:03:09 +0000
committerAndrey Nazarov <skuller@skuller.net>2008-04-02 23:03:09 +0000
commit7ec50f12252b4dfb97f3249ccf05a771b98785c1 (patch)
tree279e4e8bd7b940368331a43869c165de9637ae99 /source/gl_models.c
parent80e48417564f1ce50a39a7c552ad95e651362c1f (diff)
Use size_t instead of int where possible.
Added initial support for Win64 port.
Diffstat (limited to 'source/gl_models.c')
-rw-r--r--source/gl_models.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/source/gl_models.c b/source/gl_models.c
index a586e25..5defe24 100644
--- a/source/gl_models.c
+++ b/source/gl_models.c
@@ -848,7 +848,8 @@ void GL_GetModelSize( qhandle_t hModel, vec3_t mins, vec3_t maxs ) {
}
qhandle_t GL_RegisterModel( const char *name ) {
- int index, length, nameLength;
+ int index, length = 0;
+ size_t namelen;
model_t *model;
byte *rawdata;
uint32_t ident;
@@ -869,9 +870,9 @@ qhandle_t GL_RegisterModel( const char *name ) {
return 0;
}
- nameLength = strlen( name );
- if( nameLength > MAX_QPATH - 1 ) {
- Com_Error( ERR_DROP, "%s: oversize name: %d chars", __func__, nameLength );
+ namelen = strlen( name );
+ if( namelen > MAX_QPATH - 1 ) {
+ Com_Error( ERR_DROP, "%s: oversize name", __func__ );
}
model = Model_Find( name );
@@ -879,18 +880,18 @@ qhandle_t GL_RegisterModel( const char *name ) {
goto finish;
}
- length = -1;
+ rawdata = NULL;
buffer[0] = 0;
if( gl_override_models->integer ) {
- if( nameLength > 4 && !strcmp( name + nameLength - 4, ".md2" ) ) {
+ if( namelen > 4 && !strcmp( name + namelen - 4, ".md2" ) ) {
strcpy( buffer, name );
- buffer[nameLength - 1] = '3';
+ buffer[namelen - 1] = '3';
length = fs.LoadFile( buffer, ( void ** )&rawdata );
}
}
- if( length == -1 ) {
+ if( !rawdata ) {
length = fs.LoadFile( name, ( void ** )&rawdata );
- if( length == -1 ) {
+ if( !rawdata ) {
Com_DPrintf( "Couldn't load %s\n", name );
return 0;
}