teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-03-11 19:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Allow passing angle through when drawing the generic crosshair.

Browse source
This commit is contained in:
Mitchell Richters 2022-12-01 10:26:43 +11:00 committed by Christoph Oelckers
parent e972818db5
commit 318ff64f36
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/common/statusbar/base_sbar.cpp
View file

@ -124,7 +124,7 @@ void ST_UnloadCrosshair()
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void ST_DrawCrosshair(int phealth, double xpos, double ypos, double scale) void ST_DrawCrosshair(int phealth, double xpos, double ypos, double scale, DAngle angle)
{ {
uint32_t color; uint32_t color;
double size; double size;
@ -207,6 +207,7 @@ void ST_DrawCrosshair(int phealth, double xpos, double ypos, double scale)
xpos, ypos, xpos, ypos,
DTA_DestWidth, w, DTA_DestWidth, w,
DTA_DestHeight, h, DTA_DestHeight, h,
DTA_Rotate, angle.Degrees(),
DTA_AlphaChannel, true, DTA_AlphaChannel, true,
DTA_FillColor, color & 0xFFFFFF, DTA_FillColor, color & 0xFFFFFF,
TAG_DONE); TAG_DONE);

2
source/common/statusbar/base_sbar.h
View file

@ -10,7 +10,7 @@ class FFont;
extern FGameTexture* CrosshairImage; extern FGameTexture* CrosshairImage;
void ST_LoadCrosshair(int num, bool alwaysload); void ST_LoadCrosshair(int num, bool alwaysload);
void ST_UnloadCrosshair(); void ST_UnloadCrosshair();
void ST_DrawCrosshair(int phealth, double xpos, double ypos, double scale); void ST_DrawCrosshair(int phealth, double xpos, double ypos, double scale, DAngle angle = nullAngle);
enum DI_Flags enum DI_Flags

6
source/core/gamecontrol.cpp
View file

@ -1387,7 +1387,7 @@ void GameInterface::FreeLevelData()
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void ST_DrawCrosshair(int phealth, double xpos, double ypos, double scale); void ST_DrawCrosshair(int phealth, double xpos, double ypos, double scale, DAngle angle);
//void DrawGenericCrosshair(int num, int phealth, double xdelta); //void DrawGenericCrosshair(int num, int phealth, double xdelta);
void ST_LoadCrosshair(int num, bool alwaysload); void ST_LoadCrosshair(int num, bool alwaysload);
CVAR(Int, crosshair, 0, CVAR_ARCHIVE) CVAR(Int, crosshair, 0, CVAR_ARCHIVE)
@ -1414,8 +1414,8 @@ void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double
ST_LoadCrosshair(crosshair == 0 ? 2 : *crosshair, false); ST_LoadCrosshair(crosshair == 0 ? 2 : *crosshair, false);
double xpos = viewport3d.Width() * 0.5 + xdelta * viewport3d.Height() / 240.; double xpos = viewport3d.Width() * 0.5 + xdelta * viewport3d.Height() / 240.;
double ypos = viewport3d.Height() * 0.5; double ypos = viewport3d.Height() * 0.5 + ydelta * viewport3d.Width() / 320.;
ST_DrawCrosshair(health, xpos, ypos, 1); ST_DrawCrosshair(health, xpos, ypos, 1, angle);
} }
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------