mirror of
https://git.code.sf.net/p/quake/newtree
synced 2025-02-19 18:11:21 +00:00
fix alias model loading for when the model has groups. gdbinit added to ease
debugging
This commit is contained in:
parent
830d6e044e
commit
b88799880f
4 changed files with 7 additions and 7 deletions
|
@ -272,15 +272,16 @@ Alias models are position independent, so the cache manager can move them.
|
||||||
==============================================================================
|
==============================================================================
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/* NOTE: the first three lines must match maliasgroupframedesc_t */
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
trivertx_t bboxmin;
|
||||||
|
trivertx_t bboxmax;
|
||||||
|
int frame;
|
||||||
aliasframetype_t type;
|
aliasframetype_t type;
|
||||||
int firstpose;
|
int firstpose;
|
||||||
int numposes;
|
int numposes;
|
||||||
float interval;
|
float interval;
|
||||||
trivertx_t bboxmin;
|
|
||||||
trivertx_t bboxmax;
|
|
||||||
int frame;
|
|
||||||
char name[16];
|
char name[16];
|
||||||
} maliasframedesc_t;
|
} maliasframedesc_t;
|
||||||
|
|
||||||
|
|
1
source/.gdbinit
Normal file
1
source/.gdbinit
Normal file
|
@ -0,0 +1 @@
|
||||||
|
set args -nodga -nosound +set _windowed_mouse 0
|
|
@ -210,7 +210,7 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinind
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// animating skin group. yuck.
|
// animating skin group. yuck.
|
||||||
Con_Printf("Animating Skin Group, if you get this message please notify warp@debian.org\n");
|
// Con_Printf("Animating Skin Group, if you get this message please notify warp@debian.org\n");
|
||||||
pskintype++;
|
pskintype++;
|
||||||
pinskingroup = (daliasskingroup_t *)pskintype;
|
pinskingroup = (daliasskingroup_t *)pskintype;
|
||||||
groupskins = LittleLong (pinskingroup->numskins);
|
groupskins = LittleLong (pinskingroup->numskins);
|
||||||
|
@ -221,8 +221,7 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinind
|
||||||
|
|
||||||
for (j=0 ; j<groupskins ; j++)
|
for (j=0 ; j<groupskins ; j++)
|
||||||
{
|
{
|
||||||
skin+=4;
|
skin = Mod_LoadSkin (skin, skinsize, i, j&3, true);
|
||||||
skin = Mod_LoadSkin (skin, skinsize, i, j, true);
|
|
||||||
}
|
}
|
||||||
k = j;
|
k = j;
|
||||||
for (/* */; j < 4; j++) {
|
for (/* */; j < 4; j++) {
|
||||||
|
|
|
@ -150,7 +150,6 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinind
|
||||||
|
|
||||||
for (j=0 ; j<groupskins ; j++)
|
for (j=0 ; j<groupskins ; j++)
|
||||||
{
|
{
|
||||||
skin+=4;
|
|
||||||
skin = Mod_LoadSkin (skin, skinsize, &paliasskingroup->skindescs[i].skin, i, j);
|
skin = Mod_LoadSkin (skin, skinsize, &paliasskingroup->skindescs[i].skin, i, j);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue