From 4c7503d798ce7fcf6da57b21c57b6f8ef7bc5ba7 Mon Sep 17 00:00:00 2001 From: q3rally Date: Mon, 27 Aug 2018 20:46:43 +0000 Subject: [PATCH] working on surfaceparms --- baseq3r/models/players/plates/player0.tga | Bin 8210 -> 0 bytes baseq3r/scripts/custinfoparms.txt | 14 +++++++------- engine/code/qcommon/q_shared.h | 2 +- engine/code/qcommon/surfaceflags.h | 10 ++++++---- q3rallycode.ppr | 20 ++++++++++++++++---- 5 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 baseq3r/models/players/plates/player0.tga diff --git a/baseq3r/models/players/plates/player0.tga b/baseq3r/models/players/plates/player0.tga deleted file mode 100644 index c96857f97f39f8adb02494f4c8266039d7400db8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8210 zcmcgx`)^do6-ND?pR3YDZKbM!Le(g$NTfdUaFnzWEwR!(ND~Su!NFMw&jv6?!YT19 zv~@!l2u_0yaR>@FHf!&$@9y5cd-uKTUB56kM6J}cf5+GPW;t|vW$!KyuC1dpGw1ou zoSA!f?y6PaSS5c?top9{Z{D>F#e5$5Y!;4fBN2}ynMfezx|-N_9Y>Sd<`{KpL$ae$ z#A7ktCifEMUXpm^qEEjPhg@Pv4r0S`A&!x}wzN+tlbVP}{E=r;DO?{O!NUAJCQBt9 zpW}kt?~Sa zTJXK^Jbg#m!fC-_qJ)zJ^b0gfSzw}4C>36*LEfQjLF)+*x#?~pLy1bNBq;1 zle!Lwi8l4*PCeSz^8f#qGk4}y4|e88?1JB{|CPwwfBLjKYlrXaoPAxNg5SIU?*+el zlH$>g8<)h@a`Y%xuU-x6i7w}wF{Hm#JnETtqF2qQ=+xq@6`mP9>sJbYM|-=@f6baT z;9Bk3y<5)}$C+O({Edx`TAy~rOq*IhYvDHK#LpU#^RM20WBRCufptOoQgvU=mN8g2 zW-PXA`Sj{n>r4Hw6#iQH>XCc%uVv%aU#idNE^D8}_WwW{r{tE?v62 zW|S>Pa$eNJLiu9xs`>QlFVz?Pd@q{2apP;@_vS-W2E6+&ttdzMiG0@iZCBDU{ zsavZp_;09pdcMowZ~TnUytt;sNN(oIK5OFXh6YWne>3OB@YnKb+E;7K{^uSb{`*n? z%%518w^_&4@~9?T3V$`5dS!yYbO*oumaErZ^q8ZUr1nK;xqPMZ%lpohdIyRHm$(19 z&L(+lc)8eVx6=5z|5*pqlV#Xr%X|Lc3qGDNaxYPj-Tl}@OU2=x1=l~H&8gpvQ-}sC zcNvT6bB>rhNot0AY*!=G7vD7ph7;JcCyczC)z4j1Ud@ll^m(n;O!{JP<|Z<788`Jf z&OYyo*w*-GX8s4i*ovLWWe$jEUfrAUK8Shg_XyP{mps{~9&Nbpqa!(Nd}4UeR8V4s6O zpK|q`L&_?l=ajlrwJPt_^igt3xIC25b5cm<5Db*@PP2pGyyBp27S8oW@u{k@crbG}cN4$lPfj0yD1dZ-t+B_p{+HlabFm8vG;8YUkv8(!71y`+Dt3k1TGEbbgdmbVxhY|hQD2@ z%-`8_X>9pzSmhAG@xyVn9E#!eM-?ny?B+VMO&sLB1B{01$IqI7^>u~cm%#0X1splz zV6QKZH@4Y$W^)t|{y2;SDwjOG!&lI!Zl>g`JnmGf$ED*Se+{`Y_4Kc(va2R{oT5SUbTJc|!L zbnv;_6YsaB;M-^8^018_zl(=$ErtI5S*KT4tJOcD#~cQn^Q)}oXx zV#~HDUVbHp*}^2IN@bnjwUGi|+Zw~%#0-MLN&KZJftmaidM~EX@droOxp|gV&Zued zUG3`il$I9~Iknd;>}pD2@OoOGfy6FnMz#DY6Z{jYO8wXS`-gkVRo_;k>i5zomt8#k zqy_)E0^Z&4;CdjV*I~L`xmV@+c2VuyhRrs*x-#%z$l=20c|AYBdeO#-V`=>T%P)1! z@*LxSG@mCjMlQrT92}~gU95M`Ic2if`Q3-u>cP)B&L^|_{)_lIe~a1CxAj~!zn!Xl8vOTo(+YvJ~P^myZCiuQtw$} zCUzmyp0!4zFUpJQJp3QKx)!KM8S`fQ+TbA8uV0S~=RecBCKeNejMFBYOygf)eTAZ` z34TlC^N96k&Y`r)X)_iGsG9B3I?VmDdginqi{n#Ohg@^kAW3pB6(=w-l*F{cP8=LB z*acM!u5MFT#>JMHyd*MmVh~J{AHO$tb#@{W8rQiA7UChXFJt6fODAZ7|M;i= z9%_C!l<%g(`OPq!PHP{G&o+tinJZ&ZmwH0%^Scc7<=Z32XeU0zFS+Olr>?YxGe?u; z8!0*c@|z}qXS1fsrOiHxzjdiYAGQ_6x^+K9PxqhncU;PYqoW9qj3G2Ks@IzR@lXiS zv2j?VAy|P*J2w7be-ejlz&8Dpn3J?AleRg}f`u~bEM~)T=1ro1vn}|TBfrf?#>X|W X9S#Qd-3EW(a-3sq)1JJuqXYi|&dDS} diff --git a/baseq3r/scripts/custinfoparms.txt b/baseq3r/scripts/custinfoparms.txt index 42742d79..80136e15 100644 --- a/baseq3r/scripts/custinfoparms.txt +++ b/baseq3r/scripts/custinfoparms.txt @@ -7,12 +7,12 @@ //custom SURF_ flags { - grass 0x80000 - asphalt 0x100000 - wet 0x200000 - snow 0x400000 - gravel 0x800000 - ice 0x1000000 - dirt 0x2000000 + SURF_GRASS 0x80000 + SURF_ASPHALT 0x100000 + SURF_WET 0x200000 + SURF_SNOW 0x400000 + SURF_GRAVEL 0x800000 + SURF_ICE 0x1000000 + SURF_DIRT 0x2000000 } diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index 1f9df116..20862f3e 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.0.1.3_r242" +#define PRODUCT_VERSION "v0.0.1.4_r245" #endif diff --git a/engine/code/qcommon/surfaceflags.h b/engine/code/qcommon/surfaceflags.h index 173c9ca4..5d9f7280 100644 --- a/engine/code/qcommon/surfaceflags.h +++ b/engine/code/qcommon/surfaceflags.h @@ -83,9 +83,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // STONELANCE #define SURF_GRASS 0x80000 #define SURF_ASPHALT 0x100000 -#define SURF_WET 0x200000 -#define SURF_SNOW 0x400000 +#define SURF_WET 0x200000 +#define SURF_SNOW 0x400000 #define SURF_GRAVEL 0x800000 -#define SURF_ICE 0x1000000 -#define SURF_DIRT 0x2000000 +#define SURF_ICE 0x1000000 +#define SURF_DIRT 0x2000000 +#define SURF_METAL 0x4000000 // END + diff --git a/q3rallycode.ppr b/q3rallycode.ppr index b0a35f75..e3a7bba5 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -16,7 +16,7 @@ HTServer=localhost [Project tree] q3rallycode +engine - +code + -code -AL engine\code\AL\al.h engine\code\AL\alc.h @@ -486,7 +486,7 @@ q3rallycode engine\code\q3_ui\ui_team.c engine\code\q3_ui\ui_teamorders.c engine\code\q3_ui\ui_video.c - +qcommon + -qcommon engine\code\qcommon\cm_load.c engine\code\qcommon\cm_local.h engine\code\qcommon\cm_patch.c @@ -860,12 +860,24 @@ q3rallycode [Open project files] 0=engine\code\qcommon\files.c 1=engine\code\qcommon\q_shared.h +2=engine\Makefile +3=engine\code\cgame\cg_players.c +4=engine\code\qcommon\surfaceflags.h [Selected Project Files] Main= Selected=engine\code\qcommon\q_shared.h [engine\code\qcommon\files.c] -TopLine=194 +TopLine=184 Caret=3,211 [engine\code\qcommon\q_shared.h] TopLine=49 -Caret=34,70 +Caret=39,70 +[engine\Makefile] +TopLine=99 +Caret=17,114 +[engine\code\cgame\cg_players.c] +TopLine=2747 +Caret=1,2762 +[engine\code\qcommon\surfaceflags.h] +TopLine=69 +Caret=1,93