From 5732476c656eb3295b8530d9e9e4bb3c22a0cf9f Mon Sep 17 00:00:00 2001 From: Walter Julius Hennecke Date: Tue, 24 Jan 2012 09:26:54 +0100 Subject: [PATCH] Forgot to comit those changes They are for the new rpgxEF version --- cgame/cg_draw.c | 77 ------------------------------------------ cgame/cg_local.h | 14 -------- cgame/cg_public.h | 1 - cgame/tr_types.h | 11 +++--- game/bg_public.h | 2 +- qcommon/stv_version.h | 2 +- stefgame.suo | Bin 223232 -> 223232 bytes 7 files changed, 8 insertions(+), 99 deletions(-) diff --git a/cgame/cg_draw.c b/cgame/cg_draw.c index 3e3a974..a1d39e4 100644 --- a/cgame/cg_draw.c +++ b/cgame/cg_draw.c @@ -4947,79 +4947,6 @@ static void CG_Draw2D( void ) { } -#ifdef XTRA -void CG_MotionBlur(void) { - //motionblurDot_t *dot; - //vec3_t pos, axis[3]; - //int i; - - - /*if ( !cg.snap->ps.powerups[PW_BOOST] && cg.snap->ps.timers[tmZanzoken] < 1 && !cg.snap->ps.timers[tmTransform]) { - cg.refdef.rdflags &= ~RDF_MOTIONBLUR; - - - //for ( i = 0; i < MAX_MOTIONBLURDOTS; i++ ) { - // cg_motionblurDots[i].active = qfalse; - //} - - - return; - }*/ - - - cg.refdef.rdflags |= RDF_MOTIONBLUR; - - /* - // Destroy dots over lifetime - for ( i = 0; i < MAX_MOTIONBLURDOTS; i++ ) { - dot = &cg_motionblurDots[i]; - - if ( dot->lifeTime + dot->startTime < cg.time ) { - dot->active = qfalse; - } - } - - // Create new dots - for ( i = 0; i < MAX_MOTIONBLURDOTS; i++ ) { - dot = &cg_motionblurDots[i]; - - if ( dot->active ) - continue; - - VectorCopy( cg.predictedPlayerEntity.lerpOrigin, pos ); - VectorNormalize2( cg.predictedPlayerState.velocity, axis[0] ); - VectorMA( pos, 300, axis[0], pos ); - RotateAroundDirection( axis, crandom() * 360 ); - VectorMA( pos, 120, axis[2], pos ); - - memset( &(dot->refEnt), 0, sizeof(refEntity_t)); - dot->refEnt.reType = RT_SPRITE; - dot->refEnt.radius = 2; - dot->refEnt.customShader = cgs.media.whiteShader; - dot->refEnt.shaderRGBA[0] = 255; - dot->refEnt.shaderRGBA[1] = 255; - dot->refEnt.shaderRGBA[2] = 255; - dot->refEnt.shaderRGBA[3] = 128; - VectorCopy( pos, dot->refEnt.origin ); - - dot->lifeTime = 250 + crandom() * 100; - dot->startTime = cg.time + crandom() * 150; - dot->active = qtrue; - } - - // Render dots - for ( i = 0; i < MAX_MOTIONBLURDOTS; i++ ) { - dot = &cg_motionblurDots[i]; - if ( dot->startTime > cg.time ) - continue; - - trap_R_AddRefEntityToScene( &(dot->refEnt)); - } - */ -} -#endif //XTRA - - /* ===================== CG_DrawActive @@ -5078,10 +5005,6 @@ void CG_DrawActive( stereoFrame_t stereoView ) { VectorMA( cg.refdef.vieworg, -separation, cg.refdef.viewaxis[1], cg.refdef.vieworg ); } - #ifdef XTRA - CG_MotionBlur(); - #endif// XTRA - // draw 3D view trap_R_RenderScene( &cg.refdef ); diff --git a/cgame/cg_local.h b/cgame/cg_local.h index e5b5281..ea28fa6 100644 --- a/cgame/cg_local.h +++ b/cgame/cg_local.h @@ -1153,12 +1153,6 @@ typedef struct { qhandle_t photonRay; qhandle_t fireParticle; - #ifdef XTRA - //RPG-X | GSIO01 | 08/03/2010: - qhandle_t snowShader; - qhandle_t waterShader; - #endif - qhandle_t explosionModel; qhandle_t nukeModel; //qhandle_t electricalExplosionFastShader;// These are used to have a bit of variation in the explosions @@ -1974,10 +1968,6 @@ extern int sortedTeamPlayers[TEAM_MAXOVERLAY]; extern int numSortedTeamPlayers; extern int drawTeamOverlayModificationCount; -#ifdef XTRA -void CG_MotionBlur( void ); -#endif - void CG_AddLagometerFrameInfo( void ); void CG_AddLagometerSnapshotInfo( snapshot_t *snap ); void CG_CenterPrint( const char *str, int y, int charWidth ); @@ -2405,10 +2395,6 @@ void trap_R_ModelBounds( clipHandle_t model, vec3_t mins, vec3_t maxs ); void trap_R_LerpTag( orientation_t *tag, clipHandle_t mod, int startFrame, int endFrame, float frac, const char *tagName ); -#ifdef XTRA -void trap_R_AddPolysToScene( qhandle_t hShader , int numVerts, const polyVert_t *verts, int numPolys ); -#endif - // The glconfig_t will not change during the life of a cgame. // If it needs to change, the entire cgame will be restarted, because // all the qhandle_t are then invalid. diff --git a/cgame/cg_public.h b/cgame/cg_public.h index 1177af4..2c8a8df 100644 --- a/cgame/cg_public.h +++ b/cgame/cg_public.h @@ -129,7 +129,6 @@ typedef enum { #ifdef XTRA CG_R_REMAP_SHADER = 200, - CG_R_ADDPOLYSTOSCENE #endif } cgameImport_t; //these must match up with cg_syscalls.asm diff --git a/cgame/tr_types.h b/cgame/tr_types.h index ceddf5b..684842e 100644 --- a/cgame/tr_types.h +++ b/cgame/tr_types.h @@ -6,7 +6,12 @@ #define MAX_DLIGHTS 32 // can't be increased, because bit flags are used on surfaces -#define MAX_ENTITIES 2047 +#ifndef XTRA +#define ENTITYNUM_BITS 10 // can't be increased without changing drawsurf bit packing +#else +#define ENTITYNUM_BITS 11 // can't be increased without changing drawsurf bit packing +#endif +#define MAX_ENTITIES ((1<ouqXk zHJD>rZA^?BldIM$My~UHsg^;FM$=Y&G;Ny1P?MV4_SVr*B~7At?R{oOY;W$(AGd$p z@1F15vS;se_S$Q$-&*Upx4!lmUwcgRJe?un8(CWY-l6%r$|wUYP!y$?TAAA$otv0h zb?S_VI%C>(`aATr-7{|ZAt=iEe(K-j%k(|ztC)Lc4|#j*`mslg4?S()Fw=bXz2-lE zsk}MyK$&~;?X7(d9{la!$bMG=1;^mha`d+4_q z%fKC*p&yJ9f9~JhVDl$$hEJ?;70(&?NZha+EU4QJQ?avvrD5|XHV_A%fFul@g>?M; zI2I3&;0hD#gMrhKf{sdN;);@rZR1!52G4^I8%voLocNTBIk4dwh(@0ZdH%e;a2$Hi zRH_xPQm@o03lzIjLmF?wgIm~WJgSn2U2j1$HtvDJcyt?B(f3m@V0JXKpfi!#@JL@4 z3q!CV$j0JV$zZ~ceKf!20_~T!V#a6pfei~2*l-M70G;Yq&2SK(8pnn-y$UJ*l>KnI z54NA8b^n?OW+=j5r(i5jKS`f^T`UDFikL~gdc6v<2z$D=1<8hXc(;9wDL!TvVw zjeZWt?JgFJpSOUS^j?OqoP#_mt6VHN5m%YWYV+QPG@N=Gs$dDm<*~WwK22iCpf>ak zauJbGm#Kx0kX2)Xbvq|`JJ5*!K z6&Ry798ZCT!e#w27!=yJL!#J4xzIwYEM=wP$)2ABRLc4A> zatmw|dr6Qg@A`rz`(1woZZ@B(J@e7JAvM3rJTW_eJb(BTe`OaqAx`%}TU>j`mupLY z=gv=RTkG7QHeR>*U;iAg0#y4Ozkrq)eJlCHjQ4F~{YB@aRuK;A=MK_hn;c@Z|_C@?~TM@Y;2jh4sti z=6;8jry&<_9g+B4qs<*yBIkZB>`ivEuq2Vj2;L&w$N+XG(AMuJpARg|`a+%udWH5U z@{`ZXY<`=SbpT$bIDoA(Gl_I=hNls739{Q0nNfzQY9E(Ku#^d+;|iHI?~u%9bvWq) zIMgRc#lsPy%(Bp`Nvt|4?za7~|H|102qlB4>%`Rqw<9INi&BUkk39yu^y5$Q}bxU{g z8f<@$o2&Tfuy1w?NDaVwZrV(w$YCh8y+e7mzn0v`U#AQfEFeRP&_;U#)rL`;X?>++ ziUW(7mE@flo_J8`mW@Z>pcpfI$V97(Sh=v1tcICF!%?z$&_QXIT?LKgejL|T_ z3@gOKd0`SzAQT*g!5FgXZ5K-d3q|MvlqqoAF_r>vYBlQ5%b7?fA9PbWln6cvhjf|@ zcX}xuHw%Bt0)P7fQb-n2QO0^MB+zMqTO6r~vC`l4-J-h|+1`U2F)*GP;Tc&+)geJ4 zemt%$A%tHv@Jwtd(J)1MS!BSY4}q|eUxa6__*4h20#{jKO@FCn6kCu$xrQq2;WBns zB!>11whWrFn(^K^vy#m-e}Cn*ddJ=cf68enzLE0aJP*cw0SW$KB~wS3--(@(HT?ZO zb^Tv>GQYg?!!E4cMRU7XutbLLw+Niy9l&Gb0(GyI)!cXNv+3@hpDcg>^oVj1cIx)? zDUgG0KO)BSr^^tn+H=gfwhaisyTR79n5AmN`yVswQy=O#XkpW87BF26*1mOvS3Od9 zxz>Z`Y-ZP&D@95U-f^&0zikbr4sc=HdxTd(uj0NHH}==3>z{q~i5LHJJa^|GE*}<> z@zKRZJNCs8SK2?)@XbkM&qt^#xr8{SLWLzGwNh?=j`H>!f?@p6Jd(;xjv4;-bWt)Z zsvTMm`0r^V%U9Ifi*qo43m6Y?WNwCmlQ3CC(7%*5{@&a4(Y&S<(vwHp4hHnRao{SJB*KAq9e=pb~@^qFA@3uTFyuuA_?6u zu>jhB1?d!d@+9<6v{65oFzm*Iw^-Ke+b9bDe{u6~V#semzLWg!1I!1p^Fz5?+EnrX zs+rv!YK$cV(+Tws+BOj_CHCs?e4m}|sU2=VWhNueA4rAs=q*XORC$`96ORE?_7H>k zt;o>>!U-`RJ{4K|L2=H?Mml~9GO|}Np^->M(kyD99f_7iW7%1Vh89t29QXtkCp;4* zZYPQFfeJ|lejy5-JkC-Y@|eLV4tsrYdoI=4;h#~xTvNgtB;T8eJBD&eOVjXDJ0ugs zq$)DN51s4|z#UAz34+@EOk+Y$r$KF5XNDbW-pC^PeN?2Dg-&-r+e^f=<1?zxjXFM0 zoG*zPI}Pa5adWp!LqU}cWq9Xfl9k@YY@mOFt`=$|=K#O=b5^0#*U;dsyMvuyvFW{fvOp&YzN>i%%_kvV?;vjy{iC^7g1 zVKD4%k#~sLxkLs^6bI)q=*%Jntk(_KH(T)QWDisWeOXMcA3jD~v1YQ}IG1=FpqQCq=(BS??MP?#+h!IP^tEKTyKHp)s`En))Xf)X$q0+3wciq}HhM+=C7I+<^C&@JzY@5xU{y#iaIG2d8sr zF)21In>#4k*~jw<(F^BJUpRMWwYR=bDjgcu%VGR$DZ!F-t>O#4blp`-aV1QFd#2Gi z^`4WHXj?^Dl&tk_Rz0_A9UCU5zJ&o7kHJO7e1K*e+Sy9&>lhbz#)1N*w0!2eyLm@v zRXlfpmc|u^UZOvNiS$qJrs;h8J-%p|%B|Kfqr>m@4;bmrHH&_F)(WRTgx5;>1J-%r zd0J;N^~JrcXN~p(`PgIqut)ff{()=MA1hwy?&30QLU_kYSF4Ts;tS8$z^5SYRTf@Q z2^^sQV6@HPkK%?Yw|i*E0xoi2)|RO7 z8(pof)RzYMFM(8G?MomIJ%M!UOKGbm=pq1}sycK==FwKTi@9QJPQ)2X-~sAOL7F?m zP%Mlq>E@2f)He!f2y7Nx2Zu$Iw*?fWaLwDiE(B6x>A2~_X7cH3okRT|w8p~`=;p?) z*WI0Oq`pDQAOsi38N=c;cLwB3IAlDZ*h4$KHi!%G46JyJ55|ls{M+~gJB6SSiEJXj z-L!_XR$4qyHOP{@EfV`|hyib|rgF5CCWY78u<$?}pR9M%jeiZE>!5h+=%9Ou6La{u zrdq1HI}>=Cel6{2ePk*0R#0kLMq?YpV^RLURq&pGi^lUgFqBl;X&os7K|WorZtCB) zbQPMv$2=CXK=_4q)EB1ow@=|+26!pFE-|`?`NgPzOn0^XY?LDYFXSG)V&^PTU696q y99aOpvqkwDk%@ns&C3lS2+P*UtbTyh`}0~#Ug^ELO(xNoBh#iqG+iCq<$nS{mJON! delta 7304 zcmd5>d32OjmjB*+sgSi&Nh%@4bf|=ouw<#EQXxB8iX9~hplOMOY#<{`keHU1B`65C zN`oKfI=Bot3@)t_w=UZeD3nI&b4G&DO`mZ?+t%(gv?db8Wi<1<-}j}6^OrNH&zyOO zSMTP2_q})D-QK;Ap8n{b{^-6{A)!?Vw@-fh{PQ=5)Q5*^>orZY>-A;vuw3*DmQYCUwP!TqPT3Jpc3DUo`949bsXh zFxvCZUG1C2UjK$DF?WUjT6VsFXuWtU<%Y>vZ3_BS^gQ$&^j!4sv8)?oK6(MV2fYy8 zi(Z6Yf?kZybfp-}(96*)&@0iWqgT;^Jz~5+WsmqMQT&-=2jv915HFMTfqX}JftIVa zfwg-{JTB(Y!AM!GyGtGP@dlYpbx(*C>U%;YQ+u^^QeBKprM!9>r8F(gT*uLrRTvz1U z6J#lU)*~HbG_4j#nXeyDiKl@wnM4K{tGdLFuz+eLcZr0DV=h3Ghi!jz=q9~@pGa`>ZdrgGl>vMGM zEpatv%o$O>g`Y$pIAw{x#v5n55xmz>%N*$;*IOcvYTgq*=4BG~Y{Om|sVYUUj4twb zofG$ji?#H@4w*03(VnwnA!UT)3>OAuir%?79lOTH$$Wj_-;%`>bS6vX)9MdJ9Jn|^ zX%EV3s(8{ciIr@qUa^{n-xv3Y9&)_^30=5VMp59Dh@hTY8RidM5LLFAwOY5a|hV3~LWE_3>yoejqsdeHg_pva`XyASb?&4)>7pv$%B$Tl%LE35l z$2eeNge)+u4V=Y8dShvKge+pT(>(IQZ)J+V@-IR;9A|P{p6sq!G=J`?MgOt*4=4WW zum4K8MeNuW#g`5*i=Dl5#)_8Xm#>PsSKmG8^dI_K{8fl1|L$+a3(>Y{Fyo+~?2;2W zpio!1yoc_4LcssJr2|`E#Uh$UMR$NNcZ3WfXB;fJ{}WKaZecEO!BRf^$`IfYIx|~N zBS*N3xbM7Oyhv$tq`|g}UWt-X`nh%|A0nNOOb~XgJ&g^pM9*Ey(!Z7ku)uVSzGx7g z%Tl?z`xj2}YpSo1t7+|4gQ2;+s)zD6$Oz0j%S()9<)+h%2SpqLU^ZKdM%7AGfxyGs zo<^<=74`6_CDCy z!FO2T4*9CkpDRnGo)}2u(J?BU`um|TUJ&~&*IVkx(?A7+!rnOiz^2{Q7msBPhsVj1 z!`YSt=*5&a6ESjs1VV}#9ZSu_9lq5#-0$f~yj)_+8BE*tfjNod6m3nA^EepQv1ixu zy4e&c0lT;T1~&Je6VTognXRvZkH2Ds&)$hDiF(FLm*15rF9^MJQxXgtK9{fOmM6iQ zMHvFr{v;V@I_-uRA%SH{SctW)4{S=dJ@`X@>6LNPNBvHm%TWwD7`6Z&oQ5@9O*Qzk4b6xJd9HDwIu1f8kDtcy*LM4i&?$;m=FS7p4kWVo|+i zSa|PQQEWu=#q7&ww9-2lJH?%BFJ)ve#XKChl_Qm%{x%mf-^IdU^C5Q${yb3*6|CKC zSkL=>)LRU{qBZ3*R0M-~rMXq-T!*aD8*RlFvWU>$oXEnMYMFd6{0SFfn8 z7B)ICT{hFIIdW3(X%5`eS*UzP)bI~>DJ1te87CfRzC0ADlE$s)V;eOtsbqt>s!Cj^ z`vwuEKCQ;lFT4*I?X;;7I$8r&L7VARR}NP`+>QA?e6?jfhP>!?VpKYi4BdQoo@PW2FLyx>`qmDiPllb9q56_YPq2dwhuamdoFwaUAPtEmmm1F(=kKP*>`-SIEM+1+J zzrOcriv1Q=K2R_99LJX5ZM=9cCaz@9(A$Bm;gVOW{vf_RzD2^-BD5l#rb&%lC29w} zNHx+xv2xpmCY1KB|APk>F5FqQonnjCRlRq}0J$qvdC2 zH8~3xmFAbaOK&Um6c;V`7I|~prnMI36y|$da#~wkT630rTHGE_M|($MalxjV`=~lk z)!SSR9i40G@O)JvYktWaEl4m>O)FYfcQm!GXkNc+WqZf!wbWUmvT@z!=c;m1ryt+w zHS#8M?1W>bc~t`KE>mL+?x}8uN=(=r0ihW!GjIT~6R^)bCx4GUV|~@M%)rBdo%HQ8 zb>7yFYxM7uHzJKr!?H%AvZR z>>Co0YH~7*qx_gG(k~y8--lEB90WL{kob|gB;w#wz5?q07wO^_OUuxla{wBcVF>W4(yAv>^pzR!m+XXlU`)m6wBrntl z7_mirZWQ5*fM)>r@+jOzz&XHuZ{c{Zfb-O1lo**2?u!94GuK);fZArji!kf6 z8R3r-jQ?a2GVWghqdL@nW#M>}7Xjm+_J)Pa0^AHHxSh9f4F3@@(_gS~yw4|q-5CF3 z;nJ|b_5uFjHeeys0S{WZuPq#Z{{}EGIBel^85zYtnwEu;H{do2Fw^B*IF{xtz%Gn) zE!;%F1qR)9nl{fu@&eZY=9AZt!d(lP#osgv*9Mr|8jM`mYg!lVh>Hm`8=S!@TGp0M zB()=atpmImQ`TF!34pr*bL+KmeD(({+&^15{(cZ}GsZ&}E(7pm7Trr0j@NtH!u{67 zv2khIN&LYAIc*U#L!SfYnsV5}@tOI`38BBR3S_9w&?qaJR8MpbAuOYsyCiSrJIon; z)p|fi3oaniQ ztEJ(0!~}o(S2A7L+Mv|-D`M*UTGoZwSauy(kVD_erjS^EyBcW^VAd~aUWHoTmM8tG{Qt7{&~G3t6Qr>+#7$Hkre@I47*)p!YXe_d*CLU%5@reMh6^lOCs=%k1$8$}_x9=mAooX6YIz14f+@ire=<*2V;JxrNwJ=#M z;c`Ep0+FCK(;MN7CD5-!%+{7>idO< z>-{9NBH%YQ=xqa+*=5w3pD)$3p?%}nxA5`QI8V$8F|xs+S916<_M5W zb*(CsUYM%plN|-V==>qODG5kT>SpCM7BsaPRY2Q{=8iSpG?=ZXa01^*<11C3xP#IF z%XO=a52OC<_k!-tJQYrpOJJN2=izzHn6~z6OuLusjwSS)`N|`9Fx(ir{MP1GD_d!6 zj=DW$^~&{a=1$*uRetYxGQ*$YRtF_&{on)DPysCAHmG>#6+;l8IzI#DHux!^{wmcd?lu{iz6fjuD=vn1noN%?hM1ynP=zCuZ`=S%WBz_VSd)7fe(i3Ubd=O`eSZ!?LZBn&u(S zezsUe>3MkOo3KFw^0{1$IpQBJGJTar`QQJ9}o(pu!s@py{7B?Sd- z1uZn#pvKW>b5+Ecu)uCyfuZDDs%{tq^{wpcSZ!*JYrDjwrugw27I+=M1?avzS?&$S zj-jY4S>uL98P(t?(5Bg<0-pnpp!XN5WucunceJl;qn0LB9edLV1xAL)k)uL2*?!j1 zf&!L{V59DwxH-5|X5cQslR)a*A$+KeQ5(-JtoD|8N~kAIWzfMys5%!STbivr#^Q;?oLv|#6Cuyc8hv*e1{KoL-Lb~x)XwRF(ZT}b0mrkPmeJAq z$`@;eA$-jYti$hY3i#BaME=hpvn2&~Sdh7JBb9q$x-2C_cM%*};h~yu8<*?Xk;+9d zF~mOAN_9{T1f~Jz^vAc8-k%9a4{1pAg#b~bhwT^eMaJW zoYZV#fj?QW?~3~y{yxHAcy!OoKnkemqmLpAsyZ9o z#}(jYm;dyc@xzb!F-y?0ONgd9FCo$KW#N#BuQtnlJ%tFr{G2f=8W{}9AnQ{DaBnRx$a*k{1Z?$3{|EzN{-NvDxp4775J5xj>NNk~9SwEx#YWimAFq7vTFw_GCp7!6 ZAcuhD`_wiOC084z-GZm$6AM)Ne*yJcifaG>