Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
040faa4c1c | ||
|
|
640934634d | ||
|
|
9842815557 | ||
|
|
4d19769dd0 | ||
|
|
dd75012982 | ||
|
|
9d48ac5bad | ||
|
|
0dc8f320a9 | ||
|
|
c9e96949a3 | ||
|
|
2d70bd0c73 | ||
|
|
3949add6af | ||
|
|
b87eeaa873 | ||
|
|
b56402a0a9 | ||
|
|
b1a47f164e | ||
|
|
7fa0820a93 | ||
|
|
f2ad6199bf | ||
|
|
14f0e70a9b | ||
|
|
58147117be | ||
|
|
5c4e00694a | ||
|
|
8d123f5e83 | ||
|
|
d78fb05be0 | ||
|
|
b9124e717d | ||
|
|
84c2721d8b | ||
|
|
1569ec7a8b | ||
|
|
f741c3ff17 | ||
|
|
ff31eb7d17 | ||
|
|
52b5db7ad0 | ||
|
|
f10608ea2c | ||
|
|
364eb1b0c8 | ||
|
|
0e2d793a7a | ||
|
|
9b8c569c9e | ||
|
|
9402a006f4 | ||
|
|
6aae3d5f90 | ||
|
|
b5cdc0ca94 | ||
|
|
28c0339261 | ||
|
|
d7cb89a232 | ||
|
|
98b132fcc4 | ||
|
|
37377a42e6 | ||
|
|
088f1800ff | ||
|
|
a96fb7d247 | ||
|
|
ca30725f8d | ||
|
|
6d8337dbad | ||
|
|
6a8360ab46 | ||
|
|
ddeb438a29 | ||
|
|
11fdaf1515 | ||
|
|
7c68d50548 | ||
|
|
c81a434f0b | ||
|
|
c88f3dc302 | ||
|
|
ffb22a954f | ||
|
|
31f9937d7e | ||
|
|
1abdc6c747 | ||
|
|
122cb918a1 | ||
|
|
a92f05b864 | ||
|
|
a457bc4187 | ||
|
|
bb5b888aef | ||
|
|
2797fa9a05 | ||
|
|
7d5c63d8ee | ||
|
|
39b70b3686 | ||
|
|
34933fdf82 | ||
|
|
ccb2c4ef18 | ||
|
|
ea5ac63e0f | ||
|
|
de04223443 | ||
|
|
20467bdc1e | ||
|
|
fc458128cf | ||
|
|
e57ad13004 | ||
|
|
88e8c0541b | ||
|
|
2a3a63ca28 | ||
|
|
c2ddac2c1e | ||
|
|
9de9b72940 | ||
|
|
4cb3b5bc0d | ||
|
|
dc190be6b3 | ||
|
|
0373b19269 | ||
|
|
3610096c35 | ||
|
|
2b75d0b26b | ||
|
|
a27dc33e25 | ||
|
|
3718c5bd51 | ||
|
|
a256e170ab | ||
|
|
2009ed38f0 | ||
|
|
7599d9ddd4 | ||
|
|
0907c219af | ||
|
|
0ae1f2606f | ||
|
|
2abb65403f | ||
|
|
223e858d00 | ||
|
|
2769847c90 | ||
|
|
0fc3d9d4d6 | ||
|
|
d6702be08b | ||
|
|
d41c7bedd8 | ||
|
|
d0f9993385 | ||
|
|
caf05f5923 | ||
|
|
cc996759be | ||
|
|
51de2a4610 | ||
|
|
e15c9558fa | ||
|
|
29edb49861 | ||
|
|
7ce3d0c733 | ||
|
|
fb8cdbb9cc | ||
|
|
882554a3fe | ||
|
|
40a8554cc9 | ||
|
|
146a80e91c | ||
|
|
b533dbee55 | ||
|
|
3ede4eb1a6 | ||
|
|
5813c2b3c3 | ||
|
|
2b1dc82bfa | ||
|
|
0b59c156a0 | ||
|
|
03fb7fd145 | ||
|
|
f99e516e63 | ||
|
|
f62642f855 | ||
|
|
3adad0ed18 | ||
|
|
429976faf8 | ||
|
|
1d40c26fd9 | ||
|
|
4c730ec84d | ||
|
|
2d25fabe64 | ||
|
|
095ec063fb | ||
|
|
ab8d3e2642 | ||
|
|
cbd59a04f6 | ||
|
|
e49e6b8998 | ||
|
|
02cd4e753d | ||
|
|
d06f923066 | ||
|
|
bb9f7c8196 | ||
|
|
bf2c786a02 | ||
|
|
7d66da2b94 | ||
|
|
f346f075ee | ||
|
|
38c612a752 | ||
|
|
d77ccd0dfc | ||
|
|
7ba146b4ff | ||
|
|
cf8ef69fed | ||
|
|
2f5b894c47 | ||
|
|
e248b85380 | ||
|
|
84cc8d10a7 | ||
|
|
0b4e70faf3 | ||
|
|
78018e1f78 | ||
|
|
7a2f925078 | ||
|
|
ec1123251f | ||
|
|
cc408cc859 | ||
|
|
16f8299c4a | ||
|
|
10953dbb3a | ||
|
|
49aaa25255 | ||
|
|
ccbb894a6b | ||
|
|
54542031a1 | ||
|
|
ff04b83ec0 | ||
|
|
b03faeff25 | ||
|
|
d1becfcf0c | ||
|
|
3c078c6676 | ||
|
|
4e6dc92033 | ||
|
|
8d607594ff | ||
|
|
71486a4982 | ||
|
|
9ae1f20735 | ||
|
|
53febafd50 | ||
|
|
7f7ea2c592 | ||
|
|
dc1dfe0d4d | ||
|
|
48e3c14d30 | ||
|
|
16b3687774 | ||
|
|
cf101ccc5d | ||
|
|
d04a6ad5ee | ||
|
|
840c7ea154 | ||
|
|
268300913d | ||
|
|
7a4ef35e7b | ||
|
|
84140f3faa | ||
|
|
673a03e033 | ||
|
|
32d4a38b9e | ||
|
|
7cc4d1f601 | ||
|
|
25e60a9882 | ||
|
|
79582ce73d | ||
|
|
3526a52827 | ||
|
|
4b8bc46358 | ||
|
|
ddd6488b55 | ||
|
|
dfccca4026 | ||
|
|
d33c1e83de | ||
|
|
2ffc7293af | ||
|
|
fde184b7a7 | ||
|
|
7163194ce9 | ||
|
|
ec97111d26 | ||
|
|
6d24d5a44a | ||
|
|
3700dc3bae | ||
|
|
6114bdd9dc | ||
|
|
2fe912eebf | ||
|
|
ccf6840cd5 | ||
|
|
955c7f0cfb | ||
|
|
994fd6354f | ||
|
|
30602a8eb7 | ||
|
|
2290c1955b | ||
|
|
f167db0cc6 | ||
|
|
42e04ce981 | ||
|
|
41cf467f2a | ||
|
|
2ca7c8178f | ||
|
|
c4d8de471e | ||
|
|
2a49236914 | ||
|
|
fcf0836e7b | ||
|
|
284845aad6 | ||
|
|
44b2937ea1 | ||
|
|
00c20f7c8c | ||
|
|
e74a28a2c1 | ||
|
|
91ed5c4871 | ||
|
|
7ca88fb131 | ||
|
|
76047e75d5 | ||
|
|
25b5e5f510 | ||
|
|
4377a6d7fe | ||
|
|
5cfe9a4c4e | ||
|
|
b5f90ab5b9 | ||
|
|
badf395dad | ||
|
|
1e13abea19 | ||
|
|
ca08c7b6e4 | ||
|
|
d427cd60b2 | ||
|
|
f29240f3e8 | ||
|
|
6196185d62 | ||
|
|
ba825cf688 | ||
|
|
cbbc356386 | ||
|
|
62cc95da95 | ||
|
|
48ae18cede | ||
|
|
cd804c5984 | ||
|
|
c338453ce9 | ||
|
|
6d5d1a1339 | ||
|
|
953e1734b4 | ||
|
|
cc01c576a3 | ||
|
|
018bac2be6 | ||
|
|
c01bc39659 | ||
|
|
5d49fd9411 | ||
|
|
23775b6ec0 | ||
|
|
b8ada40a72 | ||
|
|
58c72ab345 | ||
|
|
143dc55f90 | ||
|
|
227664bd12 | ||
|
|
3ee2e47724 | ||
|
|
4aa4e235a5 | ||
|
|
76521ec0dd | ||
|
|
dfae95c7a3 | ||
|
|
7a31dffcdc | ||
|
|
0f27f573f6 | ||
|
|
67d2673dc0 | ||
|
|
c36564df1e | ||
|
|
4ed6066e97 | ||
|
|
4e7a5d1b89 | ||
|
|
c70ef22141 | ||
|
|
d15f69dfcd | ||
|
|
27734387c0 | ||
|
|
b05eb4d848 | ||
|
|
5e079a3990 | ||
|
|
39964e995d | ||
|
|
8d80118a72 | ||
|
|
5a163be5e8 | ||
|
|
429d8620e1 | ||
|
|
5c54f7dc7a | ||
|
|
153ae53f8c | ||
|
|
95e54e97e5 | ||
|
|
949bbebf7b | ||
|
|
ef1eea5ba8 | ||
|
|
d3ea2eb287 | ||
|
|
383b395c78 | ||
|
|
cb03260e43 | ||
|
|
e8a92dd836 | ||
|
|
a6296445da | ||
|
|
2658003a1a | ||
|
|
54c6196412 | ||
|
|
4b3989f18c | ||
|
|
3b41873893 | ||
|
|
a211badb73 | ||
|
|
262a07ea9a | ||
|
|
ef323c66c7 | ||
|
|
74c8b05469 | ||
|
|
8028c285ff | ||
|
|
966b273ecd | ||
|
|
bf2eecf9a4 | ||
|
|
84d9665467 | ||
|
|
df60b9ceee | ||
|
|
37459d3d09 | ||
|
|
3e0cc1bb48 | ||
|
|
ae5cf2116f | ||
|
|
6c1426f1f3 | ||
|
|
067ebba4d4 | ||
|
|
dc16f8b4a6 | ||
|
|
9ed348c8a8 | ||
|
|
3ccf44a0be | ||
|
|
ee2bc85fe7 | ||
|
|
9b3bfaabad | ||
|
|
3f8a227769 | ||
|
|
7993df1be7 | ||
|
|
f2b0b8359e | ||
|
|
7d7c053fc1 | ||
|
|
25398af8f5 | ||
|
|
c98971953c | ||
|
|
d9739755ce | ||
|
|
895bd2da15 | ||
|
|
8950e31f4c | ||
|
|
601928f49f | ||
|
|
773e243c88 | ||
|
|
311f3a6cf4 | ||
|
|
fed1b23b8b | ||
|
|
5c2d8f6901 | ||
|
|
68b88e40b5 | ||
|
|
6f3770a54a | ||
|
|
eaf2506b4f | ||
|
|
2cec4c8b52 | ||
|
|
7ebccc19db | ||
|
|
797d080df0 | ||
|
|
7c6b03145d | ||
|
|
7b136a62c4 | ||
|
|
fec433372d | ||
|
|
41a827727d | ||
|
|
bfd0f0c7c2 | ||
|
|
21c9ae8f7e | ||
|
|
581b503edf | ||
|
|
d380391d80 | ||
|
|
ff41393edd | ||
|
|
654784690e | ||
|
|
cd682e3961 | ||
|
|
cd4482dd97 | ||
|
|
6eb96a4992 | ||
|
|
3c3c59928d | ||
|
|
01911e4d37 | ||
|
|
37c65ca7e4 | ||
|
|
cb4ffe6f60 | ||
|
|
98f8b49e45 | ||
|
|
bf6be522ea | ||
|
|
2365ee9cb0 | ||
|
|
16c70e7b29 | ||
|
|
46f0385566 | ||
|
|
579c5ab052 | ||
|
|
94e7430dd9 | ||
|
|
7fea4894a2 | ||
|
|
a5b99199fc | ||
|
|
79e2596ce6 | ||
|
|
1b82918384 | ||
|
|
4e9e18df82 | ||
|
|
cec92474d2 | ||
|
|
d8f3dca2fc | ||
|
|
89576adbcf | ||
|
|
d9b8bd0b8c | ||
|
|
525f1b317c | ||
|
|
ac119f9d42 | ||
|
|
a18af5b3e0 | ||
|
|
ae87cdc8d9 | ||
|
|
f2f324c487 | ||
|
|
8cd848e44d | ||
|
|
d83842df55 | ||
|
|
0a0567c311 | ||
|
|
1c067d7eec | ||
|
|
1b5c155dda | ||
|
|
8065761c38 | ||
|
|
118bb5b107 | ||
|
|
d1db73342a | ||
|
|
f3e8630049 | ||
|
|
17b1369085 | ||
|
|
497b7e983e | ||
|
|
e8e24be6e1 | ||
|
|
52e2c2bc17 | ||
|
|
d5d3445fae | ||
|
|
f22fcbc31c | ||
|
|
275f2f7c28 | ||
|
|
b96663ffb8 | ||
|
|
939aedd384 | ||
|
|
b3509e46dd | ||
|
|
869ddb0b35 | ||
|
|
466ab2883b | ||
|
|
544c471a9c | ||
|
|
b3c1111cd3 | ||
|
|
2fa79155de | ||
|
|
8af91b8c9b | ||
|
|
7dae68561e | ||
|
|
c5476ff8f9 | ||
|
|
2071684fec | ||
|
|
50cde90736 | ||
|
|
b00538a123 | ||
|
|
1f900c4c75 | ||
|
|
72890d6ed4 | ||
|
|
1a13e70b37 | ||
|
|
21dcd757b5 | ||
|
|
817c4a4042 | ||
|
|
ea2281355a | ||
|
|
643c7a851d | ||
|
|
3d56f3f212 | ||
|
|
f086d9a698 | ||
|
|
e4cd3f8bb7 | ||
|
|
4647fd80b9 | ||
|
|
2ce9803257 | ||
|
|
90623359c7 | ||
|
|
8ecf4f26a7 | ||
|
|
b5c525a990 | ||
|
|
09fcff21ed | ||
|
|
eb229e1844 | ||
|
|
22bdf442d4 | ||
|
|
f92a7582c6 | ||
|
|
d158eae377 | ||
|
|
67c67ec1b0 | ||
|
|
6f998f922b | ||
|
|
859c0181a1 | ||
|
|
6a8bfb0da2 | ||
|
|
26fae628da | ||
|
|
7ce18078f0 | ||
|
|
c9289dec5a | ||
|
|
2ba311705f | ||
|
|
5201ccd6d2 | ||
|
|
74a6f76621 | ||
|
|
1702cc249d | ||
|
|
0fbe87a481 | ||
|
|
ad3a5e9329 | ||
|
|
2a3acc7286 | ||
|
|
e7fc777e57 | ||
|
|
5cd4b79ecf | ||
|
|
1af9e362e0 | ||
|
|
9c35e61f6c | ||
|
|
e2a1147eea | ||
|
|
503629024a | ||
|
|
1fa7eb24ac | ||
|
|
ac211aabe8 | ||
|
|
e9e501bb10 | ||
|
|
1bc674d73f | ||
|
|
10a724a048 | ||
|
|
7a780bf898 | ||
|
|
b9d6d510be | ||
|
|
5d98bde04c | ||
|
|
1059a7ca5e | ||
|
|
05173de41f | ||
|
|
ec1cd5f933 | ||
|
|
074be933ad | ||
|
|
41229be341 | ||
|
|
1336848f1d | ||
|
|
e10ed14a3c | ||
|
|
dc0e67515b | ||
|
|
6544851ba5 | ||
|
|
02fab76406 | ||
|
|
acb139a8c6 | ||
|
|
82fe3e5362 | ||
|
|
26b28f9b4d | ||
|
|
689f5add60 | ||
|
|
c444d4180e | ||
|
|
c4312e3f2f | ||
|
|
50526d2728 | ||
|
|
04edcd03f2 | ||
|
|
09cb8779e4 | ||
|
|
d86eec52ae | ||
|
|
e6a1e58405 | ||
|
|
ea10c9ac13 | ||
|
|
e6d3f3f27c | ||
|
|
f713b7fb60 | ||
|
|
c35a542d60 | ||
|
|
e6c699faf4 | ||
|
|
f626b4b031 | ||
|
|
aed81c0ff5 | ||
|
|
1354f2f302 | ||
|
|
8ea5d0f729 | ||
|
|
a4f5f3b7dc | ||
|
|
ab93865255 | ||
|
|
1ecdd3dae6 | ||
|
|
ddcd6b0d31 | ||
|
|
5196f1c5b9 | ||
|
|
e4afbc93fe | ||
|
|
ec62d20a7c | ||
|
|
9dd6ec718f | ||
|
|
69237d6a3a | ||
|
|
426cbee752 | ||
|
|
d8ed0681ab | ||
|
|
c2f3486e6d | ||
|
|
784093603e | ||
|
|
e4a575cc5e | ||
|
|
f00c9d8c23 | ||
|
|
9440a22e88 | ||
|
|
f70f7152ab | ||
|
|
8c7f35fa29 | ||
|
|
fe74e69da6 | ||
|
|
c170f53948 | ||
|
|
13fd825bcf | ||
|
|
8ee4fc2fa1 | ||
|
|
679a8387c9 | ||
|
|
00f3805721 | ||
|
|
ab2194e053 | ||
|
|
9044a46b31 | ||
|
|
53d76ea037 | ||
|
|
f3a28c83d8 | ||
|
|
b1e2986f65 | ||
|
|
267b53a90e | ||
|
|
e1b41d2c58 | ||
|
|
3204095afb | ||
|
|
538de7d2d2 | ||
|
|
2cba586d9c | ||
|
|
ad4d587a52 | ||
|
|
a929636a28 | ||
|
|
06a2508a9c | ||
|
|
64b2e2ee37 | ||
|
|
b6ef6eb801 | ||
|
|
b4d48cc9ec | ||
|
|
f83a937dc5 | ||
|
|
e2acb4c3fc | ||
|
|
5bf722a1fb | ||
|
|
0751484439 | ||
|
|
e5b16c7aa0 | ||
|
|
bac058d128 | ||
|
|
dd4a9ae890 | ||
|
|
f91687209b | ||
|
|
ec4140a9d2 | ||
|
|
2553c9e878 | ||
|
|
f9f33aa53a | ||
|
|
4455ebe58f | ||
|
|
35cfdea9e7 | ||
|
|
346433d248 | ||
|
|
16a7e69292 | ||
|
|
441824fc70 | ||
|
|
f46b77ab7b | ||
|
|
561af0e601 | ||
|
|
362c21505d | ||
|
|
d3d40de996 | ||
|
|
3ce4653bb5 | ||
|
|
a639c87a90 | ||
|
|
3aac16432a | ||
|
|
1c9ea1eb2e | ||
|
|
a47aea4c9f | ||
|
|
c31e7ff2b3 | ||
|
|
9cd0e6c385 | ||
|
|
c23a0f08c4 | ||
|
|
3ff865b1b6 | ||
|
|
cdedf1349c | ||
|
|
7beab3b582 | ||
|
|
b1b592f88d | ||
|
|
8737a40a4d | ||
|
|
71ce5be570 | ||
|
|
b883d02abb | ||
|
|
09f79a6934 | ||
|
|
9bdcfe9750 | ||
|
|
b767180473 | ||
|
|
acb5d96788 | ||
|
|
228a932598 | ||
|
|
b53cc6fd2b | ||
|
|
01cd8f5a0f | ||
|
|
9732e74bf3 | ||
|
|
2ed4a7b548 | ||
|
|
52c11d1444 | ||
|
|
78d50e4c43 | ||
|
|
7f05d27f42 | ||
|
|
3675fdd361 | ||
|
|
98dfe528d8 | ||
|
|
7da590df94 | ||
|
|
90cc5a6cb0 | ||
|
|
ca9277366c | ||
|
|
e79bf24bcd | ||
|
|
2c1201ff34 | ||
|
|
c4ff1a3aca | ||
|
|
5760f25c74 | ||
|
|
0a6f700c6f | ||
|
|
3147dfb012 | ||
|
|
5007a33bbf | ||
|
|
c65acfa90e | ||
|
|
b167c19137 | ||
|
|
d48b08856e | ||
|
|
9ba5c9a38b | ||
|
|
1a9f30a328 | ||
|
|
97058bfcf6 | ||
|
|
bd41bbb304 | ||
|
|
f47cb885cc | ||
|
|
1ab243d93a | ||
|
|
15d59cbbd8 | ||
|
|
c88d2dadb0 | ||
|
|
a4e96d2380 | ||
|
|
002c550263 | ||
|
|
25b9bc4100 | ||
|
|
7105606475 | ||
|
|
71e4005226 | ||
|
|
76b66b41b6 | ||
|
|
43e1331594 | ||
|
|
23ba3d493b | ||
|
|
487cbc495a | ||
|
|
faeb4d22ed | ||
|
|
9dc2ad4f32 | ||
|
|
ceae12baba | ||
|
|
58c58e9542 | ||
|
|
46c7bf8b03 | ||
|
|
c011d09e33 | ||
|
|
65fadcf709 | ||
|
|
e2b06aa600 | ||
|
|
7ab0a808a9 | ||
|
|
bc7ce5c983 | ||
|
|
6e55d88816 | ||
|
|
97f0ea1b0f | ||
|
|
684b016487 | ||
|
|
0b55e8df7b | ||
|
|
f9880e8413 | ||
|
|
c499a8387e |
No files matched your search
@@ -43,7 +43,7 @@ jobs:
|
|||||||
- v1-SRB2-APT
|
- v1-SRB2-APT
|
||||||
- run:
|
- run:
|
||||||
name: Install SDK
|
name: Install SDK
|
||||||
command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
|
command: apt-get -qq -y --no-install-recommends install git build-essential libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: v1-SRB2-APT
|
key: v1-SRB2-APT
|
||||||
paths:
|
paths:
|
||||||
|
|||||||
@@ -16,3 +16,5 @@
|
|||||||
#Appveyor
|
#Appveyor
|
||||||
/appveyor.yml -crlf -whitespace
|
/appveyor.yml -crlf -whitespace
|
||||||
# Other
|
# Other
|
||||||
|
*.c text=auto
|
||||||
|
*.h text=auto
|
||||||
+436
@@ -0,0 +1,436 @@
|
|||||||
|
default:
|
||||||
|
image: debian:stable-slim
|
||||||
|
|
||||||
|
stages: # List of stages for jobs, and their order of execution
|
||||||
|
- build
|
||||||
|
|
||||||
|
variables:
|
||||||
|
GIT_STRATEGY: clone
|
||||||
|
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
|
||||||
|
|
||||||
|
.job_template: &job_build # This job runs in the build stage, which runs first.
|
||||||
|
|
||||||
|
stage: build
|
||||||
|
|
||||||
|
cache:
|
||||||
|
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
|
||||||
|
fallback_keys:
|
||||||
|
- cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH
|
||||||
|
- cache-$CI_PROJECT_PATH_SLUG-default
|
||||||
|
paths:
|
||||||
|
- ccache
|
||||||
|
- ccache_statslog
|
||||||
|
|
||||||
|
- key: apt-$CI_JOB_IMAGE
|
||||||
|
paths:
|
||||||
|
- apt-cache
|
||||||
|
unprotect: true
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- - |
|
||||||
|
# debconf
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
|
||||||
|
- export DEBIAN_FRONTEND="noninteractive"
|
||||||
|
- export DEBIAN_PRIORITY="low"
|
||||||
|
- export DEBCONF_NONINTERACTIVE_SEEN="true"
|
||||||
|
- |
|
||||||
|
# debconf
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
|
||||||
|
- - |
|
||||||
|
# dpkg_aa
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
|
||||||
|
- dpkg --add-architecture i386
|
||||||
|
- dpkg --add-architecture amd64
|
||||||
|
- dpkg --add-architecture arm64
|
||||||
|
- |
|
||||||
|
# dpkg_aa
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
|
||||||
|
- - |
|
||||||
|
# apt_conf
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
|
||||||
|
- export APT_CACHE_DIR=`pwd`/apt-cache
|
||||||
|
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
|
||||||
|
- touch /etc/apt/apt.conf.d/99build
|
||||||
|
- |
|
||||||
|
# apt.conf
|
||||||
|
echo Adding options to apt.conf':'
|
||||||
|
- |
|
||||||
|
# APT::Install-Recommends
|
||||||
|
echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
|
||||||
|
- |
|
||||||
|
# quit
|
||||||
|
echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
|
||||||
|
- |
|
||||||
|
# APT::Get::Assume-Yes
|
||||||
|
echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
|
||||||
|
- |
|
||||||
|
# Dir::Cache::Archives
|
||||||
|
echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
|
||||||
|
- |
|
||||||
|
# apt_conf
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
|
||||||
|
- - |
|
||||||
|
# apt_update
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
|
||||||
|
- apt-get update
|
||||||
|
- |
|
||||||
|
# apt_update
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# apt_pre
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
|
||||||
|
- apt-get install apt-utils
|
||||||
|
- |
|
||||||
|
# apt_pre
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# apt_upgrade
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
|
||||||
|
- apt-get upgrade
|
||||||
|
- |
|
||||||
|
# apt_update
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_upgrade\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# apt_common
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
|
||||||
|
- apt-get install make git ccache
|
||||||
|
- |
|
||||||
|
# apt_common
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# ccache_config
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
|
||||||
|
- mkdir --parents --verbose ~/.ccache/
|
||||||
|
- touch ~/.ccache/ccache.conf
|
||||||
|
- |
|
||||||
|
# cache.conf
|
||||||
|
echo Adding ccache configution option
|
||||||
|
- |
|
||||||
|
# base_dir
|
||||||
|
echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
|
||||||
|
- |
|
||||||
|
# cache_dir
|
||||||
|
echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
|
||||||
|
- |
|
||||||
|
# compiler_check
|
||||||
|
echo compiler_check = content | tee --append ~/.ccache/ccache.conf
|
||||||
|
- |
|
||||||
|
# stats_log
|
||||||
|
echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
|
||||||
|
- |
|
||||||
|
# max_size
|
||||||
|
echo max_size = 50M | tee --append ~/.ccache/ccache.conf
|
||||||
|
- |
|
||||||
|
# ccache_config
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# cache_reset
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
|
||||||
|
- ccache --zero-stats
|
||||||
|
- ccache --show-stats
|
||||||
|
- |
|
||||||
|
# ccache_reset
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
|
||||||
|
|
||||||
|
after_script:
|
||||||
|
- - |
|
||||||
|
# apt_clean
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
|
||||||
|
- apt-get autoclean
|
||||||
|
- |
|
||||||
|
# apt_clean
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# ccache_stats
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
|
||||||
|
- ccache --show-stats --verbose
|
||||||
|
- ccache --show-log-stats --verbose
|
||||||
|
- |
|
||||||
|
# ccahe_stats
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
|
||||||
|
|
||||||
|
Debian testing GCC:
|
||||||
|
<<: *job_build
|
||||||
|
image: debian:testing-slim
|
||||||
|
|
||||||
|
allow_failure: true
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- "bin/"
|
||||||
|
- "src/comptime.h"
|
||||||
|
expose_as: "Debian GCC testing"
|
||||||
|
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-gcc"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
CC: gcc
|
||||||
|
|
||||||
|
script:
|
||||||
|
- - |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
|
||||||
|
- apt-get install gcc
|
||||||
|
- |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
|
||||||
|
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
|
||||||
|
- |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
|
||||||
|
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
|
||||||
|
- |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||||
|
|
||||||
|
Windows x86:
|
||||||
|
<<: *job_build
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- "bin/"
|
||||||
|
- "src/comptime.h"
|
||||||
|
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
PREFIX: i686-w64-mingw32
|
||||||
|
|
||||||
|
script:
|
||||||
|
- - |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
|
||||||
|
- apt-get install gcc-mingw-w64-i686-win32
|
||||||
|
- |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
|
||||||
|
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 SDL=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 SDL=1
|
||||||
|
- |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||||
|
|
||||||
|
Debian stable:amd64:
|
||||||
|
<<: *job_build
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- "bin/"
|
||||||
|
- "src/comptime.h"
|
||||||
|
expose_as: "Debian amd64"
|
||||||
|
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
CC: x86_64-linux-gnu-gcc
|
||||||
|
OBJCOPY: x86_64-linux-gnu-objcopy
|
||||||
|
OBJDUMP: x86_64-linux-gnu-objdump
|
||||||
|
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
|
||||||
|
|
||||||
|
script:
|
||||||
|
- - |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
|
||||||
|
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
|
||||||
|
- |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
|
||||||
|
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
|
||||||
|
- |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
|
||||||
|
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
|
||||||
|
- |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||||
|
|
||||||
|
Debian stable:i386:
|
||||||
|
<<: *job_build
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- "bin/"
|
||||||
|
- "src/comptime.h"
|
||||||
|
expose_as: "Debian i386"
|
||||||
|
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
CC: i686-linux-gnu-gcc
|
||||||
|
OBJCOPY: i686-linux-gnu-objcopy
|
||||||
|
OBJDUMP: i686-linux-gnu-objdump
|
||||||
|
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
|
||||||
|
|
||||||
|
script:
|
||||||
|
- - |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
|
||||||
|
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
|
||||||
|
- |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
|
||||||
|
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
|
||||||
|
- |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
|
||||||
|
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
|
||||||
|
- |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||||
|
|
||||||
|
Debian stable:arm64:
|
||||||
|
<<: *job_build
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- "bin/"
|
||||||
|
- "src/comptime.h"
|
||||||
|
expose_as: "Debian arm64"
|
||||||
|
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
CC: aarch64-linux-gnu-gcc
|
||||||
|
OBJCOPY: aarch64-linux-gnu-objcopy
|
||||||
|
OBJDUMP: aarch64-linux-gnu-objdump
|
||||||
|
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
|
||||||
|
|
||||||
|
script:
|
||||||
|
- - |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
|
||||||
|
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
|
||||||
|
- |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
|
||||||
|
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
|
||||||
|
- |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
|
||||||
|
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
|
||||||
|
- |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||||
|
|
||||||
|
Windows x64:
|
||||||
|
<<: *job_build
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- "bin/"
|
||||||
|
- "src/comptime.h"
|
||||||
|
expose_as: "Win64"
|
||||||
|
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
PREFIX: x86_64-w64-mingw32
|
||||||
|
|
||||||
|
script:
|
||||||
|
- - |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
|
||||||
|
- apt-get install gcc-mingw-w64-x86-64-win32
|
||||||
|
- |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
|
||||||
|
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 SDL=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 SDL=1
|
||||||
|
- |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||||
|
|
||||||
|
Debian stable Clang:
|
||||||
|
<<: *job_build
|
||||||
|
|
||||||
|
allow_failure: true
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- "bin/"
|
||||||
|
- "src/comptime.h"
|
||||||
|
expose_as: "Debian Clang"
|
||||||
|
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
CC: clang
|
||||||
|
WFLAGS: -Wno-cast-align
|
||||||
|
|
||||||
|
script:
|
||||||
|
- - |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
|
||||||
|
- apt-get install clang
|
||||||
|
- |
|
||||||
|
# apt_toolchain
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
|
||||||
|
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
|
||||||
|
- |
|
||||||
|
# apt_development
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
|
||||||
|
|
||||||
|
- - |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
|
||||||
|
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
|
||||||
|
- |
|
||||||
|
# make
|
||||||
|
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||||
|
|
||||||
|
Debian testing Clang:
|
||||||
|
extends: Debian stable Clang
|
||||||
|
|
||||||
|
image: debian:testing-slim
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- "bin/"
|
||||||
|
- "src/comptime.h"
|
||||||
|
expose_as: "Debina Clang testing"
|
||||||
|
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-clang"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
CC: clang
|
||||||
|
WFLAGS: -Wno-cast-align -Wno-deprecated-non-prototype
|
||||||
@@ -109,13 +109,10 @@ FILE_PATTERNS = *.c \
|
|||||||
*.mm \
|
*.mm \
|
||||||
*.dox
|
*.dox
|
||||||
RECURSIVE = YES
|
RECURSIVE = YES
|
||||||
EXCLUDE = ./src/djgppdos/internal.h \
|
EXCLUDE = ./src/sdl/IMG_xpm.c \
|
||||||
./src/djgppdos/setup.c \
|
|
||||||
./src/sdl/IMG_xpm.c \
|
|
||||||
./src/sdl/SRB2DC/scramble.c
|
./src/sdl/SRB2DC/scramble.c
|
||||||
EXCLUDE_SYMLINKS = NO
|
EXCLUDE_SYMLINKS = NO
|
||||||
EXCLUDE_PATTERNS = */src/hardware/*/* \
|
EXCLUDE_PATTERNS = */src/hardware/*/* \
|
||||||
*/src/djgppdos/bcd.? \
|
|
||||||
*/src/sdl/SDL_main/* \
|
*/src/sdl/SDL_main/* \
|
||||||
*/src/*/*_private.h \
|
*/src/*/*_private.h \
|
||||||
*/src/sdl/*/*help.? \
|
*/src/sdl/*/*help.? \
|
||||||
|
|||||||
+39
@@ -0,0 +1,39 @@
|
|||||||
|
# SRB2Kart Saturn: Custom lua features
|
||||||
|
|
||||||
|
## mobj.localskin and player.localskin fields
|
||||||
|
|
||||||
|
Allow reading and assigning localskins to players. Local skins for other objects aren't supported currently.
|
||||||
|
|
||||||
|
## mobj.rollsum field
|
||||||
|
|
||||||
|
**Not netsafe**. Returns total sprite rotation value, taking sliptideroll and sloperoll cvars value into account.
|
||||||
|
Mainly for use in visual-only addons like secondcolor.
|
||||||
|
|
||||||
|
## player.sliproll field
|
||||||
|
|
||||||
|
**Not netsafe**. Returns player's current sliptide roll angle, taking sliptideroll cvar value into account.
|
||||||
|
|
||||||
|
## hud.setVoteBackground(name)
|
||||||
|
|
||||||
|
Changes vote background texture prefix (game looks for PREFIX + "W" or "C" (depends on resolution) + FRAME\_NUMBER).
|
||||||
|
|
||||||
|
## hud.add(fn, "vote") and hud.add(fn, "intermission")
|
||||||
|
|
||||||
|
Hud hooks for vote screen and intermission screen. They only get drawer (`v`) as argument.
|
||||||
|
To check if those hooks are available, check if globals FEATURE\_VOTEHUD and FEATURE\_INERMISSIONHUD
|
||||||
|
exist.
|
||||||
|
|
||||||
|
## mobj.spritexscale, mobj.spriteyscale, mobj.spritexoffset, mobj.spriteyoffset, mobj.rollangle, mobj.sloperoll, mobj.rollmodel fields
|
||||||
|
|
||||||
|
Same fields as in SRB2 2.2
|
||||||
|
|
||||||
|
## S\_StopSoundByNum
|
||||||
|
|
||||||
|
Allows stopping specific sound globally. Because this function starts with S\_, like state, checking
|
||||||
|
if it exists is a bit more complicated:
|
||||||
|
|
||||||
|
```lua
|
||||||
|
if rawget(_G, "S_StopSoundByNum") ~= nil then
|
||||||
|
... -- Can use it
|
||||||
|
end
|
||||||
|
```
|
||||||
@@ -6,51 +6,74 @@
|
|||||||
|
|
||||||
- Sprites player rotation on slopes; going on hills, levitate, going down, and so on alters your sprites (configurable)
|
- Sprites player rotation on slopes; going on hills, levitate, going down, and so on alters your sprites (configurable)
|
||||||
- You can alter all the base kart HUD element offsets on the fly in the Saturn Options settings menu
|
- You can alter all the base kart HUD element offsets on the fly in the Saturn Options settings menu
|
||||||
- "addfilelocal" Command, for those who want to use things like their custom hud in netgames (Same as addfile but completely client sided)
|
- `addfilelocal` Command, for those who want to use things like their custom hud in netgames (Same as addfile but completely client sided)
|
||||||
- OpenMPT for Tracker module playback (Complete with filters) fixed looping issues while even sounding better than the old GME playback
|
- Palette rendering, make the OpenGL renderer (almost) look like software mode!
|
||||||
|
- OpenMPT for Tracker module playback instead of GME
|
||||||
|
- Fixes looping and sounds better
|
||||||
|
- Allows filter configuration
|
||||||
|
- Colourize your Kart HUD, to either your player color or whichever colour you like! (optional / requieres extra2.kart file)
|
||||||
- The minimal brightness with Shaders can be configured, now you can seeeee in dark areas (0-255 , uses Sector brightness values)
|
- The minimal brightness with Shaders can be configured, now you can seeeee in dark areas (0-255 , uses Sector brightness values)
|
||||||
- Lua hooks for Intermission (ex: You can make hostmod votes still visible during intermission!)
|
- Lua HUD hooks for Intermission (ex: You can make hostmod votes still visible during intermission!)
|
||||||
- Lua hooks for Vote Screen (ex: You can make hostmod votes still visible during map vote screen!)
|
- Lua HUD hooks for Vote Screen (ex: You can make hostmod votes still visible during map vote screen!)
|
||||||
- Saltyhop! do a funny hop
|
- Saltyhop! do a funny hop
|
||||||
- Smaller Speedometer (optional / requieres extra.kart file)
|
- Smaller Speedometer (optional / requieres extra.kart file)
|
||||||
- Record Attack input display can now be used everywhere
|
- Record Attack input display can now be used everywhere
|
||||||
- Smaller minimap icons and also show player names on the minimap (toggable)
|
- Smaller minimap icons and also show player names on the minimap (toggable)
|
||||||
- "showmusiccredits" command, shows you the current music track again
|
- Support for animated votescreens!
|
||||||
- "listskins" show a list of all skins currently loaded
|
- `showmusiccredit` command, shows you the current music track again
|
||||||
- Visual Portals from Haya´s HEP Client
|
- `listskins` show a list of all skins currently loaded
|
||||||
- Toggable lowercase menu´s also from Haya´s HEP client
|
- Visual Portals from Haya's HEP Client
|
||||||
|
- Horizonline effect in OpenGL (watch the endless bricks on SNES Bowsers Castle!)
|
||||||
|
- Localskins! use whatever skin you like!
|
||||||
|
- Toggable lowercase menu's also from Haya's HEP client
|
||||||
- Everything that Galaxy has
|
- Everything that Galaxy has
|
||||||
|
|
||||||
## Improvements / Bug fixes
|
## Improvements / Bug fixes
|
||||||
|
|
||||||
- Replay size has been increased to 10MiB minimum, to make replay overflows very unlikely to happen (can be set to 100MiB max with "maxdemosize" command in console)
|
- Replay size has been increased to 10MiB minimum, to make replay overflows very unlikely to happen
|
||||||
- Music changes now properly show the music credits (ex: Kart maps with easter eggs that alter the music) *The mapper still has to provide a MusicDEF for this to work.
|
- can be set to 100MiB max with `maxdemosize` command in console
|
||||||
|
- Music changes now properly show the music credits (ex: Kart maps with easter eggs that alter the music)
|
||||||
|
- The mapper still has to provide a MusicDEF for this to work.
|
||||||
- Configurable chatlog length (yay can read those messages from 30 mins ago without opening log.txt)
|
- Configurable chatlog length (yay can read those messages from 30 mins ago without opening log.txt)
|
||||||
- Configurable timeout for waiting to join a full server (in vanilla this is capped to 5 minutes before it boots you out)
|
- Configurable timeout for waiting to join a full server (in vanilla this is capped to 5 minutes before it boots you out)
|
||||||
- Characters now spin in skin selection menu (configurable)
|
- Characters now spin in skin selection menu (configurable)
|
||||||
- HTTP Addon download speed has been raised dramatically (configurable with "downloadspeed" command)
|
- HTTP Addon download speed has been raised dramatically
|
||||||
|
- configurable with `downloadspeed` command
|
||||||
- HWR Drawnodes have been refactored, this should fix a few rare crashes esp in regards to OpenGL Visportals
|
- HWR Drawnodes have been refactored, this should fix a few rare crashes esp in regards to OpenGL Visportals
|
||||||
- The Position Number in the corner is alot smaller now (half the size!)
|
- The Position Number in the corner is alot smaller now (half the size!)
|
||||||
- Toggable Lap animation
|
- Toggable Lap animation
|
||||||
- Main menu shows the current renderer being used
|
- Main menu shows the current renderer being used
|
||||||
- MSAA and A2C Antialiasing support (Configurable in renderer.txt file)
|
- MSAA and A2C Antialiasing support (Configurable in renderer.txt file)
|
||||||
|
- A simple button to rejoin your last visited server
|
||||||
|
- Ability to show ALL maps in the mapselect screen, this includes hidden or hellmaps "showallmaps yes/no"
|
||||||
|
- Ability to toggle the Stagetitlecard "maptitles on/off"
|
||||||
|
|
||||||
## Performance / Debugging
|
## Performance / Debugging
|
||||||
|
|
||||||
- Access for `mobj_t` and `player_t` fields from Lua has been completely rewritten, for much better performance with many Lua scripts
|
- Access for `mobj_t` and `player_t` fields from Lua has been completely rewritten, for much better performance with many Lua scripts
|
||||||
- Lua shows Tracebacks whenever an error occurs
|
- Lua shows Tracebacks whenever an error occurs
|
||||||
- The Lua Perfstats page now has multiple pages and is more organized (ps_thinkframe_page X in console)
|
- The Lua Perfstats page now has multiple pages and is more organized (ps_thinkframe_page X in console)
|
||||||
- People with lower end hardware can disable "screen textures" with "gr_screentextures" command, huge performance gain with minimal visual loss (Note intermission screen background is broken with this)
|
- People with lower end hardware can disable "screen textures" with "gr_screentextures" command, huge performance gain with minimal visual loss
|
||||||
- Software mode has gotten "ffloorclip", which boosts performance on maps with many Floor over Floor roads
|
- Intermission backgrounds, heat wave effects and etc are broken with this
|
||||||
|
- `ffloorclip`, exclusive to Software, which boosts performance on maps with many Floor over Floor sectors
|
||||||
|
|
||||||
## Technical fixes
|
## Technical fixes
|
||||||
|
|
||||||
- ZFigthing Textures in Opengl mode have been fixed in engine (well almost all of it)
|
- ZFigthing Textures in Opengl mode have been fixed in engine (well almost all of it)
|
||||||
- Fof's intersecting with slopes have less issues and now render correctly in Opengl
|
- FOFs intersecting with slopes have less issues and now render correctly in Opengl
|
||||||
- Midtextures on slopes in Opengl are fixed, many weird guardrails and fences, aswell as some of those sticking out textures from the ground on some maps should be gone
|
- Midtextures on slopes in Opengl are fixed, many weird guardrails and fences, aswell as some of those sticking out textures from the ground on some maps should be gone
|
||||||
- The annoying depraction messages for "P_TeleportMove" and "P_AproxDistance" have been silenced
|
- The annoying depraction messages for `P_TeleportMove` and `P_AproxDistance` have been silenced
|
||||||
- Silenced the annoying "cant find next map..." messages as theyre super useless and annoying anyways
|
- Silenced the annoying "cant find next map..." messages as theyre super useless and annoying anyways
|
||||||
- Added a small cooldown on "map" command due to spamming causing a SIGSEGV
|
- Added a small cooldown on `map` command due to spamming causing a SIGSEGV
|
||||||
|
- Many bugfixes to the Software renderer, so its much less prone to crashing
|
||||||
|
- Many bugfixes to the OpenGL renderer (too many too list all of them here; check the changelogs for more information)
|
||||||
|
- Bugfixes to the soundsystem, mainly regarding Sound muting
|
||||||
|
- Refactored Zone Memory Allocations (helps a bit with large maps)
|
||||||
|
- Many many more crash fixes and other bugfixes to the basegame (too many too list all of them here; check the changelogs for more information)
|
||||||
|
|
||||||
|
- Crash Backtraces have been replaced by libbacktrace (except for 32bit Windows builds)
|
||||||
|
Crashlogs now contain alot more informations. and even more if your build has debug symbols
|
||||||
|
Also allows 64bit Windows builds to produce Crashlogs!
|
||||||
|
|
||||||
## MISC
|
## MISC
|
||||||
- Bird's Camara Tilting feature is no longer turned on by default
|
- Bird's Camara Tilting feature is no longer turned on by default
|
||||||
@@ -61,13 +84,16 @@
|
|||||||
- A2C antialiasing makes transparent surfaces even more transparent
|
- A2C antialiasing makes transparent surfaces even more transparent
|
||||||
- You tell us! c:
|
- You tell us! c:
|
||||||
|
|
||||||
|
## Note
|
||||||
|
Check the LUASTUFF file for more information on all the lua things Saturn has.
|
||||||
|
|
||||||
## Dependencies
|
## Dependencies
|
||||||
- NASM (x86 builds only)
|
|
||||||
- SDL2 (Linux/OS X only)
|
- SDL2 (Linux/OS X only)
|
||||||
- SDL2-Mixer (Linux/OS X only)
|
- SDL2-Mixer (Linux/OS X only)
|
||||||
- libupnp (Linux/OS X only)
|
- libupnp (Linux/OS X only)
|
||||||
- libgme (Linux/OS X only)
|
- libgme (Linux/OS X only)
|
||||||
- libopenmpt (Linux/OS X only)
|
- libopenmpt (Linux/OS X only)
|
||||||
|
- libbacktrace (Linux/OS X only)
|
||||||
|
|
||||||
## Compiling
|
## Compiling
|
||||||
|
|
||||||
|
|||||||
@@ -1996,24 +1996,6 @@ HW3SOUND for 3D hardware sound support
|
|||||||
<Option compilerVar="CC" />
|
<Option compilerVar="CC" />
|
||||||
</Unit>
|
</Unit>
|
||||||
<Unit filename="src/v_video.h" />
|
<Unit filename="src/v_video.h" />
|
||||||
<Unit filename="src/vid_copy.s">
|
|
||||||
<Option compilerVar="CC" />
|
|
||||||
<Option compiler="avrgcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
|
|
||||||
<Option compiler="gnu_gcc_compiler_for_mingw32" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
|
|
||||||
<Option compiler="gnu_gcc_compiler_for_mingw64" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
|
|
||||||
<Option compiler="armelfgcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
|
|
||||||
<Option compiler="tricoregcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
|
|
||||||
<Option compiler="ppcgcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
|
|
||||||
<Option compiler="gcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
|
|
||||||
<Option target="Debug Native/SDL" />
|
|
||||||
<Option target="Release Native/SDL" />
|
|
||||||
<Option target="Debug Linux/SDL" />
|
|
||||||
<Option target="Release Linux/SDL" />
|
|
||||||
<Option target="Debug Mingw/SDL" />
|
|
||||||
<Option target="Release Mingw/SDL" />
|
|
||||||
<Option target="Debug Mingw/DirectX" />
|
|
||||||
<Option target="Release Mingw/DirectX" />
|
|
||||||
</Unit>
|
|
||||||
<Unit filename="src/w_wad.c">
|
<Unit filename="src/w_wad.c">
|
||||||
<Option compilerVar="CC" />
|
<Option compilerVar="CC" />
|
||||||
</Unit>
|
</Unit>
|
||||||
|
|||||||
@@ -25,9 +25,6 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(PlatformTarget)'=='x86'">
|
<ItemDefinitionGroup Condition="'$(PlatformTarget)'=='x86'">
|
||||||
<ClCompile>
|
|
||||||
<PreprocessorDefinitions>USEASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
<Link>
|
||||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||||
</Link>
|
</Link>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Ver=3
|
|||||||
IsCpp=0
|
IsCpp=0
|
||||||
Type=0
|
Type=0
|
||||||
UnitCount=279
|
UnitCount=279
|
||||||
Folders=A_Asm,B_Bot,BLUA,D_Doom,F_Frame,G_Game,H_Hud,Hw_Hardware,Hw_Hardware/r_opengl,I_Interface,I_Interface/Dummy,I_Interface/SDL,I_Interface/Win32,LUA,M_Misc,P_Play,R_Rend,S_Sounds,W_Wad
|
Folders=B_Bot,BLUA,D_Doom,F_Frame,G_Game,H_Hud,Hw_Hardware,Hw_Hardware/r_opengl,I_Interface,I_Interface/Dummy,I_Interface/SDL,I_Interface/Win32,LUA,M_Misc,P_Play,R_Rend,S_Sounds,W_Wad
|
||||||
CommandLine=
|
CommandLine=
|
||||||
CompilerSettings=00000000000100000111e1
|
CompilerSettings=00000000000100000111e1
|
||||||
PchHead=-1
|
PchHead=-1
|
||||||
@@ -1473,36 +1473,6 @@ Priority=1000
|
|||||||
OverrideBuildCmd=0
|
OverrideBuildCmd=0
|
||||||
BuildCmd=
|
BuildCmd=
|
||||||
|
|
||||||
[Unit149]
|
|
||||||
FileName=src\tmap.nas
|
|
||||||
Folder=A_Asm
|
|
||||||
Compile=0
|
|
||||||
CompileCpp=0
|
|
||||||
Link=0
|
|
||||||
Priority=1000
|
|
||||||
OverrideBuildCmd=1
|
|
||||||
BuildCmd=nasm.exe -g -o $@ -f win32 src/tmap.nas
|
|
||||||
|
|
||||||
[Unit150]
|
|
||||||
FileName=src\asm_defs.inc
|
|
||||||
Folder=A_Asm
|
|
||||||
Compile=0
|
|
||||||
CompileCpp=0
|
|
||||||
Link=0
|
|
||||||
Priority=1000
|
|
||||||
OverrideBuildCmd=0
|
|
||||||
BuildCmd=
|
|
||||||
|
|
||||||
[Unit151]
|
|
||||||
FileName=src\vid_copy.s
|
|
||||||
Folder=A_Asm
|
|
||||||
Compile=1
|
|
||||||
CompileCpp=0
|
|
||||||
Link=1
|
|
||||||
Priority=1000
|
|
||||||
OverrideBuildCmd=1
|
|
||||||
BuildCmd=$(CC) $(CFLAGS) -x assembler-with-cpp -c src/vid_copy.s -o $@
|
|
||||||
|
|
||||||
[Unit152]
|
[Unit152]
|
||||||
FileName=src\y_inter.h
|
FileName=src\y_inter.h
|
||||||
Folder=H_Hud
|
Folder=H_Hud
|
||||||
@@ -1543,26 +1513,6 @@ Priority=1000
|
|||||||
OverrideBuildCmd=0
|
OverrideBuildCmd=0
|
||||||
BuildCmd=
|
BuildCmd=
|
||||||
|
|
||||||
[Unit156]
|
|
||||||
FileName=src\p5prof.h
|
|
||||||
Folder=A_Asm
|
|
||||||
Compile=1
|
|
||||||
CompileCpp=0
|
|
||||||
Link=1
|
|
||||||
Priority=1000
|
|
||||||
OverrideBuildCmd=0
|
|
||||||
BuildCmd=
|
|
||||||
|
|
||||||
[Unit157]
|
|
||||||
FileName=src\tmap_mmx.nas
|
|
||||||
Folder=A_Asm
|
|
||||||
Compile=0
|
|
||||||
CompileCpp=0
|
|
||||||
Link=0
|
|
||||||
Priority=1000
|
|
||||||
OverrideBuildCmd=1
|
|
||||||
BuildCmd=nasm.exe -g -o $@ -f win32 src/tmap_mmx.nas
|
|
||||||
|
|
||||||
[Unit159]
|
[Unit159]
|
||||||
FileName=src\lzf.h
|
FileName=src\lzf.h
|
||||||
Folder=W_Wad
|
Folder=W_Wad
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ environment:
|
|||||||
# c:\msys64 x86_64 has gcc 8.2.0, so use c:\mingw-w64 7.3.0 instead
|
# c:\msys64 x86_64 has gcc 8.2.0, so use c:\mingw-w64 7.3.0 instead
|
||||||
MINGW_SDK_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
|
MINGW_SDK_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
|
||||||
CFLAGS: -Wall -W -Werror -Wno-error=implicit-fallthrough -Wimplicit-fallthrough=3 -Wno-tautological-compare -Wno-error=suggest-attribute=noreturn
|
CFLAGS: -Wall -W -Werror -Wno-error=implicit-fallthrough -Wimplicit-fallthrough=3 -Wno-tautological-compare -Wno-error=suggest-attribute=noreturn
|
||||||
NASM_ZIP: nasm-2.12.01
|
|
||||||
NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip
|
|
||||||
UPX_ZIP: upx391w
|
UPX_ZIP: upx391w
|
||||||
UPX_URL: http://upx.sourceforge.net/download/upx391w.zip
|
UPX_URL: http://upx.sourceforge.net/download/upx391w.zip
|
||||||
CCACHE_EXE: ccache.exe
|
CCACHE_EXE: ccache.exe
|
||||||
@@ -46,7 +44,6 @@ environment:
|
|||||||
ASSET_CLEAN: 0
|
ASSET_CLEAN: 0
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
- nasm-2.12.01.zip
|
|
||||||
- upx391w.zip
|
- upx391w.zip
|
||||||
- ccache.exe
|
- ccache.exe
|
||||||
- C:\Users\appveyor\.ccache
|
- C:\Users\appveyor\.ccache
|
||||||
@@ -58,10 +55,6 @@ install:
|
|||||||
- if [%X86_64%] == [1] ( set "MINGW_SDK=%MINGW_SDK_64%" )
|
- if [%X86_64%] == [1] ( set "MINGW_SDK=%MINGW_SDK_64%" )
|
||||||
- if [%X86_64%] == [1] ( set "CCACHE_CC=%CCACHE_CC_64%" )
|
- if [%X86_64%] == [1] ( set "CCACHE_CC=%CCACHE_CC_64%" )
|
||||||
|
|
||||||
- if not exist "%NASM_ZIP%.zip" appveyor DownloadFile "%NASM_URL%" -FileName "%NASM_ZIP%.zip"
|
|
||||||
- 7z x -y "%NASM_ZIP%.zip" -o%TMP% >null
|
|
||||||
- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs "%TMP%\%NASM_ZIP%" "%MINGW_SDK%\bin" nasm.exe || exit 0
|
|
||||||
|
|
||||||
- if not exist "%UPX_ZIP%.zip" appveyor DownloadFile "%UPX_URL%" -FileName "%UPX_ZIP%.zip"
|
- if not exist "%UPX_ZIP%.zip" appveyor DownloadFile "%UPX_URL%" -FileName "%UPX_ZIP%.zip"
|
||||||
- 7z x -y "%UPX_ZIP%.zip" -o%TMP% >null
|
- 7z x -y "%UPX_ZIP%.zip" -o%TMP% >null
|
||||||
- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs "%TMP%\%UPX_ZIP%" "%MINGW_SDK%\bin" upx.exe || exit 0
|
- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs "%TMP%\%UPX_ZIP%" "%MINGW_SDK%\bin" upx.exe || exit 0
|
||||||
@@ -78,7 +71,6 @@ before_build:
|
|||||||
- set "Path=%MINGW_SDK%\bin;%Path%"
|
- set "Path=%MINGW_SDK%\bin;%Path%"
|
||||||
- if [%X86_64%] == [1] ( x86_64-w64-mingw32-gcc --version ) else ( i686-w64-mingw32-gcc --version )
|
- if [%X86_64%] == [1] ( x86_64-w64-mingw32-gcc --version ) else ( i686-w64-mingw32-gcc --version )
|
||||||
- mingw32-make --version
|
- mingw32-make --version
|
||||||
- if not [%X86_64%] == [1] ( nasm -v )
|
|
||||||
- if not [%NOUPX%] == [1] ( upx -V )
|
- if not [%NOUPX%] == [1] ( upx -V )
|
||||||
- ccache -V
|
- ccache -V
|
||||||
- ccache -s
|
- ccache -s
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
/*.elf
|
|
||||||
/*.self
|
|
||||||
/*.pkg
|
|
||||||
/*.BIN
|
|
||||||
/pkg
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
/*.elf
|
|
||||||
/*.self
|
|
||||||
/*.pkg
|
|
||||||
/*.BIN
|
|
||||||
/pkg
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
/EBOOT.PBP
|
|
||||||
/PARAM.SFO
|
|
||||||
/SRB2PSP.PBP
|
|
||||||
/SRB2PSP.elf
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
/*.elf
|
|
||||||
/*.dol
|
|
||||||
/apps
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
/*.elf
|
|
||||||
/*.dol
|
|
||||||
/apps
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
*.arm9
|
|
||||||
*.elf*
|
|
||||||
*.nds
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
*.arm9
|
|
||||||
*.elf*
|
|
||||||
*.nds
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2010 Kitware, Inc.
|
|
||||||
#
|
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
# see accompanying file Copyright.txt for details.
|
|
||||||
#
|
|
||||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
||||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
# See the License for more information.
|
|
||||||
#=============================================================================
|
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
|
||||||
# License text for the above reference.)
|
|
||||||
|
|
||||||
# support for the yasm assembler
|
|
||||||
|
|
||||||
set(CMAKE_ASM_YASM_SOURCE_FILE_EXTENSIONS nasm yasm asm)
|
|
||||||
|
|
||||||
if(NOT CMAKE_ASM_YASM_OBJECT_FORMAT)
|
|
||||||
if(WIN32)
|
|
||||||
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
|
|
||||||
set(CMAKE_ASM_YASM_OBJECT_FORMAT win64)
|
|
||||||
else()
|
|
||||||
set(CMAKE_ASM_YASM_OBJECT_FORMAT win32)
|
|
||||||
endif()
|
|
||||||
elseif(APPLE)
|
|
||||||
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
|
|
||||||
set(CMAKE_ASM_YASM_OBJECT_FORMAT macho64)
|
|
||||||
else()
|
|
||||||
set(CMAKE_ASM_YASM_OBJECT_FORMAT macho)
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
|
|
||||||
set(CMAKE_ASM_YASM_OBJECT_FORMAT elf64)
|
|
||||||
else()
|
|
||||||
set(CMAKE_ASM_YASM_OBJECT_FORMAT elf)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_ASM_YASM_COMPILE_OBJECT "<CMAKE_ASM_YASM_COMPILER> <FLAGS> -f ${CMAKE_ASM_YASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
|
|
||||||
|
|
||||||
# Load the generic ASMInformation file:
|
|
||||||
set(ASM_DIALECT "_YASM")
|
|
||||||
include(CMakeASMInformation)
|
|
||||||
set(ASM_DIALECT)
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2010 Kitware, Inc.
|
|
||||||
#
|
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
# see accompanying file Copyright.txt for details.
|
|
||||||
#
|
|
||||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
||||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
# See the License for more information.
|
|
||||||
#=============================================================================
|
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
|
||||||
# License text for the above reference.)
|
|
||||||
|
|
||||||
# Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is nasm compatible
|
|
||||||
|
|
||||||
set(CMAKE_ASM_YASM_COMPILER_LIST nasm yasm)
|
|
||||||
|
|
||||||
if(NOT CMAKE_ASM_YASM_COMPILER)
|
|
||||||
find_program(CMAKE_ASM_YASM_COMPILER yasm
|
|
||||||
"$ENV{ProgramFiles}/YASM")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Load the generic DetermineASM compiler file with the DIALECT set properly:
|
|
||||||
set(ASM_DIALECT "_YASM")
|
|
||||||
include(CMakeDetermineASMCompiler)
|
|
||||||
set(ASM_DIALECT)
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2010 Kitware, Inc.
|
|
||||||
#
|
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
# see accompanying file Copyright.txt for details.
|
|
||||||
#
|
|
||||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
||||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
# See the License for more information.
|
|
||||||
#=============================================================================
|
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
|
||||||
# License text for the above reference.)
|
|
||||||
|
|
||||||
# This file is used by EnableLanguage in cmGlobalGenerator to
|
|
||||||
# determine that the selected ASM_NASM "compiler" works.
|
|
||||||
# For assembler this can only check whether the compiler has been found,
|
|
||||||
# because otherwise there would have to be a separate assembler source file
|
|
||||||
# for each assembler on every architecture.
|
|
||||||
|
|
||||||
set(ASM_DIALECT "_YASM")
|
|
||||||
include(CMakeTestASMCompiler)
|
|
||||||
set(ASM_DIALECT)
|
|
||||||
+23
-32
@@ -1,54 +1,45 @@
|
|||||||
#!/bin/bash -e
|
#!/bin/sh
|
||||||
path="."
|
path="."
|
||||||
if [ x"$1" != x ]; then
|
if [ x"$1" != x ]; then
|
||||||
path="$1"
|
path="$1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
versiongit() {
|
version() {
|
||||||
gitbranch=`git rev-parse --abbrev-ref HEAD`
|
cat <<EOF > "$path/comptime.h"
|
||||||
gitversion=`git rev-parse HEAD`
|
|
||||||
cat <<EOF > $path/comptime.h
|
|
||||||
|
|
||||||
// Do not edit! This file was autogenerated
|
// Do not edit! This file was autogenerated
|
||||||
// by the $0 script with git
|
// by the $0 script with git
|
||||||
//
|
//
|
||||||
const char* compbranch = "$gitbranch";
|
const char* compbranch = "$1";
|
||||||
const char* comprevision = "${gitversion:0:8}";
|
const char* comprevision = "$2";
|
||||||
EOF
|
EOF
|
||||||
exit 0
|
}
|
||||||
|
|
||||||
|
versiongit() {
|
||||||
|
gitbranch="$(git rev-parse --abbrev-ref HEAD)"
|
||||||
|
gitversion="$(git rev-parse HEAD | cut -c -8)"
|
||||||
|
version "$gitbranch" "$gitversion";
|
||||||
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
versionsvn() {
|
versionsvn() {
|
||||||
svnrevision=`svnversion -n $1`
|
svnrevision="$(svnversion -n "$1")"
|
||||||
cat <<EOF > $path/comptime.h
|
version "Subversion" "r$svnrevision";
|
||||||
|
exit 0
|
||||||
// Do not edit! This file was autogenerated
|
|
||||||
// by the $0 script with subversion
|
|
||||||
//
|
|
||||||
const char* compbranch = "Subversion";
|
|
||||||
const char* comprevision = "r$svnrevision";
|
|
||||||
EOF
|
|
||||||
exit 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
versionfake() {
|
versionfake() {
|
||||||
cat <<EOF > $path/comptime.h
|
version "Unknown" "illegal";
|
||||||
|
|
||||||
// Do not edit! This file was autogenerated
|
|
||||||
// by the $0 script with an unknown or nonexist SCM
|
|
||||||
//
|
|
||||||
const char* compbranch = "Unknown";
|
|
||||||
const char* comprevision = "illegal";
|
|
||||||
EOF
|
|
||||||
}
|
}
|
||||||
|
|
||||||
compversion() {
|
compversion() {
|
||||||
touch $path/comptime.c
|
touch "$path/comptime.c"
|
||||||
versionfake
|
versionfake
|
||||||
test -d $path/.svn && versionsvn
|
[ -d "$path/.svn" ] && versionsvn "$@"
|
||||||
test -d $path/../.git && versiongit
|
[ -d "$path/../.git" ] && versiongit
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
test -f $path/comptime.c && compversion
|
[ -f "$path/comptime.c" ] && compversion "$@"
|
||||||
exit 2
|
exit 2
|
||||||
|
|
||||||
+1
-3
@@ -23,10 +23,8 @@ and don't forget to build r_opengl.dll for srb2dd.
|
|||||||
|
|
||||||
## srb2kart, 64-bit
|
## srb2kart, 64-bit
|
||||||
|
|
||||||
* libs\dll-binaries\x86_64\exchndl.dll
|
|
||||||
* libs\dll-binaries\x86_64\libgme.dll
|
* libs\dll-binaries\x86_64\libgme.dll
|
||||||
* libs\dll-binaries\x86_64\discord-rpc.dll
|
* libs\dll-binaries\x86_64\discord-rpc.dll
|
||||||
* libs\dll-binaries\x86_64\mgwhelp.dll (depend for exchndl.dll)
|
|
||||||
* libs\SDL2\x86_64-w64-mingw32\bin\SDL2.dll
|
* libs\SDL2\x86_64-w64-mingw32\bin\SDL2.dll
|
||||||
* libs\SDL2_mixer\x86_64-w64-mingw32\bin\*.dll (get everything)
|
* libs\SDL2_mixer\x86_64-w64-mingw32\bin\*.dll (get everything)
|
||||||
* libs\libopenmpt\x86_64\bin\mingw\libopenmpt.dll
|
* libs\libopenmpt\x86_64\bin\mingw\libopenmpt.dll
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,29 @@
|
|||||||
|
# Copyright (C) 2012-2016 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
# Redistribution and use in source and binary forms, with or without
|
||||||
|
# modification, are permitted provided that the following conditions are
|
||||||
|
# met:
|
||||||
|
|
||||||
|
# (1) Redistributions of source code must retain the above copyright
|
||||||
|
# notice, this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
# (2) Redistributions in binary form must reproduce the above copyright
|
||||||
|
# notice, this list of conditions and the following disclaimer in
|
||||||
|
# the documentation and/or other materials provided with the
|
||||||
|
# distribution.
|
||||||
|
|
||||||
|
# (3) The name of the author may not be used to
|
||||||
|
# endorse or promote products derived from this software without
|
||||||
|
# specific prior written permission.
|
||||||
|
|
||||||
|
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||||
|
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
|
||||||
|
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||||
|
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
# POSSIBILITY OF SUCH DAMAGE.
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# libbacktrace
|
||||||
|
A C library that may be linked into a C/C++ program to produce symbolic backtraces
|
||||||
|
|
||||||
|
Initially written by Ian Lance Taylor <iant@golang.org>.
|
||||||
|
|
||||||
|
This is version 1.0.
|
||||||
|
It is likely that this will always be version 1.0.
|
||||||
|
|
||||||
|
The libbacktrace library may be linked into a program or library and
|
||||||
|
used to produce symbolic backtraces.
|
||||||
|
Sample uses would be to print a detailed backtrace when an error
|
||||||
|
occurs or to gather detailed profiling information.
|
||||||
|
In general the functions provided by this library are async-signal-safe,
|
||||||
|
meaning that they may be safely called from a signal handler.
|
||||||
|
|
||||||
|
The libbacktrace library is provided under a BSD license.
|
||||||
|
See the source files for the exact license text.
|
||||||
|
|
||||||
|
The public functions are declared and documented in the header file
|
||||||
|
backtrace.h, which should be #include'd by a user of the library.
|
||||||
|
|
||||||
|
Building libbacktrace will generate a file backtrace-supported.h,
|
||||||
|
which a user of the library may use to determine whether backtraces
|
||||||
|
will work.
|
||||||
|
See the source file backtrace-supported.h.in for the macros that it
|
||||||
|
defines.
|
||||||
|
|
||||||
|
As of October 2020, libbacktrace supports ELF, PE/COFF, Mach-O, and
|
||||||
|
XCOFF executables with DWARF debugging information.
|
||||||
|
In other words, it supports GNU/Linux, *BSD, macOS, Windows, and AIX.
|
||||||
|
The library is written to make it straightforward to add support for
|
||||||
|
other object file and debugging formats.
|
||||||
|
|
||||||
|
The library relies on the C++ unwind API defined at
|
||||||
|
https://itanium-cxx-abi.github.io/cxx-abi/abi-eh.html
|
||||||
|
This API is provided by GCC and clang.
|
||||||
@@ -0,0 +1,188 @@
|
|||||||
|
/* backtrace.h -- Public header file for stack backtrace library.
|
||||||
|
Copyright (C) 2012-2020 Free Software Foundation, Inc.
|
||||||
|
Written by Ian Lance Taylor, Google.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are
|
||||||
|
met:
|
||||||
|
|
||||||
|
(1) Redistributions of source code must retain the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
(2) Redistributions in binary form must reproduce the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer in
|
||||||
|
the documentation and/or other materials provided with the
|
||||||
|
distribution.
|
||||||
|
|
||||||
|
(3) The name of the author may not be used to
|
||||||
|
endorse or promote products derived from this software without
|
||||||
|
specific prior written permission.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||||
|
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
|
||||||
|
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||||
|
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
POSSIBILITY OF SUCH DAMAGE. */
|
||||||
|
|
||||||
|
#ifndef BACKTRACE_H
|
||||||
|
#define BACKTRACE_H
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* The backtrace state. This struct is intentionally not defined in
|
||||||
|
the public interface. */
|
||||||
|
|
||||||
|
struct backtrace_state;
|
||||||
|
|
||||||
|
/* The type of the error callback argument to backtrace functions.
|
||||||
|
This function, if not NULL, will be called for certain error cases.
|
||||||
|
The DATA argument is passed to the function that calls this one.
|
||||||
|
The MSG argument is an error message. The ERRNUM argument, if
|
||||||
|
greater than 0, holds an errno value. The MSG buffer may become
|
||||||
|
invalid after this function returns.
|
||||||
|
|
||||||
|
As a special case, the ERRNUM argument will be passed as -1 if no
|
||||||
|
debug info can be found for the executable, but the function
|
||||||
|
requires debug info (e.g., backtrace_full, backtrace_pcinfo). The
|
||||||
|
MSG in this case will be something along the lines of "no debug
|
||||||
|
info". Similarly, ERRNUM will be passed as -1 if there is no
|
||||||
|
symbol table, but the function requires a symbol table (e.g.,
|
||||||
|
backtrace_syminfo). This may be used as a signal that some other
|
||||||
|
approach should be tried. */
|
||||||
|
|
||||||
|
typedef void (*backtrace_error_callback) (void *data, const char *msg,
|
||||||
|
int errnum);
|
||||||
|
|
||||||
|
/* Create state information for the backtrace routines. This must be
|
||||||
|
called before any of the other routines, and its return value must
|
||||||
|
be passed to all of the other routines. FILENAME is the path name
|
||||||
|
of the executable file; if it is NULL the library will try
|
||||||
|
system-specific path names. If not NULL, FILENAME must point to a
|
||||||
|
permanent buffer. If THREADED is non-zero the state may be
|
||||||
|
accessed by multiple threads simultaneously, and the library will
|
||||||
|
use appropriate atomic operations. If THREADED is zero the state
|
||||||
|
may only be accessed by one thread at a time. This returns a state
|
||||||
|
pointer on success, NULL on error. If an error occurs, this will
|
||||||
|
call the ERROR_CALLBACK routine.
|
||||||
|
|
||||||
|
Calling this function allocates resources that cannot be freed.
|
||||||
|
There is no backtrace_free_state function. The state is used to
|
||||||
|
cache information that is expensive to recompute. Programs are
|
||||||
|
expected to call this function at most once and to save the return
|
||||||
|
value for all later calls to backtrace functions. */
|
||||||
|
|
||||||
|
extern struct backtrace_state *backtrace_create_state (
|
||||||
|
const char *filename, int threaded,
|
||||||
|
backtrace_error_callback error_callback, void *data);
|
||||||
|
|
||||||
|
/* The type of the callback argument to the backtrace_full function.
|
||||||
|
DATA is the argument passed to backtrace_full. PC is the program
|
||||||
|
counter. FILENAME is the name of the file containing PC, or NULL
|
||||||
|
if not available. LINENO is the line number in FILENAME containing
|
||||||
|
PC, or 0 if not available. FUNCTION is the name of the function
|
||||||
|
containing PC, or NULL if not available. This should return 0 to
|
||||||
|
continuing tracing. The FILENAME and FUNCTION buffers may become
|
||||||
|
invalid after this function returns. */
|
||||||
|
|
||||||
|
typedef int (*backtrace_full_callback) (void *data, uintptr_t pc,
|
||||||
|
const char *filename, int lineno,
|
||||||
|
const char *function);
|
||||||
|
|
||||||
|
/* Get a full stack backtrace. SKIP is the number of frames to skip;
|
||||||
|
passing 0 will start the trace with the function calling
|
||||||
|
backtrace_full. DATA is passed to the callback routine. If any
|
||||||
|
call to CALLBACK returns a non-zero value, the stack backtrace
|
||||||
|
stops, and backtrace returns that value; this may be used to limit
|
||||||
|
the number of stack frames desired. If all calls to CALLBACK
|
||||||
|
return 0, backtrace returns 0. The backtrace_full function will
|
||||||
|
make at least one call to either CALLBACK or ERROR_CALLBACK. This
|
||||||
|
function requires debug info for the executable. */
|
||||||
|
|
||||||
|
extern int backtrace_full (struct backtrace_state *state, int skip,
|
||||||
|
backtrace_full_callback callback,
|
||||||
|
backtrace_error_callback error_callback,
|
||||||
|
void *data);
|
||||||
|
|
||||||
|
/* The type of the callback argument to the backtrace_simple function.
|
||||||
|
DATA is the argument passed to simple_backtrace. PC is the program
|
||||||
|
counter. This should return 0 to continue tracing. */
|
||||||
|
|
||||||
|
typedef int (*backtrace_simple_callback) (void *data, uintptr_t pc);
|
||||||
|
|
||||||
|
/* Get a simple backtrace. SKIP is the number of frames to skip, as
|
||||||
|
in backtrace. DATA is passed to the callback routine. If any call
|
||||||
|
to CALLBACK returns a non-zero value, the stack backtrace stops,
|
||||||
|
and backtrace_simple returns that value. Otherwise
|
||||||
|
backtrace_simple returns 0. The backtrace_simple function will
|
||||||
|
make at least one call to either CALLBACK or ERROR_CALLBACK. This
|
||||||
|
function does not require any debug info for the executable. */
|
||||||
|
|
||||||
|
extern int backtrace_simple (struct backtrace_state *state, int skip,
|
||||||
|
backtrace_simple_callback callback,
|
||||||
|
backtrace_error_callback error_callback,
|
||||||
|
void *data);
|
||||||
|
|
||||||
|
/* Print the current backtrace in a user readable format to a FILE.
|
||||||
|
SKIP is the number of frames to skip, as in backtrace_full. Any
|
||||||
|
error messages are printed to stderr. This function requires debug
|
||||||
|
info for the executable. */
|
||||||
|
|
||||||
|
extern void backtrace_print (struct backtrace_state *state, int skip, FILE *);
|
||||||
|
|
||||||
|
/* Given PC, a program counter in the current program, call the
|
||||||
|
callback function with filename, line number, and function name
|
||||||
|
information. This will normally call the callback function exactly
|
||||||
|
once. However, if the PC happens to describe an inlined call, and
|
||||||
|
the debugging information contains the necessary information, then
|
||||||
|
this may call the callback function multiple times. This will make
|
||||||
|
at least one call to either CALLBACK or ERROR_CALLBACK. This
|
||||||
|
returns the first non-zero value returned by CALLBACK, or 0. */
|
||||||
|
|
||||||
|
extern int backtrace_pcinfo (struct backtrace_state *state, uintptr_t pc,
|
||||||
|
backtrace_full_callback callback,
|
||||||
|
backtrace_error_callback error_callback,
|
||||||
|
void *data);
|
||||||
|
|
||||||
|
/* The type of the callback argument to backtrace_syminfo. DATA and
|
||||||
|
PC are the arguments passed to backtrace_syminfo. SYMNAME is the
|
||||||
|
name of the symbol for the corresponding code. SYMVAL is the
|
||||||
|
value and SYMSIZE is the size of the symbol. SYMNAME will be NULL
|
||||||
|
if no error occurred but the symbol could not be found. */
|
||||||
|
|
||||||
|
typedef void (*backtrace_syminfo_callback) (void *data, uintptr_t pc,
|
||||||
|
const char *symname,
|
||||||
|
uintptr_t symval,
|
||||||
|
uintptr_t symsize);
|
||||||
|
|
||||||
|
/* Given ADDR, an address or program counter in the current program,
|
||||||
|
call the callback information with the symbol name and value
|
||||||
|
describing the function or variable in which ADDR may be found.
|
||||||
|
This will call either CALLBACK or ERROR_CALLBACK exactly once.
|
||||||
|
This returns 1 on success, 0 on failure. This function requires
|
||||||
|
the symbol table but does not require the debug info. Note that if
|
||||||
|
the symbol table is present but ADDR could not be found in the
|
||||||
|
table, CALLBACK will be called with a NULL SYMNAME argument.
|
||||||
|
Returns 1 on success, 0 on error. */
|
||||||
|
|
||||||
|
extern int backtrace_syminfo (struct backtrace_state *state, uintptr_t addr,
|
||||||
|
backtrace_syminfo_callback callback,
|
||||||
|
backtrace_error_callback error_callback,
|
||||||
|
void *data);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* End extern "C". */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# DON'T REMOVE
|
|
||||||
# This keeps the folder from disappearing
|
|
||||||
+1
-1
@@ -76,7 +76,7 @@ LOCAL_SRC_FILES := am_map.c \
|
|||||||
android/i_system.c \
|
android/i_system.c \
|
||||||
android/i_video.c
|
android/i_video.c
|
||||||
|
|
||||||
LOCAL_CFLAGS += -DPLATFORM_ANDROID -DNONX86 -DLINUX -DDEBUGMODE -DNOASM -DNOPIX -DUNIXCOMMON -DNOTERMIOS
|
LOCAL_CFLAGS += -DPLATFORM_ANDROID -DNONX86 -DLINUX -DDEBUGMODE -DNOPIX -DUNIXCOMMON -DNOTERMIOS
|
||||||
|
|
||||||
LOCAL_MODULE := libsrb2
|
LOCAL_MODULE := libsrb2
|
||||||
|
|
||||||
|
|||||||
+2
-52
@@ -3,6 +3,7 @@
|
|||||||
# Core sources
|
# Core sources
|
||||||
set(SRB2_CORE_SOURCES
|
set(SRB2_CORE_SOURCES
|
||||||
am_map.c
|
am_map.c
|
||||||
|
args.c
|
||||||
b_bot.c
|
b_bot.c
|
||||||
command.c
|
command.c
|
||||||
comptime.c
|
comptime.c
|
||||||
@@ -52,6 +53,7 @@ set(SRB2_CORE_SOURCES
|
|||||||
|
|
||||||
set(SRB2_CORE_HEADERS
|
set(SRB2_CORE_HEADERS
|
||||||
am_map.h
|
am_map.h
|
||||||
|
args.h
|
||||||
b_bot.h
|
b_bot.h
|
||||||
byteptr.h
|
byteptr.h
|
||||||
command.h
|
command.h
|
||||||
@@ -196,32 +198,6 @@ source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
|
|||||||
source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
|
source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
|
||||||
source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
|
source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
|
||||||
|
|
||||||
|
|
||||||
set(SRB2_ASM_SOURCES
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/vid_copy.s
|
|
||||||
)
|
|
||||||
|
|
||||||
set(SRB2_NASM_SOURCES
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/tmap_mmx.nas
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/tmap.nas
|
|
||||||
)
|
|
||||||
|
|
||||||
if(MSVC)
|
|
||||||
list(APPEND SRB2_NASM_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tmap_vc.nas)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(SRB2_NASM_OBJECTS
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/tmap_mmx.obj
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/tmap.obj
|
|
||||||
)
|
|
||||||
|
|
||||||
if(MSVC)
|
|
||||||
list(APPEND SRB2_NASM_OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/tmap_vc.obj)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
source_group("Assembly" FILES ${SRB2_ASM_SOURCES} ${SRB2_NASM_SOURCES})
|
|
||||||
|
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
set(SRB2_CONFIG_HAVE_BLUA ON CACHE BOOL
|
set(SRB2_CONFIG_HAVE_BLUA ON CACHE BOOL
|
||||||
"Enable Lua interpreter support")
|
"Enable Lua interpreter support")
|
||||||
@@ -239,10 +215,6 @@ set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL
|
|||||||
"Enable curl support, used for downloading files via HTTP.")
|
"Enable curl support, used for downloading files via HTTP.")
|
||||||
set(SRB2_CONFIG_HWRENDER ON CACHE BOOL
|
set(SRB2_CONFIG_HWRENDER ON CACHE BOOL
|
||||||
"Enable hardware rendering through OpenGL.")
|
"Enable hardware rendering through OpenGL.")
|
||||||
set(SRB2_CONFIG_USEASM OFF CACHE BOOL
|
|
||||||
"Enable NASM tmap implementation for software mode speedup.")
|
|
||||||
set(SRB2_CONFIG_YASM OFF CACHE BOOL
|
|
||||||
"Use YASM in place of NASM.")
|
|
||||||
set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL
|
set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL
|
||||||
"Use statically linked OpenGL. NOT RECOMMENDED.")
|
"Use statically linked OpenGL. NOT RECOMMENDED.")
|
||||||
|
|
||||||
@@ -533,28 +505,6 @@ if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${SRB2_CONFIG_USEASM})
|
|
||||||
#SRB2_ASM_FLAGS can be used to pass flags to either nasm or yasm.
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES "Linux")
|
|
||||||
set(SRB2_ASM_FLAGS "-DLINUX ${SRB2_ASM_FLAGS}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(${SRB2_CONFIG_YASM})
|
|
||||||
set(CMAKE_ASM_YASM_SOURCE_FILE_EXTENSIONS ${CMAKE_ASM_YASM_SOURCE_FILE_EXTENSIONS} nas)
|
|
||||||
set(CMAKE_ASM_YASM_FLAGS "${SRB2_ASM_FLAGS}" CACHE STRING "Flags used by the assembler during all build types.")
|
|
||||||
enable_language(ASM_YASM)
|
|
||||||
else()
|
|
||||||
set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS ${CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS} nas)
|
|
||||||
set(CMAKE_ASM_NASM_FLAGS "${SRB2_ASM_FLAGS}" CACHE STRING "Flags used by the assembler during all build types.")
|
|
||||||
enable_language(ASM_NASM)
|
|
||||||
endif()
|
|
||||||
set(SRB2_USEASM ON)
|
|
||||||
add_definitions(-DUSEASM)
|
|
||||||
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -msse3 -mfpmath=sse)
|
|
||||||
else()
|
|
||||||
set(SRB2_USEASM OFF)
|
|
||||||
add_definitions(-DNONX86 -DNORUSEASM)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Targets
|
# Targets
|
||||||
|
|
||||||
|
|||||||
+5
-256
@@ -8,14 +8,11 @@
|
|||||||
# terms of the GNU General Public License, version 2.
|
# terms of the GNU General Public License, version 2.
|
||||||
# See the 'LICENSE' file for more details.
|
# See the 'LICENSE' file for more details.
|
||||||
#
|
#
|
||||||
# -DPC_DOS -> use DOS specific code (eg:textmode stuff)...
|
|
||||||
# -DLINUX -> use for the GNU/Linux specific
|
# -DLINUX -> use for the GNU/Linux specific
|
||||||
# -D_WINDOWS -> use for the Win32/DirectX specific
|
|
||||||
# -DHAVE_SDL -> use for the SDL interface
|
# -DHAVE_SDL -> use for the SDL interface
|
||||||
#
|
#
|
||||||
# Sets:
|
# Sets:
|
||||||
# Compile the DGJPP/DOS version with 'make WATTCP=1'
|
# Compile the Mingw version with 'make MINGW=1'
|
||||||
# Compile the DirectX/Mingw version with 'make MINGW=1'
|
|
||||||
# Compile the SDL/Mingw version with 'make MINGW=1 SDL=1'
|
# Compile the SDL/Mingw version with 'make MINGW=1 SDL=1'
|
||||||
# Compile the SDL/Linux version with 'make LINUX=1'
|
# Compile the SDL/Linux version with 'make LINUX=1'
|
||||||
# Compile the SDL/Solaris version with 'make SOLARIS=1'
|
# Compile the SDL/Solaris version with 'make SOLARIS=1'
|
||||||
@@ -62,7 +59,6 @@
|
|||||||
# Compile a debug version, add 'DEBUGMODE=1'
|
# Compile a debug version, add 'DEBUGMODE=1'
|
||||||
# Compile with less warnings, add 'RELAXWARNINGS=1'
|
# Compile with less warnings, add 'RELAXWARNINGS=1'
|
||||||
# Generate compiler errors for most compiler warnings, add 'ERRORMODE=1'
|
# Generate compiler errors for most compiler warnings, add 'ERRORMODE=1'
|
||||||
# Compile without NASM's tmap.nas, add 'NOASM=1'
|
|
||||||
# Compile without 3D hardware support, add 'NOHW=1'
|
# Compile without 3D hardware support, add 'NOHW=1'
|
||||||
# Compile with GDBstubs, add 'RDB=1'
|
# Compile with GDBstubs, add 'RDB=1'
|
||||||
# Compile without PNG, add 'NOPNG=1'
|
# Compile without PNG, add 'NOPNG=1'
|
||||||
@@ -88,7 +84,6 @@ ALL_SYSTEMS=\
|
|||||||
MINGW64\
|
MINGW64\
|
||||||
HAIKU\
|
HAIKU\
|
||||||
DUMMY\
|
DUMMY\
|
||||||
DJGPPDOS\
|
|
||||||
MINGW\
|
MINGW\
|
||||||
UNIX\
|
UNIX\
|
||||||
LINUX\
|
LINUX\
|
||||||
@@ -149,10 +144,6 @@ D_FILES=$(D_DIR)/srb2.srb \
|
|||||||
|
|
||||||
PKG_CONFIG?=pkg-config
|
PKG_CONFIG?=pkg-config
|
||||||
|
|
||||||
ifdef WIILINUX
|
|
||||||
LINUX=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef PANDORA
|
ifdef PANDORA
|
||||||
LINUX=1
|
LINUX=1
|
||||||
endif
|
endif
|
||||||
@@ -166,7 +157,6 @@ endif
|
|||||||
ifdef MINGW64
|
ifdef MINGW64
|
||||||
MINGW=1
|
MINGW=1
|
||||||
NONX86=1
|
NONX86=1
|
||||||
NOASM=1
|
|
||||||
# MINGW64 should not necessarily imply X86_64=1, but we make that assumption elsewhere
|
# MINGW64 should not necessarily imply X86_64=1, but we make that assumption elsewhere
|
||||||
# Once that changes, remove this
|
# Once that changes, remove this
|
||||||
X86_64=1
|
X86_64=1
|
||||||
@@ -176,12 +166,6 @@ ifdef HAIKU
|
|||||||
SDL=1
|
SDL=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NDS
|
|
||||||
# Include this before the main Makefile.cfg
|
|
||||||
EXENAME?=srb2.elf
|
|
||||||
include nds/Makefile.cfg
|
|
||||||
endif
|
|
||||||
|
|
||||||
include Makefile.cfg
|
include Makefile.cfg
|
||||||
|
|
||||||
ifdef DUMMY
|
ifdef DUMMY
|
||||||
@@ -189,7 +173,6 @@ NOPNG=1
|
|||||||
NOZLIB=1
|
NOZLIB=1
|
||||||
NONET=1
|
NONET=1
|
||||||
NOHW=1
|
NOHW=1
|
||||||
NOASM=1
|
|
||||||
NOIPX=1
|
NOIPX=1
|
||||||
EXENAME?=srb2dummy
|
EXENAME?=srb2dummy
|
||||||
OBJS=$(OBJDIR)/i_video.o
|
OBJS=$(OBJDIR)/i_video.o
|
||||||
@@ -198,7 +181,6 @@ endif
|
|||||||
|
|
||||||
ifdef HAIKU
|
ifdef HAIKU
|
||||||
NOIPX=1
|
NOIPX=1
|
||||||
NOASM=1
|
|
||||||
ifndef NONET
|
ifndef NONET
|
||||||
LIBS=-lnetwork
|
LIBS=-lnetwork
|
||||||
endif
|
endif
|
||||||
@@ -207,35 +189,11 @@ PNG_CFLAGS?=
|
|||||||
PNG_LDFLAGS?=-lpng
|
PNG_LDFLAGS?=-lpng
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef WIILINUX
|
|
||||||
NONX86=1
|
|
||||||
NOTERMIOS=1
|
|
||||||
NOHW=1
|
|
||||||
CFLAGS+=-DWMINPUT
|
|
||||||
NOTERMIOS=1
|
|
||||||
NOPOSTPROCESSING=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef PANDORA
|
ifdef PANDORA
|
||||||
NONX86=1
|
NONX86=1
|
||||||
NOHW=1
|
NOHW=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef WII
|
|
||||||
NONX86=1
|
|
||||||
NOHW=1
|
|
||||||
NOPOSTPROCESSING=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef PS3N
|
|
||||||
NONX86=1
|
|
||||||
NOHW=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef DJGPPDOS
|
|
||||||
include djgppdos/Makefile.cfg
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef NOOPENMPT
|
ifndef NOOPENMPT
|
||||||
HAVE_OPENMPT=1
|
HAVE_OPENMPT=1
|
||||||
endif
|
endif
|
||||||
@@ -267,26 +225,8 @@ ifdef MACOSX
|
|||||||
UNIXCOMMON=1
|
UNIXCOMMON=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NDS
|
|
||||||
NOPNG=1
|
|
||||||
NOZLIB=1
|
|
||||||
NONET=1
|
|
||||||
#NOHW=1
|
|
||||||
NOASM=1
|
|
||||||
NOIPX=1
|
|
||||||
NONX86=1
|
|
||||||
OBJS+=$(OBJDIR)/i_video.o
|
|
||||||
LIBS+=-lm
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef SDL
|
ifdef SDL
|
||||||
#SDL 2.0
|
|
||||||
ifndef SDL12
|
|
||||||
include sdl/Makefile.cfg
|
include sdl/Makefile.cfg
|
||||||
#SDL 1.2
|
|
||||||
else
|
|
||||||
include sdl12/Makefile.cfg
|
|
||||||
endif #ifndef SDL12
|
|
||||||
endif #ifdef SDL
|
endif #ifdef SDL
|
||||||
|
|
||||||
ifdef DISTCC
|
ifdef DISTCC
|
||||||
@@ -300,7 +240,6 @@ endif
|
|||||||
MSGFMT?=msgfmt
|
MSGFMT?=msgfmt
|
||||||
|
|
||||||
ifndef ECHO
|
ifndef ECHO
|
||||||
NASM:=@$(NASM)
|
|
||||||
REMOVE:=@$(REMOVE)
|
REMOVE:=@$(REMOVE)
|
||||||
CC:=@$(CC)
|
CC:=@$(CC)
|
||||||
CXX:=@$(CXX)
|
CXX:=@$(CXX)
|
||||||
@@ -331,10 +270,8 @@ endif
|
|||||||
ifdef NOHW
|
ifdef NOHW
|
||||||
OPTS+=-DNOHW
|
OPTS+=-DNOHW
|
||||||
else
|
else
|
||||||
ifndef DC
|
|
||||||
#Hurdler: not really supported and not tested recently
|
#Hurdler: not really supported and not tested recently
|
||||||
#OPTS+=-DUSE_PALETTED_TEXTURE
|
#OPTS+=-DUSE_PALETTED_TEXTURE
|
||||||
endif
|
|
||||||
OPTS+=-DHWRENDER
|
OPTS+=-DHWRENDER
|
||||||
OBJS+=$(OBJDIR)/hw_bsp.o $(OBJDIR)/hw_draw.o $(OBJDIR)/hw_light.o \
|
OBJS+=$(OBJDIR)/hw_bsp.o $(OBJDIR)/hw_draw.o $(OBJDIR)/hw_light.o \
|
||||||
$(OBJDIR)/hw_main.o $(OBJDIR)/hw_clip.o $(OBJDIR)/hw_md2.o $(OBJDIR)/hw_cache.o $(OBJDIR)/hw_trick.o \
|
$(OBJDIR)/hw_main.o $(OBJDIR)/hw_clip.o $(OBJDIR)/hw_md2.o $(OBJDIR)/hw_cache.o $(OBJDIR)/hw_trick.o \
|
||||||
@@ -355,12 +292,6 @@ ifdef X86_64
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef NOASM
|
|
||||||
ifndef NONX86
|
|
||||||
OBJS+=$(OBJDIR)/tmap.o $(OBJDIR)/tmap_mmx.o
|
|
||||||
OPTS+=-DUSEASM
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef NOPNG
|
ifndef NOPNG
|
||||||
OPTS+=-DHAVE_PNG
|
OPTS+=-DHAVE_PNG
|
||||||
@@ -470,14 +401,6 @@ else
|
|||||||
OBJS:=$(OBJDIR)/md5.o $(OBJS)
|
OBJS:=$(OBJDIR)/md5.o $(OBJS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef FAKEDC
|
|
||||||
OPTS+=-DDC
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef FAKEPSP
|
|
||||||
OPTS+=-DPSP
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef NOPOSTPROCESSING
|
ifdef NOPOSTPROCESSING
|
||||||
OPTS+=-DNOPOSTPROCESSING
|
OPTS+=-DNOPOSTPROCESSING
|
||||||
endif
|
endif
|
||||||
@@ -511,16 +434,6 @@ else
|
|||||||
endif
|
endif
|
||||||
CFLAGS+=-g $(OPTS) $(ARCHOPTS) $(WINDRESFLAGS)
|
CFLAGS+=-g $(OPTS) $(ARCHOPTS) $(WINDRESFLAGS)
|
||||||
|
|
||||||
ifdef YASM
|
|
||||||
ifdef STABS
|
|
||||||
NASMOPTS?= -g stabs
|
|
||||||
else
|
|
||||||
NASMOPTS?= -g dwarf2
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
NASMOPTS?= -g
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef PROFILEMODE
|
ifdef PROFILEMODE
|
||||||
# build with profiling information
|
# build with profiling information
|
||||||
CFLAGS+=-pg
|
CFLAGS+=-pg
|
||||||
@@ -624,9 +537,8 @@ OBJS:=$(i_main_o) \
|
|||||||
$(OBJDIR)/i_tcp.o \
|
$(OBJDIR)/i_tcp.o \
|
||||||
$(OBJDIR)/i_time.o \
|
$(OBJDIR)/i_time.o \
|
||||||
$(OBJDIR)/lzf.o \
|
$(OBJDIR)/lzf.o \
|
||||||
$(OBJDIR)/vid_copy.o \
|
|
||||||
$(OBJDIR)/b_bot.o \
|
$(OBJDIR)/b_bot.o \
|
||||||
$(i_cdmus_o) \
|
$(OBJDIR)/args.o \
|
||||||
$(i_net_o) \
|
$(i_net_o) \
|
||||||
$(i_system_o) \
|
$(i_system_o) \
|
||||||
$(i_sound_o) \
|
$(i_sound_o) \
|
||||||
@@ -642,53 +554,19 @@ POS:=$(BIN)/en.mo
|
|||||||
OPTS+=-DGETTEXT
|
OPTS+=-DGETTEXT
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef DJGPPDOS
|
|
||||||
all: pre-build $(BIN)/$(EXENAME)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef XBOX
|
|
||||||
all: pre-build $(BIN)/$(BINNAME)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef PS3N
|
|
||||||
all: pre-build $(BIN)/$(PKGNAME)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef WII
|
|
||||||
all: pre-build $(BIN)/$(DOLNAME)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef PANDORA
|
ifdef PANDORA
|
||||||
all: pre-build $(BIN)/$(PNDNAME)
|
all: pre-build $(BIN)/$(PNDNAME)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef PSP
|
|
||||||
all: pre-build $(BIN)/$(BINNAME) post-build
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef DC
|
|
||||||
all: pre-build $(BIN)/$(BINNAME) post-build
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef DC
|
|
||||||
ifndef PSP
|
|
||||||
ifndef XBOX
|
|
||||||
ifdef MINGW
|
ifdef MINGW
|
||||||
ifndef SDL
|
ifndef SDL
|
||||||
all: pre-build $(BIN)/$(EXENAME) dll
|
all: pre-build $(BIN)/$(EXENAME) dll
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef SDL
|
ifdef SDL
|
||||||
all: pre-build $(BIN)/$(EXENAME)
|
all: pre-build $(BIN)/$(EXENAME)
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef NDS
|
|
||||||
all: $(BIN)/$(EXENAME:.elf=.nds)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef DUMMY
|
ifdef DUMMY
|
||||||
all: $(BIN)/$(EXENAME)
|
all: $(BIN)/$(EXENAME)
|
||||||
@@ -700,9 +578,9 @@ cleandep:
|
|||||||
|
|
||||||
pre-build:
|
pre-build:
|
||||||
ifdef WINDOWSHELL
|
ifdef WINDOWSHELL
|
||||||
-..\comptime.bat .
|
-$(.)..\comptime.bat .
|
||||||
else
|
else
|
||||||
-@../comptime.sh .
|
-$(.)../comptime.sh .
|
||||||
endif
|
endif
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@@ -717,14 +595,8 @@ ifdef CYGWIN32
|
|||||||
$(REMOVE) $(OBJDIR)/*.res
|
$(REMOVE) $(OBJDIR)/*.res
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#make a big srb2.s that is the disasm of the exe (dos only ?)
|
|
||||||
asm:
|
|
||||||
$(CC) $(LDFLAGS) $(OBJS) -o $(OBJDIR)/tmp.exe $(LIBS)
|
|
||||||
$(OBJDUMP) -d $(OBJDIR)/tmp.exe --no-show-raw-insn > srb2.s
|
|
||||||
$(REMOVE) $(OBJDIR)/tmp.exe
|
|
||||||
|
|
||||||
# executable
|
# executable
|
||||||
# NOTE: DJGPP's objcopy do not have --add-gnu-debuglink
|
|
||||||
|
|
||||||
$(BIN)/$(EXENAME): $(POS) $(OBJS)
|
$(BIN)/$(EXENAME): $(POS) $(OBJS)
|
||||||
-$(MKDIR) $(BIN)
|
-$(MKDIR) $(BIN)
|
||||||
@@ -742,12 +614,10 @@ endif
|
|||||||
|
|
||||||
# mac os x lsdlsrb2 does not like objcopy
|
# mac os x lsdlsrb2 does not like objcopy
|
||||||
ifndef MACOSX
|
ifndef MACOSX
|
||||||
ifndef PSP
|
|
||||||
$(OBJCOPY) $(BIN)/$(EXENAME) $(BIN)/$(DBGNAME)
|
$(OBJCOPY) $(BIN)/$(EXENAME) $(BIN)/$(DBGNAME)
|
||||||
$(OBJCOPY) --strip-debug $(BIN)/$(EXENAME)
|
$(OBJCOPY) --strip-debug $(BIN)/$(EXENAME)
|
||||||
-$(OBJCOPY) --add-gnu-debuglink=$(BIN)/$(DBGNAME) $(BIN)/$(EXENAME)
|
-$(OBJCOPY) --add-gnu-debuglink=$(BIN)/$(DBGNAME) $(BIN)/$(EXENAME)
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
ifndef NOUPX
|
ifndef NOUPX
|
||||||
-$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME)
|
-$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME)
|
||||||
endif
|
endif
|
||||||
@@ -772,7 +642,7 @@ else
|
|||||||
dll : opengl_dll
|
dll : opengl_dll
|
||||||
endif
|
endif
|
||||||
ifdef MINGW
|
ifdef MINGW
|
||||||
all_dll: opengl_dll minigl_dll ds3d_dll fmod_dll openal_dll
|
all_dll: opengl_dll ds3d_dll fmod_dll openal_dll
|
||||||
|
|
||||||
opengl_dll: $(BIN)/r_opengl.dll
|
opengl_dll: $(BIN)/r_opengl.dll
|
||||||
$(BIN)/r_opengl.dll: $(OBJDIR)/ogl_win.o $(OBJDIR)/r_opengl.o
|
$(BIN)/r_opengl.dll: $(OBJDIR)/ogl_win.o $(OBJDIR)/r_opengl.o
|
||||||
@@ -783,12 +653,6 @@ ifndef NOUPX
|
|||||||
-$(UPX) $(UPX_OPTS) $@
|
-$(UPX) $(UPX_OPTS) $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
minigl_dll: $(BIN)/r_minigl.dll
|
|
||||||
$(BIN)/r_minigl.dll: $(OBJDIR)/r_minigl.o
|
|
||||||
-$(MKDIR) $(BIN)
|
|
||||||
@echo Linking R_MiniGL.dll...
|
|
||||||
$(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -lgdi32
|
|
||||||
|
|
||||||
ds3d_dll: $(BIN)/s_ds3d.dll
|
ds3d_dll: $(BIN)/s_ds3d.dll
|
||||||
$(BIN)/s_ds3d.dll: $(OBJDIR)/s_ds3d.o
|
$(BIN)/s_ds3d.dll: $(OBJDIR)/s_ds3d.o
|
||||||
@echo Linking S_DS3d.dll...
|
@echo Linking S_DS3d.dll...
|
||||||
@@ -868,16 +732,6 @@ endif
|
|||||||
$(REMOVE) $(OBJDIR)/depend.ped
|
$(REMOVE) $(OBJDIR)/depend.ped
|
||||||
@echo "Created dependency file, depend.dep"
|
@echo "Created dependency file, depend.dep"
|
||||||
|
|
||||||
ifdef DC
|
|
||||||
$(OBJDIR)/v_video.o: v_video.c doomdef.h doomtype.h g_state.h m_swap.h r_local.h \
|
|
||||||
tables.h m_fixed.h screen.h command.h m_bbox.h r_main.h d_player.h \
|
|
||||||
p_pspr.h info.h d_think.h sounds.h p_mobj.h doomdata.h d_ticcmd.h \
|
|
||||||
r_data.h r_defs.h r_state.h r_bsp.h r_segs.h r_plane.h r_sky.h \
|
|
||||||
r_things.h r_draw.h v_video.h hu_stuff.h d_event.h w_wad.h console.h \
|
|
||||||
i_video.h z_zone.h doomstat.h d_clisrv.h d_netcmd.h
|
|
||||||
$(CC) $(CFLAGS) -fno-omit-frame-pointer $(WFLAGS) -c $< -o $@
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef VALGRIND
|
ifdef VALGRIND
|
||||||
$(OBJDIR)/z_zone.o: z_zone.c
|
$(OBJDIR)/z_zone.o: z_zone.c
|
||||||
$(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@
|
$(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@
|
||||||
@@ -907,117 +761,12 @@ $(OBJDIR)/%.o: hardware/%.c
|
|||||||
$(OBJDIR)/%.o: blua/%.c
|
$(OBJDIR)/%.o: blua/%.c
|
||||||
$(CC) $(CFLAGS) $(LUA_CFLAGS) $(WFLAGS) -c $< -o $@
|
$(CC) $(CFLAGS) $(LUA_CFLAGS) $(WFLAGS) -c $< -o $@
|
||||||
|
|
||||||
$(OBJDIR)/%.o: %.nas
|
|
||||||
$(NASM) $(NASMOPTS) -o $@ -f $(NASMFORMAT) $<
|
|
||||||
|
|
||||||
$(OBJDIR)/vid_copy.o: vid_copy.s asm_defs.inc
|
|
||||||
$(CC) $(OPTS) $(ASFLAGS) -x assembler-with-cpp -c $< -o $@
|
|
||||||
|
|
||||||
$(OBJDIR)/%.o: %.s
|
$(OBJDIR)/%.o: %.s
|
||||||
$(CC) $(OPTS) -x assembler-with-cpp -c $< -o $@
|
$(CC) $(OPTS) -x assembler-with-cpp -c $< -o $@
|
||||||
|
|
||||||
$(OBJDIR)/SRB2.res: win32/Srb2win.rc win32/afxres.h win32/resource.h
|
$(OBJDIR)/SRB2.res: win32/Srb2win.rc win32/afxres.h win32/resource.h
|
||||||
$(WINDRES) -i $< -O rc $(WINDRESFLAGS) --include-dir=win32 -o $@ -O coff
|
$(WINDRES) -i $< -O rc $(WINDRESFLAGS) --include-dir=win32 -o $@ -O coff
|
||||||
|
|
||||||
ifdef DC
|
|
||||||
$(OBJDIR)/romdisk.img:
|
|
||||||
$(KOS_GENROMFS) -f romdisk.img -d ../data -v
|
|
||||||
|
|
||||||
$(OBJDIR)/romdisk.o: romdisk.img
|
|
||||||
$(KOS_BASE)/utils/bin2o/bin2o romdisk.img romdisk romdisk.o
|
|
||||||
|
|
||||||
$(OBJDIR)/dchelp.o: $(INTERFACE)/SRB2DC/dchelp.c
|
|
||||||
$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
$(OBJDIR)/i_udp.o: $(INTERFACE)/SRB2DC/i_udp.c
|
|
||||||
$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
$(BIN)/IP.BIN: $(INTERFACE)/SRB2DC/IP.BIN
|
|
||||||
$(CP) $< $@
|
|
||||||
|
|
||||||
$(BIN)/SRB2DC.cdi.pass1: $(INTERFACE)/SRB2DC/SELFBOOT.BIN
|
|
||||||
$(CP) $< $@
|
|
||||||
|
|
||||||
$(BIN)/$(BINNAME): $(BIN)/$(EXENAME)
|
|
||||||
$(KOS_OBJCOPY) -R .stack -O binary $< $@
|
|
||||||
|
|
||||||
$(BIN)/1ST_READ.BIN: $(BIN)/$(BINNAME) $(BIN)/scramble
|
|
||||||
$(BIN)/scramble $< $@
|
|
||||||
|
|
||||||
$(BIN)/scramble: $(INTERFACE)/SRB2DC/scramble.c
|
|
||||||
-$(MKDIR) $(BIN)
|
|
||||||
$(HOSTCC) $< -o $@
|
|
||||||
|
|
||||||
iso: $(BIN)/SRB2DC.iso
|
|
||||||
cdi: $(BIN)/SRB2DC.cdi
|
|
||||||
|
|
||||||
$(BIN)/SRB2DC.iso.pass1: $(BIN)/1ST_READ.BIN $(BIN)/IP.BIN
|
|
||||||
-$(MKDIR) $(BIN)/cdrom
|
|
||||||
$(CP) $(BIN)/1ST_READ.BIN $(D_FILES) $(BIN)/cdrom
|
|
||||||
$(MKISOFS) -l -r -o $@ $(BIN)/cdrom
|
|
||||||
|
|
||||||
$(BIN)/SRB2DC.iso.pass2: $(BIN)/SRB2DC.iso.pass1
|
|
||||||
$(DD) if=$< of=$@ bs=2048 skip=16 status=noxfer
|
|
||||||
|
|
||||||
$(BIN)/SRB2DC.iso: $(BIN)/SRB2DC.iso.pass2 $(BIN)/IP.BIN
|
|
||||||
@cat $(BIN)/IP.BIN $(BIN)/SRB2DC.iso.pass2 > $@
|
|
||||||
|
|
||||||
$(BIN)/SRB2DC.cdi: $(BIN)/SRB2DC.iso.pass2 $(BIN)/SRB2DC.cdi.pass1 $(BIN)/IP.BIN
|
|
||||||
@cat $(BIN)/SRB2DC.cdi.pass1 $(BIN)/IP.BIN $(BIN)/SRB2DC.iso.pass2 > $@
|
|
||||||
|
|
||||||
post-build: $(BIN)/1ST_READ.BIN
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef XBOX
|
|
||||||
$(OBJDIR)/xboxhelp.o: $(INTERFACE)/SRB2XBOX/xboxhelp.c
|
|
||||||
$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
$(BIN)/$(BINNAME): $(BIN)/$(EXENAME)
|
|
||||||
$(CXBE) -OUT:"$@" -DUMPINFO:"$(BIN)/SRB2XBOX.cxbe" -TITLE:"Sonic Robo Blast 2" $<
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef NDS
|
|
||||||
$(BIN)/$(EXENAME:.elf=.nds): $(BIN)/$(EXENAME:.elf=.arm9)
|
|
||||||
$(NDSTOOL) -c $@ -9 $(BIN)/$(EXENAME:.elf=.arm9)
|
|
||||||
|
|
||||||
%.arm9: %.elf
|
|
||||||
$(OBJCOPY) -O binary $< $@
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MINGW
|
|
||||||
ifndef SDL
|
|
||||||
ifndef NOHW
|
|
||||||
$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
|
|
||||||
doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
|
|
||||||
command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
|
|
||||||
hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
|
|
||||||
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
|
|
||||||
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
|
|
||||||
p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
|
|
||||||
$(CC) $(CFLAGS) $(WFLAGS) -D_WINDOWS -mwindows -c $< -o $@
|
|
||||||
|
|
||||||
$(OBJDIR)/ogl_win.o: hardware/r_opengl/ogl_win.c hardware/r_opengl/r_opengl.h \
|
|
||||||
doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
|
|
||||||
command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
|
|
||||||
hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
|
|
||||||
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
|
|
||||||
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
|
|
||||||
p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
|
|
||||||
$(CC) $(CFLAGS) $(WFLAGS) -D_WINDOWS -mwindows -c $< -o $@
|
|
||||||
|
|
||||||
$(OBJDIR)/r_minigl.o: hardware/r_minigl/r_minigl.c hardware/r_opengl/r_opengl.h \
|
|
||||||
doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
|
|
||||||
command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
|
|
||||||
hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
|
|
||||||
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
|
|
||||||
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
|
|
||||||
p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
|
|
||||||
$(CC) $(CFLAGS) $(WFLAGS) -D_WINDOWS -mwindows -c $< -o $@
|
|
||||||
endif
|
|
||||||
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef SDL
|
ifdef SDL
|
||||||
|
|
||||||
ifdef MINGW
|
ifdef MINGW
|
||||||
|
|||||||
+138
-153
@@ -12,29 +12,32 @@
|
|||||||
# to avoid a false positive with the version detection...
|
# to avoid a false positive with the version detection...
|
||||||
|
|
||||||
SUPPORTED_GCC_VERSIONS:=\
|
SUPPORTED_GCC_VERSIONS:=\
|
||||||
101 102\
|
132 131 130 13\
|
||||||
91 92 93\
|
123 122 121 120 12\
|
||||||
81 82 83 84\
|
114 113 112 111 110 11\
|
||||||
71 72 73 74 75\
|
105 104 103 102 101 100 10\
|
||||||
61 62 63 64\
|
95 94 93 92 91 90\
|
||||||
51 52 53 54 55\
|
85 84 83 82 81 80\
|
||||||
40 41 42 43 44 45 46 47 48 49
|
75 74 73 72 71 70\
|
||||||
|
64 63 62 61 60\
|
||||||
|
55 54 53 52 51 50\
|
||||||
|
49 48 47 46 45 44 43 42 41 40
|
||||||
|
|
||||||
LATEST_GCC_VERSION=10.2
|
LATEST_GCC_VERSION=13.2
|
||||||
|
|
||||||
# gcc or g++
|
# gcc or g++
|
||||||
ifdef PREFIX
|
ifdef PREFIX
|
||||||
CC=$(PREFIX)-gcc
|
CC:=$(PREFIX)-gcc
|
||||||
CXX=$(PREFIX)-g++
|
CXX:=$(PREFIX)-g++
|
||||||
OBJCOPY=$(PREFIX)-objcopy
|
OBJCOPY?=$(PREFIX)-objcopy
|
||||||
OBJDUMP=$(PREFIX)-objdump
|
OBJDUMP?=$(PREFIX)-objdump
|
||||||
STRIP=$(PREFIX)-strip
|
STRIP?=$(PREFIX)-strip
|
||||||
WINDRES=$(PREFIX)-windres
|
WINDRES?=$(PREFIX)-windres
|
||||||
else
|
else
|
||||||
OBJCOPY=objcopy
|
OBJCOPY?=objcopy
|
||||||
OBJDUMP=objdump
|
OBJDUMP?=objdump
|
||||||
STRIP=strip
|
STRIP?=strip
|
||||||
WINDRES=windres
|
WINDRES?=windres
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# because Apple screws with us on this
|
# because Apple screws with us on this
|
||||||
@@ -51,7 +54,10 @@ ifeq (,$(filter GCC%,$(.VARIABLES)))
|
|||||||
version:=$(shell $(CC) --version)
|
version:=$(shell $(CC) --version)
|
||||||
# check if this is in fact GCC
|
# check if this is in fact GCC
|
||||||
ifneq (,$(or $(findstring gcc,$(version)),$(findstring GCC,$(version))))
|
ifneq (,$(or $(findstring gcc,$(version)),$(findstring GCC,$(version))))
|
||||||
version:=$(shell $(CC) -dumpversion)
|
shellversion:=$(shell $(CC) -dumpversion)
|
||||||
|
|
||||||
|
# Try to remove "-win32"
|
||||||
|
version:=$(subst -win32,.0,$(shellversion))
|
||||||
|
|
||||||
# Turn version into words of major, minor
|
# Turn version into words of major, minor
|
||||||
v:=$(subst ., ,$(version))
|
v:=$(subst ., ,$(version))
|
||||||
@@ -71,11 +77,99 @@ ifeq (,$(filter GCC%,$(.VARIABLES)))
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef GCC132
|
||||||
|
GCC131=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC131
|
||||||
|
GCC130=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC13
|
||||||
|
GCC130=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC130
|
||||||
|
GCC123=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC123
|
||||||
|
GCC122=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC122
|
||||||
|
GCC121=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC121
|
||||||
|
GCC120=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC12
|
||||||
|
GCC120=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC120
|
||||||
|
GCC114=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC114
|
||||||
|
GCC113=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC113
|
||||||
|
GCC112=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC112
|
||||||
|
GCC111=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC111
|
||||||
|
GCC110=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC11
|
||||||
|
GCC110=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC110
|
||||||
|
GCC105=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC105
|
||||||
|
GCC104=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC104
|
||||||
|
GCC103=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC103
|
||||||
|
GCC102=1
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef GCC102
|
ifdef GCC102
|
||||||
GCC101=1
|
GCC101=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef GCC101
|
ifdef GCC101
|
||||||
|
GCC100=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC10
|
||||||
|
GCC100=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC100
|
||||||
|
GCC93=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC95
|
||||||
|
GCC94=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC94
|
||||||
GCC93=1
|
GCC93=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -88,6 +182,14 @@ GCC91=1
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef GCC91
|
ifdef GCC91
|
||||||
|
GCC90=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC90
|
||||||
|
GCC85=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC85
|
||||||
GCC84=1
|
GCC84=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -104,6 +206,10 @@ GCC81=1
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef GCC81
|
ifdef GCC81
|
||||||
|
GCC80=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC80
|
||||||
GCC75=1
|
GCC75=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -124,6 +230,10 @@ GCC71=1
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef GCC71
|
ifdef GCC71
|
||||||
|
GCC70=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC70
|
||||||
GCC64=1
|
GCC64=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -140,6 +250,10 @@ GCC61=1
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef GCC61
|
ifdef GCC61
|
||||||
|
GCC60=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC60
|
||||||
GCC55=1
|
GCC55=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -160,6 +274,10 @@ GCC51=1
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef GCC51
|
ifdef GCC51
|
||||||
|
GCC50=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef GCC50
|
||||||
GCC49=1
|
GCC49=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -204,10 +322,6 @@ ifdef GCC295
|
|||||||
GCC29=1
|
GCC29=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef DC
|
|
||||||
NOCASTALIGNWARN=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
OLDWFLAGS:=$(WFLAGS)
|
OLDWFLAGS:=$(WFLAGS)
|
||||||
# -W -Wno-unused
|
# -W -Wno-unused
|
||||||
WFLAGS=-Wall
|
WFLAGS=-Wall
|
||||||
@@ -264,15 +378,11 @@ endif
|
|||||||
ifdef GCC40
|
ifdef GCC40
|
||||||
WFLAGS+=-Wold-style-definition
|
WFLAGS+=-Wold-style-definition
|
||||||
endif
|
endif
|
||||||
ifndef XBOX
|
|
||||||
WFLAGS+=-Wmissing-prototypes -Wmissing-declarations
|
WFLAGS+=-Wmissing-prototypes -Wmissing-declarations
|
||||||
endif
|
|
||||||
ifdef GCC40
|
ifdef GCC40
|
||||||
WFLAGS+=-Wmissing-field-initializers
|
WFLAGS+=-Wmissing-field-initializers
|
||||||
endif
|
endif
|
||||||
ifndef XBOX
|
|
||||||
WFLAGS+=-Wmissing-noreturn
|
WFLAGS+=-Wmissing-noreturn
|
||||||
endif
|
|
||||||
#WFLAGS+=-Wmissing-format-attribute
|
#WFLAGS+=-Wmissing-format-attribute
|
||||||
#WFLAGS+=-Wno-multichar
|
#WFLAGS+=-Wno-multichar
|
||||||
#WFLAGS+=-Wno-deprecated-declarations
|
#WFLAGS+=-Wno-deprecated-declarations
|
||||||
@@ -344,28 +454,14 @@ endif
|
|||||||
|
|
||||||
|
|
||||||
#indicate platform and what interface use with
|
#indicate platform and what interface use with
|
||||||
ifndef WINCE
|
|
||||||
ifndef XBOX
|
|
||||||
ifndef PSP
|
|
||||||
ifndef DC
|
|
||||||
ifndef WII
|
|
||||||
ifndef PS3N
|
|
||||||
ifndef LINUX
|
ifndef LINUX
|
||||||
ifndef FREEBSD
|
ifndef FREEBSD
|
||||||
ifndef CYGWIN32
|
ifndef CYGWIN32
|
||||||
ifndef MINGW
|
ifndef MINGW
|
||||||
ifndef MINGW64
|
ifndef MINGW64
|
||||||
ifndef SDL
|
ifndef SDL
|
||||||
ifndef NDS
|
|
||||||
ifndef DUMMY
|
ifndef DUMMY
|
||||||
DJGPPDOS=1
|
$(error No interface or platform flag defined)
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -375,7 +471,6 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
#determine the interface directory (where you put all i_*.c)
|
#determine the interface directory (where you put all i_*.c)
|
||||||
i_cdmus_o=$(OBJDIR)/i_cdmus.o
|
|
||||||
i_net_o=$(OBJDIR)/i_net.o
|
i_net_o=$(OBJDIR)/i_net.o
|
||||||
i_system_o=$(OBJDIR)/i_system.o
|
i_system_o=$(OBJDIR)/i_system.o
|
||||||
i_sound_o=$(OBJDIR)/i_sound.o
|
i_sound_o=$(OBJDIR)/i_sound.o
|
||||||
@@ -383,12 +478,6 @@ i_main_o=$(OBJDIR)/i_main.o
|
|||||||
#set OBJDIR and BIN's starting place
|
#set OBJDIR and BIN's starting place
|
||||||
OBJDIR=../objs
|
OBJDIR=../objs
|
||||||
BIN=../bin
|
BIN=../bin
|
||||||
#Nasm ASM and rm
|
|
||||||
ifdef YASM
|
|
||||||
NASM?=yasm
|
|
||||||
else
|
|
||||||
NASM?=nasm
|
|
||||||
endif
|
|
||||||
REMOVE?=rm -f
|
REMOVE?=rm -f
|
||||||
CP?=cp
|
CP?=cp
|
||||||
MKDIR?=mkdir -p
|
MKDIR?=mkdir -p
|
||||||
@@ -404,23 +493,12 @@ UPX_OPTS+=-q
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
#Interface Setup
|
#Interface Setup
|
||||||
ifdef DJGPPDOS
|
|
||||||
INTERFACE=djgppdos
|
|
||||||
NASMFORMAT=coff
|
|
||||||
OBJDIR:=$(OBJDIR)/djgppdos
|
|
||||||
ifdef WATTCP
|
|
||||||
OBJDIR:=$(OBJDIR)/wattcp
|
|
||||||
endif
|
|
||||||
WFLAGS+=-Wno-format
|
|
||||||
BIN:=$(BIN)/Dos
|
|
||||||
else
|
|
||||||
ifdef DUMMY
|
ifdef DUMMY
|
||||||
INTERFACE=dummy
|
INTERFACE=dummy
|
||||||
OBJDIR:=$(OBJDIR)/dummy
|
OBJDIR:=$(OBJDIR)/dummy
|
||||||
BIN:=$(BIN)/dummy
|
BIN:=$(BIN)/dummy
|
||||||
else
|
else
|
||||||
ifdef LINUX
|
ifdef LINUX
|
||||||
NASMFORMAT=elf -DLINUX
|
|
||||||
SDL=1
|
SDL=1
|
||||||
ifdef LINUX64
|
ifdef LINUX64
|
||||||
OBJDIR:=$(OBJDIR)/Linux64
|
OBJDIR:=$(OBJDIR)/Linux64
|
||||||
@@ -432,7 +510,6 @@ endif
|
|||||||
else
|
else
|
||||||
ifdef FREEBSD
|
ifdef FREEBSD
|
||||||
INTERFACE=sdl
|
INTERFACE=sdl
|
||||||
NASMFORMAT=elf -DLINUX
|
|
||||||
SDL=1
|
SDL=1
|
||||||
|
|
||||||
OBJDIR:=$(OBJDIR)/FreeBSD
|
OBJDIR:=$(OBJDIR)/FreeBSD
|
||||||
@@ -440,7 +517,6 @@ ifdef FREEBSD
|
|||||||
else
|
else
|
||||||
ifdef SOLARIS
|
ifdef SOLARIS
|
||||||
INTERFACE=sdl
|
INTERFACE=sdl
|
||||||
NASMFORMAT=elf -DLINUX
|
|
||||||
SDL=1
|
SDL=1
|
||||||
|
|
||||||
OBJDIR:=$(OBJDIR)/Solaris
|
OBJDIR:=$(OBJDIR)/Solaris
|
||||||
@@ -448,7 +524,6 @@ ifdef SOLARIS
|
|||||||
else
|
else
|
||||||
ifdef CYGWIN32
|
ifdef CYGWIN32
|
||||||
INTERFACE=sdl
|
INTERFACE=sdl
|
||||||
NASMFORMAT=win32
|
|
||||||
SDL=1
|
SDL=1
|
||||||
|
|
||||||
OBJDIR:=$(OBJDIR)/cygwin
|
OBJDIR:=$(OBJDIR)/cygwin
|
||||||
@@ -456,83 +531,13 @@ ifdef CYGWIN32
|
|||||||
else
|
else
|
||||||
ifdef MINGW64
|
ifdef MINGW64
|
||||||
INTERFACE=win32
|
INTERFACE=win32
|
||||||
#NASMFORMAT=win64
|
|
||||||
OBJDIR:=$(OBJDIR)/Mingw64
|
OBJDIR:=$(OBJDIR)/Mingw64
|
||||||
BIN:=$(BIN)/Mingw64
|
BIN:=$(BIN)/Mingw64
|
||||||
else
|
else
|
||||||
ifdef WII
|
|
||||||
INTERFACE=sdl12
|
|
||||||
NONX86=1
|
|
||||||
STATIC=1
|
|
||||||
PREFIX?=powerpc-eabi
|
|
||||||
SDL=1
|
|
||||||
SDL12=1
|
|
||||||
SDLMAIN=1
|
|
||||||
OBJDIR:=$(OBJDIR)/Wii
|
|
||||||
BIN:=$(BIN)/Wii
|
|
||||||
NOUPX=1
|
|
||||||
else
|
|
||||||
ifdef PS3N
|
|
||||||
INTERFACE=sdl12
|
|
||||||
NONX86=1
|
|
||||||
STATIC=1
|
|
||||||
PREFIX?=ppu
|
|
||||||
SDL=1
|
|
||||||
SDL12=1
|
|
||||||
# unsure?
|
|
||||||
#SDLMAIN=1
|
|
||||||
# can't compile SDL_mixer for ps3...
|
|
||||||
NOMIXER=1
|
|
||||||
OBJDIR:=$(OBJDIR)/PS3
|
|
||||||
BIN:=$(BIN)/PS3
|
|
||||||
else
|
|
||||||
ifdef MINGW
|
ifdef MINGW
|
||||||
INTERFACE=win32
|
INTERFACE=win32
|
||||||
NASMFORMAT=win32
|
|
||||||
OBJDIR:=$(OBJDIR)/Mingw
|
OBJDIR:=$(OBJDIR)/Mingw
|
||||||
BIN:=$(BIN)/Mingw
|
BIN:=$(BIN)/Mingw
|
||||||
else
|
|
||||||
ifdef XBOX
|
|
||||||
INTERFACE=sdl12
|
|
||||||
NASMFORMAT=win32
|
|
||||||
PREFIX?=/usr/local/openxdk/bin/i386-pc-xbox
|
|
||||||
SDL=1
|
|
||||||
SDL12=1
|
|
||||||
OBJDIR:=$(OBJDIR)/XBOX
|
|
||||||
BIN:=$(BIN)/XBOX
|
|
||||||
else
|
|
||||||
ifdef PSP
|
|
||||||
INTERFACE=sdl12
|
|
||||||
NONX86=1
|
|
||||||
SDL=1
|
|
||||||
SDL12=1
|
|
||||||
OBJDIR:=$(OBJDIR)/PSP
|
|
||||||
BIN:=$(BIN)/PSP
|
|
||||||
NOUPX=1
|
|
||||||
else
|
|
||||||
ifdef DC
|
|
||||||
INTERFACE=sdl12
|
|
||||||
NONX86=1
|
|
||||||
SDL=1
|
|
||||||
SDL12=1
|
|
||||||
OBJDIR:=$(OBJDIR)/DC
|
|
||||||
BIN:=$(BIN)/DC
|
|
||||||
NOUPX=1
|
|
||||||
else
|
|
||||||
ifdef WINCE
|
|
||||||
INTERFACE=sdl12
|
|
||||||
NONX86=1
|
|
||||||
PREFIX?=arm-wince-pe
|
|
||||||
SDL=1
|
|
||||||
SDL12=1
|
|
||||||
OBJDIR:=$(OBJDIR)/WinCE
|
|
||||||
BIN:=$(BIN)/WinCE
|
|
||||||
else
|
|
||||||
ifdef NDS
|
|
||||||
INTERFACE=nds
|
|
||||||
OBJDIR:=$(OBJDIR)/nds
|
|
||||||
BIN:=$(BIN)/nds
|
|
||||||
NOUPX=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -540,20 +545,6 @@ endif
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef GP2X
|
|
||||||
ifdef SDL
|
|
||||||
SDL12=1
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef ARCHNAME
|
ifdef ARCHNAME
|
||||||
OBJDIR:=$(OBJDIR)/$(ARCHNAME)
|
OBJDIR:=$(OBJDIR)/$(ARCHNAME)
|
||||||
@@ -564,13 +555,7 @@ OBJDUMP_OPTS?=--wide --source --line-numbers
|
|||||||
LD=$(CC)
|
LD=$(CC)
|
||||||
|
|
||||||
ifdef SDL
|
ifdef SDL
|
||||||
# SDL 2.0
|
|
||||||
ifndef SDL12
|
|
||||||
INTERFACE=sdl
|
INTERFACE=sdl
|
||||||
# SDL 1.2
|
|
||||||
else
|
|
||||||
INTERFACE=sdl12
|
|
||||||
endif
|
|
||||||
OBJDIR:=$(OBJDIR)/SDL
|
OBJDIR:=$(OBJDIR)/SDL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
@@ -42,11 +42,6 @@ static const UINT8 NOCLIMBGRAYS = 204;
|
|||||||
static const UINT8 NOCLIMBBROWNS = (2*16);
|
static const UINT8 NOCLIMBBROWNS = (2*16);
|
||||||
static const UINT8 NOCLIMBYELLOWS = (11*16);
|
static const UINT8 NOCLIMBYELLOWS = (11*16);
|
||||||
|
|
||||||
|
|
||||||
#ifdef _NDS
|
|
||||||
#undef BACKGROUND
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Automap colors
|
// Automap colors
|
||||||
#define BACKGROUND DBLACK
|
#define BACKGROUND DBLACK
|
||||||
#define WALLCOLORS (REDS + REDRANGE/2)
|
#define WALLCOLORS (REDS + REDRANGE/2)
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ static INT64 start_time; // as microseconds since the epoch
|
|||||||
|
|
||||||
// I should probably return how much memory is remaining
|
// I should probably return how much memory is remaining
|
||||||
// for this process, considering Android's process memory limit.
|
// for this process, considering Android's process memory limit.
|
||||||
UINT32 I_GetFreeMem(UINT32 *total)
|
size_t I_GetFreeMem(size_t *total)
|
||||||
{
|
{
|
||||||
// what the heck? sysinfo() is partially missing in bionic?
|
// what the heck? sysinfo() is partially missing in bionic?
|
||||||
/* struct sysinfo si; */
|
/* struct sysinfo si; */
|
||||||
|
|||||||
@@ -24,12 +24,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#define APNG_H
|
#define APNG_H
|
||||||
|
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
#ifndef _WII
|
|
||||||
#ifndef _LARGEFILE64_SOURCE
|
#ifndef _LARGEFILE64_SOURCE
|
||||||
#define _LARGEFILE64_SOURCE
|
#define _LARGEFILE64_SOURCE
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _LFS64_LARGEFILE
|
#ifndef _LFS64_LARGEFILE
|
||||||
#define _LFS64_LARGEFILE
|
#define _LFS64_LARGEFILE
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
// SONIC ROBO BLAST 2
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Copyright (C) 1998-2000 by DooM Legacy Team.
|
|
||||||
// Copyright (C) 1999-2018 by Sonic Team Junior.
|
|
||||||
//
|
|
||||||
// This program is free software distributed under the
|
|
||||||
// terms of the GNU General Public License, version 2.
|
|
||||||
// See the 'LICENSE' file for more details.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
/// \file asm_defs.inc
|
|
||||||
/// \brief must match the C structures
|
|
||||||
|
|
||||||
#ifndef __ASM_DEFS__
|
|
||||||
#define __ASM_DEFS__
|
|
||||||
|
|
||||||
// this makes variables more noticable,
|
|
||||||
// and make the label match with C code
|
|
||||||
|
|
||||||
// Linux, unlike DOS, has no "_" 19990119 by Kin
|
|
||||||
// and nasm needs .data code segs under linux 20010210 by metzgermeister
|
|
||||||
// FIXME: nasm ignores these settings, so I put the macros into the makefile
|
|
||||||
#ifdef __ELF__
|
|
||||||
#define C(label) label
|
|
||||||
#define CODE_SEG .data
|
|
||||||
#else
|
|
||||||
#define C(label) _##label
|
|
||||||
#define CODE_SEG .text
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* This is a more readable way to access the arguments passed from C code */
|
|
||||||
/* PLEASE NOTE: it is supposed that all arguments passed from C code are */
|
|
||||||
/* 32bit integer (INT32, long, and most *pointers) */
|
|
||||||
#define ARG1 8(%ebp)
|
|
||||||
#define ARG2 12(%ebp)
|
|
||||||
#define ARG3 16(%ebp)
|
|
||||||
#define ARG4 20(%ebp)
|
|
||||||
#define ARG5 24(%ebp)
|
|
||||||
#define ARG6 28(%ebp)
|
|
||||||
#define ARG7 32(%ebp)
|
|
||||||
#define ARG8 36(%ebp)
|
|
||||||
#define ARG9 40(%ebp) //(c)tm ... Allegro by Shawn Hargreaves.
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+11
-12
@@ -686,6 +686,15 @@ static void codearith (FuncState *fs, OpCode op, expdesc *e1, expdesc *e2) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void codeunaryarith (FuncState *fs, OpCode op, expdesc *e) {
|
||||||
|
expdesc e2;
|
||||||
|
e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
|
||||||
|
if (!isnumeral(e))
|
||||||
|
luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */
|
||||||
|
codearith(fs, op, e, &e2);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1,
|
static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1,
|
||||||
expdesc *e2) {
|
expdesc *e2) {
|
||||||
int o1 = luaK_exp2RK(fs, e1);
|
int o1 = luaK_exp2RK(fs, e1);
|
||||||
@@ -706,18 +715,8 @@ void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
|
|||||||
expdesc e2;
|
expdesc e2;
|
||||||
e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
|
e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
|
||||||
switch (op) {
|
switch (op) {
|
||||||
case OPR_MINUS: {
|
case OPR_MINUS: codeunaryarith(fs, OP_UNM, e); break;
|
||||||
if (!isnumeral(e))
|
case OPR_BNOT: codeunaryarith(fs, OP_BNOT, e); break;
|
||||||
luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */
|
|
||||||
codearith(fs, OP_UNM, e, &e2);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case OPR_BNOT: {
|
|
||||||
if (e->k == VK)
|
|
||||||
luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */
|
|
||||||
codearith(fs, OP_BNOT, e, &e2);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case OPR_NOT: codenot(fs, e); break;
|
case OPR_NOT: codenot(fs, e); break;
|
||||||
case OPR_LEN: {
|
case OPR_LEN: {
|
||||||
luaK_exp2anyreg(fs, e); /* cannot operate on constants */
|
luaK_exp2anyreg(fs, e); /* cannot operate on constants */
|
||||||
|
|||||||
@@ -445,7 +445,6 @@ static int io_readline (lua_State *L) {
|
|||||||
static int g_write (lua_State *L, FILE *f, int arg) {
|
static int g_write (lua_State *L, FILE *f, int arg) {
|
||||||
int nargs = lua_gettop(L) - 1;
|
int nargs = lua_gettop(L) - 1;
|
||||||
int status = 1;
|
int status = 1;
|
||||||
size_t count;
|
|
||||||
for (; nargs--; arg++) {
|
for (; nargs--; arg++) {
|
||||||
if (lua_type(L, arg) == LUA_TNUMBER) {
|
if (lua_type(L, arg) == LUA_TNUMBER) {
|
||||||
/* optimization: could be done exactly as for strings */
|
/* optimization: could be done exactly as for strings */
|
||||||
@@ -455,7 +454,6 @@ static int g_write (lua_State *L, FILE *f, int arg) {
|
|||||||
else {
|
else {
|
||||||
size_t l;
|
size_t l;
|
||||||
const char *s = luaL_checklstring(L, arg, &l);
|
const char *s = luaL_checklstring(L, arg, &l);
|
||||||
count += l;
|
|
||||||
if (ftell(f) + l > FILELIMIT)
|
if (ftell(f) + l > FILELIMIT)
|
||||||
{
|
{
|
||||||
luaL_error(L,"write limit bypassed in file. Changes have been discarded.");
|
luaL_error(L,"write limit bypassed in file. Changes have been discarded.");
|
||||||
|
|||||||
+90
-30
@@ -49,6 +49,7 @@ static void COM_CEchoDuration_f(void);
|
|||||||
static void COM_Exec_f(void);
|
static void COM_Exec_f(void);
|
||||||
static void COM_Wait_f(void);
|
static void COM_Wait_f(void);
|
||||||
static void COM_Help_f(void);
|
static void COM_Help_f(void);
|
||||||
|
static void COM_Find_f(void);
|
||||||
static void COM_Toggle_f(void);
|
static void COM_Toggle_f(void);
|
||||||
static void COM_Add_f(void);
|
static void COM_Add_f(void);
|
||||||
|
|
||||||
@@ -277,7 +278,7 @@ static xcommand_t *com_commands = NULL; // current commands
|
|||||||
|
|
||||||
#define MAX_ARGS 80
|
#define MAX_ARGS 80
|
||||||
static size_t com_argc;
|
static size_t com_argc;
|
||||||
static char *com_argv[MAX_ARGS];
|
char *com_argv[MAX_ARGS];
|
||||||
static const char *com_null_string = "";
|
static const char *com_null_string = "";
|
||||||
static char *com_args = NULL; // current command args or NULL
|
static char *com_args = NULL; // current command args or NULL
|
||||||
|
|
||||||
@@ -299,6 +300,7 @@ void COM_Init(void)
|
|||||||
COM_AddCommand("exec", COM_Exec_f);
|
COM_AddCommand("exec", COM_Exec_f);
|
||||||
COM_AddCommand("wait", COM_Wait_f);
|
COM_AddCommand("wait", COM_Wait_f);
|
||||||
COM_AddCommand("help", COM_Help_f);
|
COM_AddCommand("help", COM_Help_f);
|
||||||
|
COM_AddCommand("find", COM_Find_f);
|
||||||
COM_AddCommand("toggle", COM_Toggle_f);
|
COM_AddCommand("toggle", COM_Toggle_f);
|
||||||
COM_AddCommand("add", COM_Add_f);
|
COM_AddCommand("add", COM_Add_f);
|
||||||
RegisterNetXCmd(XD_NETVAR, Got_NetVar);
|
RegisterNetXCmd(XD_NETVAR, Got_NetVar);
|
||||||
@@ -327,6 +329,16 @@ const char *COM_Argv(size_t arg)
|
|||||||
return com_argv[arg];
|
return com_argv[arg];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Returns all of the console command arguments
|
||||||
|
*
|
||||||
|
* \return String pointer to the argv table.
|
||||||
|
* \sa COM_ArgvList
|
||||||
|
*/
|
||||||
|
char **COM_ArgvList(void)
|
||||||
|
{
|
||||||
|
return com_argv;
|
||||||
|
}
|
||||||
|
|
||||||
/** Gets all console command arguments.
|
/** Gets all console command arguments.
|
||||||
*
|
*
|
||||||
* \return String pointer to all arguments for the last command.
|
* \return String pointer to all arguments for the last command.
|
||||||
@@ -810,7 +822,7 @@ static void COM_Help_f(void)
|
|||||||
if (cvar)
|
if (cvar)
|
||||||
{
|
{
|
||||||
CONS_Printf("\x82""Variable %s:\n", cvar->name);
|
CONS_Printf("\x82""Variable %s:\n", cvar->name);
|
||||||
CONS_Printf(M_GetText(" flags :"));
|
CONS_Printf(M_GetText(" flags: "));
|
||||||
if (cvar->flags & CV_SAVE)
|
if (cvar->flags & CV_SAVE)
|
||||||
CONS_Printf("AUTOSAVE ");
|
CONS_Printf("AUTOSAVE ");
|
||||||
if (cvar->flags & CV_FLOAT)
|
if (cvar->flags & CV_FLOAT)
|
||||||
@@ -864,30 +876,9 @@ static void COM_Help_f(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
CONS_Printf("No exact match, searching...\n");
|
CONS_Printf("No variable or command named %s", help);
|
||||||
// commands
|
CONS_Printf("\x82""\nCheck wiki.srb2.org for more or try typing help without arguments\n");
|
||||||
CONS_Printf("\x82""Commands:\n");
|
|
||||||
for (cmd = com_commands; cmd; cmd = cmd->next)
|
|
||||||
{
|
|
||||||
if (!strstr(cmd->name, help))
|
|
||||||
continue;
|
|
||||||
CONS_Printf("%s ",cmd->name);
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// variables
|
|
||||||
CONS_Printf("\x82""\nVariables:\n");
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
|
||||||
{
|
|
||||||
if ((cvar->flags & CV_NOSHOWHELP) || (!strstr(cvar->name, help)))
|
|
||||||
continue;
|
|
||||||
CONS_Printf("%s ", cvar->name);
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
CONS_Printf("\x82""\nCheck wiki.srb2.org for more or type help <command or variable>\n");
|
|
||||||
|
|
||||||
CONS_Debug(DBG_GAMELOGIC, "\x87Total : %d\n", i);
|
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -917,6 +908,78 @@ static void COM_Help_f(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void COM_Find_f(void)
|
||||||
|
{
|
||||||
|
static char prefix[80];
|
||||||
|
xcommand_t *cmd;
|
||||||
|
consvar_t *cvar;
|
||||||
|
cmdalias_t *alias;
|
||||||
|
const char *match;
|
||||||
|
const char *help;
|
||||||
|
size_t helplen;
|
||||||
|
boolean matchesany;
|
||||||
|
|
||||||
|
if (COM_Argc() != 2)
|
||||||
|
{
|
||||||
|
CONS_Printf(M_GetText("find <text>: Search for variables, commands and aliases containing <text>\n"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
help = COM_Argv(1);
|
||||||
|
helplen = strlen(help);
|
||||||
|
CONS_Printf("\x82""Variables:\n");
|
||||||
|
matchesany = false;
|
||||||
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
|
{
|
||||||
|
if (cvar->flags & CV_NOSHOWHELP)
|
||||||
|
continue;
|
||||||
|
match = strstr(cvar->name, help);
|
||||||
|
if (match != NULL)
|
||||||
|
{
|
||||||
|
memcpy(prefix, cvar->name, match - cvar->name);
|
||||||
|
prefix[match - cvar->name] = '\0';
|
||||||
|
CONS_Printf(" %s\x83%s\x80%s\n", prefix, help, &match[helplen]);
|
||||||
|
matchesany = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!matchesany)
|
||||||
|
CONS_Printf(" (none)\n");
|
||||||
|
|
||||||
|
CONS_Printf("\x82""Commands:\n");
|
||||||
|
matchesany = false;
|
||||||
|
for (cmd = com_commands; cmd; cmd = cmd->next)
|
||||||
|
{
|
||||||
|
match = strstr(cmd->name, help);
|
||||||
|
if (match != NULL)
|
||||||
|
{
|
||||||
|
memcpy(prefix, cmd->name, match - cmd->name);
|
||||||
|
prefix[match - cmd->name] = '\0';
|
||||||
|
CONS_Printf(" %s\x83%s\x80%s\n", prefix, help, &match[helplen]);
|
||||||
|
matchesany = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!matchesany)
|
||||||
|
CONS_Printf(" (none)\n");
|
||||||
|
|
||||||
|
CONS_Printf("\x82""Aliases:\n");
|
||||||
|
matchesany = false;
|
||||||
|
for (alias = com_alias; alias; alias = alias->next)
|
||||||
|
{
|
||||||
|
match = strstr(alias->name, help);
|
||||||
|
if (match != NULL)
|
||||||
|
{
|
||||||
|
memcpy(prefix, alias->name, match - alias->name);
|
||||||
|
prefix[match - alias->name] = '\0';
|
||||||
|
CONS_Printf(" %s\x83%s\x80%s\n", prefix, help, &match[helplen]);
|
||||||
|
matchesany = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!matchesany)
|
||||||
|
CONS_Printf(" (none)\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/** Toggles a console variable. Useful for on/off values.
|
/** Toggles a console variable. Useful for on/off values.
|
||||||
*
|
*
|
||||||
* This works on on/off, yes/no values only
|
* This works on on/off, yes/no values only
|
||||||
@@ -1445,7 +1508,7 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
|
|||||||
|
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -1464,9 +1527,6 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, "Netvar not found with netid %hu\n", netid);
|
CONS_Alert(CONS_WARNING, "Netvar not found with netid %hu\n", netid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#if 0 //defined (GP2X) || defined (PSP)
|
|
||||||
CONS_Printf("Netvar received: %s [netid=%d] value %s\n", cvar->name, netid, svalue);
|
|
||||||
#endif
|
|
||||||
DEBFILE(va("Netvar received: %s [netid=%d] value %s\n", cvar->name, netid, svalue));
|
DEBFILE(va("Netvar received: %s [netid=%d] value %s\n", cvar->name, netid, svalue));
|
||||||
|
|
||||||
Setvalue(cvar, svalue, stealth);
|
Setvalue(cvar, svalue, stealth);
|
||||||
@@ -1587,7 +1647,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
|
|||||||
if (var->flags & CV_NETVAR)
|
if (var->flags & CV_NETVAR)
|
||||||
{
|
{
|
||||||
// send the value of the variable
|
// send the value of the variable
|
||||||
XBOXSTATIC UINT8 buf[128];
|
UINT8 buf[128];
|
||||||
UINT8 *p = buf;
|
UINT8 *p = buf;
|
||||||
if (!(server || (IsPlayerAdmin(consoleplayer))))
|
if (!(server || (IsPlayerAdmin(consoleplayer))))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -33,8 +33,12 @@ typedef void (*com_func_t)(void);
|
|||||||
void COM_AddCommand(const char *name, com_func_t func);
|
void COM_AddCommand(const char *name, com_func_t func);
|
||||||
int COM_AddLuaCommand(const char *name);
|
int COM_AddLuaCommand(const char *name);
|
||||||
|
|
||||||
|
#define MAX_ARGS 80
|
||||||
|
extern char *com_argv[MAX_ARGS];
|
||||||
|
|
||||||
size_t COM_Argc(void);
|
size_t COM_Argc(void);
|
||||||
const char *COM_Argv(size_t arg); // if argv > argc, returns empty string
|
const char *COM_Argv(size_t arg); // if argv > argc, returns empty string
|
||||||
|
char **COM_ArgvList(void);
|
||||||
char *COM_Args(void);
|
char *COM_Args(void);
|
||||||
size_t COM_CheckParm(const char *check); // like M_CheckParm :)
|
size_t COM_CheckParm(const char *check); // like M_CheckParm :)
|
||||||
size_t COM_CheckPartialParm(const char *check);
|
size_t COM_CheckPartialParm(const char *check);
|
||||||
|
|||||||
+39
-74
@@ -12,9 +12,6 @@
|
|||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#ifdef _XBOX
|
|
||||||
#include <openxdk/debug.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "doomdef.h"
|
#include "doomdef.h"
|
||||||
@@ -23,6 +20,7 @@
|
|||||||
#include "g_input.h"
|
#include "g_input.h"
|
||||||
#include "hu_stuff.h"
|
#include "hu_stuff.h"
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
|
#include "r_main.h"
|
||||||
#include "r_defs.h"
|
#include "r_defs.h"
|
||||||
#include "sounds.h"
|
#include "sounds.h"
|
||||||
#include "st_stuff.h"
|
#include "st_stuff.h"
|
||||||
@@ -36,10 +34,6 @@
|
|||||||
#include "m_menu.h"
|
#include "m_menu.h"
|
||||||
#include "filesrch.h"
|
#include "filesrch.h"
|
||||||
|
|
||||||
#ifdef _WINDOWS
|
|
||||||
#include "win32/win_main.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
#include "hardware/hw_main.h"
|
#include "hardware/hw_main.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -374,14 +368,10 @@ static void CON_SetupColormaps(void)
|
|||||||
CON_SetupBackColormap();
|
CON_SetupBackColormap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
// Setup the console text buffer
|
// Setup the console text buffer
|
||||||
//
|
//
|
||||||
// for WII, libogc already has a CON_Init function, we must rename it here
|
|
||||||
#ifdef _WII
|
|
||||||
void CON_InitWii(void)
|
|
||||||
#else
|
|
||||||
void CON_Init(void)
|
void CON_Init(void)
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
@@ -456,6 +446,8 @@ void CON_Init(void)
|
|||||||
Unlock_state();
|
Unlock_state();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
// Console input initialization
|
// Console input initialization
|
||||||
//
|
//
|
||||||
static void CON_InputInit(void)
|
static void CON_InputInit(void)
|
||||||
@@ -602,32 +594,38 @@ static void CON_ChangeHeight(void)
|
|||||||
//
|
//
|
||||||
static void CON_MoveConsole(void)
|
static void CON_MoveConsole(void)
|
||||||
{
|
{
|
||||||
fixed_t conspeed;
|
static fixed_t fracmovement = 0;
|
||||||
|
|
||||||
Lock_state();
|
Lock_state();
|
||||||
|
|
||||||
conspeed = FixedDiv(cons_speed.value*vid.fdupy, FRACUNIT);
|
|
||||||
|
|
||||||
// instant
|
// instant
|
||||||
if (!cons_speed.value)
|
if (!cons_speed.value)
|
||||||
{
|
{
|
||||||
con_curlines = con_destlines;
|
con_curlines = con_destlines;
|
||||||
|
Unlock_state();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// up/down move to dest
|
// Not instant - Increment fracmovement fractionally
|
||||||
if (con_curlines < con_destlines)
|
fracmovement += FixedMul(cons_speed.value*vid.fdupy, renderdeltatics);
|
||||||
|
|
||||||
|
if (con_curlines < con_destlines) // Move the console downwards
|
||||||
{
|
{
|
||||||
con_curlines += FixedInt(conspeed);
|
con_curlines += FixedInt(fracmovement); // Move by fracmovement's integer value
|
||||||
if (con_curlines > con_destlines)
|
if (con_curlines > con_destlines) // If we surpassed the destination...
|
||||||
con_curlines = con_destlines;
|
con_curlines = con_destlines; // ...clamp to it!
|
||||||
}
|
}
|
||||||
else if (con_curlines > con_destlines)
|
else // Move the console upwards
|
||||||
{
|
{
|
||||||
con_curlines -= FixedInt(conspeed);
|
con_curlines -= FixedInt(fracmovement);
|
||||||
if (con_curlines < con_destlines)
|
if (con_curlines < con_destlines)
|
||||||
con_curlines = con_destlines;
|
con_curlines = con_destlines;
|
||||||
|
|
||||||
|
if (con_destlines == 0) // If the console is being closed, not just moved up...
|
||||||
|
con_tick = 0; // ...don't show the blinking cursor
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fracmovement %= FRACUNIT; // Reset fracmovement's integer value, but keep the fraction
|
||||||
|
|
||||||
Unlock_state();
|
Unlock_state();
|
||||||
}
|
}
|
||||||
@@ -724,10 +722,6 @@ void CON_Ticker(void)
|
|||||||
CON_ChangeHeight();
|
CON_ChangeHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
// console movement
|
|
||||||
if (con_destlines != con_curlines)
|
|
||||||
CON_MoveConsole();
|
|
||||||
|
|
||||||
// clip the view, so that the part under the console is not drawn
|
// clip the view, so that the part under the console is not drawn
|
||||||
con_clipviewtop = -1;
|
con_clipviewtop = -1;
|
||||||
if (cons_backpic.value) // clip only when using an opaque background
|
if (cons_backpic.value) // clip only when using an opaque background
|
||||||
@@ -875,7 +869,9 @@ boolean CON_Responder(event_t *ev)
|
|||||||
static UINT8 consdown = false; // console is treated differently due to rare usage
|
static UINT8 consdown = false; // console is treated differently due to rare usage
|
||||||
|
|
||||||
// sequential completions a la 4dos
|
// sequential completions a la 4dos
|
||||||
static char completion[80];
|
static char completioncmd[80 + sizeof("find ")] = "find ";
|
||||||
|
static char *completion = &completioncmd[sizeof("find ")-1];
|
||||||
|
|
||||||
static INT32 comskips, varskips;
|
static INT32 comskips, varskips;
|
||||||
|
|
||||||
const char *cmd = "";
|
const char *cmd = "";
|
||||||
@@ -954,7 +950,6 @@ boolean CON_Responder(event_t *ev)
|
|||||||
// show all cvars/commands that match what we have inputted
|
// show all cvars/commands that match what we have inputted
|
||||||
if (key == KEY_TAB)
|
if (key == KEY_TAB)
|
||||||
{
|
{
|
||||||
size_t i, len;
|
|
||||||
|
|
||||||
if (!completion[0])
|
if (!completion[0])
|
||||||
{
|
{
|
||||||
@@ -963,19 +958,8 @@ boolean CON_Responder(event_t *ev)
|
|||||||
strcpy(completion, inputlines[inputline]);
|
strcpy(completion, inputlines[inputline]);
|
||||||
comskips = varskips = 0;
|
comskips = varskips = 0;
|
||||||
}
|
}
|
||||||
len = strlen(completion);
|
|
||||||
|
|
||||||
//first check commands
|
COM_BufInsertText(completioncmd);
|
||||||
CONS_Printf("\nCommands:\n");
|
|
||||||
for (i = 0, cmd = COM_CompleteCommand(completion, i); cmd; cmd = COM_CompleteCommand(completion, ++i))
|
|
||||||
CONS_Printf(" \x83" "%s" "\x80" "%s\n", completion, cmd+len);
|
|
||||||
if (i == 0) CONS_Printf(" (none)\n");
|
|
||||||
|
|
||||||
//now we move on to CVARs
|
|
||||||
CONS_Printf("Variables:\n");
|
|
||||||
for (i = 0, cmd = CV_CompleteVar(completion, i); cmd; cmd = CV_CompleteVar(completion, ++i))
|
|
||||||
CONS_Printf(" \x83" "%s" "\x80" "%s\n", completion, cmd+len);
|
|
||||||
if (i == 0) CONS_Printf(" (none)\n");
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1148,7 +1132,10 @@ boolean CON_Responder(event_t *ev)
|
|||||||
|
|
||||||
CONS_Printf("\x86""%c""\x80""%s\n", CON_PROMPTCHAR, inputlines[inputline]);
|
CONS_Printf("\x86""%c""\x80""%s\n", CON_PROMPTCHAR, inputlines[inputline]);
|
||||||
|
|
||||||
inputline = (inputline+1) & 31;
|
// Only add command to history if it differs from previous one
|
||||||
|
if (strcmp(inputlines[inputline], inputlines[(inputline-1) & 31]))
|
||||||
|
inputline = (inputline+1) & 31;
|
||||||
|
|
||||||
inputhist = inputline;
|
inputhist = inputline;
|
||||||
CON_InputClear();
|
CON_InputClear();
|
||||||
|
|
||||||
@@ -1215,10 +1202,10 @@ boolean CON_Responder(event_t *ev)
|
|||||||
// allow people to use keypad in console (good for typing IP addresses) - Calum
|
// allow people to use keypad in console (good for typing IP addresses) - Calum
|
||||||
if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL)
|
if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char keypad_translation[] = {'7','8','9','-',
|
char keypad_translation[] = {'7','8','9','-',
|
||||||
'4','5','6','+',
|
'4','5','6','+',
|
||||||
'1','2','3',
|
'1','2','3',
|
||||||
'0','.'};
|
'0','.'};
|
||||||
|
|
||||||
key = keypad_translation[key - KEY_KEYPAD7];
|
key = keypad_translation[key - KEY_KEYPAD7];
|
||||||
}
|
}
|
||||||
@@ -1376,7 +1363,7 @@ static void CON_Print(char *msg)
|
|||||||
|
|
||||||
void CON_LogMessage(const char *msg)
|
void CON_LogMessage(const char *msg)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char txt[8192], *t;
|
char txt[8192], *t;
|
||||||
const char *p = msg, *e = txt+sizeof (txt)-2;
|
const char *p = msg, *e = txt+sizeof (txt)-2;
|
||||||
|
|
||||||
for (t = txt; *p != '\0'; p++)
|
for (t = txt; *p != '\0'; p++)
|
||||||
@@ -1413,28 +1400,12 @@ void CONS_Printf(const char *fmt, ...)
|
|||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
// echo console prints to log file
|
// echo console prints to log file
|
||||||
#ifndef _arch_dreamcast
|
|
||||||
DEBFILE(txt);
|
DEBFILE(txt);
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!con_started)
|
if (con_started)
|
||||||
{
|
|
||||||
#if defined (_XBOX) && defined (__GNUC__)
|
|
||||||
if (!keyboard_started) debugPrint(txt);
|
|
||||||
#endif
|
|
||||||
#ifdef PC_DOS
|
|
||||||
CON_LogMessage(txt);
|
|
||||||
free(txt);
|
|
||||||
return;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
else
|
|
||||||
// write message in con text buffer
|
|
||||||
CON_Print(txt);
|
CON_Print(txt);
|
||||||
|
|
||||||
#ifndef PC_DOS
|
|
||||||
CON_LogMessage(txt);
|
CON_LogMessage(txt);
|
||||||
#endif
|
|
||||||
|
|
||||||
Lock_state();
|
Lock_state();
|
||||||
|
|
||||||
@@ -1447,19 +1418,9 @@ void CONS_Printf(const char *fmt, ...)
|
|||||||
// if not in display loop, force screen update
|
// if not in display loop, force screen update
|
||||||
if (startup)
|
if (startup)
|
||||||
{
|
{
|
||||||
#if (defined (_WINDOWS)) || (defined (__OS2__) && !defined (HAVE_SDL))
|
|
||||||
patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_CACHE);
|
|
||||||
|
|
||||||
// Jimita: CON_DrawBackpic just called V_DrawScaledPatch
|
|
||||||
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, con_backpic, NULL);
|
|
||||||
|
|
||||||
W_UnlockCachedPatch(con_backpic);
|
|
||||||
I_LoadingScreen(txt); // Win32/OS2 only
|
|
||||||
#else
|
|
||||||
// here we display the console text
|
// here we display the console text
|
||||||
CON_Drawer();
|
CON_Drawer();
|
||||||
I_FinishUpdate(); // page flip or blit buffer
|
I_FinishUpdate(); // page flip or blit buffer
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1774,6 +1735,10 @@ void CON_Drawer(void)
|
|||||||
if (con_curlines <= 0)
|
if (con_curlines <= 0)
|
||||||
CON_ClearHUD();
|
CON_ClearHUD();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// console movement
|
||||||
|
if (con_curlines != con_destlines)
|
||||||
|
CON_MoveConsole();
|
||||||
|
|
||||||
if (con_curlines > 0)
|
if (con_curlines > 0)
|
||||||
CON_DrawConsole();
|
CON_DrawConsole();
|
||||||
|
|||||||
@@ -14,11 +14,7 @@
|
|||||||
#include "command.h"
|
#include "command.h"
|
||||||
#include "i_threads.h"
|
#include "i_threads.h"
|
||||||
|
|
||||||
#ifdef _WII
|
|
||||||
void CON_InitWii(void);
|
|
||||||
#else
|
|
||||||
void CON_Init(void);
|
void CON_Init(void);
|
||||||
#endif
|
|
||||||
|
|
||||||
boolean CON_Responder(event_t *ev);
|
boolean CON_Responder(event_t *ev);
|
||||||
|
|
||||||
|
|||||||
+153
-44
@@ -10,9 +10,7 @@
|
|||||||
/// \file d_clisrv.c
|
/// \file d_clisrv.c
|
||||||
/// \brief SRB2 Network game communication and protocol, all OS independent parts.
|
/// \brief SRB2 Network game communication and protocol, all OS independent parts.
|
||||||
|
|
||||||
#if !defined (UNDER_CE)
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#endif
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#include <unistd.h> //for unlink
|
#include <unistd.h> //for unlink
|
||||||
#endif
|
#endif
|
||||||
@@ -49,6 +47,7 @@
|
|||||||
#include "k_kart.h"
|
#include "k_kart.h"
|
||||||
#include "s_sound.h" // sfx_syfail
|
#include "s_sound.h" // sfx_syfail
|
||||||
#include "m_perfstats.h"
|
#include "m_perfstats.h"
|
||||||
|
#include "d_main.h"
|
||||||
|
|
||||||
#ifdef CLIENT_LOADINGSCREEN
|
#ifdef CLIENT_LOADINGSCREEN
|
||||||
// cl loading screen
|
// cl loading screen
|
||||||
@@ -56,10 +55,6 @@
|
|||||||
#include "f_finale.h"
|
#include "f_finale.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _XBOX
|
|
||||||
#include "sdl12/SRB2XBOX/xboxhelp.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_DISCORDRPC
|
#ifdef HAVE_DISCORDRPC
|
||||||
#include "discord.h"
|
#include "discord.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -177,6 +172,8 @@ static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
|
|||||||
|
|
||||||
consvar_t cv_showjoinaddress = {"showjoinaddress", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showjoinaddress = {"showjoinaddress", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
consvar_t cv_shownodeip = {"showipinnodelist", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_playbackspeed = {"playbackspeed", "1", 0, playbackspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_playbackspeed = {"playbackspeed", "1", 0, playbackspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -452,7 +449,7 @@ static void ExtraDataTicker(void)
|
|||||||
{
|
{
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[3];
|
UINT8 buf[3];
|
||||||
|
|
||||||
buf[0] = (UINT8)i;
|
buf[0] = (UINT8)i;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -1073,7 +1070,7 @@ static void SV_SendResynch(INT32 node)
|
|||||||
|
|
||||||
if (resynch_score[node] > (unsigned)cv_resynchattempts.value*250)
|
if (resynch_score[node] > (unsigned)cv_resynchattempts.value*250)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
buf[0] = (UINT8)nodetoplayer[node];
|
buf[0] = (UINT8)nodetoplayer[node];
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
SendNetXCmd(XD_KICK, &buf, 2);
|
SendNetXCmd(XD_KICK, &buf, 2);
|
||||||
@@ -1833,7 +1830,7 @@ static void SV_SavedGame(void)
|
|||||||
{
|
{
|
||||||
size_t length;
|
size_t length;
|
||||||
UINT8 *savebuffer;
|
UINT8 *savebuffer;
|
||||||
XBOXSTATIC char tmpsave[264];
|
char tmpsave[264];
|
||||||
|
|
||||||
if (!cv_dumpconsistency.value)
|
if (!cv_dumpconsistency.value)
|
||||||
return;
|
return;
|
||||||
@@ -1875,7 +1872,7 @@ static void CL_LoadReceivedSavegame(void)
|
|||||||
{
|
{
|
||||||
UINT8 *savebuffer = NULL;
|
UINT8 *savebuffer = NULL;
|
||||||
size_t length, decompressedlen;
|
size_t length, decompressedlen;
|
||||||
XBOXSTATIC char tmpsave[264];
|
char tmpsave[264];
|
||||||
|
|
||||||
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
|
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
|
||||||
|
|
||||||
@@ -1905,6 +1902,15 @@ static void CL_LoadReceivedSavegame(void)
|
|||||||
demo.title = false;
|
demo.title = false;
|
||||||
automapactive = false;
|
automapactive = false;
|
||||||
|
|
||||||
|
if (!postautoloaded)
|
||||||
|
{
|
||||||
|
CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
|
||||||
|
if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
|
||||||
|
CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
|
||||||
|
D_CleanFile(autoloadwadfilespost);
|
||||||
|
postautoloaded = true;
|
||||||
|
}
|
||||||
|
|
||||||
// load a base level
|
// load a base level
|
||||||
if (P_LoadNetGame())
|
if (P_LoadNetGame())
|
||||||
{
|
{
|
||||||
@@ -1945,12 +1951,13 @@ static void CL_LoadReceivedSavegame(void)
|
|||||||
static void SendAskInfo(INT32 node)
|
static void SendAskInfo(INT32 node)
|
||||||
{
|
{
|
||||||
tic_t asktime;
|
tic_t asktime;
|
||||||
|
#ifdef HOLEPUNCH
|
||||||
if (node != 0 && node != BROADCASTADDR &&
|
if (node != 0 && node != BROADCASTADDR &&
|
||||||
cv_rendezvousserver.string[0])
|
cv_rendezvousserver.string[0])
|
||||||
{
|
{
|
||||||
I_NetRequestHolePunch(node);
|
I_NetRequestHolePunch(node);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
asktime = I_GetTime();
|
asktime = I_GetTime();
|
||||||
|
|
||||||
@@ -2639,7 +2646,7 @@ static void CL_ConnectToServer(void)
|
|||||||
tic_t asksent;
|
tic_t asksent;
|
||||||
#endif
|
#endif
|
||||||
#ifdef JOININGAME
|
#ifdef JOININGAME
|
||||||
XBOXSTATIC char tmpsave[264];
|
char tmpsave[264];
|
||||||
|
|
||||||
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
|
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
|
||||||
#endif
|
#endif
|
||||||
@@ -3351,7 +3358,7 @@ static void Command_Nodes(void)
|
|||||||
{
|
{
|
||||||
CONS_Printf("%.2u: %*s", i, (int)maxlen, player_names[i]);
|
CONS_Printf("%.2u: %*s", i, (int)maxlen, player_names[i]);
|
||||||
CONS_Printf(" - %.2d", playernode[i]);
|
CONS_Printf(" - %.2d", playernode[i]);
|
||||||
if (I_GetNodeAddress && (address = I_GetNodeAddress(playernode[i])) != NULL)
|
if ((I_GetNodeAddress && (address = I_GetNodeAddress(playernode[i])) != NULL) && (cv_shownodeip.value))
|
||||||
CONS_Printf(" - %s", address);
|
CONS_Printf(" - %s", address);
|
||||||
|
|
||||||
if (IsPlayerAdmin(i))
|
if (IsPlayerAdmin(i))
|
||||||
@@ -3365,6 +3372,94 @@ static void Command_Nodes(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Screw the base game nodes lets replace with listplayers instead.
|
||||||
|
static void Command_Listplayers(void)
|
||||||
|
{
|
||||||
|
const char *address;
|
||||||
|
int width = 0;
|
||||||
|
|
||||||
|
boolean admin;
|
||||||
|
boolean spectator;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Mode of player status for an individual player (admin, spectator).
|
||||||
|
1 for admin
|
||||||
|
2 for spectator
|
||||||
|
4 for both
|
||||||
|
*/
|
||||||
|
int mode = 0;
|
||||||
|
|
||||||
|
INT32 totalplayers = 0;
|
||||||
|
|
||||||
|
const char *cc;
|
||||||
|
const char *pcc;
|
||||||
|
|
||||||
|
INT32 i;
|
||||||
|
int n;
|
||||||
|
|
||||||
|
for (i = 0; i < MAXPLAYERS; ++i)
|
||||||
|
if (playeringame[i])
|
||||||
|
{
|
||||||
|
n = strlen(player_names[i]);
|
||||||
|
if (n > width)
|
||||||
|
width = n;
|
||||||
|
|
||||||
|
if (mode != 7)
|
||||||
|
{
|
||||||
|
admin = IsPlayerAdmin(i);
|
||||||
|
spectator = players[i].spectator;
|
||||||
|
|
||||||
|
if (admin)
|
||||||
|
mode |= 1;
|
||||||
|
if (spectator)
|
||||||
|
mode |= 2;
|
||||||
|
if (admin && spectator)
|
||||||
|
mode |= 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < MAXPLAYERS; ++i)
|
||||||
|
if (playeringame[i])
|
||||||
|
{
|
||||||
|
admin = IsPlayerAdmin(i);
|
||||||
|
spectator = players[i].spectator;
|
||||||
|
|
||||||
|
if (admin)
|
||||||
|
cc = "\x85";/* red */
|
||||||
|
else if (spectator)
|
||||||
|
cc = "\x86";/* gray */
|
||||||
|
else
|
||||||
|
cc = "";
|
||||||
|
|
||||||
|
pcc = HU_SkinColorToConsoleColor(players[i].skincolor);
|
||||||
|
|
||||||
|
CONS_Printf("%.2d: ""%s""%-*s""\x80", i, pcc,width, player_names[i]);
|
||||||
|
|
||||||
|
if ((I_GetNodeAddress && (address = I_GetNodeAddress(playernode[i])) != NULL) && (cv_shownodeip.value))
|
||||||
|
CONS_Printf(" -- %s", address);
|
||||||
|
else/* print spacer */
|
||||||
|
{
|
||||||
|
/* ...but not if there's a crammed status and were admin */
|
||||||
|
if (mode != 7 || !admin)
|
||||||
|
CONS_Printf(" -- ");/* -- self */
|
||||||
|
}
|
||||||
|
|
||||||
|
if (admin)
|
||||||
|
CONS_Printf(M_GetText("%s"" (admin)"),cc);
|
||||||
|
if (spectator)
|
||||||
|
CONS_Printf(M_GetText("%s"" (spectator)"),cc);
|
||||||
|
|
||||||
|
CONS_Printf("\n");
|
||||||
|
|
||||||
|
totalplayers++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (totalplayers == 1)
|
||||||
|
CONS_Printf("\nThere is 1 player in the game.\n");
|
||||||
|
else
|
||||||
|
CONS_Printf("\nThere are %d players in the game.\n", totalplayers);
|
||||||
|
}
|
||||||
|
|
||||||
static void Command_Ban(void)
|
static void Command_Ban(void)
|
||||||
{
|
{
|
||||||
if (COM_Argc() < 2)
|
if (COM_Argc() < 2)
|
||||||
@@ -3381,7 +3476,7 @@ static void Command_Ban(void)
|
|||||||
|
|
||||||
if (server || IsPlayerAdmin(consoleplayer))
|
if (server || IsPlayerAdmin(consoleplayer))
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[3 + MAX_REASONLENGTH];
|
UINT8 buf[3 + MAX_REASONLENGTH];
|
||||||
UINT8 *p = buf;
|
UINT8 *p = buf;
|
||||||
const SINT8 pn = nametonum(COM_Argv(1));
|
const SINT8 pn = nametonum(COM_Argv(1));
|
||||||
|
|
||||||
@@ -3498,7 +3593,7 @@ static void Command_Kick(void)
|
|||||||
|
|
||||||
if (server || IsPlayerAdmin(consoleplayer))
|
if (server || IsPlayerAdmin(consoleplayer))
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[3 + MAX_REASONLENGTH];
|
UINT8 buf[3 + MAX_REASONLENGTH];
|
||||||
UINT8 *p = buf;
|
UINT8 *p = buf;
|
||||||
const SINT8 pn = nametonum(COM_Argv(1));
|
const SINT8 pn = nametonum(COM_Argv(1));
|
||||||
|
|
||||||
@@ -3550,7 +3645,7 @@ static void Command_Kick(void)
|
|||||||
static void Got_KickCmd(UINT8 **p, INT32 playernum)
|
static void Got_KickCmd(UINT8 **p, INT32 playernum)
|
||||||
{
|
{
|
||||||
INT32 pnum, msg;
|
INT32 pnum, msg;
|
||||||
XBOXSTATIC char buf[3 + MAX_REASONLENGTH];
|
char buf[3 + MAX_REASONLENGTH];
|
||||||
char *reason = buf;
|
char *reason = buf;
|
||||||
kickreason_t kickreason = KR_KICK;
|
kickreason_t kickreason = KR_KICK;
|
||||||
UINT32 banMinutes = 0;
|
UINT32 banMinutes = 0;
|
||||||
@@ -3930,6 +4025,7 @@ void D_ClientServerInit(void)
|
|||||||
COM_AddCommand("reloadbans", Command_ReloadBan);
|
COM_AddCommand("reloadbans", Command_ReloadBan);
|
||||||
COM_AddCommand("connect", Command_connect);
|
COM_AddCommand("connect", Command_connect);
|
||||||
COM_AddCommand("nodes", Command_Nodes);
|
COM_AddCommand("nodes", Command_Nodes);
|
||||||
|
COM_AddCommand("listplayers", Command_Listplayers);
|
||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
COM_AddCommand("set_http_login", Command_set_http_login);
|
COM_AddCommand("set_http_login", Command_set_http_login);
|
||||||
COM_AddCommand("list_http_logins", Command_list_http_logins);
|
COM_AddCommand("list_http_logins", Command_list_http_logins);
|
||||||
@@ -4124,7 +4220,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal add player command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal add player command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4209,7 +4305,7 @@ static void Got_RemovePlayer(UINT8 **p, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal remove player command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal remove player command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4221,6 +4317,13 @@ static void Got_RemovePlayer(UINT8 **p, INT32 playernum)
|
|||||||
pnum = READUINT8(*p);
|
pnum = READUINT8(*p);
|
||||||
reason = READUINT8(*p);
|
reason = READUINT8(*p);
|
||||||
|
|
||||||
|
if (pnum == serverplayer)
|
||||||
|
{
|
||||||
|
CONS_Alert(CONS_WARNING, "Attempt to remove server player\n");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
CL_RemovePlayer(pnum, reason);
|
CL_RemovePlayer(pnum, reason);
|
||||||
|
|
||||||
#ifdef HAVE_DISCORDRPC
|
#ifdef HAVE_DISCORDRPC
|
||||||
@@ -4231,7 +4334,7 @@ static void Got_RemovePlayer(UINT8 **p, INT32 playernum)
|
|||||||
static boolean SV_AddWaitingPlayers(void)
|
static boolean SV_AddWaitingPlayers(void)
|
||||||
{
|
{
|
||||||
INT32 node, n, newplayer = false;
|
INT32 node, n, newplayer = false;
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
UINT8 newplayernum = 0;
|
UINT8 newplayernum = 0;
|
||||||
|
|
||||||
// What is the reason for this? Why can't newplayernum always be 0?
|
// What is the reason for this? Why can't newplayernum always be 0?
|
||||||
@@ -4304,7 +4407,7 @@ void CL_AddSplitscreenPlayer(void)
|
|||||||
|
|
||||||
void CL_RemoveSplitscreenPlayer(UINT8 p)
|
void CL_RemoveSplitscreenPlayer(UINT8 p)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
if (cl_mode != CL_CONNECTED)
|
if (cl_mode != CL_CONNECTED)
|
||||||
return;
|
return;
|
||||||
@@ -4890,7 +4993,7 @@ static boolean CheckForSpeedHacks(UINT8 p)
|
|||||||
|| netcmds[maketic%TICQUEUE][p].sidemove > MAXPLMOVE || netcmds[maketic%TICQUEUE][p].sidemove < -MAXPLMOVE
|
|| netcmds[maketic%TICQUEUE][p].sidemove > MAXPLMOVE || netcmds[maketic%TICQUEUE][p].sidemove < -MAXPLMOVE
|
||||||
|| netcmds[maketic%TICQUEUE][p].driftturn > KART_FULLTURN || netcmds[maketic%TICQUEUE][p].driftturn < -KART_FULLTURN)
|
|| netcmds[maketic%TICQUEUE][p].driftturn > KART_FULLTURN || netcmds[maketic%TICQUEUE][p].driftturn < -KART_FULLTURN)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char buf[2];
|
char buf[2];
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal movement value received from node %d\n"), playernode[p]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal movement value received from node %d\n"), playernode[p]);
|
||||||
//D_Clearticcmd(k);
|
//D_Clearticcmd(k);
|
||||||
|
|
||||||
@@ -4912,11 +5015,11 @@ static boolean CheckForSpeedHacks(UINT8 p)
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
static void HandlePacketFromPlayer(SINT8 node)
|
static void HandlePacketFromPlayer(SINT8 node)
|
||||||
{FILESTAMP
|
{
|
||||||
XBOXSTATIC INT32 netconsole;
|
INT32 netconsole;
|
||||||
XBOXSTATIC tic_t realend, realstart;
|
tic_t realend, realstart;
|
||||||
XBOXSTATIC UINT8 *pak, *txtpak, numtxtpak;
|
UINT8 *pak, *txtpak, numtxtpak;
|
||||||
FILESTAMP
|
|
||||||
|
|
||||||
txtpak = NULL;
|
txtpak = NULL;
|
||||||
|
|
||||||
@@ -5061,7 +5164,7 @@ FILESTAMP
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[3];
|
UINT8 buf[3];
|
||||||
|
|
||||||
buf[0] = (UINT8)netconsole;
|
buf[0] = (UINT8)netconsole;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -5174,7 +5277,7 @@ FILESTAMP
|
|||||||
nodewaiting[node] = 0;
|
nodewaiting[node] = 0;
|
||||||
if (netconsole != -1 && playeringame[netconsole])
|
if (netconsole != -1 && playeringame[netconsole])
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
buf[0] = (UINT8)netconsole;
|
buf[0] = (UINT8)netconsole;
|
||||||
if (netbuffer->packettype == PT_NODETIMEOUT)
|
if (netbuffer->packettype == PT_NODETIMEOUT)
|
||||||
buf[1] = KICK_MSG_TIMEOUT;
|
buf[1] = KICK_MSG_TIMEOUT;
|
||||||
@@ -5219,7 +5322,7 @@ FILESTAMP
|
|||||||
|
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
buf[0] = (UINT8)node;
|
buf[0] = (UINT8)node;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
SendNetXCmd(XD_KICK, &buf, 2);
|
SendNetXCmd(XD_KICK, &buf, 2);
|
||||||
@@ -5244,7 +5347,7 @@ FILESTAMP
|
|||||||
|
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
buf[0] = (UINT8)node;
|
buf[0] = (UINT8)node;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
SendNetXCmd(XD_KICK, &buf, 2);
|
SendNetXCmd(XD_KICK, &buf, 2);
|
||||||
@@ -5295,7 +5398,7 @@ FILESTAMP
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DEBFILE(va("frame not in bound: %u\n", neededtic));
|
DEBFILE(va("frame not in bound: %u (bounds are from %u to %u)\n", neededtic, realstart, realend));
|
||||||
/*if (realend < neededtic - 2 * TICRATE || neededtic + 2 * TICRATE < realstart)
|
/*if (realend < neededtic - 2 * TICRATE || neededtic + 2 * TICRATE < realstart)
|
||||||
I_Error("Received an out of order PT_SERVERTICS packet!\n"
|
I_Error("Received an out of order PT_SERVERTICS packet!\n"
|
||||||
"Got tics %d-%d, needed tic %d\n\n"
|
"Got tics %d-%d, needed tic %d\n\n"
|
||||||
@@ -5311,7 +5414,7 @@ FILESTAMP
|
|||||||
|
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char buf[2];
|
char buf[2];
|
||||||
buf[0] = (char)node;
|
buf[0] = (char)node;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
SendNetXCmd(XD_KICK, &buf, 2);
|
SendNetXCmd(XD_KICK, &buf, 2);
|
||||||
@@ -5330,7 +5433,7 @@ FILESTAMP
|
|||||||
|
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char buf[2];
|
char buf[2];
|
||||||
buf[0] = (char)node;
|
buf[0] = (char)node;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
SendNetXCmd(XD_KICK, &buf, 2);
|
SendNetXCmd(XD_KICK, &buf, 2);
|
||||||
@@ -5361,7 +5464,7 @@ FILESTAMP
|
|||||||
|
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
buf[0] = (UINT8)node;
|
buf[0] = (UINT8)node;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
SendNetXCmd(XD_KICK, &buf, 2);
|
SendNetXCmd(XD_KICK, &buf, 2);
|
||||||
@@ -5384,9 +5487,9 @@ FILESTAMP
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
static void GetPackets(void)
|
static void GetPackets(void)
|
||||||
{FILESTAMP
|
{
|
||||||
XBOXSTATIC SINT8 node; // The packet sender
|
SINT8 node; // The packet sender
|
||||||
FILESTAMP
|
|
||||||
|
|
||||||
player_joining = false;
|
player_joining = false;
|
||||||
|
|
||||||
@@ -6085,7 +6188,7 @@ static inline void PingUpdate(void)
|
|||||||
UINT8 minimumkicklevel = (nonlaggers > 0) ? PINGKICK_LIMIT : PINGKICK_TICQUEUE;
|
UINT8 minimumkicklevel = (nonlaggers > 0) ? PINGKICK_LIMIT : PINGKICK_TICQUEUE;
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char buf[2];
|
char buf[2];
|
||||||
|
|
||||||
if (!playeringame[i] || pingkick[i] < minimumkicklevel)
|
if (!playeringame[i] || pingkick[i] < minimumkicklevel)
|
||||||
continue;
|
continue;
|
||||||
@@ -6149,6 +6252,7 @@ static void UpdatePingTable(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HOLEPUNCH
|
||||||
static void RenewHolePunch(void)
|
static void RenewHolePunch(void)
|
||||||
{
|
{
|
||||||
if (cv_rendezvousserver.string[0])
|
if (cv_rendezvousserver.string[0])
|
||||||
@@ -6164,6 +6268,7 @@ static void RenewHolePunch(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Handle timeouts to prevent definitive freezes from happenning
|
// Handle timeouts to prevent definitive freezes from happenning
|
||||||
static void HandleNodeTimeouts(void)
|
static void HandleNodeTimeouts(void)
|
||||||
@@ -6190,19 +6295,21 @@ void NetKeepAlive(void)
|
|||||||
|
|
||||||
UpdatePingTable();
|
UpdatePingTable();
|
||||||
|
|
||||||
// Sryder: What is FILESTAMP???
|
// Sryder: What is FILESTAMP??? << lmao
|
||||||
FILESTAMP
|
|
||||||
GetPackets();
|
GetPackets();
|
||||||
FILESTAMP
|
|
||||||
|
|
||||||
#ifdef MASTERSERVER
|
#ifdef MASTERSERVER
|
||||||
MasterClient_Ticker();
|
MasterClient_Ticker();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HOLEPUNCH
|
||||||
if (netgame && serverrunning)
|
if (netgame && serverrunning)
|
||||||
{
|
{
|
||||||
RenewHolePunch();
|
RenewHolePunch();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
if (client)
|
if (client)
|
||||||
{
|
{
|
||||||
@@ -6305,9 +6412,9 @@ void NetUpdate(void)
|
|||||||
|
|
||||||
if (server)
|
if (server)
|
||||||
CL_SendClientCmd(); // send it
|
CL_SendClientCmd(); // send it
|
||||||
FILESTAMP
|
|
||||||
GetPackets(); // get packet from client or from server
|
GetPackets(); // get packet from client or from server
|
||||||
FILESTAMP
|
|
||||||
// client send the command after a receive of the server
|
// client send the command after a receive of the server
|
||||||
// the server send before because in single player is beter
|
// the server send before because in single player is beter
|
||||||
|
|
||||||
@@ -6315,10 +6422,12 @@ FILESTAMP
|
|||||||
MasterClient_Ticker(); // Acking the Master Server
|
MasterClient_Ticker(); // Acking the Master Server
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HOLEPUNCH
|
||||||
if (netgame && serverrunning)
|
if (netgame && serverrunning)
|
||||||
{
|
{
|
||||||
RenewHolePunch();
|
RenewHolePunch();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (client)
|
if (client)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -515,6 +515,8 @@ extern consvar_t cv_kicktime;
|
|||||||
extern consvar_t cv_showjoinaddress;
|
extern consvar_t cv_showjoinaddress;
|
||||||
extern consvar_t cv_playbackspeed;
|
extern consvar_t cv_playbackspeed;
|
||||||
|
|
||||||
|
extern consvar_t cv_shownodeip;
|
||||||
|
|
||||||
#define BASEPACKETSIZE offsetof(doomdata_t, u)
|
#define BASEPACKETSIZE offsetof(doomdata_t, u)
|
||||||
#define FILETXHEADER offsetof(filetx_pak, data)
|
#define FILETXHEADER offsetof(filetx_pak, data)
|
||||||
#define BASESERVERTICSSIZE offsetof(doomdata_t, u.serverpak.cmds[0])
|
#define BASESERVERTICSSIZE offsetof(doomdata_t, u.serverpak.cmds[0])
|
||||||
|
|||||||
+211
-119
@@ -15,7 +15,7 @@
|
|||||||
/// plus functions to parse command line parameters, configure game
|
/// plus functions to parse command line parameters, configure game
|
||||||
/// parameters, and call the startup functions.
|
/// parameters, and call the startup functions.
|
||||||
|
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
|
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif
|
#endif
|
||||||
@@ -24,22 +24,12 @@
|
|||||||
#include <unistd.h> // for getcwd
|
#include <unistd.h> // for getcwd
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PC_DOS
|
#ifdef _WIN32
|
||||||
#include <stdio.h> // for snprintf
|
|
||||||
int snprintf(char *str, size_t n, const char *fmt, ...);
|
|
||||||
//int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if (defined (_WIN32) && !defined (_WIN32_WCE)) && !defined (_XBOX)
|
|
||||||
#include <direct.h>
|
#include <direct.h>
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined (UNDER_CE)
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#elif defined (_XBOX)
|
|
||||||
#define NO_TIME
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "doomdef.h"
|
#include "doomdef.h"
|
||||||
#include "am_map.h"
|
#include "am_map.h"
|
||||||
@@ -76,7 +66,7 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
|
|||||||
#include "fastcmp.h"
|
#include "fastcmp.h"
|
||||||
#include "r_fps.h" // Frame interpolation/uncapped
|
#include "r_fps.h" // Frame interpolation/uncapped
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
#include "filesrch.h" // refreshdirmenu
|
#include "filesrch.h" // refreshdirmenu, pathisdirectory
|
||||||
#include "d_protocol.h"
|
#include "d_protocol.h"
|
||||||
#include "m_perfstats.h"
|
#include "m_perfstats.h"
|
||||||
|
|
||||||
@@ -86,18 +76,10 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
|
|||||||
#include "config.h.in"
|
#include "config.h.in"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _XBOX
|
|
||||||
#include "sdl12/SRB2XBOX/xboxhelp.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
#include "hardware/hw_main.h" // 3D View Rendering
|
#include "hardware/hw_main.h" // 3D View Rendering
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WINDOWS
|
|
||||||
#include "win32/win_main.h" // I_DoStartupMouse
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HW3SOUND
|
#ifdef HW3SOUND
|
||||||
#include "hardware/hw3sound.h"
|
#include "hardware/hw3sound.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -112,8 +94,6 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
|
|||||||
|
|
||||||
// platform independant focus loss
|
// platform independant focus loss
|
||||||
UINT8 window_notinfocus = false;
|
UINT8 window_notinfocus = false;
|
||||||
INT32 window_x;
|
|
||||||
INT32 window_y;
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// DEMO LOOP
|
// DEMO LOOP
|
||||||
@@ -123,6 +103,13 @@ static const char *pagename = "MAP1PIC";
|
|||||||
static char *startupwadfiles[MAX_WADFILES];
|
static char *startupwadfiles[MAX_WADFILES];
|
||||||
static char *startuppwads[MAX_WADFILES];
|
static char *startuppwads[MAX_WADFILES];
|
||||||
|
|
||||||
|
// autoloading
|
||||||
|
static char *autoloadwadfiles[MAX_WADFILES];
|
||||||
|
char *autoloadwadfilespost[MAX_WADFILES];
|
||||||
|
boolean autoloading;
|
||||||
|
boolean autoloaded;
|
||||||
|
boolean postautoloaded;
|
||||||
|
|
||||||
boolean devparm = false; // started game with -devparm
|
boolean devparm = false; // started game with -devparm
|
||||||
|
|
||||||
boolean singletics = false; // timedemo
|
boolean singletics = false; // timedemo
|
||||||
@@ -134,19 +121,11 @@ INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
|||||||
// These variables are only true if
|
// These variables are only true if
|
||||||
// whether the respective sound system is disabled
|
// whether the respective sound system is disabled
|
||||||
// or they're init'ed, but the player just toggled them
|
// or they're init'ed, but the player just toggled them
|
||||||
#ifdef _XBOX
|
|
||||||
#ifndef NO_MIDI
|
|
||||||
boolean midi_disabled = true;
|
|
||||||
#endif
|
|
||||||
boolean sound_disabled = true;
|
|
||||||
boolean digital_disabled = true;
|
|
||||||
#else
|
|
||||||
#ifndef NO_MIDI
|
#ifndef NO_MIDI
|
||||||
boolean midi_disabled = false;
|
boolean midi_disabled = false;
|
||||||
#endif
|
#endif
|
||||||
boolean sound_disabled = false;
|
boolean sound_disabled = false;
|
||||||
boolean digital_disabled = false;
|
boolean digital_disabled = false;
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef DEBUGFILE
|
#ifdef DEBUGFILE
|
||||||
INT32 debugload = 0;
|
INT32 debugload = 0;
|
||||||
@@ -154,13 +133,8 @@ INT32 debugload = 0;
|
|||||||
|
|
||||||
char savegamename[256];
|
char savegamename[256];
|
||||||
|
|
||||||
#ifdef _arch_dreamcast
|
|
||||||
char srb2home[256] = "/cd";
|
|
||||||
char srb2path[256] = "/cd";
|
|
||||||
#else
|
|
||||||
char srb2home[256] = ".";
|
char srb2home[256] = ".";
|
||||||
char srb2path[256] = ".";
|
char srb2path[256] = ".";
|
||||||
#endif
|
|
||||||
boolean usehome = true;
|
boolean usehome = true;
|
||||||
const char *pandf = "%s" PATHSEP "%s";
|
const char *pandf = "%s" PATHSEP "%s";
|
||||||
|
|
||||||
@@ -185,10 +159,6 @@ void D_PostEvent(const event_t *ev)
|
|||||||
events[eventhead] = *ev;
|
events[eventhead] = *ev;
|
||||||
eventhead = (eventhead+1) & (MAXEVENTS-1);
|
eventhead = (eventhead+1) & (MAXEVENTS-1);
|
||||||
}
|
}
|
||||||
// just for lock this function
|
|
||||||
#if defined (PC_DOS) && !defined (DOXYGEN)
|
|
||||||
void D_PostEvent_end(void) {};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// modifier keys
|
// modifier keys
|
||||||
// Now handled in I_OsPolling
|
// Now handled in I_OsPolling
|
||||||
@@ -663,11 +633,6 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
// Pushing of + parameters is now done back in D_SRB2Main, not here.
|
// Pushing of + parameters is now done back in D_SRB2Main, not here.
|
||||||
|
|
||||||
#ifdef _WINDOWS
|
|
||||||
CONS_Printf("I_StartupMouse()...\n");
|
|
||||||
I_DoStartupMouse();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
I_UpdateTime(cv_timescale.value);
|
I_UpdateTime(cv_timescale.value);
|
||||||
oldentertics = I_GetTime();
|
oldentertics = I_GetTime();
|
||||||
|
|
||||||
@@ -802,9 +767,6 @@ void D_SRB2Loop(void)
|
|||||||
// consoleplayer -> displayplayers (hear sounds from viewpoint)
|
// consoleplayer -> displayplayers (hear sounds from viewpoint)
|
||||||
S_UpdateSounds(); // move positional sounds
|
S_UpdateSounds(); // move positional sounds
|
||||||
|
|
||||||
// check for media change, loop music..
|
|
||||||
I_UpdateCD();
|
|
||||||
|
|
||||||
#ifdef HW3SOUND
|
#ifdef HW3SOUND
|
||||||
HW3S_EndFrameUpdate();
|
HW3S_EndFrameUpdate();
|
||||||
#endif
|
#endif
|
||||||
@@ -928,7 +890,131 @@ static void D_AddFile(const char *file, char **filearray)
|
|||||||
filearray[pnumwadfiles] = newfile;
|
filearray[pnumwadfiles] = newfile;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void D_CleanFile(char **filearray)
|
// Taken from TSoURDt3rd
|
||||||
|
// https://github.com/StarManiaKG/The-Story-of-Uncapped-Revengence-Discord-the-3rd/blob/main/src/STAR/star_functions.c
|
||||||
|
static INT32 D_DetectFileType(const char* filename)
|
||||||
|
{
|
||||||
|
if (pathisdirectory(filename) == 1)
|
||||||
|
return 1;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!stricmp(&filename[strlen(filename) - 4], ".wad"))
|
||||||
|
return 2;
|
||||||
|
else if (!stricmp(&filename[strlen(filename) - 4], ".pk3"))
|
||||||
|
return 3;
|
||||||
|
else if (!stricmp(&filename[strlen(filename) - 5], ".kart"))
|
||||||
|
return 4;
|
||||||
|
|
||||||
|
else if (!stricmp(&filename[strlen(filename) - 4], ".lua"))
|
||||||
|
return 5;
|
||||||
|
else if (!stricmp(&filename[strlen(filename) - 4], ".soc"))
|
||||||
|
return 6;
|
||||||
|
|
||||||
|
else if (!stricmp(&filename[strlen(filename) - 4], ".cfg"))
|
||||||
|
return 7;
|
||||||
|
else if (!stricmp(&filename[strlen(filename) - 4], ".txt"))
|
||||||
|
return 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// autoload that shit
|
||||||
|
static void D_AutoloadFile(const char *file, char **filearray)
|
||||||
|
{
|
||||||
|
size_t pnumwadfiles;
|
||||||
|
char *newfile;
|
||||||
|
INT32 fileType = D_DetectFileType(file);
|
||||||
|
|
||||||
|
for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
|
||||||
|
;
|
||||||
|
|
||||||
|
newfile = malloc(strlen(file) + 1);
|
||||||
|
if (!newfile)
|
||||||
|
I_Error("No more free memory to AutoloadFile %s",file);
|
||||||
|
|
||||||
|
if (!fileType)
|
||||||
|
{
|
||||||
|
CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
strcpy(newfile, file);
|
||||||
|
|
||||||
|
if (fileType <= 6)
|
||||||
|
filearray[pnumwadfiles] = newfile;
|
||||||
|
else
|
||||||
|
COM_BufAddText(va("exec %s\n", newfile));
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *strremove(char *str, const char *sub) {
|
||||||
|
char *p, *q, *r;
|
||||||
|
if (*sub && (q = r = strstr(str, sub)) != NULL) {
|
||||||
|
size_t len = strlen(sub);
|
||||||
|
while ((r = strstr(p = r + len, sub)) != NULL) {
|
||||||
|
while (p < r)
|
||||||
|
*q++ = *p++;
|
||||||
|
}
|
||||||
|
while ((*q++ = *p++) != '\0')
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIND THEM
|
||||||
|
static void D_FindAddonsToAutoload(void)
|
||||||
|
{
|
||||||
|
FILE *autoloadconfigfile;
|
||||||
|
const char *autoloadpath;
|
||||||
|
boolean postload;
|
||||||
|
|
||||||
|
INT32 i;
|
||||||
|
char wadsToAutoload[256] = "", renameAutoloadStrings[256] = "";
|
||||||
|
|
||||||
|
// does it exist tho
|
||||||
|
autoloadpath = va("%s"PATHSEP"%s",srb2home,AUTOLOADCONFIGFILENAME);
|
||||||
|
autoloadconfigfile = fopen(autoloadpath, "r");
|
||||||
|
|
||||||
|
// If the file is found, run our shit
|
||||||
|
if (!autoloadconfigfile) // nope outta here
|
||||||
|
return;
|
||||||
|
|
||||||
|
while (fgets(wadsToAutoload, sizeof wadsToAutoload, autoloadconfigfile) != NULL)
|
||||||
|
{
|
||||||
|
postload = false;
|
||||||
|
// skip if commented or empty
|
||||||
|
if ((wadsToAutoload[1] == '\0' || wadsToAutoload[1] == '\n')
|
||||||
|
|| (wadsToAutoload[0] == '#'))
|
||||||
|
continue;
|
||||||
|
// this marks it so that it loads after loading server addons
|
||||||
|
else if (fastncmp(wadsToAutoload, "postload ", 9)) {
|
||||||
|
strremove(wadsToAutoload, "postload ");
|
||||||
|
postload = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove Any Empty or Skipped Lines
|
||||||
|
for (i = 0; wadsToAutoload[i] != '\0'; i++)
|
||||||
|
{
|
||||||
|
if (wadsToAutoload[i] == '\n')
|
||||||
|
wadsToAutoload[i] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
// LOAD IT
|
||||||
|
if (!postload)
|
||||||
|
D_AutoloadFile(wadsToAutoload, autoloadwadfiles);
|
||||||
|
else
|
||||||
|
D_AutoloadFile(wadsToAutoload, autoloadwadfilespost);
|
||||||
|
|
||||||
|
// end it here
|
||||||
|
for (i = 0; wadsToAutoload[i] != '\0'; i++)
|
||||||
|
wadsToAutoload[i] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
// we dont want memory leaks around here do we?
|
||||||
|
fclose(autoloadconfigfile);
|
||||||
|
}
|
||||||
|
|
||||||
|
void D_CleanFile(char **filearray)
|
||||||
{
|
{
|
||||||
size_t pnumwadfiles;
|
size_t pnumwadfiles;
|
||||||
for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
|
for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
|
||||||
@@ -958,13 +1044,22 @@ static boolean AddIWAD(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
boolean found_extra_kart;
|
boolean found_extra_kart;
|
||||||
|
boolean found_extra2_kart;
|
||||||
|
|
||||||
|
boolean snw_speedo; // snowy speedometer check
|
||||||
|
boolean clr_hud; // colour hud check
|
||||||
|
boolean big_lap; // bigger lap counter
|
||||||
|
boolean big_lap_color; // bigger lap counter but colour
|
||||||
|
boolean kartzspeedo; // kartZ speedometer
|
||||||
|
boolean statdp; // New stat
|
||||||
|
|
||||||
static void IdentifyVersion(void)
|
static void IdentifyVersion(void)
|
||||||
{
|
{
|
||||||
const char *srb2waddir = NULL;
|
const char *srb2waddir = NULL;
|
||||||
found_extra_kart = false;
|
found_extra_kart = false;
|
||||||
|
found_extra2_kart = false;
|
||||||
|
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
||||||
// change to the directory where 'srb2.srb' is found
|
// change to the directory where 'srb2.srb' is found
|
||||||
srb2waddir = I_LocateWad();
|
srb2waddir = I_LocateWad();
|
||||||
#endif
|
#endif
|
||||||
@@ -976,17 +1071,11 @@ static void IdentifyVersion(void)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#if !defined(_WIN32_WCE) && !defined(_PS3)
|
|
||||||
if (getcwd(srb2path, 256) != NULL)
|
if (getcwd(srb2path, 256) != NULL)
|
||||||
srb2waddir = srb2path;
|
srb2waddir = srb2path;
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
#ifdef _arch_dreamcast
|
|
||||||
srb2waddir = "/cd";
|
|
||||||
#else
|
|
||||||
srb2waddir = srb2path;
|
srb2waddir = srb2path;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1020,6 +1109,12 @@ static void IdentifyVersion(void)
|
|||||||
D_AddFile(va(pandf,srb2waddir,"extra.kart"), startupwadfiles);
|
D_AddFile(va(pandf,srb2waddir,"extra.kart"), startupwadfiles);
|
||||||
found_extra_kart = true;
|
found_extra_kart = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// completely optional 2: Back with a vengence
|
||||||
|
if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra2.kart"))) {
|
||||||
|
D_AddFile(va(pandf,srb2waddir,"extra2.kart"), startupwadfiles);
|
||||||
|
found_extra2_kart = true;
|
||||||
|
}
|
||||||
|
|
||||||
#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
|
#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
|
||||||
#define MUSICTEST(str) \
|
#define MUSICTEST(str) \
|
||||||
@@ -1037,28 +1132,6 @@ static void IdentifyVersion(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ======================================================================== */
|
|
||||||
// Just print the nice red titlebar like the original SRB2 for DOS.
|
|
||||||
/* ======================================================================== */
|
|
||||||
#ifdef PC_DOS
|
|
||||||
static inline void D_Titlebar(char *title1, char *title2)
|
|
||||||
{
|
|
||||||
// SRB2 banner
|
|
||||||
clrscr();
|
|
||||||
textattr((BLUE<<4)+WHITE);
|
|
||||||
clreol();
|
|
||||||
cputs(title1);
|
|
||||||
|
|
||||||
// standard srb2 banner
|
|
||||||
textattr((RED<<4)+WHITE);
|
|
||||||
clreol();
|
|
||||||
gotoxy((80-strlen(title2))/2, 2);
|
|
||||||
cputs(title2);
|
|
||||||
normvideo();
|
|
||||||
gotoxy(1,3);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Center the title string, then add the date and time of compilation.
|
// Center the title string, then add the date and time of compilation.
|
||||||
//
|
//
|
||||||
@@ -1086,7 +1159,6 @@ static inline void D_MakeTitleString(char *s)
|
|||||||
strcpy(s, temp);
|
strcpy(s, temp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// D_SRB2Main
|
// D_SRB2Main
|
||||||
//
|
//
|
||||||
@@ -1117,7 +1189,7 @@ void D_SRB2Main(void)
|
|||||||
"in this program.\n\n");
|
"in this program.\n\n");
|
||||||
|
|
||||||
// keep error messages until the final flush(stderr)
|
// keep error messages until the final flush(stderr)
|
||||||
#if !defined (PC_DOS) && !defined (_WIN32_WCE) && !defined(NOTERMIOS)
|
#if !defined(NOTERMIOS)
|
||||||
if (setvbuf(stderr, NULL, _IOFBF, 1000))
|
if (setvbuf(stderr, NULL, _IOFBF, 1000))
|
||||||
I_OutputMsg("setvbuf didnt work\n");
|
I_OutputMsg("setvbuf didnt work\n");
|
||||||
#endif
|
#endif
|
||||||
@@ -1139,29 +1211,23 @@ void D_SRB2Main(void)
|
|||||||
// identify the main IWAD file to use
|
// identify the main IWAD file to use
|
||||||
IdentifyVersion();
|
IdentifyVersion();
|
||||||
|
|
||||||
#if !defined (_WIN32_WCE) && !defined(NOTERMIOS)
|
#if !defined(NOTERMIOS)
|
||||||
setbuf(stdout, NULL); // non-buffered output
|
setbuf(stdout, NULL); // non-buffered output
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined (_WIN32_WCE) //|| defined (_DEBUG) || defined (GP2X)
|
#if 0 //defined (_DEBUG)
|
||||||
devparm = M_CheckParm("-nodebug") == 0;
|
devparm = M_CheckParm("-nodebug") == 0;
|
||||||
#else
|
#else
|
||||||
devparm = M_CheckParm("-debug") != 0;
|
devparm = M_CheckParm("-debug") != 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// for dedicated server
|
// for dedicated server
|
||||||
#if !defined (_WINDOWS) //already check in win_main.c
|
|
||||||
dedicated = M_CheckParm("-dedicated") != 0;
|
dedicated = M_CheckParm("-dedicated") != 0;
|
||||||
#endif
|
|
||||||
|
|
||||||
strcpy(title, "SRB2Kart");
|
strcpy(title, "SRB2Kart");
|
||||||
strcpy(srb2, "SRB2Kart");
|
strcpy(srb2, "SRB2Kart");
|
||||||
D_MakeTitleString(srb2);
|
D_MakeTitleString(srb2);
|
||||||
|
|
||||||
#ifdef PC_DOS
|
|
||||||
D_Titlebar(srb2, title);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined (__OS2__) && !defined (HAVE_SDL)
|
#if defined (__OS2__) && !defined (HAVE_SDL)
|
||||||
// set PM window title
|
// set PM window title
|
||||||
snprintf(pmData->title, sizeof (pmData->title),
|
snprintf(pmData->title, sizeof (pmData->title),
|
||||||
@@ -1183,13 +1249,8 @@ void D_SRB2Main(void)
|
|||||||
|
|
||||||
if (!userhome)
|
if (!userhome)
|
||||||
{
|
{
|
||||||
#if ((defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)) && !defined (__CYGWIN__) && !defined (DC) && !defined (PSP) && !defined(GP2X)
|
#if (defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)
|
||||||
I_Error("Please set $HOME to your home directory\n");
|
I_Error("Please set $HOME to your home directory\n");
|
||||||
#elif defined (_WIN32_WCE) && 0
|
|
||||||
if (dedicated)
|
|
||||||
snprintf(configfile, sizeof configfile, "/Storage Card/SRB2DEMO/d"CONFIGFILENAME);
|
|
||||||
else
|
|
||||||
snprintf(configfile, sizeof configfile, "/Storage Card/SRB2DEMO/"CONFIGFILENAME);
|
|
||||||
#else
|
#else
|
||||||
if (dedicated)
|
if (dedicated)
|
||||||
snprintf(configfile, sizeof configfile, "d"CONFIGFILENAME);
|
snprintf(configfile, sizeof configfile, "d"CONFIGFILENAME);
|
||||||
@@ -1246,10 +1307,6 @@ void D_SRB2Main(void)
|
|||||||
fclose(tmpfile);
|
fclose(tmpfile);
|
||||||
remove(testfile);
|
remove(testfile);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _arch_dreamcast
|
|
||||||
strcpy(downloaddir, "/ram"); // the dreamcast's TMP
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
D_SetupProtocol();
|
D_SetupProtocol();
|
||||||
@@ -1260,6 +1317,9 @@ void D_SRB2Main(void)
|
|||||||
if (M_CheckParm("-password") && M_IsNextParm())
|
if (M_CheckParm("-password") && M_IsNextParm())
|
||||||
D_SetPassword(M_GetNextParm());
|
D_SetPassword(M_GetNextParm());
|
||||||
|
|
||||||
|
// FIND THEM
|
||||||
|
D_FindAddonsToAutoload();
|
||||||
|
|
||||||
// add any files specified on the command line with -file wadfile
|
// add any files specified on the command line with -file wadfile
|
||||||
// to the wad list
|
// to the wad list
|
||||||
if (!(M_CheckParm("-connect") && !M_CheckParm("-server")))
|
if (!(M_CheckParm("-connect") && !M_CheckParm("-server")))
|
||||||
@@ -1345,8 +1405,48 @@ void D_SRB2Main(void)
|
|||||||
|
|
||||||
#endif //ifndef DEVELOP
|
#endif //ifndef DEVELOP
|
||||||
|
|
||||||
if (found_extra_kart) // found the funny, add it in!
|
if (found_extra_kart || found_extra2_kart) // found the funny, add it in!
|
||||||
mainwads++;
|
{
|
||||||
|
// HAYA: These are seperated for a reason lmao
|
||||||
|
if (found_extra_kart)
|
||||||
|
mainwads++;
|
||||||
|
if (found_extra2_kart)
|
||||||
|
mainwads++;
|
||||||
|
|
||||||
|
// now check for speedometer stuff
|
||||||
|
if (W_CheckMultipleLumps("SP_SMSTC", "K_TRNULL", "SP_MKMH", "SP_MMPH", "SP_MFRAC", "SP_MPERC", NULL))
|
||||||
|
snw_speedo = true;
|
||||||
|
|
||||||
|
// check for bigger lap count
|
||||||
|
if (W_CheckMultipleLumps("K_STLAPB", "K_STLA2B", NULL))
|
||||||
|
big_lap = true;
|
||||||
|
|
||||||
|
// now check for colour hud stuff
|
||||||
|
if (W_CheckMultipleLumps("K_SCTIME", "K_SCTIMW", "K_SCLAPS", "K_SCLAPW", \
|
||||||
|
"K_SCBALN", "K_SCBALW", "K_SCKARM", "K_SCTOUT", "K_ISMULC", "K_ITMULC", "K_ITBC","K_ITBCD", "K_ISBC", "K_ISBCD", NULL))
|
||||||
|
clr_hud = true;
|
||||||
|
|
||||||
|
// check for bigger lap count but color** its color bitch
|
||||||
|
if (W_CheckMultipleLumps("K_SCLAPB", "K_SCLA2B", NULL))
|
||||||
|
big_lap_color = true;
|
||||||
|
|
||||||
|
// kartzspeedo
|
||||||
|
if (W_CheckMultipleLumps("K_KZSP1", "K_KZSP2", "K_KZSP3", "K_KZSP4", "K_KZSP5", \
|
||||||
|
"K_KZSP6", "K_KZSP7", "K_KZSP8", "K_KZSP9", "K_KZSP10", "K_KZSP11", "K_KZSP12", \
|
||||||
|
"K_KZSP13", "K_KZSP14", "K_KZSP15", "K_KZSP16", "K_KZSP17", "K_KZSP18", "K_KZSP19", \
|
||||||
|
"K_KZSP20", "K_KZSP21", "K_KZSP22", "K_KZSP23", "K_KZSP24", "K_KZSP25", NULL))
|
||||||
|
kartzspeedo = true;
|
||||||
|
|
||||||
|
// stat display for extended player setup
|
||||||
|
if (W_CheckMultipleLumps("K_STATNB", "K_STATN1", "K_STATN2", "K_STATN3", "K_STATN4", \
|
||||||
|
"K_STATN5", "K_STATN6", NULL))
|
||||||
|
statdp = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
|
||||||
|
if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
|
||||||
|
CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
|
||||||
|
D_CleanFile(autoloadwadfiles);
|
||||||
|
|
||||||
//
|
//
|
||||||
// search for maps
|
// search for maps
|
||||||
@@ -1416,6 +1516,13 @@ void D_SRB2Main(void)
|
|||||||
CONS_Printf("I_StartupGraphics()...\n");
|
CONS_Printf("I_StartupGraphics()...\n");
|
||||||
I_StartupGraphics();
|
I_StartupGraphics();
|
||||||
|
|
||||||
|
#ifdef HWRENDER
|
||||||
|
// Lactozilla: Add every hardware mode CVAR and CCMD.
|
||||||
|
// Has to be done before the configuration file loads,
|
||||||
|
// but after the OpenGL library loads.
|
||||||
|
HWR_AddCommands();
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
if (rendermode == render_opengl)
|
if (rendermode == render_opengl)
|
||||||
{
|
{
|
||||||
@@ -1433,12 +1540,7 @@ void D_SRB2Main(void)
|
|||||||
HU_Init();
|
HU_Init();
|
||||||
|
|
||||||
COM_Init();
|
COM_Init();
|
||||||
// libogc has a CON_Init function, we must rename SRB2's CON_Init in WII/libogc
|
|
||||||
#ifndef _WII
|
|
||||||
CON_Init();
|
CON_Init();
|
||||||
#else
|
|
||||||
CON_InitWii();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
D_RegisterServerCommands();
|
D_RegisterServerCommands();
|
||||||
D_RegisterClientCommands(); // be sure that this is called before D_CheckNetGame
|
D_RegisterClientCommands(); // be sure that this is called before D_CheckNetGame
|
||||||
@@ -1452,7 +1554,7 @@ void D_SRB2Main(void)
|
|||||||
|
|
||||||
G_LoadGameData();
|
G_LoadGameData();
|
||||||
|
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
||||||
VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen
|
VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1482,10 +1584,6 @@ void D_SRB2Main(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize CD-Audio
|
|
||||||
if (M_CheckParm("-usecd") && !dedicated)
|
|
||||||
I_InitCD();
|
|
||||||
|
|
||||||
if (M_CheckParm("-noupload"))
|
if (M_CheckParm("-noupload"))
|
||||||
COM_BufAddText("downloading 0\n");
|
COM_BufAddText("downloading 0\n");
|
||||||
|
|
||||||
@@ -1544,6 +1642,7 @@ void D_SRB2Main(void)
|
|||||||
I_InitMusic();
|
I_InitMusic();
|
||||||
S_InitSfxChannels(cv_soundvolume.value);
|
S_InitSfxChannels(cv_soundvolume.value);
|
||||||
S_InitMusicDefs();
|
S_InitMusicDefs();
|
||||||
|
S_InitMTDefs();
|
||||||
}
|
}
|
||||||
|
|
||||||
CONS_Printf("ST_Init(): Init status bar.\n");
|
CONS_Printf("ST_Init(): Init status bar.\n");
|
||||||
@@ -1772,26 +1871,19 @@ const char *D_Home(void)
|
|||||||
#ifdef ANDROID
|
#ifdef ANDROID
|
||||||
return "/data/data/org.srb2/";
|
return "/data/data/org.srb2/";
|
||||||
#endif
|
#endif
|
||||||
#ifdef _arch_dreamcast
|
|
||||||
char VMUHOME[] = "HOME=/vmu/a1";
|
|
||||||
putenv(VMUHOME); //don't use I_PutEnv
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (M_CheckParm("-home") && M_IsNextParm())
|
if (M_CheckParm("-home") && M_IsNextParm())
|
||||||
userhome = M_GetNextParm();
|
userhome = M_GetNextParm();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#if defined (GP2X)
|
#if !(defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON))
|
||||||
usehome = false; //let use the CWD
|
|
||||||
return NULL;
|
|
||||||
#elif !((defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)) && !defined (__APPLE__) && !defined(_WIN32_WCE)
|
|
||||||
if (FIL_FileOK(CONFIGFILENAME))
|
if (FIL_FileOK(CONFIGFILENAME))
|
||||||
usehome = false; // Let's NOT use home
|
usehome = false; // Let's NOT use home
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
userhome = I_GetEnv("HOME"); //Alam: my new HOME for srb2
|
userhome = I_GetEnv("HOME"); //Alam: my new HOME for srb2
|
||||||
}
|
}
|
||||||
#if defined (_WIN32) && !defined(_WIN32_WCE) //Alam: only Win32 have APPDATA and USERPROFILE
|
#ifdef _WIN32 //Alam: only Win32 have APPDATA and USERPROFILE
|
||||||
if (!userhome && usehome) //Alam: Still not?
|
if (!userhome && usehome) //Alam: Still not?
|
||||||
{
|
{
|
||||||
char *testhome = NULL;
|
char *testhome = NULL;
|
||||||
|
|||||||
+16
-3
@@ -26,6 +26,20 @@ extern const char *pandf; //Alam: how to path?
|
|||||||
extern char srb2path[256]; //Alam: SRB2's Home
|
extern char srb2path[256]; //Alam: SRB2's Home
|
||||||
|
|
||||||
extern boolean found_extra_kart; // for use in k_kart.c
|
extern boolean found_extra_kart; // for use in k_kart.c
|
||||||
|
extern boolean found_extra2_kart; // for use in k_kart.c
|
||||||
|
|
||||||
|
extern boolean snw_speedo; // snowy speedometer check
|
||||||
|
extern boolean clr_hud; // colour hud check
|
||||||
|
extern boolean big_lap; // bigger lap counter
|
||||||
|
extern boolean big_lap_color; //bigger lap counter but colour
|
||||||
|
extern boolean kartzspeedo; //kartZ speedo
|
||||||
|
extern boolean statdp; //stat display for extended player setup
|
||||||
|
|
||||||
|
extern boolean autoloading;
|
||||||
|
extern boolean autoloaded;
|
||||||
|
extern boolean postautoloaded;
|
||||||
|
|
||||||
|
extern char *autoloadwadfilespost[MAX_WADFILES];
|
||||||
|
|
||||||
// the infinite loop of D_SRB2Loop() called from win_main for windows version
|
// the infinite loop of D_SRB2Loop() called from win_main for windows version
|
||||||
void D_SRB2Loop(void) FUNCNORETURN;
|
void D_SRB2Loop(void) FUNCNORETURN;
|
||||||
@@ -39,12 +53,11 @@ void D_SRB2Main(void);
|
|||||||
|
|
||||||
// Called by IO functions when input is detected.
|
// Called by IO functions when input is detected.
|
||||||
void D_PostEvent(const event_t *ev);
|
void D_PostEvent(const event_t *ev);
|
||||||
#if defined (PC_DOS) && !defined (DOXYGEN)
|
|
||||||
void D_PostEvent_end(void); // delimiter for locking memory
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void D_ProcessEvents(void);
|
void D_ProcessEvents(void);
|
||||||
|
|
||||||
|
void D_CleanFile(char **filearray);
|
||||||
|
|
||||||
const char *D_Home(void);
|
const char *D_Home(void);
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
+11
-7
@@ -51,7 +51,9 @@ doomcom_t *doomcom = NULL;
|
|||||||
/// \brief network packet data, points inside doomcom
|
/// \brief network packet data, points inside doomcom
|
||||||
doomdata_t *netbuffer = NULL;
|
doomdata_t *netbuffer = NULL;
|
||||||
/// \brief hole punching packet, also points inside doomcom
|
/// \brief hole punching packet, also points inside doomcom
|
||||||
|
#ifdef HOLEPUNCH
|
||||||
holepunch_t *holepunchpacket = NULL;
|
holepunch_t *holepunchpacket = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef DEBUGFILE
|
#ifdef DEBUGFILE
|
||||||
FILE *debugfile = NULL; // put some net info in a file during the game
|
FILE *debugfile = NULL; // put some net info in a file during the game
|
||||||
@@ -75,8 +77,10 @@ boolean (*I_NetCanGet)(void) = NULL;
|
|||||||
void (*I_NetCloseSocket)(void) = NULL;
|
void (*I_NetCloseSocket)(void) = NULL;
|
||||||
void (*I_NetFreeNodenum)(INT32 nodenum) = NULL;
|
void (*I_NetFreeNodenum)(INT32 nodenum) = NULL;
|
||||||
SINT8 (*I_NetMakeNodewPort)(const char *address, const char* port) = NULL;
|
SINT8 (*I_NetMakeNodewPort)(const char *address, const char* port) = NULL;
|
||||||
|
#ifdef HOLEPUNCH
|
||||||
void (*I_NetRequestHolePunch)(INT32 node) = NULL;
|
void (*I_NetRequestHolePunch)(INT32 node) = NULL;
|
||||||
void (*I_NetRegisterHolePunch)(void) = NULL;
|
void (*I_NetRegisterHolePunch)(void) = NULL;
|
||||||
|
#endif
|
||||||
boolean (*I_NetOpenSocket)(void) = NULL;
|
boolean (*I_NetOpenSocket)(void) = NULL;
|
||||||
boolean (*I_Ban) (INT32 node) = NULL;
|
boolean (*I_Ban) (INT32 node) = NULL;
|
||||||
void (*I_ClearBans)(void) = NULL;
|
void (*I_ClearBans)(void) = NULL;
|
||||||
@@ -827,6 +831,10 @@ static const char *packettypename[NUMPACKETTYPE] =
|
|||||||
"CLIENTJOIN",
|
"CLIENTJOIN",
|
||||||
"NODETIMEOUT",
|
"NODETIMEOUT",
|
||||||
"RESYNCHING",
|
"RESYNCHING",
|
||||||
|
|
||||||
|
"TELLFILESNEEDED",
|
||||||
|
"MOREFILESNEEDED",
|
||||||
|
|
||||||
"PING"
|
"PING"
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1349,14 +1357,11 @@ boolean D_CheckNetGame(void)
|
|||||||
I_Error("Too many nodes (%d), max:%d", doomcom->numnodes, MAXNETNODES);
|
I_Error("Too many nodes (%d), max:%d", doomcom->numnodes, MAXNETNODES);
|
||||||
|
|
||||||
netbuffer = (doomdata_t *)(void *)&doomcom->data;
|
netbuffer = (doomdata_t *)(void *)&doomcom->data;
|
||||||
|
#ifdef HOLEPUNCH
|
||||||
holepunchpacket = (holepunch_t *)(void *)&doomcom->data;
|
holepunchpacket = (holepunch_t *)(void *)&doomcom->data;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef DEBUGFILE
|
#ifdef DEBUGFILE
|
||||||
#ifdef _arch_dreamcast
|
|
||||||
//debugfile = stderr;
|
|
||||||
if (debugfile)
|
|
||||||
CONS_Printf(M_GetText("debug output to: %s\n"), "STDERR");
|
|
||||||
#else
|
|
||||||
if (M_CheckParm("-debugfile"))
|
if (M_CheckParm("-debugfile"))
|
||||||
{
|
{
|
||||||
char filename[21];
|
char filename[21];
|
||||||
@@ -1374,7 +1379,6 @@ boolean D_CheckNetGame(void)
|
|||||||
else
|
else
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("cannot debug output to file %s!\n"), va("%s" PATHSEP "%s", srb2home, filename));
|
CONS_Alert(CONS_WARNING, M_GetText("cannot debug output to file %s!\n"), va("%s" PATHSEP "%s", srb2home, filename));
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
D_ClientServerInit();
|
D_ClientServerInit();
|
||||||
@@ -1464,7 +1468,7 @@ void Command_Ping_f(void)
|
|||||||
|
|
||||||
if (!server && playeringame[consoleplayer])
|
if (!server && playeringame[consoleplayer])
|
||||||
{
|
{
|
||||||
CONS_Printf("\nYour ping is %d frames (%d ms)\n", playerpingtable[consoleplayer], (INT32)(playerpingtable[i] * (1000.00f / TICRATE)));
|
CONS_Printf("\nYour ping is %d frames (%d ms)\n", playerpingtable[consoleplayer], (INT32)(playerpingtable[consoleplayer] * (1000.00f / TICRATE)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+262
-108
@@ -49,6 +49,7 @@
|
|||||||
#include "m_anigif.h"
|
#include "m_anigif.h"
|
||||||
#include "k_kart.h" // SRB2kart
|
#include "k_kart.h" // SRB2kart
|
||||||
#include "y_inter.h"
|
#include "y_inter.h"
|
||||||
|
#include "fastcmp.h"
|
||||||
#include "m_perfstats.h"
|
#include "m_perfstats.h"
|
||||||
|
|
||||||
#ifdef NETGAME_DEVMODE
|
#ifdef NETGAME_DEVMODE
|
||||||
@@ -141,6 +142,8 @@ static void Command_SetViews_f(void);
|
|||||||
|
|
||||||
static void Command_Addfilelocal(void);
|
static void Command_Addfilelocal(void);
|
||||||
static void Command_Addfile(void);
|
static void Command_Addfile(void);
|
||||||
|
static void Command_Addskins(void);
|
||||||
|
static void Command_GLocalSkin(void);
|
||||||
static void Command_ListWADS_f(void);
|
static void Command_ListWADS_f(void);
|
||||||
#ifdef DELFILE
|
#ifdef DELFILE
|
||||||
static void Command_Delfile(void);
|
static void Command_Delfile(void);
|
||||||
@@ -192,6 +195,8 @@ static void Command_Isgamemodified_f(void);
|
|||||||
static void Command_Cheats_f(void);
|
static void Command_Cheats_f(void);
|
||||||
|
|
||||||
static void Command_ListSkins(void);
|
static void Command_ListSkins(void);
|
||||||
|
static void Command_SkinSearch(void);
|
||||||
|
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
static void Command_Togglemodified_f(void);
|
static void Command_Togglemodified_f(void);
|
||||||
@@ -210,7 +215,7 @@ void SendWeaponPref3(void);
|
|||||||
void SendWeaponPref4(void);
|
void SendWeaponPref4(void);
|
||||||
|
|
||||||
static CV_PossibleValue_t usemouse_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Force"}, {0, NULL}};
|
static CV_PossibleValue_t usemouse_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Force"}, {0, NULL}};
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
|
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
|
||||||
static CV_PossibleValue_t mouse2port_cons_t[] = {{0, "/dev/gpmdata"}, {1, "/dev/ttyS0"},
|
static CV_PossibleValue_t mouse2port_cons_t[] = {{0, "/dev/gpmdata"}, {1, "/dev/ttyS0"},
|
||||||
{2, "/dev/ttyS1"}, {3, "/dev/ttyS2"}, {4, "/dev/ttyS3"}, {0, NULL}};
|
{2, "/dev/ttyS1"}, {3, "/dev/ttyS2"}, {4, "/dev/ttyS3"}, {0, NULL}};
|
||||||
#else
|
#else
|
||||||
@@ -289,6 +294,10 @@ consvar_t cv_skin = {"skin", DEFAULTSKIN, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin_
|
|||||||
consvar_t cv_skin2 = {"skin2", DEFAULTSKIN2, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin2_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_skin2 = {"skin2", DEFAULTSKIN2, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin2_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_skin3 = {"skin3", DEFAULTSKIN3, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin3_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_skin3 = {"skin3", DEFAULTSKIN3, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin3_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_skin4 = {"skin4", DEFAULTSKIN4, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin4_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_skin4 = {"skin4", DEFAULTSKIN4, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin4_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
// haha I've beaten you now, ONLINE
|
||||||
|
consvar_t cv_localskin = {"internal___localskin", "none", CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
consvar_t cv_showlocalskinmenus = {"showlocalskinmenus", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -296,8 +305,10 @@ INT32 cv_debug;
|
|||||||
|
|
||||||
consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_usemouse2 = {"use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_usemouse2 = {"use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
//WTF
|
||||||
|
consvar_t cv_mouseturn = {"mouseturn", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
#if defined (DC) || defined (_XBOX) || defined (WMINPUT) || defined (_WII) || defined(HAVE_SDL) || defined(_WINDOWS) //joystick 1 and 2
|
#if defined(HAVE_SDL) || defined(_WINDOWS) //joystick 1 and 2
|
||||||
consvar_t cv_usejoystick = {"use_joystick", "1", CV_SAVE|CV_CALL, usejoystick_cons_t,
|
consvar_t cv_usejoystick = {"use_joystick", "1", CV_SAVE|CV_CALL, usejoystick_cons_t,
|
||||||
I_InitJoystick, 0, NULL, NULL, 0, 0, NULL};
|
I_InitJoystick, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_usejoystick2 = {"use_joystick2", "2", CV_SAVE|CV_CALL, usejoystick_cons_t,
|
consvar_t cv_usejoystick2 = {"use_joystick2", "2", CV_SAVE|CV_CALL, usejoystick_cons_t,
|
||||||
@@ -321,7 +332,7 @@ consvar_t cv_joyscale4 = {"joyscale4", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale4,
|
|||||||
consvar_t cv_joyscale = {"joyscale", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: Dummy for save
|
consvar_t cv_joyscale = {"joyscale", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: Dummy for save
|
||||||
consvar_t cv_joyscale2 = {"joyscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: Dummy for save
|
consvar_t cv_joyscale2 = {"joyscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: Dummy for save
|
||||||
#endif
|
#endif
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
|
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
|
||||||
consvar_t cv_mouse2port = {"mouse2port", "/dev/gpmdata", CV_SAVE, mouse2port_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mouse2port = {"mouse2port", "/dev/gpmdata", CV_SAVE, mouse2port_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_mouse2opt = {"mouse2opt", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mouse2opt = {"mouse2opt", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
#else
|
#else
|
||||||
@@ -370,6 +381,9 @@ consvar_t cv_tripleorbinaut = {"tripleorbinaut", "On", CV_NETVAR|CV_CHEAT, C
|
|||||||
consvar_t cv_quadorbinaut = {"quadorbinaut", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_quadorbinaut = {"quadorbinaut", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_dualjawz = {"dualjawz", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_dualjawz = {"dualjawz", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
//Save server ip
|
||||||
|
consvar_t cv_lastserver = {"lastserver", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t kartminimap_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t kartminimap_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_kartminimap = {"kartminimap", "4", CV_SAVE, kartminimap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_kartminimap = {"kartminimap", "4", CV_SAVE, kartminimap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_kartcheck = {"kartcheck", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_kartcheck = {"kartcheck", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -404,7 +418,7 @@ consvar_t cv_kartdebugcheckpoint = {"kartdebugcheckpoint", "Off", CV_NOSHOWHELP,
|
|||||||
consvar_t cv_kartdebugnodes = {"kartdebugnodes", "Off", CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_kartdebugnodes = {"kartdebugnodes", "Off", CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_kartdebugcolorize = {"kartdebugcolorize", "Off", CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_kartdebugcolorize = {"kartdebugcolorize", "Off", CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t votetime_cons_t[] = {{10, "MIN"}, {3600, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t votetime_cons_t[] = {{1, "MIN"}, {3600, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_votetime = {"votetime", "20", CV_NETVAR, votetime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_votetime = {"votetime", "20", CV_NETVAR, votetime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_ringslinger = {"ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo,
|
consvar_t cv_ringslinger = {"ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo,
|
||||||
@@ -447,6 +461,7 @@ static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "
|
|||||||
consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_forceskin = {"forceskin", "Off", CV_NETVAR|CV_CALL|CV_CHEAT, Forceskin_cons_t, ForceSkin_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_forceskin = {"forceskin", "Off", CV_NETVAR|CV_CALL|CV_CHEAT, Forceskin_cons_t, ForceSkin_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_fakelocalskin = {"fakelocalskin", "None", CV_SAVE, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_downloading = {"downloading", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_downloading = {"downloading", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_allowexitlevel = {"allowexitlevel", "No", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_allowexitlevel = {"allowexitlevel", "No", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -468,6 +483,8 @@ consvar_t cv_showping = {"showping", "Always", CV_SAVE, showping_cons_t, NULL, 0
|
|||||||
|
|
||||||
static CV_PossibleValue_t pingmeasurement_cons_t[] = {{0, "Frames"}, {1, "Milliseconds"}, {0, NULL}};
|
static CV_PossibleValue_t pingmeasurement_cons_t[] = {{0, "Frames"}, {1, "Milliseconds"}, {0, NULL}};
|
||||||
consvar_t cv_pingmeasurement = {"pingmeasurement", "Frames", CV_SAVE, pingmeasurement_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_pingmeasurement = {"pingmeasurement", "Frames", CV_SAVE, pingmeasurement_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_pingicon = {"pingicon", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_luaimmersion = {"luaimmersion", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_minihead = {"smallminimapplayers", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_minihead = {"smallminimapplayers", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -498,7 +515,7 @@ static CV_PossibleValue_t skinselectspin_cons_t[] = {
|
|||||||
consvar_t cv_skinselectspin = {"skinselectspin", "5", CV_SAVE, skinselectspin_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_skinselectspin = {"skinselectspin", "5", CV_SAVE, skinselectspin_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t perfstats_cons_t[] = {
|
static CV_PossibleValue_t perfstats_cons_t[] = {
|
||||||
{0, "Off"}, {1, "Rendering"}, {2, "Logic"}, {3, "ThinkFrame"}, {0, NULL}};
|
{0, "Off"}, {1, "Rendering"}, {2, "Logic"}, {3, "ThinkFrame"}, {4, "PreThinkFrame"}, {5, "PostThinkFrame"}, {0, NULL}};
|
||||||
consvar_t cv_perfstats = {"perfstats", "Off", CV_CALL, perfstats_cons_t, PS_PerfStats_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_perfstats = {"perfstats", "Off", CV_CALL, perfstats_cons_t, PS_PerfStats_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_ps_thinkframe_page = {"ps_thinkframe_page", "1", CV_CALL, CV_Natural, PS_ThinkFrame_Page_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_ps_thinkframe_page = {"ps_thinkframe_page", "1", CV_CALL, CV_Natural, PS_ThinkFrame_Page_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -512,8 +529,8 @@ consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_
|
|||||||
|
|
||||||
consvar_t cv_showtrackaddon = {"showtrackaddon", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showtrackaddon = {"showtrackaddon", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t skinselectmenu_t[] = {{SKINMENUTYPE_SCROLL, "Scoll"}, {SKINMENUTYPE_2D, "2d"}, {SKINMENUTYPE_GRID, "Grid"}, {0, NULL}};
|
static CV_PossibleValue_t skinselectmenu_t[] = {{SKINMENUTYPE_SCROLL, "Scroll"}, {SKINMENUTYPE_2D, "2d"}, {SKINMENUTYPE_GRID, "Grid"}, {SKINMENUTYPE_EXTENDED, "Extended"}, {0, NULL}};
|
||||||
consvar_t cv_skinselectmenu = {"skinselectmenu", "Grid", CV_SAVE, skinselectmenu_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_skinselectmenu = {"skinselectmenu", "Extended", CV_SAVE, skinselectmenu_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t skinselectgridsort_t[] ={
|
static CV_PossibleValue_t skinselectgridsort_t[] ={
|
||||||
{ SKINMENUSORT_REALNAME, "Real name" },
|
{ SKINMENUSORT_REALNAME, "Real name" },
|
||||||
@@ -643,6 +660,8 @@ void D_RegisterServerCommands(void)
|
|||||||
|
|
||||||
COM_AddCommand("addfilelocal", Command_Addfilelocal);
|
COM_AddCommand("addfilelocal", Command_Addfilelocal);
|
||||||
COM_AddCommand("addfile", Command_Addfile);
|
COM_AddCommand("addfile", Command_Addfile);
|
||||||
|
COM_AddCommand("addskins", Command_Addskins);
|
||||||
|
COM_AddCommand("localskin", Command_GLocalSkin);
|
||||||
COM_AddCommand("listwad", Command_ListWADS_f);
|
COM_AddCommand("listwad", Command_ListWADS_f);
|
||||||
|
|
||||||
#ifdef DELFILE
|
#ifdef DELFILE
|
||||||
@@ -709,8 +728,6 @@ void D_RegisterServerCommands(void)
|
|||||||
CV_RegisterVar(&cv_powerstones);
|
CV_RegisterVar(&cv_powerstones);
|
||||||
CV_RegisterVar(&cv_competitionboxes);
|
CV_RegisterVar(&cv_competitionboxes);
|
||||||
CV_RegisterVar(&cv_matchboxes);
|
CV_RegisterVar(&cv_matchboxes);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_slamsound);
|
|
||||||
|
|
||||||
/*CV_RegisterVar(&cv_recycler);
|
/*CV_RegisterVar(&cv_recycler);
|
||||||
CV_RegisterVar(&cv_teleporters);
|
CV_RegisterVar(&cv_teleporters);
|
||||||
@@ -763,6 +780,7 @@ void D_RegisterServerCommands(void)
|
|||||||
CV_RegisterVar(&cv_joinnextround);
|
CV_RegisterVar(&cv_joinnextround);
|
||||||
#endif
|
#endif
|
||||||
CV_RegisterVar(&cv_showjoinaddress);
|
CV_RegisterVar(&cv_showjoinaddress);
|
||||||
|
CV_RegisterVar(&cv_shownodeip);
|
||||||
CV_RegisterVar(&cv_blamecfail);
|
CV_RegisterVar(&cv_blamecfail);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -776,15 +794,7 @@ void D_RegisterServerCommands(void)
|
|||||||
CV_RegisterVar(&cv_pingtimeout);
|
CV_RegisterVar(&cv_pingtimeout);
|
||||||
CV_RegisterVar(&cv_showping);
|
CV_RegisterVar(&cv_showping);
|
||||||
CV_RegisterVar(&cv_pingmeasurement);
|
CV_RegisterVar(&cv_pingmeasurement);
|
||||||
|
CV_RegisterVar(&cv_pingicon);
|
||||||
CV_RegisterVar(&cv_minihead);
|
|
||||||
CV_RegisterVar(&cv_showminimapnames);
|
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showlapemblem);
|
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showtrackaddon);
|
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showviewpointtext);
|
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
CV_RegisterVar(&cv_allowseenames);
|
CV_RegisterVar(&cv_allowseenames);
|
||||||
@@ -802,6 +812,8 @@ void D_RegisterServerCommands(void)
|
|||||||
CV_RegisterVar(&cv_recordmultiplayerdemos);
|
CV_RegisterVar(&cv_recordmultiplayerdemos);
|
||||||
CV_RegisterVar(&cv_netdemosyncquality);
|
CV_RegisterVar(&cv_netdemosyncquality);
|
||||||
CV_RegisterVar(&cv_maxdemosize);
|
CV_RegisterVar(&cv_maxdemosize);
|
||||||
|
|
||||||
|
CV_RegisterVar(&cv_cechotoggle);
|
||||||
}
|
}
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
@@ -885,6 +897,7 @@ void D_RegisterClientCommands(void)
|
|||||||
CV_RegisterVar(&cv_playername);
|
CV_RegisterVar(&cv_playername);
|
||||||
CV_RegisterVar(&cv_playercolor);
|
CV_RegisterVar(&cv_playercolor);
|
||||||
CV_RegisterVar(&cv_skin); // r_things.c (skin NAME)
|
CV_RegisterVar(&cv_skin); // r_things.c (skin NAME)
|
||||||
|
CV_RegisterVar(&cv_localskin);
|
||||||
// secondary player (splitscreen)
|
// secondary player (splitscreen)
|
||||||
CV_RegisterVar(&cv_playername2);
|
CV_RegisterVar(&cv_playername2);
|
||||||
CV_RegisterVar(&cv_playercolor2);
|
CV_RegisterVar(&cv_playercolor2);
|
||||||
@@ -927,6 +940,8 @@ void D_RegisterClientCommands(void)
|
|||||||
|
|
||||||
COM_AddCommand("displayplayer", Command_Displayplayer_f);
|
COM_AddCommand("displayplayer", Command_Displayplayer_f);
|
||||||
|
|
||||||
|
CV_RegisterVar(&cv_audbuffersize);
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
CV_RegisterVar(&cv_modfilter);
|
CV_RegisterVar(&cv_modfilter);
|
||||||
CV_RegisterVar(&cv_stereosep);
|
CV_RegisterVar(&cv_stereosep);
|
||||||
@@ -949,33 +964,18 @@ void D_RegisterClientCommands(void)
|
|||||||
CV_RegisterVar(&cv_chatnotifications);
|
CV_RegisterVar(&cv_chatnotifications);
|
||||||
CV_RegisterVar(&cv_chatbacktint);
|
CV_RegisterVar(&cv_chatbacktint);
|
||||||
CV_RegisterVar(&cv_songcredits);
|
CV_RegisterVar(&cv_songcredits);
|
||||||
CV_RegisterVar(&cv_showfreeplay);
|
CV_RegisterVar(&cv_showfreeplay);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_item_xoffset);
|
CV_RegisterVar(&cv_growmusic);
|
||||||
CV_RegisterVar(&cv_item_yoffset);
|
CV_RegisterVar(&cv_supermusic);
|
||||||
CV_RegisterVar(&cv_time_xoffset);
|
|
||||||
CV_RegisterVar(&cv_time_yoffset);
|
CV_RegisterVar(&cv_showtrackaddon);
|
||||||
CV_RegisterVar(&cv_laps_xoffset);
|
CV_RegisterVar(&cv_showviewpointtext);
|
||||||
CV_RegisterVar(&cv_laps_yoffset);
|
|
||||||
CV_RegisterVar(&cv_spdm_xoffset);
|
CV_RegisterVar(&cv_luaimmersion);
|
||||||
CV_RegisterVar(&cv_spdm_yoffset);
|
CV_RegisterVar(&cv_fakelocalskin);
|
||||||
CV_RegisterVar(&cv_posi_xoffset);
|
|
||||||
CV_RegisterVar(&cv_posi_yoffset);
|
CV_RegisterVar(&cv_showlocalskinmenus);
|
||||||
CV_RegisterVar(&cv_face_xoffset);
|
|
||||||
CV_RegisterVar(&cv_face_yoffset);
|
|
||||||
CV_RegisterVar(&cv_stcd_xoffset);
|
|
||||||
CV_RegisterVar(&cv_stcd_yoffset);
|
|
||||||
CV_RegisterVar(&cv_chek_yoffset);
|
|
||||||
CV_RegisterVar(&cv_mini_xoffset);
|
|
||||||
CV_RegisterVar(&cv_mini_yoffset);
|
|
||||||
CV_RegisterVar(&cv_want_xoffset);
|
|
||||||
CV_RegisterVar(&cv_want_yoffset);
|
|
||||||
CV_RegisterVar(&cv_showinput);
|
|
||||||
CV_RegisterVar(&cv_newspeedometer);
|
|
||||||
|
|
||||||
CV_RegisterVar(&cv_saltyhop);
|
|
||||||
CV_RegisterVar(&cv_saltyhopsfx);
|
|
||||||
CV_RegisterVar(&cv_saltysquish);
|
|
||||||
|
|
||||||
//CV_RegisterVar(&cv_crosshair);
|
//CV_RegisterVar(&cv_crosshair);
|
||||||
//CV_RegisterVar(&cv_crosshair2);
|
//CV_RegisterVar(&cv_crosshair2);
|
||||||
@@ -1041,7 +1041,7 @@ void D_RegisterClientCommands(void)
|
|||||||
// WARNING: the order is important when initialising mouse2
|
// WARNING: the order is important when initialising mouse2
|
||||||
// we need the mouse2port
|
// we need the mouse2port
|
||||||
CV_RegisterVar(&cv_mouse2port);
|
CV_RegisterVar(&cv_mouse2port);
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
|
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
|
||||||
CV_RegisterVar(&cv_mouse2opt);
|
CV_RegisterVar(&cv_mouse2opt);
|
||||||
#endif
|
#endif
|
||||||
CV_RegisterVar(&cv_controlperkey);
|
CV_RegisterVar(&cv_controlperkey);
|
||||||
@@ -1089,10 +1089,6 @@ void D_RegisterClientCommands(void)
|
|||||||
#endif
|
#endif
|
||||||
CV_RegisterVar(&cv_numChannels);
|
CV_RegisterVar(&cv_numChannels);
|
||||||
|
|
||||||
// i_cdmus.c
|
|
||||||
CV_RegisterVar(&cd_volume);
|
|
||||||
CV_RegisterVar(&cdUpdate);
|
|
||||||
|
|
||||||
// screen.c
|
// screen.c
|
||||||
CV_RegisterVar(&cv_fullscreen);
|
CV_RegisterVar(&cv_fullscreen);
|
||||||
CV_RegisterVar(&cv_renderview);
|
CV_RegisterVar(&cv_renderview);
|
||||||
@@ -1110,17 +1106,12 @@ void D_RegisterClientCommands(void)
|
|||||||
CV_RegisterVar(&cv_ps_thinkframe_page);
|
CV_RegisterVar(&cv_ps_thinkframe_page);
|
||||||
CV_RegisterVar(&cv_ps_samplesize);
|
CV_RegisterVar(&cv_ps_samplesize);
|
||||||
CV_RegisterVar(&cv_ps_descriptor);
|
CV_RegisterVar(&cv_ps_descriptor);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_invincmusicfade);
|
//Value used to store last server player has joined
|
||||||
CV_RegisterVar(&cv_growmusicfade);
|
CV_RegisterVar(&cv_lastserver);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_respawnfademusicout);
|
CV_RegisterVar(&cv_showallmaps);
|
||||||
CV_RegisterVar(&cv_respawnfademusicback);
|
CV_RegisterVar(&cv_showmusicfilename);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_resetspecialmusic);
|
|
||||||
|
|
||||||
CV_RegisterVar(&cv_resume);
|
|
||||||
CV_RegisterVar(&cv_fading);
|
|
||||||
|
|
||||||
// ingame object placing
|
// ingame object placing
|
||||||
COM_AddCommand("objectplace", Command_ObjectPlace_f);
|
COM_AddCommand("objectplace", Command_ObjectPlace_f);
|
||||||
@@ -1166,6 +1157,7 @@ void D_RegisterClientCommands(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
COM_AddCommand("listskins", Command_ListSkins);
|
COM_AddCommand("listskins", Command_ListSkins);
|
||||||
|
COM_AddCommand("skinsearch", Command_SkinSearch);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1424,7 +1416,7 @@ static void SetPlayerName(INT32 playernum, char *newname)
|
|||||||
CONS_Printf(M_GetText("Player %d sent a bad name change\n"), playernum+1);
|
CONS_Printf(M_GetText("Player %d sent a bad name change\n"), playernum+1);
|
||||||
if (server && netgame)
|
if (server && netgame)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -1508,7 +1500,7 @@ static INT32 snacpending = 0, snac2pending = 0, snac3pending = 0, snac4pending =
|
|||||||
//
|
//
|
||||||
static void SendNameAndColor(void)
|
static void SendNameAndColor(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char buf[MAXPLAYERNAME+2];
|
char buf[MAXPLAYERNAME+2];
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
p = buf;
|
p = buf;
|
||||||
@@ -1630,7 +1622,7 @@ static void SendNameAndColor(void)
|
|||||||
static void SendNameAndColor2(void)
|
static void SendNameAndColor2(void)
|
||||||
{
|
{
|
||||||
INT32 secondplaya = -1;
|
INT32 secondplaya = -1;
|
||||||
XBOXSTATIC char buf[MAXPLAYERNAME+2];
|
char buf[MAXPLAYERNAME+2];
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
if (splitscreen < 1 && !botingame)
|
if (splitscreen < 1 && !botingame)
|
||||||
@@ -1758,7 +1750,7 @@ static void SendNameAndColor2(void)
|
|||||||
static void SendNameAndColor3(void)
|
static void SendNameAndColor3(void)
|
||||||
{
|
{
|
||||||
INT32 thirdplaya = -1;
|
INT32 thirdplaya = -1;
|
||||||
XBOXSTATIC char buf[MAXPLAYERNAME+2];
|
char buf[MAXPLAYERNAME+2];
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
if (splitscreen < 2)
|
if (splitscreen < 2)
|
||||||
@@ -1878,7 +1870,7 @@ static void SendNameAndColor3(void)
|
|||||||
static void SendNameAndColor4(void)
|
static void SendNameAndColor4(void)
|
||||||
{
|
{
|
||||||
INT32 fourthplaya = -1;
|
INT32 fourthplaya = -1;
|
||||||
XBOXSTATIC char buf[MAXPLAYERNAME+2];
|
char buf[MAXPLAYERNAME+2];
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
if (splitscreen < 3)
|
if (splitscreen < 3)
|
||||||
@@ -2066,7 +2058,7 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
if (kick)
|
if (kick)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal color change received from %s (team: %d), color: %d)\n"), player_names[playernum], p->ctfteam, p->skincolor);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal color change received from %s (team: %d), color: %d)\n"), player_names[playernum], p->ctfteam, p->skincolor);
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
@@ -2102,7 +2094,7 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
void SendWeaponPref(void)
|
void SendWeaponPref(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[1];
|
UINT8 buf[1];
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
if (cv_flipcam.value)
|
if (cv_flipcam.value)
|
||||||
@@ -2114,7 +2106,7 @@ void SendWeaponPref(void)
|
|||||||
|
|
||||||
void SendWeaponPref2(void)
|
void SendWeaponPref2(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[1];
|
UINT8 buf[1];
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
if (cv_flipcam2.value)
|
if (cv_flipcam2.value)
|
||||||
@@ -2126,7 +2118,7 @@ void SendWeaponPref2(void)
|
|||||||
|
|
||||||
void SendWeaponPref3(void)
|
void SendWeaponPref3(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[1];
|
UINT8 buf[1];
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
if (cv_flipcam3.value)
|
if (cv_flipcam3.value)
|
||||||
@@ -2138,7 +2130,7 @@ void SendWeaponPref3(void)
|
|||||||
|
|
||||||
void SendWeaponPref4(void)
|
void SendWeaponPref4(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[1];
|
UINT8 buf[1];
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
if (cv_flipcam4.value)
|
if (cv_flipcam4.value)
|
||||||
@@ -2933,7 +2925,7 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal map change received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal map change received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -3016,7 +3008,7 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
static void Command_Pause(void)
|
static void Command_Pause(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
UINT8 *cp = buf;
|
UINT8 *cp = buf;
|
||||||
|
|
||||||
if (COM_Argc() > 1)
|
if (COM_Argc() > 1)
|
||||||
@@ -3058,7 +3050,7 @@ static void Got_Pause(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal pause command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal pause command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -3090,7 +3082,7 @@ static void Got_Pause(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
if (paused)
|
if (paused)
|
||||||
{
|
{
|
||||||
if (!menuactive || netgame)
|
if ((!menuactive || netgame) && (!cv_pausemusic.value))
|
||||||
S_PauseAudio();
|
S_PauseAudio();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -3121,7 +3113,7 @@ static void Command_ReplayMarker(void)
|
|||||||
// Command for stuck characters in netgames, griefing, etc.
|
// Command for stuck characters in netgames, griefing, etc.
|
||||||
static void Command_Respawn(void)
|
static void Command_Respawn(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[4];
|
UINT8 buf[4];
|
||||||
UINT8 *cp = buf;
|
UINT8 *cp = buf;
|
||||||
|
|
||||||
WRITEINT32(cp, consoleplayer);
|
WRITEINT32(cp, consoleplayer);
|
||||||
@@ -3171,7 +3163,7 @@ static void Got_Respawn(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal respawn command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal respawn command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -3245,7 +3237,7 @@ static void Got_Clearscores(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal clear scores command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal clear scores command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -3768,7 +3760,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -3783,7 +3775,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -3821,7 +3813,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -3874,7 +3866,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
if (server && ((NetPacket.packet.newteam < 0 || NetPacket.packet.newteam > 3) || error))
|
if (server && ((NetPacket.packet.newteam < 0 || NetPacket.packet.newteam > 3) || error))
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4055,7 +4047,7 @@ static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt,
|
|||||||
(void)salt;
|
(void)salt;
|
||||||
memset(dest, 0, 16);
|
memset(dest, 0, 16);
|
||||||
#else
|
#else
|
||||||
XBOXSTATIC char tmpbuf[256];
|
char tmpbuf[256];
|
||||||
const size_t sl = strlen(salt);
|
const size_t sl = strlen(salt);
|
||||||
|
|
||||||
if (len > 256-sl)
|
if (len > 256-sl)
|
||||||
@@ -4113,7 +4105,7 @@ static void Command_Login_f(void)
|
|||||||
// If we have no MD5 support then completely disable XD_LOGIN responses for security.
|
// If we have no MD5 support then completely disable XD_LOGIN responses for security.
|
||||||
CONS_Alert(CONS_NOTICE, "Remote administration commands are not supported in this build.\n");
|
CONS_Alert(CONS_NOTICE, "Remote administration commands are not supported in this build.\n");
|
||||||
#else
|
#else
|
||||||
XBOXSTATIC UINT8 finalmd5[MD5_LEN];
|
UINT8 finalmd5[MD5_LEN];
|
||||||
const char *pw;
|
const char *pw;
|
||||||
|
|
||||||
if (!netgame)
|
if (!netgame)
|
||||||
@@ -4220,7 +4212,7 @@ void RemoveAdminPlayer(INT32 playernum)
|
|||||||
|
|
||||||
static void Command_Verify_f(void)
|
static void Command_Verify_f(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char buf[8]; // Should be plenty
|
char buf[8]; // Should be plenty
|
||||||
char *temp;
|
char *temp;
|
||||||
INT32 playernum;
|
INT32 playernum;
|
||||||
|
|
||||||
@@ -4263,7 +4255,7 @@ static void Got_Verification(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal verification received from %s (serverplayer is %s)\n"), player_names[playernum], player_names[serverplayer]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal verification received from %s (serverplayer is %s)\n"), player_names[playernum], player_names[serverplayer]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4282,7 +4274,7 @@ static void Got_Verification(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
static void Command_RemoveAdmin_f(void)
|
static void Command_RemoveAdmin_f(void)
|
||||||
{
|
{
|
||||||
XBOXSTATIC char buf[8]; // Should be plenty
|
char buf[8]; // Should be plenty
|
||||||
char *temp;
|
char *temp;
|
||||||
INT32 playernum;
|
INT32 playernum;
|
||||||
|
|
||||||
@@ -4319,7 +4311,7 @@ static void Got_Removal(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal demotion received from %s (serverplayer is %s)\n"), player_names[playernum], player_names[serverplayer]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal demotion received from %s (serverplayer is %s)\n"), player_names[playernum], player_names[serverplayer]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4399,7 +4391,7 @@ static void Got_MotD_f(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal motd change received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal motd change received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4420,7 +4412,7 @@ static void Got_MotD_f(UINT8 **cp, INT32 playernum)
|
|||||||
static void Command_RunSOC(void)
|
static void Command_RunSOC(void)
|
||||||
{
|
{
|
||||||
const char *fn;
|
const char *fn;
|
||||||
XBOXSTATIC char buf[255];
|
char buf[255];
|
||||||
size_t length = 0;
|
size_t length = 0;
|
||||||
|
|
||||||
if (COM_Argc() != 2)
|
if (COM_Argc() != 2)
|
||||||
@@ -4462,7 +4454,7 @@ static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal runsoc command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal runsoc command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4530,7 +4522,7 @@ static void Command_Addfilelocal(void)
|
|||||||
static void Command_Addfile(void)
|
static void Command_Addfile(void)
|
||||||
{
|
{
|
||||||
const char *fn, *p;
|
const char *fn, *p;
|
||||||
XBOXSTATIC char buf[256];
|
char buf[256];
|
||||||
char *buf_p = buf;
|
char *buf_p = buf;
|
||||||
INT32 i;
|
INT32 i;
|
||||||
int musiconly; // W_VerifyNMUSlumps isn't boolean
|
int musiconly; // W_VerifyNMUSlumps isn't boolean
|
||||||
@@ -4564,7 +4556,7 @@ static void Command_Addfile(void)
|
|||||||
// Add file on your client directly if it is trivial, or you aren't in a netgame.
|
// Add file on your client directly if it is trivial, or you aren't in a netgame.
|
||||||
if (!(netgame || multiplayer) || musiconly)
|
if (!(netgame || multiplayer) || musiconly)
|
||||||
{
|
{
|
||||||
P_AddWadFile(fn);
|
P_AddWadFile(fn, false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4613,6 +4605,156 @@ static void Command_Addfile(void)
|
|||||||
SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
|
SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// i hate myself
|
||||||
|
static boolean DumbStartsWith(const char *pre, const char *str)
|
||||||
|
{
|
||||||
|
size_t lenpre = strlen(pre),
|
||||||
|
lenstr = strlen(str);
|
||||||
|
return lenstr < lenpre ? false : memcmp(pre, str, lenpre) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Adds something at runtime.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
Command_Addskins (void)
|
||||||
|
{
|
||||||
|
if (COM_Argc() > 3)
|
||||||
|
{
|
||||||
|
CONS_Printf(
|
||||||
|
"addskins <file>: Load a skin file.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// no forcing?
|
||||||
|
/*
|
||||||
|
if (fasticmp(COM_Argv(2), "-force") || fasticmp(COM_Argv(2), "-f")) {
|
||||||
|
CONS_Alert(CONS_NOTICE, M_GetText("Adding file %s. May or may not be a skin.\n"), COM_Argv(1));
|
||||||
|
P_AddWadFile(COM_Argv(1), 0, true);
|
||||||
|
} else {
|
||||||
|
if (DumbStartsWith("KC_", COM_Argv(1))) {
|
||||||
|
P_AddWadFile(COM_Argv(1), 0, true);
|
||||||
|
} else if (DumbStartsWith("KCL_", COM_Argv(1))) {
|
||||||
|
if (!demo.playback) {
|
||||||
|
CONS_Alert(CONS_ERROR, M_GetText("Cannot add file %s as it is a skin with lua. Include -force or -f to force it to load.\n"), COM_Argv(1));
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
*/
|
||||||
|
P_AddWadFile(COM_Argv(1), true);
|
||||||
|
/*
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
CONS_Alert(CONS_ERROR, M_GetText("Cannot add file %s as it is not a skin.\n"), COM_Argv(1));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
// args n stuff
|
||||||
|
#include "args.h"
|
||||||
|
|
||||||
|
static void Command_GLocalSkin (void)
|
||||||
|
{
|
||||||
|
size_t first_option;
|
||||||
|
size_t option_display;
|
||||||
|
size_t option_all;
|
||||||
|
size_t option_player;
|
||||||
|
|
||||||
|
option_player = COM_CheckPartialParm("-p");
|
||||||
|
option_display = COM_CheckPartialParm("-d");
|
||||||
|
option_all = COM_CheckPartialParm("-a");
|
||||||
|
|
||||||
|
char* fuck; // local skin name
|
||||||
|
|
||||||
|
if (!( first_option = COM_FirstOption() ))
|
||||||
|
first_option = COM_Argc();
|
||||||
|
|
||||||
|
if (first_option < 2)
|
||||||
|
{
|
||||||
|
/* holy fucking shit */
|
||||||
|
CONS_Printf("localskin <name> [-player <name>] [-display <number>] [-all]:\n");
|
||||||
|
CONS_Printf(M_GetText("Set a localskin via its internal name (usually printed on the console).\n\n\
|
||||||
|
* Using \"-player\" will set a localskin to a specified player.\n\
|
||||||
|
Defaults to yourself.\n\
|
||||||
|
* Using \"-display\" will set a localskin to the displayed player.\n\
|
||||||
|
Defaults to 0, which is the first player displayed.\n\
|
||||||
|
Can go up to 3 for splitscreen.\n\
|
||||||
|
* Using \"-all\" will set a localskin to ALL players.\n\
|
||||||
|
* \"localskin none\" removes the localskin, just like how\n\
|
||||||
|
\"forceskin none\" does.\n"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
fuck = ConcatCommandArgv(1, first_option);
|
||||||
|
|
||||||
|
char* player_name = player_names[consoleplayer];
|
||||||
|
char* display_num = "0";
|
||||||
|
size_t dnum = 0;
|
||||||
|
|
||||||
|
if (option_display) // -display
|
||||||
|
{
|
||||||
|
// handle default: 0
|
||||||
|
if (COM_Argv(option_display + 1)[0] == "" || COM_Argv(option_display + 1)[0] != "-")
|
||||||
|
display_num = COM_Argv(option_display + 1);
|
||||||
|
|
||||||
|
if (isdigit(display_num[0]) || display_num == "0")
|
||||||
|
{
|
||||||
|
dnum = atoi(display_num);
|
||||||
|
if (dnum > 3 || dnum < 0) // nuh uh
|
||||||
|
dnum = 0;
|
||||||
|
SetLocalPlayerSkin(displayplayers[dnum], fuck, NULL);
|
||||||
|
|
||||||
|
CONS_Printf("Successfully applied localskin to displayed player.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
CONS_Printf("Could not apply localskin.\n");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (option_all) // -all
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < MAXPLAYERS; ++i)
|
||||||
|
{
|
||||||
|
if (!playeringame[i])
|
||||||
|
continue;
|
||||||
|
SetLocalPlayerSkin(i, fuck, NULL);
|
||||||
|
}
|
||||||
|
CONS_Printf("Successfully applied localskin to all players.\n");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else // -player or no other arguments
|
||||||
|
{
|
||||||
|
if (option_player)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
player_name = COM_Argv(option_player + 1);
|
||||||
|
|
||||||
|
for (i = 0; i < MAXPLAYERS; ++i)
|
||||||
|
{
|
||||||
|
if (fasticmp(player_names[i], player_name))
|
||||||
|
SetLocalPlayerSkin(i, fuck, NULL);
|
||||||
|
}
|
||||||
|
CONS_Printf("Successfully applied localskin to specified player.\n");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SetLocalPlayerSkin(consoleplayer, fuck, &cv_localskin);
|
||||||
|
CONS_Printf("Successfully applied localskin.\n");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
CONS_Printf("Could not apply localskin.\n");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef DELFILE
|
#ifdef DELFILE
|
||||||
/** removes the last added pwad at runtime.
|
/** removes the last added pwad at runtime.
|
||||||
* Searches for sounds, maps, music and images to remove
|
* Searches for sounds, maps, music and images to remove
|
||||||
@@ -4676,7 +4818,7 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
if ((playernum != serverplayer && !IsPlayerAdmin(playernum)) || kick)
|
if ((playernum != serverplayer && !IsPlayerAdmin(playernum)) || kick)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal addfile command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal addfile command received from %s\n"), player_names[playernum]);
|
||||||
|
|
||||||
@@ -4725,7 +4867,7 @@ static void Got_Delfilecmd(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal delfile command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal delfile command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4758,7 +4900,7 @@ static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal addfile command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal addfile command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -4769,7 +4911,7 @@ static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
ncs = findfile(filename,md5sum,true);
|
ncs = findfile(filename,md5sum,true);
|
||||||
|
|
||||||
if (ncs != FS_FOUND || !P_AddWadFile(filename))
|
if (ncs != FS_FOUND || !P_AddWadFile(filename, false))
|
||||||
{
|
{
|
||||||
Command_ExitGame_f();
|
Command_ExitGame_f();
|
||||||
if (ncs == FS_FOUND)
|
if (ncs == FS_FOUND)
|
||||||
@@ -4832,8 +4974,6 @@ static void Command_Version_f(void)
|
|||||||
// Base library
|
// Base library
|
||||||
#if defined( HAVE_SDL)
|
#if defined( HAVE_SDL)
|
||||||
CONS_Printf("SDL ");
|
CONS_Printf("SDL ");
|
||||||
#elif defined(_WINDOWS)
|
|
||||||
CONS_Printf("DD ");
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// OS
|
// OS
|
||||||
@@ -4858,11 +4998,6 @@ static void Command_Version_f(void)
|
|||||||
else // 16-bit? 128-bit?
|
else // 16-bit? 128-bit?
|
||||||
CONS_Printf("Bits Unknown ");
|
CONS_Printf("Bits Unknown ");
|
||||||
|
|
||||||
// No ASM?
|
|
||||||
#ifdef NOASM
|
|
||||||
CONS_Printf("\x85" "NOASM " "\x80");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Debug build
|
// Debug build
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
CONS_Printf("\x85" "DEBUG " "\x80");
|
CONS_Printf("\x85" "DEBUG " "\x80");
|
||||||
@@ -5450,7 +5585,7 @@ static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal exitlevel command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal exitlevel command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -5472,7 +5607,7 @@ static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal vote setup received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal vote setup received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -5537,7 +5672,7 @@ static void Got_PickVotecmd(UINT8 **cp, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal vote setup received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal vote setup received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
@@ -5925,6 +6060,25 @@ static void Command_ListSkins(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void Command_SkinSearch(void)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
UINT16 s;
|
||||||
|
UINT16 ic = 0;
|
||||||
|
//skin_t *skininput = &skins[s];
|
||||||
|
for (i = 1; i < COM_Argc(); i++){
|
||||||
|
for( s = 0 ; s < numallskins ; s++ )
|
||||||
|
{
|
||||||
|
skin_t *skininput = &skins[s];
|
||||||
|
if (strcasestr(skininput->realname,COM_Argv(i)))
|
||||||
|
{
|
||||||
|
ic++;
|
||||||
|
CONS_Printf("%d. %s%s:\x80 %s\n", ic,HU_SkinColorToConsoleColor(skininput->prefcolor),skininput->realname,skininput->name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CONS_Printf("Total %d skins.\n", ic);
|
||||||
|
}
|
||||||
|
|
||||||
/** Sends a color change for the console player, unless that player is moving.
|
/** Sends a color change for the console player, unless that player is moving.
|
||||||
* \sa cv_playercolor, Color2_OnChange, Skin_OnChange
|
* \sa cv_playercolor, Color2_OnChange, Skin_OnChange
|
||||||
@@ -6162,7 +6316,7 @@ void Got_DiscordInfo(UINT8 **p, INT32 playernum)
|
|||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal Discord info command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal Discord info command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
XBOXSTATIC UINT8 buf[2];
|
UINT8 buf[2];
|
||||||
|
|
||||||
buf[0] = (UINT8)playernum;
|
buf[0] = (UINT8)playernum;
|
||||||
buf[1] = KICK_MSG_CON_FAIL;
|
buf[1] = KICK_MSG_CON_FAIL;
|
||||||
|
|||||||
+13
-2
@@ -21,6 +21,7 @@
|
|||||||
extern consvar_t cv_playername;
|
extern consvar_t cv_playername;
|
||||||
extern consvar_t cv_playercolor;
|
extern consvar_t cv_playercolor;
|
||||||
extern consvar_t cv_skin;
|
extern consvar_t cv_skin;
|
||||||
|
extern consvar_t cv_localskin;
|
||||||
// secondary splitscreen player
|
// secondary splitscreen player
|
||||||
extern consvar_t cv_playername2;
|
extern consvar_t cv_playername2;
|
||||||
extern consvar_t cv_playercolor2;
|
extern consvar_t cv_playercolor2;
|
||||||
@@ -40,6 +41,8 @@ extern consvar_t cv_splitplayers;
|
|||||||
extern consvar_t cv_seenames, cv_allowseenames;
|
extern consvar_t cv_seenames, cv_allowseenames;
|
||||||
#endif
|
#endif
|
||||||
extern consvar_t cv_usemouse;
|
extern consvar_t cv_usemouse;
|
||||||
|
//WTF
|
||||||
|
extern consvar_t cv_mouseturn;
|
||||||
extern consvar_t cv_usejoystick;
|
extern consvar_t cv_usejoystick;
|
||||||
extern consvar_t cv_usejoystick2;
|
extern consvar_t cv_usejoystick2;
|
||||||
extern consvar_t cv_usejoystick3;
|
extern consvar_t cv_usejoystick3;
|
||||||
@@ -56,7 +59,7 @@ extern consvar_t cv_joyscale4;
|
|||||||
// splitscreen with second mouse
|
// splitscreen with second mouse
|
||||||
extern consvar_t cv_mouse2port;
|
extern consvar_t cv_mouse2port;
|
||||||
extern consvar_t cv_usemouse2;
|
extern consvar_t cv_usemouse2;
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON)
|
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
|
||||||
extern consvar_t cv_mouse2opt;
|
extern consvar_t cv_mouse2opt;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -110,6 +113,9 @@ extern consvar_t cv_thundershield, cv_hyudoro, cv_pogospring, cv_kitchensink;
|
|||||||
extern consvar_t cv_triplesneaker, cv_triplebanana, cv_decabanana;
|
extern consvar_t cv_triplesneaker, cv_triplebanana, cv_decabanana;
|
||||||
extern consvar_t cv_tripleorbinaut, cv_quadorbinaut, cv_dualjawz;
|
extern consvar_t cv_tripleorbinaut, cv_quadorbinaut, cv_dualjawz;
|
||||||
|
|
||||||
|
//Lastserver
|
||||||
|
extern consvar_t cv_lastserver;
|
||||||
|
|
||||||
extern consvar_t cv_kartminimap;
|
extern consvar_t cv_kartminimap;
|
||||||
extern consvar_t cv_kartcheck;
|
extern consvar_t cv_kartcheck;
|
||||||
extern consvar_t cv_kartinvinsfx;
|
extern consvar_t cv_kartinvinsfx;
|
||||||
@@ -149,6 +155,7 @@ extern consvar_t cv_maxping;
|
|||||||
extern consvar_t cv_pingtimeout;
|
extern consvar_t cv_pingtimeout;
|
||||||
extern consvar_t cv_showping;
|
extern consvar_t cv_showping;
|
||||||
extern consvar_t cv_pingmeasurement;
|
extern consvar_t cv_pingmeasurement;
|
||||||
|
extern consvar_t cv_pingicon;
|
||||||
|
|
||||||
//extern consvar_t cv_smallpos;
|
//extern consvar_t cv_smallpos;
|
||||||
extern consvar_t cv_showminimapnames;
|
extern consvar_t cv_showminimapnames;
|
||||||
@@ -157,6 +164,9 @@ extern consvar_t cv_minihead;
|
|||||||
extern consvar_t cv_showlapemblem;
|
extern consvar_t cv_showlapemblem;
|
||||||
|
|
||||||
extern consvar_t cv_showviewpointtext;
|
extern consvar_t cv_showviewpointtext;
|
||||||
|
extern consvar_t cv_luaimmersion;
|
||||||
|
extern consvar_t cv_fakelocalskin;
|
||||||
|
extern consvar_t cv_showlocalskinmenus;
|
||||||
|
|
||||||
extern consvar_t cv_skipmapcheck;
|
extern consvar_t cv_skipmapcheck;
|
||||||
|
|
||||||
@@ -176,7 +186,8 @@ typedef enum
|
|||||||
{
|
{
|
||||||
SKINMENUTYPE_SCROLL = 0,
|
SKINMENUTYPE_SCROLL = 0,
|
||||||
SKINMENUTYPE_2D, // 1
|
SKINMENUTYPE_2D, // 1
|
||||||
SKINMENUTYPE_GRID // 2
|
SKINMENUTYPE_GRID, // 2
|
||||||
|
SKINMENUTYPE_EXTENDED // 3
|
||||||
} skinmenutype_t;
|
} skinmenutype_t;
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
|
|||||||
+33
-22
@@ -11,21 +11,17 @@
|
|||||||
/// \brief Transfer a file using HSendPacket.
|
/// \brief Transfer a file using HSendPacket.
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#ifndef _WIN32_WCE
|
|
||||||
#ifdef __OS2__
|
#ifdef __OS2__
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif // __OS2__
|
#endif // __OS2__
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined (UNDER_CE)
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ((defined (_WIN32) && !defined (_WIN32_WCE)) || defined (__DJGPP__)) && !defined (_XBOX)
|
#ifdef _WIN32
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <direct.h>
|
#include <direct.h>
|
||||||
#elif !defined (_WIN32_WCE) && !(defined (_XBOX) && !defined (__GNUC__))
|
#else
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <utime.h>
|
#include <utime.h>
|
||||||
@@ -34,13 +30,9 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#elif defined (_WIN32) && !defined (_WIN32_WCE)
|
#elif defined (_WIN32)
|
||||||
#include <sys/utime.h>
|
#include <sys/utime.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef __DJGPP__
|
|
||||||
#include <dir.h>
|
|
||||||
#include <utime.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
#include "curl/curl.h"
|
#include "curl/curl.h"
|
||||||
@@ -72,8 +64,13 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid);
|
|||||||
|
|
||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream);
|
size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream);
|
||||||
|
#if defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 35, 0)
|
||||||
|
int curlprogress_callbackx(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
|
||||||
|
#define XFERINFOFUNCTION
|
||||||
|
#else
|
||||||
int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
|
int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
// Sender structure
|
// Sender structure
|
||||||
typedef struct filetx_s
|
typedef struct filetx_s
|
||||||
@@ -489,7 +486,6 @@ INT32 CL_CheckFiles(void)
|
|||||||
{
|
{
|
||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
char wadfilename[MAX_WADPATH];
|
char wadfilename[MAX_WADPATH];
|
||||||
size_t packetsize = 0;
|
|
||||||
size_t filestoload = 0;
|
size_t filestoload = 0;
|
||||||
boolean downloadrequired = false;
|
boolean downloadrequired = false;
|
||||||
|
|
||||||
@@ -513,7 +509,7 @@ INT32 CL_CheckFiles(void)
|
|||||||
|
|
||||||
for (i = 0, j = mainwads+1; i < fileneedednum || j < numwadfiles;)
|
for (i = 0, j = mainwads+1; i < fileneedednum || j < numwadfiles;)
|
||||||
{
|
{
|
||||||
if (j < numwadfiles && !wadfiles[j]->important)
|
if (j < numwadfiles && (!wadfiles[j]->important || wadfiles[j]->localfile))
|
||||||
{
|
{
|
||||||
// Unimportant on our side. still don't care.
|
// Unimportant on our side. still don't care.
|
||||||
++j;
|
++j;
|
||||||
@@ -562,7 +558,7 @@ INT32 CL_CheckFiles(void)
|
|||||||
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
|
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
|
||||||
|
|
||||||
// Check in already loaded files
|
// Check in already loaded files
|
||||||
for (j = mainwads+1; wadfiles[j]; j++)
|
for (j = mainwads+1; j < numwadfiles; j++)
|
||||||
{
|
{
|
||||||
nameonly(strcpy(wadfilename, wadfiles[j]->filename));
|
nameonly(strcpy(wadfilename, wadfiles[j]->filename));
|
||||||
if (!stricmp(wadfilename, fileneeded[i].filename) &&
|
if (!stricmp(wadfilename, fileneeded[i].filename) &&
|
||||||
@@ -574,8 +570,6 @@ INT32 CL_CheckFiles(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
packetsize += nameonlylength(fileneeded[i].filename) + 22;
|
|
||||||
|
|
||||||
fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true);
|
fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true);
|
||||||
CONS_Debug(DBG_NETPLAY, "found %d\n", fileneeded[i].status);
|
CONS_Debug(DBG_NETPLAY, "found %d\n", fileneeded[i].status);
|
||||||
return 4;
|
return 4;
|
||||||
@@ -1142,7 +1136,7 @@ size_t nameonlylength(const char *s)
|
|||||||
|
|
||||||
filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum)
|
filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum)
|
||||||
{
|
{
|
||||||
#if defined (NOMD5) || defined (_arch_dreamcast)
|
#if defined (NOMD5)
|
||||||
(void)wantedmd5sum;
|
(void)wantedmd5sum;
|
||||||
(void)filename;
|
(void)filename;
|
||||||
#else
|
#else
|
||||||
@@ -1194,11 +1188,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
|
|||||||
// if not found at all, just move on without doing anything
|
// if not found at all, just move on without doing anything
|
||||||
|
|
||||||
// finally check "." directory
|
// finally check "." directory
|
||||||
#ifdef _arch_dreamcast
|
|
||||||
homecheck = filesearch(filename, "/cd", wantedmd5sum, completepath, 10);
|
|
||||||
#else
|
|
||||||
homecheck = filesearch(filename, ".", wantedmd5sum, completepath, 10);
|
homecheck = filesearch(filename, ".", wantedmd5sum, completepath, 10);
|
||||||
#endif
|
|
||||||
|
|
||||||
if (homecheck != FS_NOTFOUND) // if not found this time, fall back on the below return statement
|
if (homecheck != FS_NOTFOUND) // if not found this time, fall back on the below return statement
|
||||||
return homecheck; // otherwise return the result we got
|
return homecheck; // otherwise return the result we got
|
||||||
@@ -1214,6 +1204,18 @@ size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream)
|
|||||||
return written;
|
return written;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef XFERINFOFUNCTION
|
||||||
|
int curlprogress_callbackx(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
|
||||||
|
{
|
||||||
|
(void)clientp;
|
||||||
|
(void)ultotal;
|
||||||
|
(void)ulnow; // Function prototype requires these but we won't use, so just discard
|
||||||
|
curl_dlnow = dlnow;
|
||||||
|
curl_dltotal = dltotal;
|
||||||
|
getbytes = curl_dlnow / (time(NULL) - curl_starttime); // To-do: Make this more accurate???
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#else
|
||||||
int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
|
int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
|
||||||
{
|
{
|
||||||
(void)clientp;
|
(void)clientp;
|
||||||
@@ -1224,6 +1226,7 @@ int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ul
|
|||||||
getbytes = curl_dlnow / (time(NULL) - curl_starttime); // To-do: Make this more accurate???
|
getbytes = curl_dlnow / (time(NULL) - curl_starttime); // To-do: Make this more accurate???
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void CURLPrepareFile(const char* url, int dfilenum)
|
void CURLPrepareFile(const char* url, int dfilenum)
|
||||||
{
|
{
|
||||||
@@ -1253,7 +1256,11 @@ void CURLPrepareFile(const char* url, int dfilenum)
|
|||||||
curl_easy_setopt(http_handle, CURLOPT_URL, va("%s/%s", url, curl_realname));
|
curl_easy_setopt(http_handle, CURLOPT_URL, va("%s/%s", url, curl_realname));
|
||||||
|
|
||||||
// Only allow HTTP and HTTPS
|
// Only allow HTTP and HTTPS
|
||||||
|
#if defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 85, 0)
|
||||||
|
curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS_STR, "http,https");
|
||||||
|
#else
|
||||||
curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
|
curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
|
||||||
|
#endif
|
||||||
|
|
||||||
curl_easy_setopt(http_handle, CURLOPT_USERAGENT, va("SRB2Kart/v%d.%d", VERSION, SUBVERSION)); // Set user agent as some servers won't accept invalid user agents.
|
curl_easy_setopt(http_handle, CURLOPT_USERAGENT, va("SRB2Kart/v%d.%d", VERSION, SUBVERSION)); // Set user agent as some servers won't accept invalid user agents.
|
||||||
|
|
||||||
@@ -1277,7 +1284,11 @@ void CURLPrepareFile(const char* url, int dfilenum)
|
|||||||
curl_easy_setopt(http_handle, CURLOPT_WRITEDATA, curl_curfile->file);
|
curl_easy_setopt(http_handle, CURLOPT_WRITEDATA, curl_curfile->file);
|
||||||
curl_easy_setopt(http_handle, CURLOPT_WRITEFUNCTION, curlwrite_data);
|
curl_easy_setopt(http_handle, CURLOPT_WRITEFUNCTION, curlwrite_data);
|
||||||
curl_easy_setopt(http_handle, CURLOPT_NOPROGRESS, 0L);
|
curl_easy_setopt(http_handle, CURLOPT_NOPROGRESS, 0L);
|
||||||
|
#ifdef XFERINFOFUNCTION
|
||||||
|
curl_easy_setopt(http_handle, CURLOPT_XFERINFOFUNCTION, curlprogress_callbackx);
|
||||||
|
#else
|
||||||
curl_easy_setopt(http_handle, CURLOPT_PROGRESSFUNCTION, curlprogress_callback);
|
curl_easy_setopt(http_handle, CURLOPT_PROGRESSFUNCTION, curlprogress_callback);
|
||||||
|
#endif
|
||||||
|
|
||||||
curl_curfile->status = FS_DOWNLOADING;
|
curl_curfile->status = FS_DOWNLOADING;
|
||||||
lastfilenum = dfilenum;
|
lastfilenum = dfilenum;
|
||||||
@@ -1331,7 +1342,7 @@ void CURLGetFile(void)
|
|||||||
if (easyres == CURLE_HTTP_RETURNED_ERROR)
|
if (easyres == CURLE_HTTP_RETURNED_ERROR)
|
||||||
curl_easy_getinfo(e, CURLINFO_RESPONSE_CODE, &response_code);
|
curl_easy_getinfo(e, CURLINFO_RESPONSE_CODE, &response_code);
|
||||||
|
|
||||||
easy_handle_error = (response_code) ? va("HTTP reponse code %ld", response_code) : curl_easy_strerror(easyres);
|
easy_handle_error = (response_code) ? va("HTTP response code %ld", response_code) : curl_easy_strerror(easyres);
|
||||||
curl_curfile->status = FS_FALLBACK;
|
curl_curfile->status = FS_FALLBACK;
|
||||||
curl_curfile->currentsize = curl_origfilesize;
|
curl_curfile->currentsize = curl_origfilesize;
|
||||||
curl_curfile->totalsize = curl_origtotalfilesize;
|
curl_curfile->totalsize = curl_origtotalfilesize;
|
||||||
|
|||||||
@@ -371,6 +371,7 @@ typedef struct player_s
|
|||||||
|
|
||||||
angle_t viewrollangle;
|
angle_t viewrollangle;
|
||||||
angle_t tilt;
|
angle_t tilt;
|
||||||
|
angle_t tilt_sprite;
|
||||||
|
|
||||||
// Mouse aiming, where the guy is looking at!
|
// Mouse aiming, where the guy is looking at!
|
||||||
// It is updated with cmd->aiming.
|
// It is updated with cmd->aiming.
|
||||||
@@ -415,6 +416,8 @@ typedef struct player_s
|
|||||||
UINT8 skincolor;
|
UINT8 skincolor;
|
||||||
|
|
||||||
INT32 skin;
|
INT32 skin;
|
||||||
|
INT32 localskin; // current localskin number
|
||||||
|
boolean skinlocal; // determines if localskin is a skin already loaded in the server
|
||||||
|
|
||||||
UINT32 score; // player score
|
UINT32 score; // player score
|
||||||
fixed_t dashspeed; // dashing speed
|
fixed_t dashspeed; // dashing speed
|
||||||
|
|||||||
+4
-11
@@ -43,12 +43,6 @@
|
|||||||
#include "r_draw.h" // translation colormap consts (for lua)
|
#include "r_draw.h" // translation colormap consts (for lua)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PC_DOS
|
|
||||||
#include <stdio.h> // for snprintf
|
|
||||||
//int snprintf(char *str, size_t n, const char *fmt, ...);
|
|
||||||
int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Free slot names
|
// Free slot names
|
||||||
// The crazy word-reading stuff uses these.
|
// The crazy word-reading stuff uses these.
|
||||||
static char *FREE_STATES[NUMSTATEFREESLOTS];
|
static char *FREE_STATES[NUMSTATEFREESLOTS];
|
||||||
@@ -1888,7 +1882,7 @@ static void readframe(MYFILE *f, INT32 num)
|
|||||||
{
|
{
|
||||||
size_t z;
|
size_t z;
|
||||||
boolean found = false;
|
boolean found = false;
|
||||||
XBOXSTATIC char actiontocompare[32];
|
char actiontocompare[32];
|
||||||
|
|
||||||
memset(actiontocompare, 0x00, sizeof(actiontocompare));
|
memset(actiontocompare, 0x00, sizeof(actiontocompare));
|
||||||
strlcpy(actiontocompare, word2, sizeof (actiontocompare));
|
strlcpy(actiontocompare, word2, sizeof (actiontocompare));
|
||||||
@@ -3159,9 +3153,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
char *word2;
|
char *word2;
|
||||||
INT32 i;
|
INT32 i;
|
||||||
// do a copy of this for cross references probleme
|
// do a copy of this for cross references probleme
|
||||||
//XBOXSTATIC actionf_t saveactions[NUMSTATES];
|
const char *savesfxnames[NUMSFX];
|
||||||
//XBOXSTATIC const char *savesprnames[NUMSPRITES];
|
|
||||||
XBOXSTATIC const char *savesfxnames[NUMSFX];
|
|
||||||
|
|
||||||
if (!deh_loaded)
|
if (!deh_loaded)
|
||||||
initfreeslots();
|
initfreeslots();
|
||||||
@@ -3181,7 +3173,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
dbg_line = -1; // start at -1 so the first line is 0.
|
dbg_line = -1; // start at -1 so the first line is 0.
|
||||||
while (!myfeof(f))
|
while (!myfeof(f))
|
||||||
{
|
{
|
||||||
XBOXSTATIC char origpos[128];
|
char origpos[128];
|
||||||
INT32 size = 0;
|
INT32 size = 0;
|
||||||
char *traverse;
|
char *traverse;
|
||||||
|
|
||||||
@@ -8285,6 +8277,7 @@ struct {
|
|||||||
|
|
||||||
// Frame settings
|
// Frame settings
|
||||||
{"FF_FRAMEMASK",FF_FRAMEMASK},
|
{"FF_FRAMEMASK",FF_FRAMEMASK},
|
||||||
|
{"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP},
|
||||||
{"FF_PAPERSPRITE",FF_PAPERSPRITE},
|
{"FF_PAPERSPRITE",FF_PAPERSPRITE},
|
||||||
{"FF_ANIMATE",FF_ANIMATE},
|
{"FF_ANIMATE",FF_ANIMATE},
|
||||||
{"FF_FULLBRIGHT",FF_FULLBRIGHT},
|
{"FF_FULLBRIGHT",FF_FULLBRIGHT},
|
||||||
|
|||||||
+43
-2
@@ -37,7 +37,9 @@
|
|||||||
// length of IP strings
|
// length of IP strings
|
||||||
#define IP_SIZE 21
|
#define IP_SIZE 21
|
||||||
|
|
||||||
consvar_t cv_discordrp = {"discordrp", "On", CV_SAVE|CV_CALL, CV_OnOff, DRPC_UpdatePresence, 0, NULL, NULL, 0, 0, NULL};
|
static void Discordrp_OnChange(void);
|
||||||
|
|
||||||
|
consvar_t cv_discordrp = {"discordrp", "On", CV_SAVE|CV_CALL, CV_OnOff, Discordrp_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_discordstreamer = {"discordstreamer", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_discordstreamer = {"discordstreamer", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_discordasks = {"discordasks", "Yes", CV_SAVE|CV_CALL, CV_YesNo, DRPC_UpdatePresence, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_discordasks = {"discordasks", "Yes", CV_SAVE|CV_CALL, CV_YesNo, DRPC_UpdatePresence, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -47,6 +49,8 @@ discordRequest_t *discordRequestList = NULL;
|
|||||||
|
|
||||||
static char self_ip[IP_SIZE];
|
static char self_ip[IP_SIZE];
|
||||||
|
|
||||||
|
boolean drpc_init = false;
|
||||||
|
|
||||||
/*--------------------------------------------------
|
/*--------------------------------------------------
|
||||||
static char *DRPC_XORIPString(const char *input)
|
static char *DRPC_XORIPString(const char *input)
|
||||||
|
|
||||||
@@ -315,6 +319,9 @@ void DRPC_RemoveRequest(discordRequest_t *removeRequest)
|
|||||||
--------------------------------------------------*/
|
--------------------------------------------------*/
|
||||||
void DRPC_Init(void)
|
void DRPC_Init(void)
|
||||||
{
|
{
|
||||||
|
if (drpc_init || !cv_discordrp.value) return;
|
||||||
|
|
||||||
|
drpc_init = true;
|
||||||
DiscordEventHandlers handlers;
|
DiscordEventHandlers handlers;
|
||||||
memset(&handlers, 0, sizeof(handlers));
|
memset(&handlers, 0, sizeof(handlers));
|
||||||
|
|
||||||
@@ -325,10 +332,36 @@ void DRPC_Init(void)
|
|||||||
handlers.joinRequest = DRPC_HandleJoinRequest;
|
handlers.joinRequest = DRPC_HandleJoinRequest;
|
||||||
|
|
||||||
Discord_Initialize(DISCORD_APPID, &handlers, 1, NULL);
|
Discord_Initialize(DISCORD_APPID, &handlers, 1, NULL);
|
||||||
I_AddExitFunc(Discord_Shutdown);
|
I_AddExitFunc(DRPC_Shutdown);
|
||||||
DRPC_UpdatePresence();
|
DRPC_UpdatePresence();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DRPC_Shutdown(void)
|
||||||
|
{
|
||||||
|
if (!drpc_init)
|
||||||
|
{
|
||||||
|
CONS_Printf("DiscordRPC never started\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
CONS_Printf("Shutting down DiscordRPC\n");
|
||||||
|
|
||||||
|
Discord_Shutdown();
|
||||||
|
drpc_init = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void Discordrp_OnChange(void)
|
||||||
|
{
|
||||||
|
if (cv_discordrp.value)
|
||||||
|
{
|
||||||
|
DRPC_UpdatePresence();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DRPC_Shutdown();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------
|
/*--------------------------------------------------
|
||||||
static void DRPC_GotServerIP(UINT32 address)
|
static void DRPC_GotServerIP(UINT32 address)
|
||||||
|
|
||||||
@@ -402,6 +435,10 @@ static void DRPC_EmptyRequests(void)
|
|||||||
--------------------------------------------------*/
|
--------------------------------------------------*/
|
||||||
void DRPC_UpdatePresence(void)
|
void DRPC_UpdatePresence(void)
|
||||||
{
|
{
|
||||||
|
if (!cv_discordrp.value) return;
|
||||||
|
|
||||||
|
if (!drpc_init) DRPC_Init();
|
||||||
|
|
||||||
char detailstr[48+1];
|
char detailstr[48+1];
|
||||||
|
|
||||||
char mapimg[8+1];
|
char mapimg[8+1];
|
||||||
@@ -443,14 +480,18 @@ void DRPC_UpdatePresence(void)
|
|||||||
// Server info
|
// Server info
|
||||||
if (netgame)
|
if (netgame)
|
||||||
{
|
{
|
||||||
|
#ifdef MASTERSERVER
|
||||||
if (cv_advertise.value)
|
if (cv_advertise.value)
|
||||||
{
|
{
|
||||||
discordPresence.state = "Public";
|
discordPresence.state = "Public";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
#endif
|
||||||
discordPresence.state = "Private";
|
discordPresence.state = "Private";
|
||||||
|
#ifdef MASTERSERVER
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
discordPresence.partyId = server_context; // Thanks, whoever gave us Mumble support, for implementing the EXACT thing Discord wanted for this field!
|
discordPresence.partyId = server_context; // Thanks, whoever gave us Mumble support, for implementing the EXACT thing Discord wanted for this field!
|
||||||
discordPresence.partySize = D_NumPlayers(); // Players in server
|
discordPresence.partySize = D_NumPlayers(); // Players in server
|
||||||
|
|||||||
@@ -64,6 +64,13 @@ void DRPC_RemoveRequest(discordRequest_t *removeRequest);
|
|||||||
void DRPC_Init(void);
|
void DRPC_Init(void);
|
||||||
|
|
||||||
|
|
||||||
|
/*--------------------------------------------------
|
||||||
|
void DRPC_Shutdown(void);
|
||||||
|
|
||||||
|
Shutdown Discord Rich Presence if it was started at all.
|
||||||
|
--------------------------------------------------*/
|
||||||
|
void DRPC_Shutdown(void);
|
||||||
|
|
||||||
/*--------------------------------------------------
|
/*--------------------------------------------------
|
||||||
void DRPC_UpdatePresence(void);
|
void DRPC_UpdatePresence(void);
|
||||||
|
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
#
|
|
||||||
# djgppdos/makefile.cfg for SRB2/DOS
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
#now for the DOS stuff, go DOS!
|
|
||||||
#
|
|
||||||
|
|
||||||
# options
|
|
||||||
OPTS=-DPC_DOS
|
|
||||||
WFLAGS+=-Wno-cast-qual
|
|
||||||
NOHW=1
|
|
||||||
NOHS=1
|
|
||||||
PNG_CFLAGS=
|
|
||||||
PNG_LDFLAGS=-lpng -lz
|
|
||||||
|
|
||||||
ifdef WATTCP
|
|
||||||
OPTS+=-DWATTCP
|
|
||||||
NOOBJDUMP=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
#ifdef DEBUGMODE
|
|
||||||
LIBS=-lalld
|
|
||||||
#else
|
|
||||||
# LIBS=-lalleg
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ifndef NONET
|
|
||||||
ifdef WATTCP
|
|
||||||
LIBS+=-lwatt
|
|
||||||
else
|
|
||||||
LIBS+=-lsocket
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef RDB
|
|
||||||
LIBS+=-lgdbst -ldzcom
|
|
||||||
OPTS+=-DREMOTE_DEBUGGING
|
|
||||||
endif
|
|
||||||
|
|
||||||
OBJS=$(OBJDIR)/i_video.o $(OBJDIR)/vid_vesa.o
|
|
||||||
|
|
||||||
# name of the exefile
|
|
||||||
ifdef WATTCP
|
|
||||||
EXENAME?=srb2dos.exe
|
|
||||||
else
|
|
||||||
EXENAME?=srb2w16.exe
|
|
||||||
endif
|
|
||||||
Loaded 100 of 363 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user