Subversion Repositories eduke32

Rev

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

Rev 8519 Rev 8576
Line 3705... Line 3705...
3705
    short cang, csect;
3705
    short cang, csect;
3706
    fix16_t tang;
3706
    fix16_t tang;
3707
    char ch, *ptr, *ptr2, *ptr3, *ptr4;
3707
    char ch, *ptr, *ptr2, *ptr3, *ptr4;
3708
    tspriteptr_t tspr;
3708
    tspriteptr_t tspr;
3709
3709
-
 
3710
    int32_t const viewingRange = viewingrange;
-
 
3711
3710
    smoothratio = max(min(dasmoothratio,65536),0);
3712
    smoothratio = max(min(dasmoothratio,65536),0);
3711
3713
3712
    dointerpolations();
3714
    dointerpolations();
3713
3715
3714
    if ((snum == myconnectindex) && ((networkmode == 1) || (myconnectindex != connecthead)))
3716
    if ((snum == myconnectindex) && ((networkmode == 1) || (myconnectindex != connecthead)))
Line 3801... Line 3803...
3801
        screensizeflag = loc.bits;
3803
        screensizeflag = loc.bits;
3802
    }
3804
    }
3803
3805
3804
    if (dimensionmode[snum] != 2)
3806
    if (dimensionmode[snum] != 2)
3805
    {
3807
    {
-
 
3808
        if (r_usenewaspect)
-
 
3809
        {
-
 
3810
            newaspect_enable = 1;
-
 
3811
            videoSetCorrectedAspect();
-
 
3812
        }
-
 
3813
3806
        if ((numplayers > 1) && (option[4] == 0))
3814
        if ((numplayers > 1) && (option[4] == 0))
3807
        {
3815
        {
3808
            //Do not draw other views constantly if they're staying still
3816
            //Do not draw other views constantly if they're staying still
3809
            //It's a shame this trick will only work in screen-buffer mode
3817
            //It's a shame this trick will only work in screen-buffer mode
3810
            //At least screen-buffer mode covers all the HI hi-res modes
3818
            //At least screen-buffer mode covers all the HI hi-res modes
Line 4114... Line 4122...
4114
            }
4122
            }
4115
4123
4116
            if (health[screenpeek] <= 0)
4124
            if (health[screenpeek] <= 0)
4117
                rotatesprite(320<<15,200<<15,(-health[screenpeek])<<11,(-health[screenpeek])<<5,NO,0,0,2,windowxy1.x,windowxy1.y,windowxy2.x,windowxy2.y);
4125
                rotatesprite(320<<15,200<<15,(-health[screenpeek])<<11,(-health[screenpeek])<<5,NO,0,0,2,windowxy1.x,windowxy1.y,windowxy2.x,windowxy2.y);
4118
        }
4126
        }
-
 
4127
-
 
4128
        if (r_usenewaspect)
-
 
4129
        {
-
 
4130
            newaspect_enable = 0;
-
 
4131
            renderSetAspect(viewingRange, tabledivide32_noinline(65536 * ydim * 8, xdim * 5));
-
 
4132
        }
4119
    }
4133
    }
4120
4134
4121
    //Only animate lava if its picnum is on screen
4135
    //Only animate lava if its picnum is on screen
4122
    //gotpic is a bit array where the tile number's bit is set
4136
    //gotpic is a bit array where the tile number's bit is set
4123
    //whenever it is drawn (ceilings, walls, sprites, etc.)
4137
    //whenever it is drawn (ceilings, walls, sprites, etc.)
Line 5928... Line 5942...
5928
    int xvect, yvect, xvect2, yvect2;
5942
    int xvect, yvect, xvect2, yvect2;
5929
    char col;
5943
    char col;
5930
    walltype *wal, *wal2;
5944
    walltype *wal, *wal2;
5931
    spritetype *spr;
5945
    spritetype *spr;
5932
5946
-
 
5947
    int32_t tmpydim = (xdim*5)/8;
-
 
5948
-
 
5949
    renderSetAspect(65536, divscale16(tmpydim*320, xdim*200));
-
 
5950
5933
    xvect = sintable[(-cang)&2047] * czoom;
5951
    xvect = sintable[(-cang)&2047] * czoom;
5934
    yvect = sintable[(1536-cang)&2047] * czoom;
5952
    yvect = sintable[(1536-cang)&2047] * czoom;
5935
    xvect2 = mulscale16(xvect,yxaspect);
5953
    xvect2 = mulscale16(xvect,yxaspect);
5936
    yvect2 = mulscale16(yvect,yxaspect);
5954
    yvect2 = mulscale16(yvect,yxaspect);
5937
5955
Line 6159... Line 6177...
6159
            y2 = dmulscale16(oy,xvect2,ox,yvect2)+(ydim<<11);
6177
            y2 = dmulscale16(oy,xvect2,ox,yvect2)+(ydim<<11);
6160
6178
6161
            renderDrawLine(x1,y1,x2,y2,24);
6179
            renderDrawLine(x1,y1,x2,y2,24);
6162
        }
6180
        }
6163
    }
6181
    }
-
 
6182
-
 
6183
    videoSetCorrectedAspect();
6164
}
6184
}
6165
6185
6166
//New movesprite using getzrange.  Note that I made the getzrange
6186
//New movesprite using getzrange.  Note that I made the getzrange
6167
//parameters global (&globhiz,&globhihit,&globloz,&globlohit) so they
6187
//parameters global (&globhiz,&globhihit,&globloz,&globlohit) so they
6168
//don't need to be passed everywhere.  Also this should make this
6188
//don't need to be passed everywhere.  Also this should make this