From a4879fb3381bc7769e3ad319a228929738bc478d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 6 Jul 2020 15:52:09 +0200 Subject: [PATCH] - draw all overlay elements on the game screen. --- source/games/duke/src/hudweapon_d.cpp | 8 ++++---- source/games/duke/src/macros.h | 15 --------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/source/games/duke/src/hudweapon_d.cpp b/source/games/duke/src/hudweapon_d.cpp index 965b5cd45..a17f8a382 100644 --- a/source/games/duke/src/hudweapon_d.cpp +++ b/source/games/duke/src/hudweapon_d.cpp @@ -75,9 +75,9 @@ void displayloogie(short snum) z = 4096 + ((ps[snum].loogcnt + i) << 9); x = (-getavel(snum)) + (sintable[((ps[snum].loogcnt + i) << 6) & 2047] >> 10); - rotatesprite( + hud_drawsprite( (ps[snum].loogiex[i] + x) << 16, (200 + ps[snum].loogiey[i] - y) << 16, z - (i << 8), 256 - a, - LOOGIE, 0, 0, 2, 0, 0, xdim - 1, ydim - 1); + LOOGIE, 0, 0, 2); } } @@ -110,10 +110,10 @@ int animatefist(int gs, int snum) else fistpal = sector[ps[snum].cursectnum].floorpal; - rotatesprite( + hud_drawsprite( (-fisti + 222 + (getavel(snum) >> 4)) << 16, (looking_arc + fistz) << 16, - fistzoom, 0, FIST, gs, fistpal, 2, 0, 0, xdim - 1, ydim - 1); + fistzoom, 0, FIST, gs, fistpal, 2); return 1; } diff --git a/source/games/duke/src/macros.h b/source/games/duke/src/macros.h index 08022177f..a3a92cb7a 100644 --- a/source/games/duke/src/macros.h +++ b/source/games/duke/src/macros.h @@ -63,21 +63,6 @@ inline bool AFLAMABLE(int X) // NETWORK - REDEFINABLE SHARED (SYNC) KEYS BIT POSITIONS // -// rotatesprite flags -#define ROTATE_SPRITE_TRANSLUCENT (BIT(0)) -#define ROTATE_SPRITE_VIEW_CLIP (BIT(1)) // clip to view -#define ROTATE_SPRITE_YFLIP (BIT(2)) -#define ROTATE_SPRITE_IGNORE_START_MOST (BIT(3)) // don't clip to startumost -#define ROTATE_SPRITE_SCREEN_CLIP (BIT(1)|BIT(3)) // use window -#define ROTATE_SPRITE_CORNER (BIT(4)) // place sprite from upper left corner -#define ROTATE_SPRITE_TRANS_FLIP (BIT(5)) -#define ROTATE_SPRITE_NON_MASK (BIT(6)) // non masked sprites -#define ROTATE_SPRITE_ALL_PAGES (BIT(7)) // copies to all pages - -#define RS_SCALE BIT(16) - - - //cstat, bit 0: 1 = Blocking sprite (use with clipmove, getzrange) "B" // bit 1: 1 = 50/50 transluscence, 0 = normal "T" // bit 2: 1 = x-flipped, 0 = normal "F"