fixed the vc6 projects for the model change

This commit is contained in:
Thad Ward 2000-09-23 01:17:04 +00:00
parent ed0b3b616b
commit 2b4dcee14d
3 changed files with 132 additions and 36 deletions

View file

@ -194,25 +194,6 @@ SOURCE=.\cl_misc.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\cl_model.c
!IF "$(CFG)" == "qw_client - Win32 Release"
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug"
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\cl_parse.c SOURCE=.\cl_parse.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -565,7 +546,64 @@ SOURCE=.\gl_mesh.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\gl_model.c SOURCE=.\gl_model_alias.c
!IF "$(CFG)" == "qw_client - Win32 Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug"
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\gl_model_brush.c
!IF "$(CFG)" == "qw_client - Win32 Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug"
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\gl_model_fullbright.c
!IF "$(CFG)" == "qw_client - Win32 Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug"
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\gl_model_sprite.c
!IF "$(CFG)" == "qw_client - Win32 Release" !IF "$(CFG)" == "qw_client - Win32 Release"
@ -822,21 +860,18 @@ SOURCE=.\menu.c
# Begin Source File # Begin Source File
SOURCE=.\model.c SOURCE=.\model.c
# End Source File
# Begin Source File
!IF "$(CFG)" == "qw_client - Win32 Release" SOURCE=.\model_alias.c
# End Source File
# Begin Source File
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" SOURCE=.\model_brush.c
# End Source File
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" # Begin Source File
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
# PROP Exclude_From_Build 1
!ENDIF
SOURCE=.\model_sprite.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -1197,6 +1232,63 @@ SOURCE=.\snd_win.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\sw_model_alias.c
!IF "$(CFG)" == "qw_client - Win32 Release"
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug"
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\sw_model_brush.c
!IF "$(CFG)" == "qw_client - Win32 Release"
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug"
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\sw_model_sprite.c
!IF "$(CFG)" == "qw_client - Win32 Release"
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug"
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\sw_view.c SOURCE=.\sw_view.c
!IF "$(CFG)" == "qw_client - Win32 Release" !IF "$(CFG)" == "qw_client - Win32 Release"

View file

@ -139,6 +139,10 @@ SOURCE=.\model.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\model_brush.c
# End Source File
# Begin Source File
SOURCE=.\msg.c SOURCE=.\msg.c
# End Source File # End Source File
# Begin Source File # Begin Source File

View file

@ -64,9 +64,9 @@ extern int posenum;
void *Mod_LoadSkin (byte *skin, int skinsize, int *pskinindex, int snum, int gnum) void *Mod_LoadSkin (byte *skin, int skinsize, int *pskinindex, int snum, int gnum)
{ {
byte *pskin; byte *pskin;
ushort *pusskin; unsigned short *pusskin;
int i; int i;
pskin = Hunk_AllocName (skinsize * r_pixbytes, loadname); pskin = Hunk_AllocName (skinsize * r_pixbytes, loadname);
*pskinindex = (byte *)pskin - (byte *)pheader; *pskinindex = (byte *)pskin - (byte *)pheader;
@ -76,7 +76,7 @@ void *Mod_LoadSkin (byte *skin, int skinsize, int *pskinindex, int snum, int gnu
memcpy (pskin, skin, skinsize); memcpy (pskin, skin, skinsize);
break; break;
case 2: case 2:
pusskin = (ushort*)skin; pusskin = (unsigned short*)skin;
for (i=0; i<skinsize; i++) for (i=0; i<skinsize; i++)
pusskin[i] = d_8to16table[skin[i]]; pusskin[i] = d_8to16table[skin[i]];
break; break;