From bf426ec134c13b9d7f83c95bc64c979789416c7f Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 7 Apr 2007 02:04:38 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@939 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/md2.h | 2 +- source/src/menus.cpp | 2 +- source/src/rendermodel.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/src/md2.h b/source/src/md2.h index 85021354..88a87671 100644 --- a/source/src/md2.h +++ b/source/src/md2.h @@ -106,7 +106,7 @@ struct md2 : vertmodel int *glcommands = new int[header.numglcommands]; fseek(file, header.offsetglcommands, SEEK_SET); - int numglcommands = fread(glcommands, sizeof(int), header.numglcommands, file); + int numglcommands = (int)fread(glcommands, sizeof(int), header.numglcommands, file); endianswap(glcommands, sizeof(int), numglcommands); if(numglcommands < header.numglcommands) memset(&glcommands[numglcommands], 0, (header.numglcommands-numglcommands)*sizeof(int)); diff --git a/source/src/menus.cpp b/source/src/menus.cpp index 00c851ce..481e7a4b 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -142,7 +142,7 @@ void rendermenumdl() if(isplayermodel) { s_sprintfd(skin)("packages/models/%s.jpg", m.mdl); - tex = -textureload(skin)->id; + tex = -(int)textureload(skin)->id; } rendermodel(isplayermodel ? (char *)"playermodels" : m.mdl, m.anim, tex, 0, pos.x, pos.z, pos.y, yaw, 0, 100, 0, NULL, isplayermodel ? (char*)"weapons/subgun/world" : NULL, m.scale ? m.scale/25.0f : 1.0f); diff --git a/source/src/rendermodel.cpp b/source/src/rendermodel.cpp index 39309751..139fecf3 100644 --- a/source/src/rendermodel.cpp +++ b/source/src/rendermodel.cpp @@ -252,7 +252,7 @@ void renderclient(playerent *d) string vwep; if(d->gunselect>=0 && d->gunselectgunselect]); else vwep[0] = 0; - renderclient(d, "playermodels", vwep[0] ? vwep : NULL, -textureload(skin)->id); + renderclient(d, "playermodels", vwep[0] ? vwep : NULL, -(int)textureload(skin)->id); } void renderclients()