Subversion Repositories eduke32

Rev

Rev 8474 | Rev 8519 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8474 Rev 8475
Line 1964... Line 1964...
1964
        wsayfollow("shoot4.wav",4096L+(krand()&127)-64,128L,&sprite[j].x,&sprite[j].y,1);
1964
        wsayfollow("shoot4.wav",4096L+(krand()&127)-64,128L,&sprite[j].x,&sprite[j].y,1);
1965
        break;
1965
        break;
1966
    }
1966
    }
1967
}
1967
}
1968
1968
1969
#define MAXVOXMIPS 5
-
 
1970
extern intptr_t voxoff[][MAXVOXMIPS];
-
 
1971
void analyzesprites(int dax, int day)
1969
void analyzesprites(int dax, int day)
1972
{
1970
{
1973
    int i, j=0, k, *intptr;
1971
    int i, j=0, k, *intptr;
1974
    vec3_t *ospr;
1972
    vec3_t *ospr;
1975
    uspritetype *tspr;
1973
    uspritetype *tspr;
Line 1977... Line 1975...
1977
    //This function is called between drawrooms() and renderDrawMasks()
1975
    //This function is called between drawrooms() and renderDrawMasks()
1978
    //It has a list of possible sprites that may be drawn on this frame
1976
    //It has a list of possible sprites that may be drawn on this frame
1979
1977
1980
    for (i=0,tspr=&tsprite[0]; i<spritesortcnt; i++,tspr++)
1978
    for (i=0,tspr=&tsprite[0]; i<spritesortcnt; i++,tspr++)
1981
    {
1979
    {
1982
        if (usevoxels && tiletovox[tspr->picnum] >= 0)
1980
        if (usevoxels)
1983
            switch (tspr->picnum)
1981
            switch (tspr->picnum)
1984
            {
1982
            {
1985
            case PLAYER:
1983
            case PLAYER:
1986
                //   //Get which of the 8 angles of the sprite to draw (0-7)
1984
                //   //Get which of the 8 angles of the sprite to draw (0-7)
1987
                //   //k ranges from 0-7
1985
                //   //k ranges from 0-7
Line 1999... Line 1997...
1999
                //   tspr->cstat |= 4;    //set x-flipping bit
1997
                //   tspr->cstat |= 4;    //set x-flipping bit
2000
                //}
1998
                //}
2001
1999
2002
                if ((tspr->cstat&2) == 0)
2000
                if ((tspr->cstat&2) == 0)
2003
                {
2001
                {
-
 
2002
                    if (voxid_PLAYER == -1)
-
 
2003
                        break;
-
 
2004
-
 
2005
                    tspr->cstat |= 48;
2004
                    //tspr->cstat |= 48; tspr->picnum = tiletovox[tspr->picnum];
2006
                    tspr->picnum = voxid_PLAYER;
-
 
2007
2005
                    intptr = (int *)voxoff[tiletovox[PLAYER]][0];
2008
                    intptr = (int32_t *)voxoff[voxid_PLAYER][0];
2006
                    tspr->xrepeat = scale(tspr->xrepeat,56,intptr[2]);
2009
                    tspr->xrepeat = scale(tspr->xrepeat,56,intptr[2]);
2007
                    tspr->yrepeat = scale(tspr->yrepeat,56,intptr[2]);
2010
                    tspr->yrepeat = scale(tspr->yrepeat,56,intptr[2]);
2008
                    tspr->shade -= 6;
2011
                    tspr->shade -= 6;
2009
                }
2012
                }
2010
                break;
2013
                break;
2011
            case BROWNMONSTER:
2014
            case BROWNMONSTER:
-
 
2015
                if (voxid_BROWNMONSTER == -1)
-
 
2016
                    break;
-
 
2017
-
 
2018
                tspr->cstat |= 48;
2012
                //tspr->cstat |= 48; tspr->picnum = tiletovox[tspr->picnum];
2019
                tspr->picnum = voxid_BROWNMONSTER;
2013
                break;
2020
                break;
2014
            }
2021
            }
2015
2022
2016
        k = statrate[tspr->statnum];
2023
        k = statrate[tspr->statnum];
2017
        if (k >= 0)  //Interpolate moving sprite
2024
        if (k >= 0)  //Interpolate moving sprite