From 04ff274f7740f6fedcb69643ba2448e1b24592c8 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 19 Aug 2012 13:00:19 +0000 Subject: [PATCH] Display the nukebutton punching fist with viewport clipping bounds. Using rotatesprite with bit 8 clear (scale to viewport) but using fullscreen clipping bounds is never what we want. Also, tweak for fake multi. git-svn-id: https://svn.eduke32.com/eduke32@2932 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/player.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index cd9537654..63a16ca71 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -1989,6 +1989,8 @@ static int32_t P_DisplayFist(int32_t gs,int32_t snum) int32_t looking_arc,fisti,fistpal; int32_t fistzoom, fistz; + int32_t wx[2] = { windowx1, windowx2 }; + const DukePlayer_t *const ps = g_player[snum].ps; fisti = ps->fist_incs; @@ -2004,10 +2006,14 @@ static int32_t P_DisplayFist(int32_t gs,int32_t snum) fistpal = get_hud_pal(ps); - rotatesprite_fs( + if (g_fakeMultiMode && ud.multimode==2) + wx[(g_snum==0)] = (wx[0]+wx[1])/2+1; + + rotatesprite( (-fisti+222+(g_player[snum].sync->avel>>4))<<16, (looking_arc+fistz)<<16, - fistzoom,0,FIST,gs,fistpal,2); + fistzoom,0,FIST,gs,fistpal,2, + wx[0],windowy1,wx[1],windowy2); return 1; }