From e4c9d744a8e2f97f16fe44c1df136008391afa8e Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 30 Nov 2008 05:31:16 +0000 Subject: [PATCH] Why do I still have commit access? git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3073 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/server/sv_main.c | 37 ------------------------------------- engine/sw/d_iface.h | 2 +- engine/sw/d_part.c | 35 +++++++++++++++++++---------------- engine/sw/d_parta.s | 6 +++--- 4 files changed, 23 insertions(+), 57 deletions(-) diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c index 97d126e1e..499d80b52 100644 --- a/engine/server/sv_main.c +++ b/engine/server/sv_main.c @@ -1674,43 +1674,6 @@ client_t *SVC_DirectConnect(void) } } msg_badread=false; - - if (developer.value && protextsupported) - { -#define printext(e) Con_Printf("Pext: " #e ": %s\n", (protextsupported & e)?"yes":"no") - printext(PEXT_SETVIEW); - printext(PEXT_SCALE); - printext(PEXT_LIGHTSTYLECOL); - printext(PEXT_TRANS); - printext(PEXT_VIEW2); - printext(PEXT_BULLETENS); - printext(PEXT_ACCURATETIMINGS); - printext(PEXT_SOUNDDBL); - printext(PEXT_FATNESS); - printext(PEXT_HLBSP); - printext(PEXT_TE_BULLET); - printext(PEXT_HULLSIZE); - printext(PEXT_MODELDBL); - printext(PEXT_ENTITYDBL); - printext(PEXT_ENTITYDBL2); - printext(PEXT_FLOATCOORDS); -// printext(PEXT_VWEAP); - printext(PEXT_Q2BSP); - printext(PEXT_Q3BSP); - printext(PEXT_COLOURMOD); - printext(PEXT_SPLITSCREEN); - printext(PEXT_HEXEN2); - printext(PEXT_SPAWNSTATIC2); - printext(PEXT_CUSTOMTEMPEFFECTS); - printext(PEXT_256PACKETENTITIES); -// printext(PEXT_64PLAYERS); - printext(PEXT_SHOWPIC); - printext(PEXT_SETATTACHMENT); -// printext(PEXT_PK3DOWNLOADS); - printext(PEXT_CHUNKEDDOWNLOADS); - printext(PEXT_CSQC); - printext(PEXT_DPFLAGS); - } } if (protextsupported & PEXT_256PACKETENTITIES) diff --git a/engine/sw/d_iface.h b/engine/sw/d_iface.h index c00d1fa29..23d2e8f97 100644 --- a/engine/sw/d_iface.h +++ b/engine/sw/d_iface.h @@ -143,7 +143,7 @@ void D_PolysetDraw16 (void); void D_PolysetDraw32 (void); void D_PolysetDrawFinalVerts (finalvert_t *fv, int numverts); void D_PolysetDrawFinalVerts32Trans (finalvert_t *fv, int numverts); -void D_DrawParticle (vec3_t porg, float palpha, float pscale, unsigned int pcolour); +void D_DrawParticle8S (vec3_t porg, float palpha, float pscale, unsigned int pcolour); //in asm void D_DrawPoly (void); void D_DrawSprite (void); void D_DrawSurfaces (void); diff --git a/engine/sw/d_part.c b/engine/sw/d_part.c index e8ba11d16..d468e2b5c 100644 --- a/engine/sw/d_part.c +++ b/engine/sw/d_part.c @@ -53,7 +53,7 @@ D_DrawParticle */ #if !id386 -void D_DrawParticleC (vec3_t porg, float palpha, float pscale, unsigned int pcolour) +void D_DrawParticle8S (vec3_t porg, float palpha, float pscale, unsigned int pcolour) { vec3_t local, transformed; float zi; @@ -207,7 +207,7 @@ void D_DrawParticleC (vec3_t porg, float palpha, float pscale, unsigned int pcol #endif // !id386 -void D_DrawParticle16 (vec3_t porg, float palpha, float pscale, unsigned int pcolour) +void D_DrawParticle16S (vec3_t porg, float palpha, float pscale, unsigned int pcolour) { vec3_t local, transformed; float zi; @@ -281,7 +281,11 @@ void D_DrawParticle16 (vec3_t porg, float palpha, float pscale, unsigned int pco } } -void D_DrawParticle32 (vec3_t porg, float palpha, float pscale, unsigned int pcolour) +#pragma message("fixme: D_DrawParticle16T is not implemented") +#define D_DrawParticle16T D_DrawParticle16S + + +void D_DrawParticle32T (vec3_t porg, float palpha, float pscale, unsigned int pcolour) { vec3_t local, transformed; float zi; @@ -359,8 +363,8 @@ void D_DrawParticle32 (vec3_t porg, float palpha, float pscale, unsigned int pco } } -#define draw(x, y) x=Trans(x,y) -#define addblend(x, y) x=AddBlend(x,y) +#define draw(x, y) x=Trans((qbyte)x,(qbyte)y) +#define addblend(x, y) x=AddBlend((qbyte)x,(qbyte)y) void D_DrawParticleTrans (vec3_t porg, float palpha, float pscale, unsigned int pcolour, blendmode_t blendmode) { vec3_t local, transformed; @@ -371,12 +375,12 @@ void D_DrawParticleTrans (vec3_t porg, float palpha, float pscale, unsigned int if (r_pixbytes == 4) { - D_DrawParticle32(porg, palpha, pscale, pcolour); + D_DrawParticle32T(porg, palpha, pscale, pcolour); return; } if (r_pixbytes == 2) { - D_DrawParticle16(porg, palpha, pscale, pcolour); + D_DrawParticle16T(porg, palpha, pscale, pcolour); return; } @@ -385,7 +389,7 @@ void D_DrawParticleTrans (vec3_t porg, float palpha, float pscale, unsigned int if (palpha > TRANS_UPPER_CAP && blendmode == BM_BLEND) { - D_DrawParticle(porg, palpha, pscale, pcolour); + D_DrawParticle8S(porg, palpha, pscale, pcolour); return; } @@ -684,7 +688,7 @@ vec_t VI2Length(int x, int y) length = sqrt (length); return length; } -void D_DrawSparkTrans32 (vec3_t src, vec3_t dest, float palpha, unsigned int pcolour) //draw a line in 3d space +void D_DrawSpark32T (vec3_t src, vec3_t dest, float palpha, unsigned int pcolour) //draw a line in 3d space { /* Finds 2d coords for the points, then draws a line between them with an appropriate alpha @@ -772,7 +776,7 @@ void D_DrawSparkTrans32 (vec3_t src, vec3_t dest, float palpha, unsigned int pco } while (count--); } -void D_DrawSparkTrans16 (vec3_t src, vec3_t dest, float palpha, unsigned int pcolour) //draw a line in 3d space, 8bpp +void D_DrawSpark16S (vec3_t src, vec3_t dest, float palpha, unsigned int pcolour) //draw a line in 3d space, 8bpp { unsigned short *pdest; short *pz; @@ -844,6 +848,8 @@ void D_DrawSparkTrans16 (vec3_t src, vec3_t dest, float palpha, unsigned int pco z1 += dz; } while (count--); } +#pragma message("fixme: D_DrawSpark16T is not implemented") +#define D_DrawSpark16T D_DrawSpark16S void D_DrawSparkTrans (vec3_t src, vec3_t dest, float palpha, unsigned int pcolour, blendmode_t blendmode) //draw a line in 3d space, 8bpp { @@ -853,18 +859,15 @@ void D_DrawSparkTrans (vec3_t src, vec3_t dest, float palpha, unsigned int pcolo int u2, v2, z2; int du, dv, dz; -/* - D_DrawParticleTrans(pparticle); - return; -*/ + if (r_pixbytes == 4) { - D_DrawSparkTrans32(src, dest, palpha, pcolour); + D_DrawSpark32T(src, dest, palpha, pcolour); return; } if (r_pixbytes == 2) { - D_DrawSparkTrans16(src, dest, palpha, pcolour); + D_DrawSpark16T(src, dest, palpha, pcolour); return; } diff --git a/engine/sw/d_parta.s b/engine/sw/d_parta.s index cec47a28b..56528efd0 100644 --- a/engine/sw/d_parta.s +++ b/engine/sw/d_parta.s @@ -46,11 +46,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define P2 12+12 #define P3 12+16 -//void D_DrawParticle (vec3_t porg, float palpha, float pscale, unsigned int pcolour) +//void D_DrawParticle8S (vec3_t porg, float palpha, float pscale, unsigned int pcolour) .align 4 -.globl C(D_DrawParticle) -C(D_DrawParticle): +.globl C(D_DrawParticle8S) +C(D_DrawParticle8S): pushl %ebp // preserve caller's stack frame pushl %edi // preserve register variables pushl %ebx