OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2016-09-24 09:37:18 +02:00
commit 5ef46d1730
208 changed files with 21902 additions and 6688 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/r_swrenderer.cpp
View file

@ -46,7 +46,6 @@
EXTERN_CVAR(Bool, r_shadercolormaps)
class FArchive;
void R_SWRSetWindow(int windowSize, int fullWidth, int fullHeight, int stHeight, float trueratio);
void R_SetupColormap(player_t *);
void R_SetupFreelook();
@ -204,7 +203,7 @@ void FSoftwareRenderer::RemapVoxels()
//
//===========================================================================
void FSoftwareRenderer::WriteSavePic (player_t *player, FILE *file, int width, int height)
void FSoftwareRenderer::WriteSavePic (player_t *player, FileWriter *file, int width, int height)
{
DCanvas *pic = new DSimpleCanvas (width, height, false);
PalEntry palette[256];