From eaa51138add0d83568fafb79bc9afa35fe67a64f Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Mon, 30 Mar 2020 00:02:13 +1100 Subject: [PATCH] SW: Amendments to accommodate changes in master. --- source/sw/src/draw.cpp | 2 +- source/sw/src/jsector.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp index f923c985f..5df9cc879 100644 --- a/source/sw/src/draw.cpp +++ b/source/sw/src/draw.cpp @@ -2120,7 +2120,7 @@ drawscreen(PLAYERp pp) if (dimensionmode != 6)// && !ScreenSavePic) { // Cameras must be done before the main loop. - JS_DrawCameras(pp, tx, ty, tz, tang, thoriz); + JS_DrawCameras(pp, tx, ty, tz); } screen->BeginScene(); diff --git a/source/sw/src/jsector.cpp b/source/sw/src/jsector.cpp index 7c3b41fb4..a91d56d42 100644 --- a/source/sw/src/jsector.cpp +++ b/source/sw/src/jsector.cpp @@ -460,14 +460,14 @@ void JS_InitMirrors(void) // Draw a 3d screen to a specific tile ///////////////////////////////////////////////////// void drawroomstotile(int daposx, int daposy, int daposz, - short daang, fix16_t daq16horiz, short dacursectnum, short tilenume) + short daq16ang, fix16_t daq16horiz, short dacursectnum, short tilenume) { TileFiles.MakeCanvas(tilenume, tilesiz[tilenume].x, tilesiz[tilenume].y); renderSetTarget(tilenume, tilesiz[tilenume].x, tilesiz[tilenume].y); screen->BeginScene(); - drawrooms(daposx, daposy, daposz, daang, daq16horiz, dacursectnum); + renderDrawRoomsQ16(daposx, daposy, daposz, daq16ang, daq16horiz, dacursectnum); analyzesprites(daposx, daposy, daposz, FALSE); renderDrawMasks(); screen->FinishScene(); @@ -700,11 +700,11 @@ void JS_DrawCameras(PLAYERp pp, int tx, int ty, int tz) if (TEST_BOOL11(sp) && numplayers > 1) { - drawroomstotile(cp->posx, cp->posy, cp->posz, cp->pang, cp->horiz, cp->cursectnum, mirror[cnt].campic); + drawroomstotile(cp->posx, cp->posy, cp->posz, cp->q16ang, cp->q16horiz, cp->cursectnum, mirror[cnt].campic); } else { - drawroomstotile(sp->x, sp->y, sp->z, SP_TAG5(sp), camhoriz, sp->sectnum, mirror[cnt].campic); + drawroomstotile(sp->x, sp->y, sp->z, fix16_from_int(SP_TAG5(sp)), fix16_from_int(camhoriz), sp->sectnum, mirror[cnt].campic); } } }