Compare commits
852
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
148bd1ab4d | ||
|
|
473619ab66 | ||
|
|
d75638cbfc | ||
|
|
f09b591989 | ||
|
|
79d75aa08d | ||
|
|
486560d79e | ||
|
|
953b0c8f94 | ||
|
|
5639e872f1 | ||
|
|
80da0fc538 | ||
|
|
014126b57d | ||
|
|
d7b150a04f | ||
|
|
5751f9b29b | ||
|
|
1a29bd1e63 | ||
|
|
e54b6a780d | ||
|
|
c1a0b97c54 | ||
|
|
b8aaf63b20 | ||
|
|
d43b60ad83 | ||
|
|
cb5d3ab4e1 | ||
|
|
eba1cfb94d | ||
|
|
f5030e6a3c | ||
|
|
3adcf608c3 | ||
|
|
9682ab59c9 | ||
|
|
51adf8869c | ||
|
|
5183baed44 | ||
|
|
e5c6cb635d | ||
|
|
1ba4fe99a7 | ||
|
|
c44d6f6aeb | ||
|
|
07427b391e | ||
|
|
2210bd4e2d | ||
|
|
f4ac08d09f | ||
|
|
090580badf | ||
|
|
0eacda7494 | ||
|
|
14df9c01fa | ||
|
|
a69fc07dcf | ||
|
|
cea97226d5 | ||
|
|
19a7a4c5c1 | ||
|
|
98d4ab3e9d | ||
|
|
1700db48b4 | ||
|
|
ba3429f497 | ||
|
|
3b98d6c44f | ||
|
|
3183ec58ab | ||
|
|
46a72bda8e | ||
|
|
156400ffc2 | ||
|
|
116fbd93d0 | ||
|
|
30affaf451 | ||
|
|
d66020e3a9 | ||
|
|
4749d1a108 | ||
|
|
36d13734f6 | ||
|
|
3fc5f572bb | ||
|
|
d65319a9fc | ||
|
|
1d8b066a64 | ||
|
|
e6033322c6 | ||
|
|
d988876bca | ||
|
|
7e92482ced | ||
|
|
fa753c3694 | ||
|
|
58403cf4a5 | ||
|
|
13241d1880 | ||
|
|
91f016fd0c | ||
|
|
5e1ae2155f | ||
|
|
dd2a227529 | ||
|
|
9521183eb3 | ||
|
|
56bb20f4e1 | ||
|
|
604fa7281b | ||
|
|
2c9a82e2d3 | ||
|
|
4f7e296885 | ||
|
|
c917708184 | ||
|
|
110e93f4ed | ||
|
|
a0d6d452a0 | ||
|
|
7fb3f7a1aa | ||
|
|
7e906074ec | ||
|
|
de35e086d3 | ||
|
|
295b35b23a | ||
|
|
a5b6dad8f3 | ||
|
|
d024992144 | ||
|
|
3df604e8b6 | ||
|
|
080f586c19 | ||
|
|
0e62afd348 | ||
|
|
648d3c439b | ||
|
|
1dd3e90363 | ||
|
|
c78c0d1657 | ||
|
|
838d05eef7 | ||
|
|
3c3e8dd986 | ||
|
|
2d79ff9606 | ||
|
|
70f4207e02 | ||
|
|
242754f811 | ||
|
|
521544f6ba | ||
|
|
efc0681e01 | ||
|
|
4c3fa7d826 | ||
|
|
ac87678708 | ||
|
|
a6e5edabd2 | ||
|
|
24e5b1d84b | ||
|
|
ade7db9004 | ||
|
|
819b171d90 | ||
|
|
882716e911 | ||
|
|
5644036d25 | ||
|
|
de74c9251f | ||
|
|
1552b1808f | ||
|
|
fd349e2b37 | ||
|
|
0cf1cabcc2 | ||
|
|
bcbe765b9d | ||
|
|
eca3effb3b | ||
|
|
f1380a276e | ||
|
|
8ffeab1646 | ||
|
|
2eb175c356 | ||
|
|
4e606fc7de | ||
|
|
c5116dea1a | ||
|
|
924f9c2151 | ||
|
|
e0fa53e4df | ||
|
|
eeb7d48a6f | ||
|
|
df291710d8 | ||
|
|
16577877d3 | ||
|
|
309d459a70 | ||
|
|
e1430f7bc7 | ||
|
|
bf70beb88a | ||
|
|
a951622f6a | ||
|
|
d7db0d68dc | ||
|
|
2b9224cc3f | ||
|
|
0a750cd3bc | ||
|
|
0e8a32612f | ||
|
|
3c6882203b | ||
|
|
0464a8b0c7 | ||
|
|
599eda96aa | ||
|
|
421d735052 | ||
|
|
73bc64f9da | ||
|
|
5d807d65e5 | ||
|
|
88d86a6e60 | ||
|
|
b2cdbaae60 | ||
|
|
9160431556 | ||
|
|
2f9a400cf3 | ||
|
|
c39073dd9e | ||
|
|
f03692b840 | ||
|
|
617e8fdd55 | ||
|
|
d5252bd3b3 | ||
|
|
94f46c3ce6 | ||
|
|
c3e709231d | ||
|
|
7878e01e3f | ||
|
|
4631844c9f | ||
|
|
0c440d240c | ||
|
|
5c7be85977 | ||
|
|
c401926c0b | ||
|
|
e0e8be8d46 | ||
|
|
957d3f7229 | ||
|
|
7e47b9b6ba | ||
|
|
6e91e00289 | ||
|
|
a539f38e72 | ||
|
|
4f21d8f983 | ||
|
|
31517ebebe | ||
|
|
3a2e009d01 | ||
|
|
38e50a3cfb | ||
|
|
97555bc263 | ||
|
|
848115d105 | ||
|
|
3668c2c4f3 | ||
|
|
d5f68bf2aa | ||
|
|
3ae968f060 | ||
|
|
d73f79509e | ||
|
|
19e9eedce3 | ||
|
|
8880057ff2 | ||
|
|
9692484d2e | ||
|
|
df3a64339c | ||
|
|
5a966aa317 | ||
|
|
a132db9e6e | ||
|
|
0acfc96812 | ||
|
|
f09c61cee9 | ||
|
|
735c4b67dc | ||
|
|
267a758447 | ||
|
|
6892c212d1 | ||
|
|
a1127068df | ||
|
|
7ee93d889e | ||
|
|
ee9c9e2839 | ||
|
|
28c4061a26 | ||
|
|
d0f02f1530 | ||
|
|
53fbbecbcd | ||
|
|
587f24ae85 | ||
|
|
ba0b414062 | ||
|
|
b27b4bfd7a | ||
|
|
7971f76885 | ||
|
|
7048eeacc3 | ||
|
|
8a62f4e978 | ||
|
|
f5fdf917bd | ||
|
|
b9ac91c74f | ||
|
|
b408a098bd | ||
|
|
90ab1f4994 | ||
|
|
96484c94db | ||
|
|
c805fa9f33 | ||
|
|
29159ca5cd | ||
|
|
b6b70ae8f0 | ||
|
|
2b0e4b7468 | ||
|
|
c374bd75fc | ||
|
|
ec70e8aa29 | ||
|
|
3ad6159e85 | ||
|
|
2ae1e0f56e | ||
|
|
2302d4efbd | ||
|
|
be08c9cd1f | ||
|
|
7b91666db9 | ||
|
|
ba5c85ba8a | ||
|
|
05e8771fbc | ||
|
|
59b7b0529f | ||
|
|
3fa8ab442a | ||
|
|
fdd8381258 | ||
|
|
41cbce3ed3 | ||
|
|
63e4c5a63d | ||
|
|
bba86fe4af | ||
|
|
1dee3060dd | ||
|
|
56c2178bde | ||
|
|
e445669521 | ||
|
|
7a309bc0b8 | ||
|
|
8b6ebfbad4 | ||
|
|
5775c12b16 | ||
|
|
78ebc14d88 | ||
|
|
38a248193e | ||
|
|
934f2d347c | ||
|
|
551d7d4d89 | ||
|
|
a2184d2bef | ||
|
|
d638baeda6 | ||
|
|
4a06e8a6d1 | ||
|
|
e2a3992787 | ||
|
|
ec06150432 | ||
|
|
2413a3503c | ||
|
|
d9e339cb56 | ||
|
|
408db7a2eb | ||
|
|
e12ecabcf0 | ||
|
|
65c2d2733d | ||
|
|
00aa023e9e | ||
|
|
f43a4a2eb6 | ||
|
|
4eb108e0a6 | ||
|
|
ea76af5a81 | ||
|
|
4b8f998c85 | ||
|
|
d687be4997 | ||
|
|
1bcadf3c46 | ||
|
|
80e4d02c51 | ||
|
|
352d1faacf | ||
|
|
7f9d70285d | ||
|
|
496477fa9a | ||
|
|
530bb50709 | ||
|
|
8bb04a68a8 | ||
|
|
820ab4b2bc | ||
|
|
af6abb5458 | ||
|
|
5c373b6251 | ||
|
|
24bac9c133 | ||
|
|
73c7a5a0c4 | ||
|
|
49d6374505 | ||
|
|
2ba4757c6a | ||
|
|
3606b0ae66 | ||
|
|
ba75523d48 | ||
|
|
71640202ed | ||
|
|
5fb5af05be | ||
|
|
4f036c9312 | ||
|
|
d99c272a79 | ||
|
|
c4ed75fbc6 | ||
|
|
91927e324b | ||
|
|
13dc0db9a9 | ||
|
|
8aafde4c9d | ||
|
|
266a4effb7 | ||
|
|
948c9399de | ||
|
|
db4aedf498 | ||
|
|
f12d5a246d | ||
|
|
6efe56808a | ||
|
|
ec047151e3 | ||
|
|
b1100d6215 | ||
|
|
cb8df4c3d0 | ||
|
|
fbae43f61a | ||
|
|
7ea95b4495 | ||
|
|
07c780dc9c | ||
|
|
f6d3ab1f3a | ||
|
|
2c8099e228 | ||
|
|
7c84dd5661 | ||
|
|
cabd8baae5 | ||
|
|
593540a3f9 | ||
|
|
407af1d25c | ||
|
|
029c21eae8 | ||
|
|
568f29ed1c | ||
|
|
2dacc333b5 | ||
|
|
363612c488 | ||
|
|
d8ffffd86e | ||
|
|
4b2a13defb | ||
|
|
9cc74d8b17 | ||
|
|
066adb972e | ||
|
|
0f1ad8a086 | ||
|
|
40537eca81 | ||
|
|
0cff3c23f3 | ||
|
|
9bdda66a0c | ||
|
|
3b6a09da9b | ||
|
|
c275555678 | ||
|
|
fc588f8046 | ||
|
|
17093e8022 | ||
|
|
b575c288fa | ||
|
|
f9a6702219 | ||
|
|
cfda853e6f | ||
|
|
14ac3ca9b0 | ||
|
|
e94fecf56d | ||
|
|
51d9aa6197 | ||
|
|
96a29abc62 | ||
|
|
fa1b797a44 | ||
|
|
e1061ab4b4 | ||
|
|
ab0d071d35 | ||
|
|
8129b89034 | ||
|
|
14aaba7a87 | ||
|
|
2c1bb6c268 | ||
|
|
cc6437285f | ||
|
|
b24f6683b7 | ||
|
|
5f559af29c | ||
|
|
eef1c55549 | ||
|
|
3c227ec532 | ||
|
|
50f839e1ad | ||
|
|
8db399be9b | ||
|
|
8cb321993e | ||
|
|
b4cad08ad3 | ||
|
|
fa899d3970 | ||
|
|
b955fdb47d | ||
|
|
4686e8e112 | ||
|
|
667c67a61a | ||
|
|
df9a23a6c7 | ||
|
|
a3f557f4df | ||
|
|
1ac029edc6 | ||
|
|
761766d353 | ||
|
|
72d3360711 | ||
|
|
ac52ec2c48 | ||
|
|
956bc3f7df | ||
|
|
746a8cec8b | ||
|
|
f7a32b5f85 | ||
|
|
bd30ab8fb7 | ||
|
|
4140f93e41 | ||
|
|
8ae6f71578 | ||
|
|
d5083ac66c | ||
|
|
62be792a0d | ||
|
|
c34346cb9a | ||
|
|
d7803ecdcf | ||
|
|
1a2a487a93 | ||
|
|
bed6306cdf | ||
|
|
7521b3abd2 | ||
|
|
58d5bab181 | ||
|
|
2bffe443ed | ||
|
|
261c02f4b6 | ||
|
|
d59ac7d01b | ||
|
|
ac86f36186 | ||
|
|
b5c7fd5a2b | ||
|
|
da103f54d6 | ||
|
|
f82d138482 | ||
|
|
e7332a3efe | ||
|
|
bd27a62769 | ||
|
|
2b650e4b61 | ||
|
|
8e82256827 | ||
|
|
4fa937728b | ||
|
|
9f9e6450f2 | ||
|
|
1c75dd0401 | ||
|
|
e854096ca0 | ||
|
|
83a60ea857 | ||
|
|
3d9d14b353 | ||
|
|
24c9f88262 | ||
|
|
b652d802f5 | ||
|
|
459beeb000 | ||
|
|
a28d798189 | ||
|
|
e75a696ee5 | ||
|
|
e113027ce6 | ||
|
|
2ce4e866e3 | ||
|
|
55a57a1036 | ||
|
|
6aabdc86c0 | ||
|
|
9aaa7cc5bf | ||
|
|
d6946d4d44 | ||
|
|
a868844bdf | ||
|
|
39fd31c4b9 | ||
|
|
54f3d7b5e0 | ||
|
|
88116368bb | ||
|
|
9328825a7c | ||
|
|
f825ca32cc | ||
|
|
ce982d170f | ||
|
|
1b3050028e | ||
|
|
2344552ba8 | ||
|
|
50c1263e7d | ||
|
|
f1ded99262 | ||
|
|
b1620a3fce | ||
|
|
d0ea4d20d0 | ||
|
|
7f4804f98c | ||
|
|
4fe3495652 | ||
|
|
3c409b4a46 | ||
|
|
45067e00a5 | ||
|
|
370ed1583b | ||
|
|
535c2073f1 | ||
|
|
6460ae94f1 | ||
|
|
093ed023ef | ||
|
|
1bada2810a | ||
|
|
9df7f3cd3f | ||
|
|
010b6c0361 | ||
|
|
dbf67a9670 | ||
|
|
8868445c3c | ||
|
|
568cb8b8c7 | ||
|
|
3b00a69615 | ||
|
|
6949ce82ab | ||
|
|
c343c52477 | ||
|
|
7931a82b23 | ||
|
|
31ccf9c34a | ||
|
|
ff3b73c49e | ||
|
|
64bed71509 | ||
|
|
eed5943b0b | ||
|
|
4f9ddffe2a | ||
|
|
a73f3a073c | ||
|
|
a59928221b | ||
|
|
b46e5cb577 | ||
|
|
bb62fbfc12 | ||
|
|
81f46224e1 | ||
|
|
6c58c0de41 | ||
|
|
4edc102d67 | ||
|
|
e0bf663157 | ||
|
|
eccc3eb33f | ||
|
|
1217089d81 | ||
|
|
e5c0967a3f | ||
|
|
27f22e4b5b | ||
|
|
c039d14efc | ||
|
|
71a0b25e32 | ||
|
|
8c2132a98c | ||
|
|
898bcd336d | ||
|
|
5461a6dcbe | ||
|
|
d957bddc1f | ||
|
|
7177a9f57f | ||
|
|
4ccf3dfaf9 | ||
|
|
489a58f9fd | ||
|
|
b26effa241 | ||
|
|
efd8c20d26 | ||
|
|
03b85aa00e | ||
|
|
e6434c24ec | ||
|
|
52e23e7b08 | ||
|
|
b84e6d89e2 | ||
|
|
42fa435a0b | ||
|
|
873cff4474 | ||
|
|
e543599598 | ||
|
|
9d75bb1405 | ||
|
|
7b0e3269b3 | ||
|
|
12169bfb38 | ||
|
|
4dd5957f19 | ||
|
|
0fadfe0f72 | ||
|
|
621df7e296 | ||
|
|
17d72e02fe | ||
|
|
cd76660314 | ||
|
|
06a9ab785e | ||
|
|
6760546bcd | ||
|
|
b44e003ab9 | ||
|
|
6a1c907aa4 | ||
|
|
fded8cc562 | ||
|
|
43465c0e3f | ||
|
|
7fb21c35ba | ||
|
|
f6a0430a40 | ||
|
|
ab209448d1 | ||
|
|
9334b86f6e | ||
|
|
6022966d69 | ||
|
|
6c7db705c7 | ||
|
|
ce3d17de68 | ||
|
|
404d88a536 | ||
|
|
4f28f574bb | ||
|
|
654895dcff | ||
|
|
8af43a55c9 | ||
|
|
0d20ebb01f | ||
|
|
1c74b37026 | ||
|
|
6721f534cc | ||
|
|
bb3414d603 | ||
|
|
e13cb1ca92 | ||
|
|
a0dffd0670 | ||
|
|
7684e6aa07 | ||
|
|
0fb752b745 | ||
|
|
c418fe3ef8 | ||
|
|
fdccc80260 | ||
|
|
84be9096b1 | ||
|
|
e4e51f0f80 | ||
|
|
9087fd8377 | ||
|
|
1aa37be676 | ||
|
|
04f63b23ff | ||
|
|
d6ed923f83 | ||
|
|
c7845118c0 | ||
|
|
ffc6adde4c | ||
|
|
fed7020da1 | ||
|
|
1a4255d9df | ||
|
|
f6ead71f0c | ||
|
|
966f60f590 | ||
|
|
9afc018a45 | ||
|
|
43608810da | ||
|
|
90b5f9050a | ||
|
|
edc10a35a1 | ||
|
|
91435fe1b2 | ||
|
|
a7ebc7e745 | ||
|
|
3cf3c1bb99 | ||
|
|
2c170f1956 | ||
|
|
98da654e02 | ||
|
|
af84105e40 | ||
|
|
a1666704e5 | ||
|
|
7b408a33d7 | ||
|
|
9ee535066e | ||
|
|
6430150b63 | ||
|
|
16cf4ede89 | ||
|
|
efe8732188 | ||
|
|
07fc0eb03a | ||
|
|
f2b46fd148 | ||
|
|
8247133966 | ||
|
|
397fb071e5 | ||
|
|
1a9fa94cbd | ||
|
|
e8c7cc6a9b | ||
|
|
5ca3ab5966 | ||
|
|
1cf04514b3 | ||
|
|
5577ba4c7a | ||
|
|
6ff1cbf4b0 | ||
|
|
db4cd73912 | ||
|
|
3c70598aea | ||
|
|
1ec29c1c94 | ||
|
|
fedccd25b9 | ||
|
|
1e51365cad | ||
|
|
94026e4331 | ||
|
|
2084cdc6d5 | ||
|
|
1b22c3af19 | ||
|
|
3e327263c9 | ||
|
|
7c24d92613 | ||
|
|
ba808307e9 | ||
|
|
014a22e933 | ||
|
|
3f3ba9e993 | ||
|
|
2f684bba95 | ||
|
|
a287a6419f | ||
|
|
6f2aba7ee3 | ||
|
|
a9a0d4bed8 | ||
|
|
355c78e075 | ||
|
|
4623f8aff2 | ||
|
|
1265bbba2e | ||
|
|
fdccf868cc | ||
|
|
3204b5c3b4 | ||
|
|
cd02242a01 | ||
|
|
e35dc9e097 | ||
|
|
f4dc161831 | ||
|
|
1d6c27baca | ||
|
|
009df228d6 | ||
|
|
7746e494cf | ||
|
|
90a88983f1 | ||
|
|
22a4fe63db | ||
|
|
d77508f481 | ||
|
|
53321d33d5 | ||
|
|
5c28f6afd8 | ||
|
|
d49001143f | ||
|
|
513e5a7e3f | ||
|
|
6f75fab7ff | ||
|
|
38fc6d6ba1 | ||
|
|
02f2464a00 | ||
|
|
c84724da37 | ||
|
|
86b286fb0b | ||
|
|
ecef8913b1 | ||
|
|
277b202020 | ||
|
|
6ba97bc43c | ||
|
|
0fbde146a9 | ||
|
|
16e0c6f0f6 | ||
|
|
8cab07a4b2 | ||
|
|
55c8546d68 | ||
|
|
1762f18116 | ||
|
|
e4dbf1ce11 | ||
|
|
10b9d96259 | ||
|
|
b23154fd93 | ||
|
|
b0ee972178 | ||
|
|
544e1d3b21 | ||
|
|
0ca6947f99 | ||
|
|
3122c08039 | ||
|
|
7a279a6fd9 | ||
|
|
00bc8bc149 | ||
|
|
f12b55f63b | ||
|
|
3e476d7658 | ||
|
|
c4581bd9a6 | ||
|
|
bb47b976a7 | ||
|
|
6c419ff22e | ||
|
|
522904527f | ||
|
|
30539371c2 | ||
|
|
e2ecc315b4 | ||
|
|
eb2f186205 | ||
|
|
bbf06b3376 | ||
|
|
a1f70b0b31 | ||
|
|
2e0f5c02a4 | ||
|
|
0f7001ef5c | ||
|
|
4600da5782 | ||
|
|
a3557fadef | ||
|
|
d9a67faf47 | ||
|
|
96eaf8850e | ||
|
|
e7efd46419 | ||
|
|
346b1456cd | ||
|
|
9f5a5a735b | ||
|
|
8e4b304bed | ||
|
|
6cbb8a36cf | ||
|
|
7dbb08315c | ||
|
|
b1ff1bb531 | ||
|
|
8eaf4a73f4 | ||
|
|
607fbc54fc | ||
|
|
276cf0a8cb | ||
|
|
59c9af97c2 | ||
|
|
4e75d99026 | ||
|
|
8e91c16e97 | ||
|
|
186421fe85 | ||
|
|
af952870c3 | ||
|
|
4eeb0b4b20 | ||
|
|
cb2c65e9d9 | ||
|
|
f7bbde3982 | ||
|
|
c9fc3b4820 | ||
|
|
f5195dd137 | ||
|
|
5289f13891 | ||
|
|
073b35690b | ||
|
|
43d3ac102d | ||
|
|
aa96f9ceb3 | ||
|
|
104b8260fb | ||
|
|
edebc728ef | ||
|
|
08e7ce3b5b | ||
|
|
29f187b751 | ||
|
|
ac3a1ad5eb | ||
|
|
1b8d7b1541 | ||
|
|
b812d61da2 | ||
|
|
6fd64383d3 | ||
|
|
e984e7a6c8 | ||
|
|
96f90ff9c4 | ||
|
|
51aec0e012 | ||
|
|
faadd3e89f | ||
|
|
0c091256f4 | ||
|
|
7a0fb01626 | ||
|
|
c01818e2e3 | ||
|
|
e17a8a505c | ||
|
|
ab654deba7 | ||
|
|
b145d7fd0e | ||
|
|
264c9e38ad | ||
|
|
e88773da4e | ||
|
|
310f67a06c | ||
|
|
0914d5b8e2 | ||
|
|
bf1aa47854 | ||
|
|
291a4dbb25 | ||
|
|
8fe3d13935 | ||
|
|
bdc326b14e | ||
|
|
d938e38ad3 | ||
|
|
3d4772455b | ||
|
|
e1f0089627 | ||
|
|
be423b2910 | ||
|
|
3bf3bdf641 | ||
|
|
e923777eb6 | ||
|
|
cf6eb0010e | ||
|
|
5184115216 | ||
|
|
edbebbf082 | ||
|
|
242dee499d | ||
|
|
39a46e8f79 | ||
|
|
a2de1e24c5 | ||
|
|
c0cce90e60 | ||
|
|
d9712cf85e | ||
|
|
9ccd62b5cb | ||
|
|
67e74b5874 | ||
|
|
9639ace28a | ||
|
|
a2616778cc | ||
|
|
0691e2d9e2 | ||
|
|
495c34dd40 | ||
|
|
f38ca9aa28 | ||
|
|
8e67e0bace | ||
|
|
b0bf588c27 | ||
|
|
35e4f35f6e | ||
|
|
7866b769cc | ||
|
|
1af1e42dab | ||
|
|
40bd3e5e19 | ||
|
|
25dd3b4976 | ||
|
|
08864e27b2 | ||
|
|
4a3c9ccfbb | ||
|
|
cedd789a27 | ||
|
|
0fe3086a5a | ||
|
|
c9afd4a2cd | ||
|
|
7518a6f181 | ||
|
|
2bf4c44259 | ||
|
|
1c95e5f40e | ||
|
|
7c848f4be5 | ||
|
|
a4af254643 | ||
|
|
860dc37fe4 | ||
|
|
8b3d55fbc8 | ||
|
|
0540b5656a | ||
|
|
6c98440f27 | ||
|
|
3828a9f8e0 | ||
|
|
2c7c9ec32a | ||
|
|
1ccd3e37bc | ||
|
|
6ad344f65d | ||
|
|
1c289d73ca | ||
|
|
44ba69cf53 | ||
|
|
4cea0c1414 | ||
|
|
4ee468f5c6 | ||
|
|
9a58eb3010 | ||
|
|
59ff5e61bf | ||
|
|
821c061f82 | ||
|
|
fd2c208612 | ||
|
|
8f91707164 | ||
|
|
37eba186f5 | ||
|
|
eb4d9bbdd5 | ||
|
|
c19c80d797 | ||
|
|
a2feaa7fde | ||
|
|
3cb4e86b48 | ||
|
|
ed758fc921 | ||
|
|
8f3b7158e3 | ||
|
|
a191c8b71e | ||
|
|
3f2e0bd349 | ||
|
|
3bdc745bd1 | ||
|
|
f578781418 | ||
|
|
0bb63ee0af | ||
|
|
2ae9563ab3 | ||
|
|
6b429e4388 | ||
|
|
0321b0d94a | ||
|
|
ac57b7fd2d | ||
|
|
7013e63142 | ||
|
|
b76ce836a0 | ||
|
|
4e1ef7c0cd | ||
|
|
fd1e415731 | ||
|
|
41c887f2bf | ||
|
|
8091d825d5 | ||
|
|
699113fb25 | ||
|
|
3996abef36 | ||
|
|
892f2253ea | ||
|
|
bebe62346f | ||
|
|
834a94e429 | ||
|
|
fcf833ff48 | ||
|
|
f2a27539d3 | ||
|
|
05d26654df | ||
|
|
cee6a27340 | ||
|
|
66e35a9d67 | ||
|
|
ad096ccd42 | ||
|
|
7a9e81828a | ||
|
|
71e7dacb56 | ||
|
|
f9c0ee865f | ||
|
|
154eaaf027 | ||
|
|
66f5f9b2a2 | ||
|
|
b27275b887 | ||
|
|
c81c2c1d8d | ||
|
|
7eb2ad1e35 | ||
|
|
f49e57a38c | ||
|
|
265f4a50ef | ||
|
|
e83e2659a7 | ||
|
|
c680dd3222 | ||
|
|
96aaaf5261 | ||
|
|
efb29e6be5 | ||
|
|
ccfab57a8c | ||
|
|
56d1343f1b | ||
|
|
b273bc3ca8 | ||
|
|
d4f58a885b | ||
|
|
04458f18f8 | ||
|
|
64152eea0d | ||
|
|
0e0a690e3c | ||
|
|
f283d3ca43 | ||
|
|
982fff959f | ||
|
|
b0e968e3c3 | ||
|
|
e5bbb14ce0 | ||
|
|
327cca2e8e | ||
|
|
e02e9a12d7 | ||
|
|
9e2fd091a8 | ||
|
|
0a04fca634 | ||
|
|
8a3f793324 | ||
|
|
e91892849c | ||
|
|
6b4e3c9d13 | ||
|
|
5f55b81fbf | ||
|
|
ca68bab002 | ||
|
|
339eb1879e | ||
|
|
1adb49c65c | ||
|
|
1d33a05a85 | ||
|
|
cfcd20d44a | ||
|
|
204607e272 | ||
|
|
b89a8ca6f9 | ||
|
|
d4aa352d59 | ||
|
|
c489841732 | ||
|
|
a6a97b4c4f | ||
|
|
fba070f82e | ||
|
|
10c117f95f | ||
|
|
bceda5beb4 | ||
|
|
c50c936b1f | ||
|
|
22a6be76b5 | ||
|
|
d3d25df3c5 | ||
|
|
2a3f9e9ee6 | ||
|
|
31f01fd5da | ||
|
|
bb9a4a0da0 | ||
|
|
3bac722562 | ||
|
|
3769ab74ac | ||
|
|
c3d6cdd272 | ||
|
|
093602fd6b | ||
|
|
a80d119c58 | ||
|
|
1cdc92a62b | ||
|
|
6b8de308b7 | ||
|
|
310e64d8be | ||
|
|
d2d3afc7f4 | ||
|
|
c26d2faee9 | ||
|
|
1c82c338a5 | ||
|
|
c81cd48552 | ||
|
|
306f7d455e | ||
|
|
dc40befa88 | ||
|
|
2222272d6f | ||
|
|
1849d5aade | ||
|
|
3878c2f72a | ||
|
|
7cf3bceaff | ||
|
|
1e394b0530 | ||
|
|
b09660204a | ||
|
|
7b4592377e | ||
|
|
45ba69a45a | ||
|
|
4d9c345202 | ||
|
|
0437952027 | ||
|
|
d188839d0b | ||
|
|
86ac11f877 | ||
|
|
0f59e0e270 | ||
|
|
cd32270ec0 | ||
|
|
f2a7f9ccaa | ||
|
|
2c2ffe36d7 | ||
|
|
951b880acb | ||
|
|
ecfa973e6b | ||
|
|
749b87b4ca | ||
|
|
7f671e4e30 | ||
|
|
ee0e4836f5 | ||
|
|
a01cd628ab | ||
|
|
4a4e668d21 | ||
|
|
03c579769c | ||
|
|
2e88b6a1dd | ||
|
|
5265b147f5 | ||
|
|
b4a37a2fa4 | ||
|
|
93eb2b336d | ||
|
|
30acdca9d3 | ||
|
|
677b34c174 | ||
|
|
b3be7bcedc | ||
|
|
19c10be76b | ||
|
|
60222f2f00 | ||
|
|
34edd0a2e3 | ||
|
|
46b485df14 | ||
|
|
8d3632caca | ||
|
|
b5ae9ba733 | ||
|
|
2a823ecd60 | ||
|
|
940327210f | ||
|
|
20a08df1e1 | ||
|
|
4cf27d40e9 | ||
|
|
d18c9a257a | ||
|
|
65dc5bb1fd | ||
|
|
e18be33c91 | ||
|
|
9ad6751719 | ||
|
|
86ab994408 | ||
|
|
21f0d603c3 | ||
|
|
971513e7d3 | ||
|
|
03929e551f | ||
|
|
db5ae247b6 | ||
|
|
d46beab34e | ||
|
|
9a794232d7 | ||
|
|
db635e5c5b | ||
|
|
8a105a9679 | ||
|
|
46b968a351 | ||
|
|
a9836307b2 | ||
|
|
b6515bb0ae | ||
|
|
b8257e9037 | ||
|
|
416a2565f9 | ||
|
|
fa75ad4cdd | ||
|
|
cedddaadfc | ||
|
|
43ec517cdd | ||
|
|
495ad5ce06 | ||
|
|
31ce643311 | ||
|
|
b5c1f21ac1 | ||
|
|
86c1b2cbef | ||
|
|
ad828b8f4b | ||
|
|
5dda681c8a | ||
|
|
92df8ffe01 | ||
|
|
2ee8dc09d1 | ||
|
|
b8f9392efd | ||
|
|
99f1166eb1 | ||
|
|
7ab8bf1bbf | ||
|
|
a994d7c050 | ||
|
|
e46d548080 | ||
|
|
3a7108ecfa |
No files matched your search
+41
-29
@@ -1,14 +1,49 @@
|
|||||||
cmake_minimum_required(VERSION 3.5)
|
cmake_minimum_required(VERSION 3.5)
|
||||||
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
|
|
||||||
# Version change is fine.
|
# needed for lto to work for some reason
|
||||||
project(SRB2
|
cmake_policy(SET CMP0069 NEW)
|
||||||
VERSION 1.6
|
|
||||||
LANGUAGES C)
|
|
||||||
|
|
||||||
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
|
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
|
||||||
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
|
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
|
||||||
|
# Version change is fine.
|
||||||
|
project(SRB2
|
||||||
|
VERSION 1.6
|
||||||
|
LANGUAGES C CXX)
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
#set(CMAKE_CXX_EXTENSIONS OFF) # optional but recommended: disables GNU extensions, forces pure ISO C++
|
||||||
|
set(CMAKE_CXX_EXTENSIONS ON)
|
||||||
|
set(CMAKE_C_EXTENSIONS ON)
|
||||||
|
|
||||||
|
##### PACKAGE CONFIGURATION #####
|
||||||
|
|
||||||
|
set(SRB2_CPACK_GENERATOR "" CACHE STRING "Generator to use for making a package. E.g., ZIP, TGZ, DragNDrop (OSX only). Leave blank for default generator.")
|
||||||
|
|
||||||
|
if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
|
||||||
|
if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
|
||||||
|
set(SRB2_CPACK_GENERATOR "ZIP")
|
||||||
|
elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
|
||||||
|
set(SRB2_CPACK_GENERATOR "TGZ")
|
||||||
|
elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
|
||||||
|
set(SRB2_CPACK_GENERATOR "TGZ")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
|
||||||
|
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart Saturn" CACHE STRING "Program name for display purposes")
|
||||||
|
set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
|
||||||
|
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
|
||||||
|
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
||||||
|
set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR})
|
||||||
|
set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR})
|
||||||
|
set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH})
|
||||||
|
set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}")
|
||||||
|
include(CPack)
|
||||||
|
|
||||||
# Set up CMAKE path
|
# Set up CMAKE path
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
||||||
|
|
||||||
@@ -73,6 +108,7 @@ endif()
|
|||||||
# OS macros
|
# OS macros
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
add_definitions(-DUNIXCOMMON)
|
add_definitions(-DUNIXCOMMON)
|
||||||
|
add_link_options(-rdynamic) # Use -rdynamic so a backtrace log shows function names
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCC)
|
if(CMAKE_COMPILER_IS_GNUCC)
|
||||||
@@ -95,14 +131,12 @@ set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
|||||||
|
|
||||||
# Set EXE names so the assets CMakeLists can refer to its target
|
# Set EXE names so the assets CMakeLists can refer to its target
|
||||||
set(SRB2_SDL2_EXE_NAME srb2kart CACHE STRING "Executable binary output name")
|
set(SRB2_SDL2_EXE_NAME srb2kart CACHE STRING "Executable binary output name")
|
||||||
set(SRB2_WIN_EXE_NAME srb2kartdd CACHE STRING "Executable binary output name for DirectDraw build")
|
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
|
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
add_subdirectory(assets)
|
add_subdirectory(assets)
|
||||||
|
|
||||||
|
|
||||||
## config.h generation
|
## config.h generation
|
||||||
set(GIT_EXECUTABLE "git" CACHE FILEPATH "Path to git binary")
|
set(GIT_EXECUTABLE "git" CACHE FILEPATH "Path to git binary")
|
||||||
include(GitUtilities)
|
include(GitUtilities)
|
||||||
@@ -111,25 +145,3 @@ git_current_branch(SRB2_GIT_BRANCH "${CMAKE_SOURCE_DIR}")
|
|||||||
set(SRB2_COMP_BRANCH "${SRB2_GIT_BRANCH}")
|
set(SRB2_COMP_BRANCH "${SRB2_GIT_BRANCH}")
|
||||||
set(SRB2_COMP_REVISION "${SRB2_COMP_COMMIT}")
|
set(SRB2_COMP_REVISION "${SRB2_COMP_COMMIT}")
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
|
||||||
|
|
||||||
##### PACKAGE CONFIGURATION #####
|
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES "Windows")
|
|
||||||
set(CPACK_GENERATOR "ZIP")
|
|
||||||
endif()
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES "Linux")
|
|
||||||
set(CPACK_GENERATOR "TGZ")
|
|
||||||
endif()
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES "Darwin")
|
|
||||||
set(CPACK_GENERATOR "DragNDrop")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart" CACHE STRING "Program name for display purposes")
|
|
||||||
set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
|
|
||||||
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
|
|
||||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
|
||||||
set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR})
|
|
||||||
set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR})
|
|
||||||
set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH})
|
|
||||||
set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}")
|
|
||||||
include(CPack)
|
|
||||||
+8
-1
@@ -13,10 +13,12 @@ Mainly for use in visual-only addons like secondcolor.
|
|||||||
|
|
||||||
**Not netsafe**. Returns player's current sliptide roll angle, taking sliptideroll cvar value into account.
|
**Not netsafe**. Returns player's current sliptide roll angle, taking sliptideroll cvar value into account.
|
||||||
|
|
||||||
## hud.setVoteBackground(name)
|
## hud.setVoteBackground(name[, time\_per\_frame])
|
||||||
|
|
||||||
Changes vote background texture prefix (game looks for PREFIX + "W" or "C" (depends on resolution) + FRAME\_NUMBER).
|
Changes vote background texture prefix (game looks for PREFIX + "W" or "C" (depends on resolution) + FRAME\_NUMBER).
|
||||||
|
|
||||||
|
If time\_per\_frame is set, each frame will last this amount of tics, default value is 2
|
||||||
|
|
||||||
## hud.add(fn, "vote") and hud.add(fn, "intermission")
|
## hud.add(fn, "vote") and hud.add(fn, "intermission")
|
||||||
|
|
||||||
Hud hooks for vote screen and intermission screen. They only get drawer (`v`) as argument.
|
Hud hooks for vote screen and intermission screen. They only get drawer (`v`) as argument.
|
||||||
@@ -120,6 +122,11 @@ v.interpLatch(false)
|
|||||||
```
|
```
|
||||||
When using a custom string drawer, enable this mode to avoid interpolation artifacting when the string changes.
|
When using a custom string drawer, enable this mode to avoid interpolation artifacting when the string changes.
|
||||||
|
|
||||||
|
## cameras[] global array
|
||||||
|
|
||||||
|
Local player cameras that can be accessed outside of hud hooks.
|
||||||
|
`#cameras` will return amount of available cameras. (0 on dedicated server, 1 with 1 player, 4 with 4p splitscreen, etc)
|
||||||
|
|
||||||
## mobj.spritexscale, mobj.spriteyscale, mobj.spritexoffset, mobj.spriteyoffset, mobj.rollangle, mobj.sloperoll, mobj.rollmodel fields
|
## mobj.spritexscale, mobj.spriteyscale, mobj.spritexoffset, mobj.spriteyoffset, mobj.rollangle, mobj.sloperoll, mobj.rollmodel fields
|
||||||
|
|
||||||
Same fields as in SRB2 2.2
|
Same fields as in SRB2 2.2
|
||||||
|
|||||||
@@ -22,14 +22,14 @@ We also have a Flatpak available on [Flathub](https://flathub.org/en/apps/org.sr
|
|||||||
|
|
||||||
See [SRB2 Wiki/Source code compiling](http://wiki.srb2.org/wiki/Source_code_compiling). The compiling process for SRB2Kart is largely identical to SRB2.
|
See [SRB2 Wiki/Source code compiling](http://wiki.srb2.org/wiki/Source_code_compiling). The compiling process for SRB2Kart is largely identical to SRB2.
|
||||||
|
|
||||||
Currently only the Makefile build system with GCC or Clang compiler is supported.
|
For Windows only the Makefile build system with GCC or Clang compiler is supported.
|
||||||
CMake is NOT supported at the moment, but will be availible again soon.
|
|
||||||
|
|
||||||
Visual C++ (MSVC) is unsupported.
|
Visual C++ (MSVC) is unsupported.
|
||||||
|
|
||||||
64-bit Windows builds are supported and recommended over 32-bit builds, they will build automatically when using the MSYS2 MinGW 64-bit executable (requires the mingw-w64-x86_64-gcc package), no extra flags needed!
|
64-bit Windows builds are supported and recommended over 32-bit builds, they will build automatically when using the MSYS2 MinGW 64-bit executable (requires the mingw-w64-x86_64-gcc package), no extra flags needed!
|
||||||
The specific DLLs can be found under /libs/dll-binaries/(i686 for 32bit/x86_64 for 64-bit)/ or in the Release packages
|
The specific DLLs can be found under /libs/dll-binaries/(i686 for 32bit/x86_64 for 64-bit)/ or in the Release packages
|
||||||
|
|
||||||
|
MacOS and Linux can be build with CMake, but it is recommended to use the Makefile for Linux over CMake
|
||||||
|
|
||||||
Alternatively the [srb2bld](https://github.com/Bijman/srb2bld) script by Bijman can be used aswell!
|
Alternatively the [srb2bld](https://github.com/Bijman/srb2bld) script by Bijman can be used aswell!
|
||||||
|
|
||||||
## Disclaimer
|
## Disclaimer
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
## Assets Target Configuration ##
|
## Assets Target Configuration ##
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES Linux)
|
||||||
|
# Asset installation isn't part of the Linux target
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
# For prepending the current source path, later
|
# For prepending the current source path, later
|
||||||
FUNCTION(PREPEND var prefix)
|
FUNCTION(PREPEND var prefix)
|
||||||
SET(listVar "")
|
SET(listVar "")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
include(LibFindMacros)
|
include(LibFindMacros)
|
||||||
|
|
||||||
libfind_pkg_check_modules(GME_PKGCONF GME)
|
libfind_pkg_check_modules(GME_PKGCONF LIBGME)
|
||||||
|
|
||||||
find_path(GME_INCLUDE_DIR
|
find_path(GME_INCLUDE_DIR
|
||||||
NAMES gme.h
|
NAMES gme.h
|
||||||
@@ -8,6 +8,7 @@ find_path(GME_INCLUDE_DIR
|
|||||||
${GME_PKGCONF_INCLUDE_DIRS}
|
${GME_PKGCONF_INCLUDE_DIRS}
|
||||||
"/usr/include/gme"
|
"/usr/include/gme"
|
||||||
"/usr/local/include/gme"
|
"/usr/local/include/gme"
|
||||||
|
PATH_SUFFIXES gme
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(GME_LIBRARY
|
find_library(GME_LIBRARY
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
include(LibFindMacros)
|
include(LibFindMacros)
|
||||||
|
|
||||||
libfind_pkg_check_modules(OPENMPT_PKGCONF OPENMPT)
|
libfind_pkg_check_modules(OPENMPT_PKGCONF LIBOPENMPT)
|
||||||
|
|
||||||
find_path(OPENMPT_INCLUDE_DIR
|
find_path(OPENMPT_INCLUDE_DIR
|
||||||
NAMES libopenmpt.h
|
NAMES libopenmpt.h
|
||||||
@@ -8,6 +8,7 @@ find_path(OPENMPT_INCLUDE_DIR
|
|||||||
${OPENMPT_PKGCONF_INCLUDE_DIRS}
|
${OPENMPT_PKGCONF_INCLUDE_DIRS}
|
||||||
"/usr/include/libopenmpt"
|
"/usr/include/libopenmpt"
|
||||||
"/usr/local/include/libopenmpt"
|
"/usr/local/include/libopenmpt"
|
||||||
|
PATH_SUFFIXES libopenmpt
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(OPENMPT_LIBRARY
|
find_library(OPENMPT_LIBRARY
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
include(LibFindMacros)
|
||||||
|
|
||||||
|
libfind_pkg_check_modules(LIBBACKTRACE_PKGCONF LIBBACKTRACE)
|
||||||
|
|
||||||
|
find_path(LIBBACKTRACE_INCLUDE_DIR
|
||||||
|
NAMES backtrace.h
|
||||||
|
PATHS
|
||||||
|
${LIBBACKTRACE_PKGCONF_INCLUDE_DIRS}
|
||||||
|
"/usr/include"
|
||||||
|
"/usr/local/include"
|
||||||
|
)
|
||||||
|
|
||||||
|
find_library(LIBBACKTRACE_LIBRARY
|
||||||
|
NAMES backtrace
|
||||||
|
PATHS
|
||||||
|
${LIBBACKTRACE_PKGCONF_LIBRARY_DIRS}
|
||||||
|
"/usr/lib"
|
||||||
|
"/usr/local/lib"
|
||||||
|
)
|
||||||
|
|
||||||
|
set(LIBBACKTRACE_PROCESS_INCLUDES LIBBACKTRACE_INCLUDE_DIR)
|
||||||
|
set(LIBBACKTRACE_PROCESS_LIBS LIBBACKTRACE_LIBRARY)
|
||||||
|
libfind_process(LIBBACKTRACE)
|
||||||
|
|
||||||
|
if(LIBBACKTRACE_FOUND AND NOT TARGET libbacktrace)
|
||||||
|
add_library(libbacktrace UNKNOWN IMPORTED)
|
||||||
|
set_target_properties(
|
||||||
|
libbacktrace
|
||||||
|
PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${LIBBACKTRACE_LIBRARY}"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${LIBBACKTRACE_INCLUDE_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# Version 2.2
|
# Version 2.4
|
||||||
# Public Domain, originally written by Lasse Kärkkäinen <tronic>
|
# Public Domain, originally written by Lasse Kärkkäinen <tronic>
|
||||||
# Maintained at https://github.com/Tronic/cmake-modules
|
# Maintained at https://github.com/Tronic/cmake-modules
|
||||||
# Please send your improvements as pull requests on Github.
|
# Please send your improvements as pull requests on Github.
|
||||||
@@ -52,6 +52,10 @@ function (libfind_pkg_detect PREFIX)
|
|||||||
if (libraryargs)
|
if (libraryargs)
|
||||||
find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
|
find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
|
||||||
endif()
|
endif()
|
||||||
|
# Read pkg-config version
|
||||||
|
if (${PREFIX}_PKGCONF_VERSION)
|
||||||
|
set(${PREFIX}_VERSION ${${PREFIX}_PKGCONF_VERSION} PARENT_SCOPE)
|
||||||
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
|
# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
|
||||||
@@ -125,24 +129,39 @@ function (libfind_process PREFIX)
|
|||||||
|
|
||||||
# Process deps to add to
|
# Process deps to add to
|
||||||
foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
|
foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
|
||||||
if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
|
if (DEFINED ${i}_INCLUDE_OPTS)
|
||||||
# The package seems to export option lists that we can use, woohoo!
|
# The package seems to export option lists that we can use, woohoo!
|
||||||
list(APPEND includeopts ${${i}_INCLUDE_OPTS})
|
list(APPEND includeopts ${${i}_INCLUDE_OPTS})
|
||||||
|
else()
|
||||||
|
if (DEFINED ${i}_INCLUDE_DIR)
|
||||||
|
# Singular forms can be used
|
||||||
|
list(APPEND includeopts ${i}_INCLUDE_DIR)
|
||||||
|
else()
|
||||||
|
if (DEFINED ${i}_INCLUDE_DIRS)
|
||||||
|
# Plural forms can be used
|
||||||
|
list(APPEND includeopts ${i}_INCLUDE_DIRS)
|
||||||
|
else()
|
||||||
|
# Oh no, we don't know the option names
|
||||||
|
message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes. Aieeh!")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (DEFINED ${i}_LIBRARY_OPTS)
|
||||||
|
# The package seems to export option lists that we can use, woohoo!
|
||||||
list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
|
list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
|
||||||
else()
|
else()
|
||||||
# If plural forms don't exist or they equal singular forms
|
if (DEFINED ${i}_LIBRARY)
|
||||||
if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
|
|
||||||
({i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
|
|
||||||
# Singular forms can be used
|
# Singular forms can be used
|
||||||
if (DEFINED ${i}_INCLUDE_DIR)
|
list(APPEND libraryopts ${i}_LIBRARY)
|
||||||
list(APPEND includeopts ${i}_INCLUDE_DIR)
|
|
||||||
endif()
|
|
||||||
if (DEFINED ${i}_LIBRARY)
|
|
||||||
list(APPEND libraryopts ${i}_LIBRARY)
|
|
||||||
endif()
|
|
||||||
else()
|
else()
|
||||||
# Oh no, we don't know the option names
|
if (DEFINED ${i}_LIBRARIES)
|
||||||
message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
|
# Plural forms can be used
|
||||||
|
list(APPEND libraryopts ${i}_LIBRARIES)
|
||||||
|
else()
|
||||||
|
# Oh no, we don't know the option names
|
||||||
|
message(FATAL_ERROR "We couldn't determine config variable names for ${i} libraries. Aieeh!")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
@@ -209,12 +228,12 @@ function (libfind_process PREFIX)
|
|||||||
message(STATUS " ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
|
message(STATUS " ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
|
||||||
message(STATUS " ${PREFIX}_LIBRARIES=${libs}")
|
message(STATUS " ${PREFIX}_LIBRARIES=${libs}")
|
||||||
endif()
|
endif()
|
||||||
set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
|
|
||||||
set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
|
|
||||||
set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
|
|
||||||
set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
|
|
||||||
set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
|
|
||||||
endif()
|
endif()
|
||||||
|
set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
|
||||||
|
set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
|
||||||
|
set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
|
||||||
|
set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
|
||||||
|
set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
@@ -13,8 +13,3 @@ https://www.libsdl.org/download-2.0.php
|
|||||||
|
|
||||||
* i686-w64-mingw32
|
* i686-w64-mingw32
|
||||||
* x86_64-w64-mingw32
|
* x86_64-w64-mingw32
|
||||||
|
|
||||||
# SRB2Kart Saturn note:
|
|
||||||
Due to a good amount of issues with newer SDL releases, we decided to ship our own Version of the library.
|
|
||||||
This version is just the 2.28.5 release with a fix backported for non US keyboard layouts that prevented the right ALT GR key from working properly.
|
|
||||||
It can be found under: https://github.com/alufolie91/SDL/tree/backportaltgrfix
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,3 +1,4 @@
|
|||||||
/cscope.out
|
/cscope.out
|
||||||
*.json
|
*.json
|
||||||
*.idx
|
*.idx
|
||||||
|
*.gdb_history
|
||||||
+100
-32
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
# Core sources
|
# Core sources
|
||||||
set(SRB2_CORE_SOURCES
|
set(SRB2_CORE_SOURCES
|
||||||
|
core/memory.cpp
|
||||||
|
core/thread_pool.cpp
|
||||||
am_map.c
|
am_map.c
|
||||||
b_bot.c
|
b_bot.c
|
||||||
command.c
|
command.c
|
||||||
@@ -18,17 +20,21 @@ set(SRB2_CORE_SOURCES
|
|||||||
f_wipe.c
|
f_wipe.c
|
||||||
filesrch.c
|
filesrch.c
|
||||||
g_game.c
|
g_game.c
|
||||||
|
g_demo.c
|
||||||
g_input.c
|
g_input.c
|
||||||
hu_stuff.c
|
hu_stuff.c
|
||||||
i_tcp.c
|
i_tcp.c
|
||||||
info.c
|
info.c
|
||||||
|
k_hud.c
|
||||||
lzf.c
|
lzf.c
|
||||||
m_aatree.c
|
m_aatree.c
|
||||||
m_anigif.c
|
m_anigif.c
|
||||||
m_argv.c
|
m_argv.c
|
||||||
m_bbox.c
|
m_bbox.c
|
||||||
m_cheat.c
|
m_cheat.c
|
||||||
|
m_curl.c
|
||||||
m_cond.c
|
m_cond.c
|
||||||
|
m_emotes.cpp
|
||||||
m_fixed.c
|
m_fixed.c
|
||||||
m_menu.c
|
m_menu.c
|
||||||
m_textinput.c
|
m_textinput.c
|
||||||
@@ -40,19 +46,25 @@ set(SRB2_CORE_SOURCES
|
|||||||
mserv.c
|
mserv.c
|
||||||
http-mserv.c
|
http-mserv.c
|
||||||
qs22j.c
|
qs22j.c
|
||||||
|
r_skins.c
|
||||||
s_sound.c
|
s_sound.c
|
||||||
screen.c
|
screen.c
|
||||||
sounds.c
|
sounds.c
|
||||||
st_stuff.c
|
st_stuff.c
|
||||||
#string.c
|
string.c
|
||||||
tables.c
|
tables.c
|
||||||
v_video.c
|
v_video.c
|
||||||
w_wad.c
|
w_wad.c
|
||||||
y_inter.c
|
y_inter.c
|
||||||
z_zone.c
|
z_zone.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(SRB2_CORE_HEADERS
|
set(SRB2_CORE_HEADERS
|
||||||
|
core/memory.h
|
||||||
|
core/thread_pool.h
|
||||||
|
m_curl.h
|
||||||
|
m_emotes.h
|
||||||
|
k_hud.h
|
||||||
am_map.h
|
am_map.h
|
||||||
b_bot.h
|
b_bot.h
|
||||||
byteptr.h
|
byteptr.h
|
||||||
@@ -78,6 +90,7 @@ set(SRB2_CORE_HEADERS
|
|||||||
fastcmp.h
|
fastcmp.h
|
||||||
filesrch.h
|
filesrch.h
|
||||||
g_game.h
|
g_game.h
|
||||||
|
g_demo.h
|
||||||
g_input.h
|
g_input.h
|
||||||
g_state.h
|
g_state.h
|
||||||
hu_stuff.h
|
hu_stuff.h
|
||||||
@@ -109,6 +122,7 @@ set(SRB2_CORE_HEADERS
|
|||||||
md5.h
|
md5.h
|
||||||
mserv.h
|
mserv.h
|
||||||
qs22j.h
|
qs22j.h
|
||||||
|
r_skins.h
|
||||||
s_sound.h
|
s_sound.h
|
||||||
screen.h
|
screen.h
|
||||||
sounds.h
|
sounds.h
|
||||||
@@ -123,18 +137,18 @@ set(SRB2_CORE_HEADERS
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(SRB2_CORE_RENDER_SOURCES
|
set(SRB2_CORE_RENDER_SOURCES
|
||||||
r_bsp.c
|
r_bsp.cpp
|
||||||
r_data.c
|
r_data.c
|
||||||
r_draw.c
|
r_draw.cpp
|
||||||
r_fps.c
|
r_fps.cpp
|
||||||
r_main.c
|
r_main.cpp
|
||||||
r_patch.c
|
r_patch.cpp
|
||||||
r_patchrotation.c
|
r_patchrotation.cpp
|
||||||
r_plane.c
|
r_plane.cpp
|
||||||
r_segs.c
|
r_segs.cpp
|
||||||
r_sky.c
|
r_sky.c
|
||||||
r_splats.c
|
r_splats.c
|
||||||
r_things.c
|
r_things.cpp
|
||||||
r_portal.c
|
r_portal.c
|
||||||
|
|
||||||
r_bsp.h
|
r_bsp.h
|
||||||
@@ -162,7 +176,7 @@ set(SRB2_CORE_GAME_SOURCES
|
|||||||
p_inter.c
|
p_inter.c
|
||||||
p_lights.c
|
p_lights.c
|
||||||
p_map.c
|
p_map.c
|
||||||
p_maputl.c
|
p_maputl.cpp
|
||||||
p_mobj.c
|
p_mobj.c
|
||||||
p_polyobj.c
|
p_polyobj.c
|
||||||
p_saveg.c
|
p_saveg.c
|
||||||
@@ -193,10 +207,6 @@ set(SRB2_CORE_GAME_SOURCES
|
|||||||
k_stats.h
|
k_stats.h
|
||||||
)
|
)
|
||||||
|
|
||||||
if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
|
|
||||||
set(SRB2_CORE_SOURCES ${SRB2_CORE_SOURCES} string.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
prepend_sources(SRB2_CORE_SOURCES)
|
prepend_sources(SRB2_CORE_SOURCES)
|
||||||
prepend_sources(SRB2_CORE_HEADERS)
|
prepend_sources(SRB2_CORE_HEADERS)
|
||||||
prepend_sources(SRB2_CORE_RENDER_SOURCES)
|
prepend_sources(SRB2_CORE_RENDER_SOURCES)
|
||||||
@@ -226,10 +236,31 @@ set(SRB2_CONFIG_HWRENDER ON CACHE BOOL
|
|||||||
"Enable hardware rendering through OpenGL.")
|
"Enable hardware rendering through OpenGL.")
|
||||||
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.")
|
||||||
set(SRB2_CONFIG_USE_FBO_OGL ON CACHE BOOL
|
|
||||||
"Enable OpenGL FBO Downsampling support.")
|
|
||||||
set(SRB2_CONFIG_DEDICATED OFF CACHE BOOL
|
set(SRB2_CONFIG_DEDICATED OFF CACHE BOOL
|
||||||
"Build a dedicated server.")
|
"Build a dedicated server.")
|
||||||
|
set(SRB2_CONFIG_LIBBACKTRACE ON CACHE BOOL
|
||||||
|
"Enable using libbacktrace for crashlogs.")
|
||||||
|
set(SRB2_CONFIG_LTO ON CACHE BOOL
|
||||||
|
"Enable link time optimizations, improves performance at the cost of longer link times.")
|
||||||
|
set(SRB2_CONFIG_ASAN OFF CACHE BOOL
|
||||||
|
"Compile with AddressSanitizer (libasan).")
|
||||||
|
set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
|
||||||
|
"Compile with UndefinedBehaviorSanitizer (libubsan).")
|
||||||
|
set(SRB2_CONFIG_TSAN OFF CACHE BOOL
|
||||||
|
"Compile with ThreadSanitizer (libtsan).")
|
||||||
|
|
||||||
|
set(SRB2_CONFIG_MUMBLE ON CACHE BOOL
|
||||||
|
"Enable Mumble support")
|
||||||
|
|
||||||
|
set(SRB2_CONFIG_SATURNPAK ON CACHE BOOL
|
||||||
|
"Enable Saturn specific special packet. Required for using the newer resynch system")
|
||||||
|
set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
|
||||||
|
"Enable Saturn specific allowjoin toggle.")
|
||||||
|
set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
|
||||||
|
"Enable hardware renderer (OpenGL) FBO downsampling support")
|
||||||
|
|
||||||
|
set(SRB2_CONFIG_PHOBOS OFF CACHE BOOL
|
||||||
|
" Compile the Phobos client. Which contains things not compatible with vanilla, such as raised skinlimits, 32 player support, bugfixes, etc.")
|
||||||
|
|
||||||
if(${SRB2_CONFIG_DEDICATED})
|
if(${SRB2_CONFIG_DEDICATED})
|
||||||
set(SRB2_CONFIG_HAVE_GME NO)
|
set(SRB2_CONFIG_HAVE_GME NO)
|
||||||
@@ -252,6 +283,7 @@ if(${SRB2_CONFIG_HAVE_BLUA})
|
|||||||
lua_hooklib.c
|
lua_hooklib.c
|
||||||
lua_hudlib.c
|
lua_hudlib.c
|
||||||
lua_hudlib_drawlist.c
|
lua_hudlib_drawlist.c
|
||||||
|
lua_profile.cpp
|
||||||
lua_infolib.c
|
lua_infolib.c
|
||||||
lua_maplib.c
|
lua_maplib.c
|
||||||
lua_mathlib.c
|
lua_mathlib.c
|
||||||
@@ -260,16 +292,15 @@ if(${SRB2_CONFIG_HAVE_BLUA})
|
|||||||
lua_script.c
|
lua_script.c
|
||||||
lua_skinlib.c
|
lua_skinlib.c
|
||||||
lua_thinkerlib.c
|
lua_thinkerlib.c
|
||||||
lua_udatalib.c
|
|
||||||
lua_glib.c
|
lua_glib.c
|
||||||
)
|
)
|
||||||
set(SRB2_LUA_HEADERS
|
set(SRB2_LUA_HEADERS
|
||||||
lua_hook.h
|
lua_hook.h
|
||||||
lua_hud.h
|
lua_hud.h
|
||||||
lua_hudlib_drawlist.h
|
lua_hudlib_drawlist.h
|
||||||
|
lua_profile.h
|
||||||
lua_libs.h
|
lua_libs.h
|
||||||
lua_script.h
|
lua_script.h
|
||||||
lua_udatalib.h
|
|
||||||
lua_glib.h
|
lua_glib.h
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -469,6 +500,26 @@ if(${SRB2_CONFIG_HAVE_CURL})
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_LIBBACKTRACE})
|
||||||
|
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
||||||
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
|
set(LIBBACKTRACE_FOUND ON)
|
||||||
|
set(LIBBACKTRACE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libbacktrace/include)
|
||||||
|
set(LIBBACKTRACE_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libbacktrace/lib/x86_64 -lbacktrace")
|
||||||
|
else() # 32-bit
|
||||||
|
message(WARNING "libbacktrace is unsupported on 32-bit builds.")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
find_package(libbacktrace)
|
||||||
|
endif()
|
||||||
|
if(${LIBBACKTRACE_FOUND})
|
||||||
|
set(SRB2_HAVE_LIBBACKTRACE ON)
|
||||||
|
add_definitions(-DHAVE_LIBBACKTRACE)
|
||||||
|
else()
|
||||||
|
message(WARNING "You have specified that libbacktrace is available but it was not found.")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
if(${SRB2_CONFIG_HWRENDER})
|
if(${SRB2_CONFIG_HWRENDER})
|
||||||
add_definitions(-DHWRENDER)
|
add_definitions(-DHWRENDER)
|
||||||
set(SRB2_HWRENDER_SOURCES
|
set(SRB2_HWRENDER_SOURCES
|
||||||
@@ -478,7 +529,7 @@ if(${SRB2_CONFIG_HWRENDER})
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_portal.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_portal.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.c
|
||||||
@@ -493,7 +544,6 @@ if(${SRB2_CONFIG_HWRENDER})
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.h
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_data.h
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_data.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_defs.h
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_defs.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_dll.h
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_gl.h
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_gl.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glob.h
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glob.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.h
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.h
|
||||||
@@ -512,7 +562,6 @@ if(${SRB2_CONFIG_HWRENDER})
|
|||||||
set(SRB2_R_OPENGL_HEADERS
|
set(SRB2_R_OPENGL_HEADERS
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.h
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.h
|
||||||
)
|
)
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
|
if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
|
||||||
@@ -525,25 +574,44 @@ if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${SRB2_CONFIG_HWRENDER})
|
if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_SCREENFBO})
|
||||||
if(${SRB2_CONFIG_USE_FBO_OGL})
|
add_definitions(-DUSE_FBO_OGL)
|
||||||
set(SRB2_USE_FBO_OGL ON)
|
endif()
|
||||||
add_definitions(-DUSE_FBO_OGL)
|
|
||||||
endif()
|
if(${SRB2_CONFIG_SATURNPAK})
|
||||||
|
add_definitions(-DDOSATURNPAK)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_SATURNJOIN})
|
||||||
|
add_definitions(-DDOSATURNJOIN)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_PHOBOS})
|
||||||
|
add_definitions(-DPHOBOS_BUILD)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Targets
|
# Targets
|
||||||
|
|
||||||
# Compatibility flag with later versions of GCC
|
# Compatibility flag with later versions of GCC
|
||||||
# We should really fix our code to not need this
|
# We should really fix our code to not need this
|
||||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||||
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields)
|
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|x64|amd64|AMD64|em64t|EM64T)")
|
||||||
|
add_compile_options(-mno-ms-bitfields)
|
||||||
|
endif()
|
||||||
|
add_compile_options(-Wno-trigraphs)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
# TODO: fix prng and P_CreateBlockmap overflow at some point
|
||||||
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value)
|
add_compile_options(-fwrapv)
|
||||||
|
|
||||||
|
if (${CMAKE_BUILD_TYPE} MATCHES Debug)
|
||||||
|
add_compile_options(-O0)
|
||||||
|
else()
|
||||||
|
add_compile_options(-O3)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
add_compile_options(-g)
|
||||||
|
|
||||||
add_definitions(-DCMAKECONFIG)
|
add_definitions(-DCMAKECONFIG)
|
||||||
|
|
||||||
#add_library(SRB2Core STATIC
|
#add_library(SRB2Core STATIC
|
||||||
|
|||||||
+35
-16
@@ -65,12 +65,17 @@
|
|||||||
# DEBUGMODE=1 - Enable various debugging capabilities.
|
# DEBUGMODE=1 - Enable various debugging capabilities.
|
||||||
# Also disables optimizations.
|
# Also disables optimizations.
|
||||||
#
|
#
|
||||||
|
# PHOBOS_BUILD=1 - Compile the Phobos client.
|
||||||
|
# Contains things not compatible with vanilla.
|
||||||
|
# such as raised skinlimits, 32 player support, bugfixes, etc.
|
||||||
|
#
|
||||||
# Development flags:
|
# Development flags:
|
||||||
#
|
#
|
||||||
# VALGRIND=1 - Enable Valgrind memory debugging support.
|
# VALGRIND=1 - Enable Valgrind memory debugging support.
|
||||||
# PROFILEMODE=1 - Enable performance profiling (gprof).
|
# PROFILEMODE=1 - Enable performance profiling (gprof).
|
||||||
# USEASAN=1 - Enable building with Address Sanitizer.
|
# USEASAN=1 - Enable building with Address Sanitizer.
|
||||||
# USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
|
# USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
|
||||||
|
# USETSAN=1 - Enable building with Thread Sanitizer.
|
||||||
# NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
|
# NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
|
||||||
#
|
#
|
||||||
# General flags for building:
|
# General flags for building:
|
||||||
@@ -93,7 +98,8 @@
|
|||||||
# NOLDWARNING=1 - ?
|
# NOLDWARNING=1 - ?
|
||||||
# NOSDLMAIN=1 - ?
|
# NOSDLMAIN=1 - ?
|
||||||
# SDLMAIN=1 - ?
|
# SDLMAIN=1 - ?
|
||||||
# USELTO=1 - Enable building with LTO.
|
# NOLTO=1 - Disable link time optimizations
|
||||||
|
# USEJEMALLOC=1 Enable building with jemalloc Allocator to replace GLibc malloc, might improve performance
|
||||||
#
|
#
|
||||||
# Library configuration flags:
|
# Library configuration flags:
|
||||||
# Everything here is an override.
|
# Everything here is an override.
|
||||||
@@ -245,10 +251,6 @@ ifdef STATIC
|
|||||||
libs+=-static
|
libs+=-static
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter $(CC) $(CXX),gcc g++))
|
|
||||||
opts+=-mno-ms-bitfields
|
|
||||||
endif
|
|
||||||
|
|
||||||
# build with profiling information
|
# build with profiling information
|
||||||
ifdef PROFILEMODE
|
ifdef PROFILEMODE
|
||||||
opts+=-pg
|
opts+=-pg
|
||||||
@@ -260,23 +262,39 @@ debug_opts=-D_DEBUG
|
|||||||
else # build a normal optimized version
|
else # build a normal optimized version
|
||||||
debug_opts=-DNDEBUG
|
debug_opts=-DNDEBUG
|
||||||
opts+=-O3
|
opts+=-O3
|
||||||
ifdef USELTO
|
endif
|
||||||
|
|
||||||
|
ifdef USEASAN
|
||||||
|
# compile with asan
|
||||||
|
opts+=-O1 -fsanitize=address -fno-omit-frame-pointer -fno-common
|
||||||
|
libs+=-fsanitize=address
|
||||||
|
NOLTO=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef USEUBSAN
|
||||||
|
# compile with ubsan
|
||||||
|
opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
|
||||||
|
libs+=-fsanitize=undefined
|
||||||
|
NOLTO=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef USETSAN
|
||||||
|
# compile with tsan
|
||||||
|
opts+=-O1 -fsanitize=thread -fno-omit-frame-pointer
|
||||||
|
libs+=-fsanitize=thread
|
||||||
|
NOLTO=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifndef DEBUGMODE
|
||||||
|
ifndef NOLTO
|
||||||
# compile with LTO
|
# compile with LTO
|
||||||
opts+=-flto=auto
|
opts+=-flto=auto
|
||||||
libs+=-flto=auto
|
libs+=-flto=auto
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef USEASAN
|
ifdef USEJEMALLOC
|
||||||
# compile with asan
|
libs+=-ljemalloc
|
||||||
opts+=-fsanitize=address
|
|
||||||
libs+=-fsanitize=address
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef USEUBSAN
|
|
||||||
# compile with asan
|
|
||||||
opts+=-fsanitize=undefined
|
|
||||||
libs+=-fsanitize=undefined
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
||||||
@@ -295,6 +313,7 @@ opts+=$(debug_opts)
|
|||||||
|
|
||||||
opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
|
opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
|
||||||
|
|
||||||
|
CWFLAGS+=-std=gnu17
|
||||||
CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers
|
CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers
|
||||||
|
|
||||||
opts+=$(WFLAGS) $(CFLAGS)
|
opts+=$(WFLAGS) $(CFLAGS)
|
||||||
|
|||||||
@@ -64,9 +64,10 @@ endif
|
|||||||
|
|
||||||
# This must have high to low order.
|
# This must have high to low order.
|
||||||
gcc_versions:=\
|
gcc_versions:=\
|
||||||
151 150 15\
|
161 160 16\
|
||||||
|
152 151 150 15\
|
||||||
142 141 140 14\
|
142 141 140 14\
|
||||||
132 131 130 13\
|
133 132 131 130 13\
|
||||||
123 122 121 120 12\
|
123 122 121 120 12\
|
||||||
114 113 112 111 110 11\
|
114 113 112 111 110 11\
|
||||||
105 104 103 102 101 100 10\
|
105 104 103 102 101 100 10\
|
||||||
@@ -77,7 +78,7 @@ gcc_versions:=\
|
|||||||
55 54 53 52 51 50\
|
55 54 53 52 51 50\
|
||||||
49 48 47 46 45 44 43 42 41 40
|
49 48 47 46 45 44 43 42 41 40
|
||||||
|
|
||||||
latest_gcc_version:=15.1.1
|
latest_gcc_version:=16.1
|
||||||
|
|
||||||
# Automatically set version flag, but not if one was
|
# Automatically set version flag, but not if one was
|
||||||
# manually set. And don't bother if this is a clean only
|
# manually set. And don't bother if this is a clean only
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ passthru_opts+=\
|
|||||||
HAVE_MINIUPNPC\
|
HAVE_MINIUPNPC\
|
||||||
HAVE_DISCORDRPC DEVELOP\
|
HAVE_DISCORDRPC DEVELOP\
|
||||||
NOHOLEPUNCH\
|
NOHOLEPUNCH\
|
||||||
|
HAVE_IPV6\
|
||||||
|
PHOBOS_BUILD\
|
||||||
|
|
||||||
# build with debugging information
|
# build with debugging information
|
||||||
ifdef DEBUGMODE
|
ifdef DEBUGMODE
|
||||||
@@ -85,7 +87,7 @@ ifdef VALGRIND
|
|||||||
VALGRIND_PKGCONFIG?=valgrind
|
VALGRIND_PKGCONFIG?=valgrind
|
||||||
VALGRIND_LDFLAGS=
|
VALGRIND_LDFLAGS=
|
||||||
$(eval $(call Use_pkg_config,VALGRIND))
|
$(eval $(call Use_pkg_config,VALGRIND))
|
||||||
ZDEBUG=1
|
#ZDEBUG=1 we enable this by default
|
||||||
opts+=-DHAVE_VALGRIND
|
opts+=-DHAVE_VALGRIND
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
@@ -42,8 +42,6 @@ include Makefile.d/haiku.mk
|
|||||||
else ifdef SOLARIS # FIXME: UNTESTED
|
else ifdef SOLARIS # FIXME: UNTESTED
|
||||||
UNIX=1
|
UNIX=1
|
||||||
platform=solaris
|
platform=solaris
|
||||||
else ifdef CYGWIN32 # FIXME: UNTESTED
|
|
||||||
platform=cygwin
|
|
||||||
else ifdef MINGW
|
else ifdef MINGW
|
||||||
ifdef MINGW64
|
ifdef MINGW64
|
||||||
NONX86=1
|
NONX86=1
|
||||||
|
|||||||
@@ -15,16 +15,6 @@ sources+=$(call List,sdl/Sourcefile)
|
|||||||
|
|
||||||
NOUPNP=1
|
NOUPNP=1
|
||||||
|
|
||||||
# FIXME: UNTESTED
|
|
||||||
#ifdef PANDORA
|
|
||||||
#include sdl/SRB2Pandora/Makefile.cfg
|
|
||||||
#endif #ifdef PANDORA
|
|
||||||
|
|
||||||
# FIXME: UNTESTED
|
|
||||||
#ifdef CYGWIN32
|
|
||||||
#include sdl/MakeCYG.cfg
|
|
||||||
#endif #ifdef CYGWIN32
|
|
||||||
|
|
||||||
ifndef NOHW
|
ifndef NOHW
|
||||||
sources+=sdl/ogl_sdl.c
|
sources+=sdl/ogl_sdl.c
|
||||||
endif
|
endif
|
||||||
|
|||||||
+16
-12
@@ -20,7 +20,11 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\
|
|||||||
CXXFLAGS+= -Wno-aggregate-return
|
CXXFLAGS+= -Wno-aggregate-return
|
||||||
|
|
||||||
# -W -Wno-unused
|
# -W -Wno-unused
|
||||||
WFLAGS:=-Wall -Wno-trigraphs
|
WFLAGS:=-Wall -Wnull-dereference
|
||||||
|
#WFLAGS+=-Wno-trigraphs
|
||||||
|
ifdef GCC152
|
||||||
|
WFLAGS+=-Wzero-as-null-pointer-constant
|
||||||
|
endif
|
||||||
ifndef GCC295
|
ifndef GCC295
|
||||||
#WFLAGS+=-Wno-packed
|
#WFLAGS+=-Wno-packed
|
||||||
endif
|
endif
|
||||||
@@ -28,7 +32,7 @@ ifndef RELAXWARNINGS
|
|||||||
WFLAGS+=-W
|
WFLAGS+=-W
|
||||||
#WFLAGS+=-Wno-sign-compare
|
#WFLAGS+=-Wno-sign-compare
|
||||||
ifndef GCC295
|
ifndef GCC295
|
||||||
WFLAGS+=-Wno-div-by-zero
|
# WFLAGS+=-Wno-div-by-zero
|
||||||
endif
|
endif
|
||||||
#WFLAGS+=-Wsystem-headers
|
#WFLAGS+=-Wsystem-headers
|
||||||
WFLAGS+=-Wfloat-equal
|
WFLAGS+=-Wfloat-equal
|
||||||
@@ -59,7 +63,7 @@ endif
|
|||||||
endif
|
endif
|
||||||
WFLAGS+=-Wsign-compare
|
WFLAGS+=-Wsign-compare
|
||||||
ifdef GCC91
|
ifdef GCC91
|
||||||
WFLAGS+=-Wno-error=address-of-packed-member
|
# WFLAGS+=-Wno-error=address-of-packed-member
|
||||||
endif
|
endif
|
||||||
ifdef GCC45
|
ifdef GCC45
|
||||||
WFLAGS+=-Wlogical-op
|
WFLAGS+=-Wlogical-op
|
||||||
@@ -102,14 +106,14 @@ endif
|
|||||||
endif
|
endif
|
||||||
WFLAGS+=-Wformat-y2k
|
WFLAGS+=-Wformat-y2k
|
||||||
ifdef GCC71
|
ifdef GCC71
|
||||||
WFLAGS+=-Wno-error=format-overflow=2
|
#WFLAGS+=-Wno-error=format-overflow=2
|
||||||
endif
|
endif
|
||||||
WFLAGS+=-Wformat-security
|
WFLAGS+=-Wformat-security
|
||||||
ifndef GCC29
|
ifndef GCC29
|
||||||
#WFLAGS+=-Winit-self
|
#WFLAGS+=-Winit-self
|
||||||
endif
|
endif
|
||||||
ifdef GCC46
|
ifdef GCC46
|
||||||
WFLAGS+=-Wno-suggest-attribute=noreturn
|
#WFLAGS+=-Wno-suggest-attribute=noreturn
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NOLDWARNING
|
ifdef NOLDWARNING
|
||||||
@@ -127,21 +131,21 @@ ifdef GCC44
|
|||||||
#WFLAGS+=-Wno-error=array-bounds
|
#WFLAGS+=-Wno-error=array-bounds
|
||||||
endif
|
endif
|
||||||
ifdef GCC46
|
ifdef GCC46
|
||||||
WFLAGS+=-Wno-error=suggest-attribute=noreturn
|
# WFLAGS+=-Wno-error=suggest-attribute=noreturn
|
||||||
endif
|
endif
|
||||||
ifdef GCC54
|
ifdef GCC54
|
||||||
WFLAGS+=-Wno-logical-op -Wno-error=logical-op
|
# WFLAGS+=-Wno-logical-op -Wno-error=logical-op
|
||||||
endif
|
endif
|
||||||
ifdef GCC61
|
ifdef GCC61
|
||||||
WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
|
# WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
|
||||||
endif
|
endif
|
||||||
ifdef GCC71
|
ifdef GCC71
|
||||||
WFLAGS+=-Wimplicit-fallthrough=4
|
WFLAGS+=-Wimplicit-fallthrough=4
|
||||||
endif
|
endif
|
||||||
ifdef GCC81
|
ifdef GCC81
|
||||||
WFLAGS+=-Wno-error=format-overflow
|
# WFLAGS+=-Wno-error=format-overflow
|
||||||
WFLAGS+=-Wno-format-overflow
|
# WFLAGS+=-Wno-format-overflow
|
||||||
WFLAGS+=-Wno-error=multistatement-macros
|
# WFLAGS+=-Wno-error=multistatement-macros
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
||||||
@@ -180,6 +184,6 @@ endif
|
|||||||
# Lua
|
# Lua
|
||||||
ifdef GCC43
|
ifdef GCC43
|
||||||
ifndef GCC44
|
ifndef GCC44
|
||||||
WFLAGS+=-Wno-logical-op
|
#WFLAGS+=-Wno-logical-op
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
+2
-2
@@ -1,3 +1,4 @@
|
|||||||
|
string.c
|
||||||
am_map.c
|
am_map.c
|
||||||
b_bot.c
|
b_bot.c
|
||||||
command.c
|
command.c
|
||||||
@@ -42,7 +43,6 @@ s_sound.c
|
|||||||
screen.c
|
screen.c
|
||||||
sounds.c
|
sounds.c
|
||||||
st_stuff.c
|
st_stuff.c
|
||||||
string.c
|
|
||||||
tables.c
|
tables.c
|
||||||
v_video.c
|
v_video.c
|
||||||
w_wad.c
|
w_wad.c
|
||||||
@@ -97,5 +97,5 @@ lua_playerlib.c
|
|||||||
lua_script.c
|
lua_script.c
|
||||||
lua_skinlib.c
|
lua_skinlib.c
|
||||||
lua_thinkerlib.c
|
lua_thinkerlib.c
|
||||||
lua_udatalib.c
|
|
||||||
lua_glib.c
|
lua_glib.c
|
||||||
|
lua_profile.cpp
|
||||||
@@ -34,8 +34,8 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
/* return si.freeram; */
|
/* return si.freeram; */
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
char *memTag;
|
char *memTag;
|
||||||
UINT32 freeKBytes;
|
size_t freeKBytes;
|
||||||
UINT32 totalKBytes;
|
size_t totalKBytes;
|
||||||
INT32 n;
|
INT32 n;
|
||||||
INT32 meminfo_fd = -1;
|
INT32 meminfo_fd = -1;
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
if (n < 0)
|
if (n < 0)
|
||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
if (NULL == (memTag = strstr(buf, MEMTOTAL)))
|
if (NULL == (memTag = strstr(buf, MEMTOTAL)))
|
||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,7 +64,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
if (NULL == (memTag = strstr(buf, MEMFREE)))
|
if (NULL == (memTag = strstr(buf, MEMFREE)))
|
||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,10 +226,6 @@ const char *I_LocateWad(void)
|
|||||||
return "/sdcard/srb2";
|
return "/sdcard/srb2";
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_GetJoystickEvents(void){}
|
|
||||||
|
|
||||||
void I_GetJoystick2Events(void){}
|
|
||||||
|
|
||||||
char *I_GetEnv(const char *name)
|
char *I_GetEnv(const char *name)
|
||||||
{
|
{
|
||||||
LOGW("I_GetEnv() called?!");
|
LOGW("I_GetEnv() called?!");
|
||||||
|
|||||||
+2
-12
@@ -50,25 +50,15 @@ const char *VID_GetModeName(INT32 modenum)
|
|||||||
return "A320x240";
|
return "A320x240";
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_UpdateNoBlit(void){}
|
void I_FinishUpdate(void)
|
||||||
|
{
|
||||||
void I_FinishUpdate(void) {
|
|
||||||
LOGD("FRAME!");
|
LOGD("FRAME!");
|
||||||
(*jni_env)->CallVoidMethod(jni_env, androidVideo, videoFrameCB);
|
(*jni_env)->CallVoidMethod(jni_env, androidVideo, videoFrameCB);
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_UpdateNoVsync(void) {}
|
void I_UpdateNoVsync(void) {}
|
||||||
|
|
||||||
void I_WaitVBL(INT32 count)
|
|
||||||
{
|
|
||||||
(void)count;
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_ReadScreen(UINT8 * restrict scr, INT32 scale)
|
void I_ReadScreen(UINT8 * restrict scr, INT32 scale)
|
||||||
{
|
{
|
||||||
(void)scr;
|
(void)scr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_BeginRead(void){}
|
|
||||||
|
|
||||||
void I_EndRead(void){}
|
|
||||||
+11
-11
@@ -47,7 +47,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
|
|||||||
if (sonic->player->pflags & (PF_MACESPIN|PF_ITEMHANG))
|
if (sonic->player->pflags & (PF_MACESPIN|PF_ITEMHANG))
|
||||||
{
|
{
|
||||||
cmd->forwardmove = sonic->player->cmd.forwardmove;
|
cmd->forwardmove = sonic->player->cmd.forwardmove;
|
||||||
cmd->angleturn = abs((signed)(tails->angle - sonic->angle))>>16;
|
cmd->angleturn = abs((signed)(tails->angle - sonic->angle)) >> TICCMD_REDUCE;
|
||||||
if (sonic->angle < tails->angle)
|
if (sonic->angle < tails->angle)
|
||||||
cmd->angleturn = -cmd->angleturn;
|
cmd->angleturn = -cmd->angleturn;
|
||||||
} else if (dist > FixedMul(512*FRACUNIT, tails->scale))
|
} else if (dist > FixedMul(512*FRACUNIT, tails->scale))
|
||||||
@@ -139,13 +139,13 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward
|
|||||||
// Don't mess with bot inputs during these unhandled movement conditions.
|
// Don't mess with bot inputs during these unhandled movement conditions.
|
||||||
// The normal AI doesn't use abilities, so custom AI should be sending us exactly what it wants anyway.
|
// The normal AI doesn't use abilities, so custom AI should be sending us exactly what it wants anyway.
|
||||||
if (forward)
|
if (forward)
|
||||||
cmd->forwardmove += MAXPLMOVE<<FRACBITS>>16;
|
cmd->forwardmove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
if (backward)
|
if (backward)
|
||||||
cmd->forwardmove -= MAXPLMOVE<<FRACBITS>>16;
|
cmd->forwardmove -= MAXPLMOVE<<FRACBITS >> TICCMD_REDUCE;
|
||||||
if (left || strafeleft)
|
if (left || strafeleft)
|
||||||
cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
|
cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
if (right || straferight)
|
if (right || straferight)
|
||||||
cmd->sidemove += MAXPLMOVE<<FRACBITS>>16;
|
cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
} else {
|
} else {
|
||||||
// In standard 2D mode, interpret "forward" as "the way you're facing" and everything else as "the way you're not facing"
|
// In standard 2D mode, interpret "forward" as "the way you're facing" and everything else as "the way you're not facing"
|
||||||
if (left || right)
|
if (left || right)
|
||||||
@@ -163,23 +163,23 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward
|
|||||||
right = true;
|
right = true;
|
||||||
}
|
}
|
||||||
if (left || strafeleft)
|
if (left || strafeleft)
|
||||||
cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
|
cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
if (right || straferight)
|
if (right || straferight)
|
||||||
cmd->sidemove += MAXPLMOVE<<FRACBITS>>16;
|
cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (forward)
|
if (forward)
|
||||||
cmd->forwardmove += MAXPLMOVE<<FRACBITS>>16;
|
cmd->forwardmove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
if (backward)
|
if (backward)
|
||||||
cmd->forwardmove -= MAXPLMOVE<<FRACBITS>>16;
|
cmd->forwardmove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
if (left)
|
if (left)
|
||||||
cmd->angleturn += 1280;
|
cmd->angleturn += 1280;
|
||||||
if (right)
|
if (right)
|
||||||
cmd->angleturn -= 1280;
|
cmd->angleturn -= 1280;
|
||||||
if (strafeleft)
|
if (strafeleft)
|
||||||
cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
|
cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
if (straferight)
|
if (straferight)
|
||||||
cmd->sidemove += MAXPLMOVE<<FRACBITS>>16;
|
cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
|
||||||
}
|
}
|
||||||
if (jump)
|
if (jump)
|
||||||
cmd->buttons |= BT_DRIFT;
|
cmd->buttons |= BT_DRIFT;
|
||||||
|
|||||||
+1
-1
@@ -434,7 +434,7 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
|
|||||||
LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
|
LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
luaC_checkGC(L);
|
luaC_checkGC(L);
|
||||||
setsvalue2s(L, L->top, (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len));
|
setsvalue2s(L, L->top, (len == 0) ? luaS_newlstr(L, "", 0) : luaS_newlstr(L, s, len));
|
||||||
api_incr_top(L);
|
api_incr_top(L);
|
||||||
lua_unlock(L);
|
lua_unlock(L);
|
||||||
}
|
}
|
||||||
|
|||||||
+66
-3
@@ -20,6 +20,7 @@
|
|||||||
#define lauxlib_c
|
#define lauxlib_c
|
||||||
#define LUA_LIB
|
#define LUA_LIB
|
||||||
|
|
||||||
|
#include "ldebug.h"
|
||||||
#include "lua.h"
|
#include "lua.h"
|
||||||
|
|
||||||
#include "lauxlib.h"
|
#include "lauxlib.h"
|
||||||
@@ -93,6 +94,57 @@ LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
|
|||||||
/* }====================================================== */
|
/* }====================================================== */
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** {======================================================
|
||||||
|
** 'luaL_resourcetryagain'
|
||||||
|
** This function uses 'errno' to check whether the last error was
|
||||||
|
** related to lack of resources (e.g., not enough memory or too many
|
||||||
|
** open files). If so, the function performs a full garbage collection
|
||||||
|
** to try to release resources, and then it returns 1 to signal to
|
||||||
|
** the caller that it is worth trying again the failed operation.
|
||||||
|
** Otherwise, it returns 0. Because error codes are not ANSI C, the
|
||||||
|
** code must handle any combination of error codes that are defined.
|
||||||
|
** =======================================================
|
||||||
|
*/
|
||||||
|
|
||||||
|
LUALIB_API int luaL_resourcetryagain (lua_State *L) {
|
||||||
|
|
||||||
|
/* these are the resource-related errors in Linux */
|
||||||
|
#if defined(EMFILE) || defined(ENFILE) || defined(ENOMEM)
|
||||||
|
|
||||||
|
#if !defined(EMFILE) /* too many open files in the process */
|
||||||
|
#define EMFILE -1 /* if not defined, use an impossible value */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(ENFILE) /* too many open files in the system */
|
||||||
|
#define ENFILE -1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(ENOMEM) /* not enough memory */
|
||||||
|
#define ENOMEM -1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (errno == EMFILE || errno == ENFILE || errno == ENOMEM) {
|
||||||
|
CONS_Alert(CONS_WARNING, "%s, force calling lua garbage collector\n", strerror(errno));
|
||||||
|
lua_gc(L, LUA_GCCOLLECT, 0); /* try to release resources with a full GC */
|
||||||
|
return 1; /* signal to try again the creation */
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 0; /* else, asume errors are not due to lack of resources */
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* }====================================================== */
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** {======================================================
|
||||||
|
** Userdata's metatable manipulation
|
||||||
|
** =======================================================
|
||||||
|
*/
|
||||||
|
|
||||||
LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def,
|
LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def,
|
||||||
const char *const lst[]) {
|
const char *const lst[]) {
|
||||||
const char *name = (def) ? luaL_optstring(L, narg, def) :
|
const char *name = (def) ? luaL_optstring(L, narg, def) :
|
||||||
@@ -417,8 +469,19 @@ LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B) {
|
|||||||
|
|
||||||
|
|
||||||
LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
|
LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
|
||||||
while (l--)
|
while (l) {
|
||||||
luaL_addchar(B, *s++);
|
size_t space = bufffree(B);
|
||||||
|
if (space == 0) {
|
||||||
|
luaL_prepbuffer(B);
|
||||||
|
lua_assert(bufffree(B) == LUAL_BUFFERSIZE);
|
||||||
|
space = LUAL_BUFFERSIZE;
|
||||||
|
}
|
||||||
|
if (space > l) space = l;
|
||||||
|
memcpy(B->p, s, space);
|
||||||
|
B->p += space;
|
||||||
|
s += space;
|
||||||
|
l -= space;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -635,6 +698,6 @@ static int panic (lua_State *L) {
|
|||||||
|
|
||||||
LUALIB_API lua_State *luaL_newstate (void) {
|
LUALIB_API lua_State *luaL_newstate (void) {
|
||||||
lua_State *L = lua_newstate(l_alloc, NULL);
|
lua_State *L = lua_newstate(l_alloc, NULL);
|
||||||
if (L) lua_atpanic(L, &panic);
|
if (l_likely(L)) lua_atpanic(L, &panic);
|
||||||
return L;
|
return L;
|
||||||
}
|
}
|
||||||
@@ -95,6 +95,8 @@ LUALIB_API FUNCREPORT int (luaL_error) (lua_State *L, const char *fmt, ...);
|
|||||||
LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
|
LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
|
||||||
const char *const lst[]);
|
const char *const lst[]);
|
||||||
|
|
||||||
|
LUALIB_API int (luaL_resourcetryagain) (lua_State *L);
|
||||||
|
|
||||||
LUALIB_API int (luaL_ref) (lua_State *L, int t);
|
LUALIB_API int (luaL_ref) (lua_State *L, int t);
|
||||||
LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
|
LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
|
||||||
|
|
||||||
|
|||||||
+13
-12
@@ -790,18 +790,19 @@ void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) {
|
|||||||
case OPR_BXOR: codearith(fs, OP_BXOR, e1, e2); break;
|
case OPR_BXOR: codearith(fs, OP_BXOR, e1, e2); break;
|
||||||
case OPR_BSHL: codearith(fs, OP_BSHL, e1, e2); break;
|
case OPR_BSHL: codearith(fs, OP_BSHL, e1, e2); break;
|
||||||
case OPR_BSHR: codearith(fs, OP_BSHR, e1, e2); break;
|
case OPR_BSHR: codearith(fs, OP_BSHR, e1, e2); break;
|
||||||
case OPR_ADD: codearith(fs, OP_ADD, e1, e2); break;
|
case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
|
||||||
case OPR_SUB: codearith(fs, OP_SUB, e1, e2); break;
|
case OPR_MOD: case OPR_POW: {
|
||||||
case OPR_MUL: codearith(fs, OP_MUL, e1, e2); break;
|
codearith(fs, op - OPR_ADD + OP_ADD, e1, e2);
|
||||||
case OPR_DIV: codearith(fs, OP_DIV, e1, e2); break;
|
break;
|
||||||
case OPR_MOD: codearith(fs, OP_MOD, e1, e2); break;
|
}
|
||||||
case OPR_POW: codearith(fs, OP_POW, e1, e2); break;
|
case OPR_EQ: case OPR_LT: case OPR_LE: {
|
||||||
case OPR_EQ: codecomp(fs, OP_EQ, 1, e1, e2); break;
|
codecomp(fs, op - OPR_EQ + OP_EQ, 1, e1, e2);
|
||||||
case OPR_NE: codecomp(fs, OP_EQ, 0, e1, e2); break;
|
break;
|
||||||
case OPR_LT: codecomp(fs, OP_LT, 1, e1, e2); break;
|
}
|
||||||
case OPR_LE: codecomp(fs, OP_LE, 1, e1, e2); break;
|
case OPR_NE: case OPR_GT: case OPR_GE: {
|
||||||
case OPR_GT: codecomp(fs, OP_LT, 0, e1, e2); break;
|
codecomp(fs, op - OPR_NE + OP_EQ, 0, e1, e2);
|
||||||
case OPR_GE: codecomp(fs, OP_LE, 0, e1, e2); break;
|
break;
|
||||||
|
}
|
||||||
default: lua_assert(0);
|
default: lua_assert(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -21,13 +21,13 @@
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** grep "ORDER OPR" if you change these enums
|
** grep "ORDER OPR" if you change these enums (ORDER OP)
|
||||||
*/
|
*/
|
||||||
typedef enum BinOpr {
|
typedef enum BinOpr {
|
||||||
OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
|
OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
|
||||||
OPR_CONCAT,
|
OPR_CONCAT,
|
||||||
OPR_NE, OPR_EQ,
|
OPR_EQ, OPR_LT, OPR_LE,
|
||||||
OPR_LT, OPR_LE, OPR_GT, OPR_GE,
|
OPR_NE, OPR_GT, OPR_GE,
|
||||||
OPR_AND, OPR_OR,
|
OPR_AND, OPR_OR,
|
||||||
OPR_BAND, OPR_BOR, OPR_BXOR,
|
OPR_BAND, OPR_BOR, OPR_BXOR,
|
||||||
OPR_BSHL, OPR_BSHR,
|
OPR_BSHL, OPR_BSHR,
|
||||||
|
|||||||
+28
-5
@@ -542,16 +542,39 @@ static const char *getobjname (lua_State *L, CallInfo *ci, int stackpos,
|
|||||||
|
|
||||||
|
|
||||||
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
|
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
|
||||||
|
TMS tm = 0;
|
||||||
Instruction i;
|
Instruction i;
|
||||||
if ((isLua(ci) && ci->tailcalls > 0) || !isLua(ci - 1))
|
if ((isLua(ci) && ci->tailcalls > 0) || !isLua(ci - 1))
|
||||||
return NULL; /* calling function is not Lua (or is unknown) */
|
return NULL; /* calling function is not Lua (or is unknown) */
|
||||||
ci--; /* calling function */
|
ci--; /* calling function */
|
||||||
i = ci_func(ci)->l.p->code[currentpc(L, ci)];
|
i = ci_func(ci)->l.p->code[currentpc(L, ci)];
|
||||||
if (GET_OPCODE(i) == OP_CALL || GET_OPCODE(i) == OP_TAILCALL ||
|
switch (GET_OPCODE(i)) {
|
||||||
GET_OPCODE(i) == OP_TFORLOOP)
|
case OP_CALL:
|
||||||
return getobjname(L, ci, GETARG_A(i), name);
|
case OP_TAILCALL:
|
||||||
else
|
case OP_TFORLOOP:
|
||||||
return NULL; /* no useful name can be found */
|
return getobjname(L, ci, GETARG_A(i), name);
|
||||||
|
case OP_GETGLOBAL:
|
||||||
|
case OP_SELF:
|
||||||
|
case OP_GETTABLE: tm = TM_INDEX; break;
|
||||||
|
case OP_SETGLOBAL:
|
||||||
|
case OP_SETTABLE: tm = TM_NEWINDEX; break;
|
||||||
|
case OP_EQ: tm = TM_EQ; break;
|
||||||
|
case OP_ADD: tm = TM_ADD; break;
|
||||||
|
case OP_SUB: tm = TM_SUB; break;
|
||||||
|
case OP_MUL: tm = TM_MUL; break;
|
||||||
|
case OP_DIV: tm = TM_DIV; break;
|
||||||
|
case OP_MOD: tm = TM_MOD; break;
|
||||||
|
case OP_POW: tm = TM_POW; break;
|
||||||
|
case OP_UNM: tm = TM_UNM; break;
|
||||||
|
case OP_LEN: tm = TM_LEN; break;
|
||||||
|
case OP_LT: tm = TM_LT; break;
|
||||||
|
case OP_LE: tm = TM_LE; break;
|
||||||
|
case OP_CONCAT: tm = TM_CONCAT; break;
|
||||||
|
default:
|
||||||
|
return NULL; /* else no useful name can be found */
|
||||||
|
}
|
||||||
|
*name = getstr(G(L)->tmname[tm]);
|
||||||
|
return "metamethod";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -55,8 +55,8 @@ struct lua_longjmp {
|
|||||||
|
|
||||||
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
|
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
|
||||||
switch (lerrcode) {
|
switch (lerrcode) {
|
||||||
case LUA_ERRMEM: {
|
case LUA_ERRMEM: { /* memory error? */
|
||||||
setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
|
setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case LUA_ERRERR: {
|
case LUA_ERRERR: {
|
||||||
@@ -164,7 +164,7 @@ void luaD_reallocCI (lua_State *L, int newsize) {
|
|||||||
|
|
||||||
|
|
||||||
void luaD_growstack (lua_State *L, int n) {
|
void luaD_growstack (lua_State *L, int n) {
|
||||||
if (l_likely(n <= L->stacksize)) /* double size is enough? */
|
if (n <= L->stacksize) /* double size is enough? */
|
||||||
luaD_reallocstack(L, 2*L->stacksize);
|
luaD_reallocstack(L, 2*L->stacksize);
|
||||||
else
|
else
|
||||||
luaD_reallocstack(L, L->stacksize + n);
|
luaD_reallocstack(L, L->stacksize + n);
|
||||||
@@ -318,7 +318,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
|
|||||||
ci->top = L->top + LUA_MINSTACK;
|
ci->top = L->top + LUA_MINSTACK;
|
||||||
lua_assert(ci->top <= L->stack_last);
|
lua_assert(ci->top <= L->stack_last);
|
||||||
ci->nresults = nresults;
|
ci->nresults = nresults;
|
||||||
if (L->hookmask & LUA_MASKCALL)
|
if (l_unlikely(L->hookmask & LUA_MASKCALL))
|
||||||
luaD_callhook(L, LUA_HOOKCALL, -1);
|
luaD_callhook(L, LUA_HOOKCALL, -1);
|
||||||
lua_unlock(L);
|
lua_unlock(L);
|
||||||
n = (*curr_func(L)->c.f)(L); /* do the actual call */
|
n = (*curr_func(L)->c.f)(L); /* do the actual call */
|
||||||
|
|||||||
+33
-24
@@ -58,12 +58,6 @@ static int pushresult (lua_State *L, int i, const char *filename) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void fileerror (lua_State *L, int arg, const char *filename) {
|
|
||||||
lua_pushfstring(L, "%s: %s", filename, strerror(errno));
|
|
||||||
luaL_argerror(L, arg, lua_tostring(L, -1));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#define tofilep(L) ((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
|
#define tofilep(L) ((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
|
||||||
|
|
||||||
|
|
||||||
@@ -165,6 +159,24 @@ static int StartsWith(const char *a, const char *b) // this is wolfs being lazy
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
** Equivalent to 'fopen', but if it fails due to a lack of resources
|
||||||
|
** (see 'luaL_resourcetryagain'), do an "emergency" garbage collection to try
|
||||||
|
** to close some files and then tries to open the file again.
|
||||||
|
*/
|
||||||
|
static FILE *trytoopen (lua_State *L, const char *path, const char *mode) {
|
||||||
|
FILE *f = fopen(path, mode);
|
||||||
|
if (f == NULL && luaL_resourcetryagain(L)) /* resource failure? */
|
||||||
|
f = fopen(path, mode); /* try to open again */
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void opencheck (lua_State *L, const char *fname, const char *mode) {
|
||||||
|
FILE **p = newfile(L);
|
||||||
|
*p = trytoopen(L, fname, mode);
|
||||||
|
if (l_unlikely(*p == NULL))
|
||||||
|
luaL_error(L, "cannot open file '%s' (%s)", fname, strerror(errno));
|
||||||
|
}
|
||||||
|
|
||||||
static int io_open(lua_State *L)
|
static int io_open(lua_State *L)
|
||||||
{
|
{
|
||||||
@@ -212,7 +224,7 @@ static int io_open(lua_State *L)
|
|||||||
}
|
}
|
||||||
|
|
||||||
pf = newfile(L);
|
pf = newfile(L);
|
||||||
*pf = fopen(destFilename, mode);
|
*pf = trytoopen(L, destFilename, mode);
|
||||||
return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
|
return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -220,6 +232,8 @@ static int io_open(lua_State *L)
|
|||||||
static int io_tmpfile (lua_State *L) {
|
static int io_tmpfile (lua_State *L) {
|
||||||
FILE **pf = newfile(L);
|
FILE **pf = newfile(L);
|
||||||
*pf = tmpfile();
|
*pf = tmpfile();
|
||||||
|
if (*pf == NULL && luaL_resourcetryagain(L)) /* resource failure? */
|
||||||
|
*pf = tmpfile(); /* try to open again */
|
||||||
return (*pf == NULL) ? pushresult(L, 0, NULL) : 1;
|
return (*pf == NULL) ? pushresult(L, 0, NULL) : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,10 +252,7 @@ static int g_iofile (lua_State *L, int f, const char *mode) {
|
|||||||
if (!lua_isnoneornil(L, 1)) {
|
if (!lua_isnoneornil(L, 1)) {
|
||||||
const char *filename = lua_tostring(L, 1);
|
const char *filename = lua_tostring(L, 1);
|
||||||
if (filename) {
|
if (filename) {
|
||||||
FILE **pf = newfile(L);
|
opencheck(L, filename, mode);
|
||||||
*pf = fopen(filename, mode);
|
|
||||||
if (l_unlikely(*pf == NULL))
|
|
||||||
fileerror(L, 1, filename);
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
tofile(L); /* check that it's a valid file handle */
|
tofile(L); /* check that it's a valid file handle */
|
||||||
@@ -290,10 +301,7 @@ static int io_lines (lua_State *L) {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
const char *filename = luaL_checkstring(L, 1);
|
const char *filename = luaL_checkstring(L, 1);
|
||||||
FILE **pf = newfile(L);
|
opencheck(L, filename, "r");
|
||||||
*pf = fopen(filename, "r");
|
|
||||||
if (l_unlikely(*pf == NULL))
|
|
||||||
fileerror(L, 1, filename);
|
|
||||||
aux_lines(L, lua_gettop(L), 1);
|
aux_lines(L, lua_gettop(L), 1);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -348,20 +356,21 @@ static int read_line (lua_State *L, FILE *f) {
|
|||||||
|
|
||||||
|
|
||||||
static int read_chars (lua_State *L, FILE *f, size_t n) {
|
static int read_chars (lua_State *L, FILE *f, size_t n) {
|
||||||
size_t rlen; /* how much to read */
|
size_t tbr = n; /* number of chars to be read */
|
||||||
size_t nr; /* number of chars actually read */
|
size_t rlen; /* how much to read in each cycle */
|
||||||
|
size_t nr; /* number of chars actually read in each cycle */
|
||||||
luaL_Buffer b;
|
luaL_Buffer b;
|
||||||
luaL_buffinit(L, &b);
|
luaL_buffinit(L, &b);
|
||||||
rlen = LUAL_BUFFERSIZE; /* try to read that much each time */
|
rlen = LUAL_BUFFERSIZE; /* try to read that much each time */
|
||||||
do {
|
do {
|
||||||
char *p = luaL_prepbuffer(&b);
|
char *p = luaL_prepbuffer(&b);
|
||||||
if (rlen > n) rlen = n; /* cannot read more than asked */
|
if (rlen > tbr) rlen = tbr; /* cannot read more than asked */
|
||||||
nr = fread(p, sizeof(char), rlen, f);
|
nr = fread(p, sizeof(char), rlen, f);
|
||||||
luaL_addsize(&b, nr);
|
luaL_addsize(&b, nr);
|
||||||
n -= nr; /* still have to read `n' chars */
|
tbr -= nr; /* still have to read 'tbr' chars */
|
||||||
} while (n > 0 && nr == rlen); /* until end of count or eof */
|
} while (tbr > 0 && nr == rlen); /* until end of count or eof */
|
||||||
luaL_pushresult(&b); /* close buffer */
|
luaL_pushresult(&b); /* close buffer */
|
||||||
return (n == 0 || lua_objlen(L, -1) > 0);
|
return (tbr == 0 || tbr < n); /* true iff read something */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -424,13 +433,13 @@ static int f_read (lua_State *L) {
|
|||||||
|
|
||||||
static int io_readline (lua_State *L) {
|
static int io_readline (lua_State *L) {
|
||||||
FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(1));
|
FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(1));
|
||||||
int sucess;
|
int success;
|
||||||
if (f == NULL) /* file is already closed? */
|
if (f == NULL) /* file is already closed? */
|
||||||
luaL_error(L, "file is already closed");
|
luaL_error(L, "file is already closed");
|
||||||
sucess = read_line(L, f);
|
success = read_line(L, f);
|
||||||
if (ferror(f))
|
if (ferror(f))
|
||||||
return luaL_error(L, "%s", strerror(errno));
|
return luaL_error(L, "%s", strerror(errno));
|
||||||
if (sucess) return 1;
|
if (success) return 1;
|
||||||
else { /* EOF */
|
else { /* EOF */
|
||||||
if (lua_toboolean(L, lua_upvalueindex(2))) { /* generator created file? */
|
if (lua_toboolean(L, lua_upvalueindex(2))) { /* generator created file? */
|
||||||
lua_settop(L, 0);
|
lua_settop(L, 0);
|
||||||
|
|||||||
@@ -13,8 +13,6 @@
|
|||||||
#include "llimits.h"
|
#include "llimits.h"
|
||||||
#include "lua.h"
|
#include "lua.h"
|
||||||
|
|
||||||
#define MEMERRMSG "not enough memory"
|
|
||||||
|
|
||||||
|
|
||||||
#define luaM_reallocv(L,b,on,n,e) \
|
#define luaM_reallocv(L,b,on,n,e) \
|
||||||
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
|
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
|
||||||
|
|||||||
+1
-1
@@ -143,7 +143,7 @@ const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
|
|||||||
}
|
}
|
||||||
case 'p': {
|
case 'p': {
|
||||||
char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
|
char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
|
||||||
sprintf(buff, "%p", va_arg(argp, void *));
|
snprintf(buff, sizeof(buff), "%p", va_arg(argp, void *));
|
||||||
pushstr(L, buff);
|
pushstr(L, buff);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -881,10 +881,10 @@ static const struct {
|
|||||||
lu_byte right; /* right priority */
|
lu_byte right; /* right priority */
|
||||||
} priority[] = { /* ORDER OPR */
|
} priority[] = { /* ORDER OPR */
|
||||||
{6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `/' `%' */
|
{6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `/' `%' */
|
||||||
{10, 9}, {5, 4}, /* power and concat (right associative) */
|
{10, 9}, {5, 4}, /* ^, .. (right associative) */
|
||||||
{3, 3}, {3, 3}, /* equality and inequality */
|
{3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */
|
||||||
{3, 3}, {3, 3}, {3, 3}, {3, 3}, /* order */
|
{3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */
|
||||||
{2, 2}, {1, 1} /* logical (and/or) */
|
{2, 2}, {1, 1} /* and, or */
|
||||||
,{6, 6}, {6, 6}, {6, 6}, /* bit-wise (band/bor/bxor) */
|
,{6, 6}, {6, 6}, {6, 6}, /* bit-wise (band/bor/bxor) */
|
||||||
{7, 7}, {7, 7} /* shl/shr */
|
{7, 7}, {7, 7} /* shl/shr */
|
||||||
};
|
};
|
||||||
|
|||||||
+6
-1
@@ -64,6 +64,9 @@ static void freestack (lua_State *L, lua_State *L1) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#define MEMERRMSG "not enough memory"
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** open parts that may cause memory-allocation errors
|
** open parts that may cause memory-allocation errors
|
||||||
*/
|
*/
|
||||||
@@ -76,7 +79,9 @@ static void f_luaopen (lua_State *L, void *ud) {
|
|||||||
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
|
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
|
||||||
luaT_init(L);
|
luaT_init(L);
|
||||||
luaX_init(L);
|
luaX_init(L);
|
||||||
luaS_fix(luaS_newliteral(L, MEMERRMSG));
|
/* pre-create memory-error message */
|
||||||
|
g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
|
||||||
|
luaS_fix(g->memerrmsg); /* it should never be collected */
|
||||||
g->GCthreshold = 4*g->totalbytes;
|
g->GCthreshold = 4*g->totalbytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ typedef struct global_State {
|
|||||||
lua_CFunction panic; /* to be called in unprotected errors */
|
lua_CFunction panic; /* to be called in unprotected errors */
|
||||||
TValue l_registry;
|
TValue l_registry;
|
||||||
struct lua_State *mainthread;
|
struct lua_State *mainthread;
|
||||||
|
TString *memerrmsg; /* memory-error message */
|
||||||
UpVal uvhead; /* head of double-linked list of all open upvalues */
|
UpVal uvhead; /* head of double-linked list of all open upvalues */
|
||||||
struct Table *mt[NUM_TAGS]; /* metatables for basic types */
|
struct Table *mt[NUM_TAGS]; /* metatables for basic types */
|
||||||
TString *tmname[TM_N]; /* array with tag-method names */
|
TString *tmname[TM_N]; /* array with tag-method names */
|
||||||
|
|||||||
+58
-4
@@ -51,7 +51,7 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
|
|||||||
unsigned int h) {
|
unsigned int h) {
|
||||||
TString *ts;
|
TString *ts;
|
||||||
stringtable *tb;
|
stringtable *tb;
|
||||||
if (l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
|
if (l_unlikely(l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char)))
|
||||||
luaM_toobig(L);
|
luaM_toobig(L);
|
||||||
ts = cast(TString *, luaM_malloc(L, (l+1)*sizeof(char)+sizeof(TString)));
|
ts = cast(TString *, luaM_malloc(L, (l+1)*sizeof(char)+sizeof(TString)));
|
||||||
ts->tsv.len = l;
|
ts->tsv.len = l;
|
||||||
@@ -72,18 +72,72 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
// string hash taken from luaJIT
|
||||||
GCObject *o;
|
|
||||||
|
/* Unaligned load of uint32_t. */
|
||||||
|
static inline __attribute__((always_inline)) uint32_t getu32(const void* ptr)
|
||||||
|
{
|
||||||
|
uint32_t result;
|
||||||
|
memcpy(&result, ptr, 4);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// smol macro to look a little less messy lul
|
||||||
|
#define getu8(p) *cast(const uint8_t *, p)
|
||||||
|
|
||||||
|
/* Keyed sparse ARX string hash. Constant time. */
|
||||||
|
static unsigned hash_sparse(const char *str, size_t len)
|
||||||
|
{
|
||||||
|
/* Constants taken from lookup3 hash by Bob Jenkins. */
|
||||||
|
unsigned int a, b, h = cast(unsigned int, len);
|
||||||
|
#define rol(x, n) (((x)<<(n)) | ((x)>>(-cast(int, n)&(8*sizeof(x)-1))))
|
||||||
|
if (len >= 4) { /* Caveat: unaligned access! */
|
||||||
|
a = getu32(str);
|
||||||
|
h ^= getu32(str+len-4);
|
||||||
|
b = getu32(str+(len>>1)-2);
|
||||||
|
h ^= b; h -= rol(b, 14);
|
||||||
|
b += getu32(str+(len>>2)-1);
|
||||||
|
} else if (len > 0) {
|
||||||
|
a = getu8(str);
|
||||||
|
h ^= getu8(str+len-1);
|
||||||
|
b = getu8(str+(len>>1));
|
||||||
|
h ^= b; h -= rol(b, 14);
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
a ^= h; a -= rol(h, 11);
|
||||||
|
b ^= a; b -= rol(a, 25);
|
||||||
|
h ^= b; h -= rol(b, 16);
|
||||||
|
#undef rol
|
||||||
|
return h;
|
||||||
|
}
|
||||||
|
|
||||||
|
#undef getu8
|
||||||
|
|
||||||
|
|
||||||
|
static inline __attribute__((always_inline)) unsigned luaS_hash (const char *str, size_t l) {
|
||||||
|
#if 0
|
||||||
unsigned int h = cast(unsigned int, l); /* seed */
|
unsigned int h = cast(unsigned int, l); /* seed */
|
||||||
size_t step = (l>>5)+1; /* if string is too long, don't hash all its chars */
|
size_t step = (l>>5)+1; /* if string is too long, don't hash all its chars */
|
||||||
size_t l1;
|
size_t l1;
|
||||||
for (l1=l; l1>=step; l1-=step) /* compute hash */
|
for (l1=l; l1>=step; l1-=step) /* compute hash */
|
||||||
h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1]));
|
h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1]));
|
||||||
|
return h;
|
||||||
|
#else
|
||||||
|
return hash_sparse(str, l);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
||||||
|
GCObject *o;
|
||||||
|
unsigned int h = luaS_hash(str, l);
|
||||||
for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
|
for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
|
||||||
o != NULL;
|
o != NULL;
|
||||||
o = o->gch.next) {
|
o = o->gch.next) {
|
||||||
TString *ts = rawgco2ts(o);
|
TString *ts = rawgco2ts(o);
|
||||||
if (l_unlikely(ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0))) {
|
if (ts->tsv.hash == h &&
|
||||||
|
ts->tsv.len == l &&
|
||||||
|
(memcmp(str, getstr(ts), l) == 0)) {
|
||||||
/* string may be dead */
|
/* string may be dead */
|
||||||
if (isdead(G(L), o)) changewhite(o);
|
if (isdead(G(L), o)) changewhite(o);
|
||||||
return ts;
|
return ts;
|
||||||
|
|||||||
+7
-7
@@ -527,7 +527,7 @@ static int str_find_aux (lua_State *L, int find) {
|
|||||||
if (find) {
|
if (find) {
|
||||||
lua_pushinteger(L, s1-s+1); /* start */
|
lua_pushinteger(L, s1-s+1); /* start */
|
||||||
lua_pushinteger(L, res-s); /* end */
|
lua_pushinteger(L, res-s); /* end */
|
||||||
return push_captures(&ms, NULL, 0) + 2;
|
return push_captures(&ms, NULL, NULL) + 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return push_captures(&ms, s1, res);
|
return push_captures(&ms, s1, res);
|
||||||
@@ -776,23 +776,23 @@ static int str_format (lua_State *L) {
|
|||||||
strfrmt = scanformat(L, strfrmt, form);
|
strfrmt = scanformat(L, strfrmt, form);
|
||||||
switch (*strfrmt++) {
|
switch (*strfrmt++) {
|
||||||
case 'c': {
|
case 'c': {
|
||||||
sprintf(buff, form, (int)luaL_checknumber(L, arg));
|
snprintf(buff, sizeof(buff), form, (int)luaL_checknumber(L, arg));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'd': case 'i': {
|
case 'd': case 'i': {
|
||||||
addintlen(form);
|
addintlen(form);
|
||||||
sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
|
snprintf(buff, sizeof(buff), form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'o': case 'u': case 'x': case 'X': {
|
case 'o': case 'u': case 'x': case 'X': {
|
||||||
addintlen(form);
|
addintlen(form);
|
||||||
sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
|
snprintf(buff, sizeof(buff), form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'e': case 'E': case 'f':
|
case 'e': case 'E': case 'f':
|
||||||
case 'g': case 'G': {
|
case 'g': case 'G': {
|
||||||
lua_Number n = luaL_checknumber(L, arg);
|
lua_Number n = luaL_checknumber(L, arg);
|
||||||
sprintf(buff, form, (double)n);
|
snprintf(buff, sizeof(buff), form, (double)n);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'q': {
|
case 'q': {
|
||||||
@@ -810,7 +810,7 @@ static int str_format (lua_State *L) {
|
|||||||
continue; /* skip the `addsize' at the end */
|
continue; /* skip the `addsize' at the end */
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
sprintf(buff, form, s);
|
snprintf(buff, sizeof(buff), form, s);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ static /*const*/ Node dummynode_ = {
|
|||||||
/*
|
/*
|
||||||
** hash for lua_Numbers
|
** hash for lua_Numbers
|
||||||
*/
|
*/
|
||||||
|
#if 0
|
||||||
static Node *hashnum (const Table *t, lua_Number n) {
|
static Node *hashnum (const Table *t, lua_Number n) {
|
||||||
unsigned int a[numints];
|
unsigned int a[numints];
|
||||||
int i;
|
int i;
|
||||||
@@ -90,6 +91,12 @@ static Node *hashnum (const Table *t, lua_Number n) {
|
|||||||
for (i = 1; i < numints; i++) a[0] += a[i];
|
for (i = 1; i < numints; i++) a[0] += a[i];
|
||||||
return hashmod(t, a[0]);
|
return hashmod(t, a[0]);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
// our lua_Number is just typedef´d int32 so no need to do any of the above
|
||||||
|
static inline Node *hashnum (const Table *t, lua_Number n) {
|
||||||
|
return hashmod(t, cast(unsigned int, n));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -536,7 +536,7 @@
|
|||||||
#define LUA_NUMBER_SCAN "%d"
|
#define LUA_NUMBER_SCAN "%d"
|
||||||
#define LUA_NUMBER_FMT "%d"
|
#define LUA_NUMBER_FMT "%d"
|
||||||
#endif
|
#endif
|
||||||
#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n))
|
#define lua_number2str(s,n) snprintf((s), LUAI_MAXNUMBER2STR, LUA_NUMBER_FMT, (n))
|
||||||
#define LUAI_MAXNUMBER2STR 12 /* 10 digits, sign, and \0 */
|
#define LUAI_MAXNUMBER2STR 12 /* 10 digits, sign, and \0 */
|
||||||
#define lua_str2number(s,p) ({ \
|
#define lua_str2number(s,p) ({ \
|
||||||
long nmr = strtol((s), (p), 10); \
|
long nmr = strtol((s), (p), 10); \
|
||||||
@@ -772,10 +772,10 @@ union luai_Cast { double l_d; long l_l; };
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
#define l_likely(x) (__builtin_expect(((x) != 0), 1))
|
#define l_likely(x) (__builtin_expect(!!(x), 1))
|
||||||
#define l_unlikely(x) (__builtin_expect(((x) != 0), 0))
|
#define l_unlikely(x) (__builtin_expect(!!(x), 0))
|
||||||
#else
|
#else
|
||||||
#define l_likely(x) (x)
|
#define l_likely(x) (x)
|
||||||
#define l_unlikely(x) (x)
|
#define l_unlikely(x) (x)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+48
-16
@@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* limit for table tag-method chains (to avoid loops) */
|
/* limit for table tag-method chains (to avoid infinite loops) */
|
||||||
#define MAXTAGLOOP 100
|
#define MAXTAGLOOP 100
|
||||||
|
|
||||||
|
|
||||||
@@ -366,6 +366,7 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
|
|||||||
|
|
||||||
|
|
||||||
#define arith_op(op,tm) { \
|
#define arith_op(op,tm) { \
|
||||||
|
StkId ra = RA(i); \
|
||||||
TValue *rb = RKB(i); \
|
TValue *rb = RKB(i); \
|
||||||
TValue *rc = RKC(i); \
|
TValue *rc = RKC(i); \
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) { \
|
if (ttisnumber(rb) && ttisnumber(rc)) { \
|
||||||
@@ -392,7 +393,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
/* main loop of interpreter */
|
/* main loop of interpreter */
|
||||||
for (;;) {
|
for (;;) {
|
||||||
const Instruction i = *pc++;
|
const Instruction i = *pc++;
|
||||||
StkId ra;
|
|
||||||
if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
|
if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
|
||||||
(--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
|
(--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
|
||||||
traceexec(L, pc);
|
traceexec(L, pc);
|
||||||
@@ -402,26 +402,28 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
base = L->base;
|
base = L->base;
|
||||||
}
|
}
|
||||||
/* warning!! several calls may realloc the stack and invalidate `ra' */
|
|
||||||
ra = RA(i);
|
|
||||||
lua_assert(base == L->base && L->base == L->ci->base);
|
lua_assert(base == L->base && L->base == L->ci->base);
|
||||||
lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
|
lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
|
||||||
lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
|
lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
|
||||||
switch (GET_OPCODE(i)) {
|
switch (GET_OPCODE(i)) {
|
||||||
case OP_MOVE: {
|
case OP_MOVE: {
|
||||||
|
StkId ra = RA(i);
|
||||||
setobjs2s(L, ra, RB(i));
|
setobjs2s(L, ra, RB(i));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADK: {
|
case OP_LOADK: {
|
||||||
|
StkId ra = RA(i);
|
||||||
setobj2s(L, ra, KBx(i));
|
setobj2s(L, ra, KBx(i));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADBOOL: {
|
case OP_LOADBOOL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
setbvalue(ra, GETARG_B(i));
|
setbvalue(ra, GETARG_B(i));
|
||||||
if (GETARG_C(i)) pc++; /* skip next instruction (if C) */
|
if (GETARG_C(i)) pc++; /* skip next instruction (if C) */
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADNIL: {
|
case OP_LOADNIL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
do {
|
do {
|
||||||
setnilvalue(rb--);
|
setnilvalue(rb--);
|
||||||
@@ -429,11 +431,13 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETUPVAL: {
|
case OP_GETUPVAL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
setobj2s(L, ra, cl->upvals[b]->v);
|
setobj2s(L, ra, cl->upvals[b]->v);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETGLOBAL: {
|
case OP_GETGLOBAL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue g;
|
TValue g;
|
||||||
TValue *rb = KBx(i);
|
TValue *rb = KBx(i);
|
||||||
sethvalue(L, &g, cl->env);
|
sethvalue(L, &g, cl->env);
|
||||||
@@ -442,10 +446,14 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETTABLE: {
|
case OP_GETTABLE: {
|
||||||
Protect(luaV_gettable(L, RB(i), RKC(i), ra));
|
StkId ra = RA(i);
|
||||||
|
StkId rb = RB(i);
|
||||||
|
TValue *rc = RKC(i);
|
||||||
|
Protect(luaV_gettable(L, rb, rc, ra));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETGLOBAL: {
|
case OP_SETGLOBAL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue g;
|
TValue g;
|
||||||
sethvalue(L, &g, cl->env);
|
sethvalue(L, &g, cl->env);
|
||||||
lua_assert(ttisstring(KBx(i)));
|
lua_assert(ttisstring(KBx(i)));
|
||||||
@@ -453,16 +461,21 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETUPVAL: {
|
case OP_SETUPVAL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
UpVal *uv = cl->upvals[GETARG_B(i)];
|
UpVal *uv = cl->upvals[GETARG_B(i)];
|
||||||
setobj(L, uv->v, ra);
|
setobj(L, uv->v, ra);
|
||||||
luaC_barrier(L, uv, ra);
|
luaC_barrier(L, uv, ra);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETTABLE: {
|
case OP_SETTABLE: {
|
||||||
Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
|
StkId ra = RA(i);
|
||||||
|
TValue *rb = RKB(i);
|
||||||
|
TValue *rc = RKC(i);
|
||||||
|
Protect(luaV_settable(L, ra, rb, rc));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_NEWTABLE: {
|
case OP_NEWTABLE: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
int c = GETARG_C(i);
|
int c = GETARG_C(i);
|
||||||
sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
|
sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
|
||||||
@@ -470,6 +483,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SELF: {
|
case OP_SELF: {
|
||||||
|
StkId ra = RA(i);
|
||||||
StkId rb = RB(i);
|
StkId rb = RB(i);
|
||||||
setobjs2s(L, ra+1, rb);
|
setobjs2s(L, ra+1, rb);
|
||||||
Protect(luaV_gettable(L, rb, RKC(i), ra));
|
Protect(luaV_gettable(L, rb, RKC(i), ra));
|
||||||
@@ -488,6 +502,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_DIV: {
|
case OP_DIV: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RKB(i);
|
TValue *rb = RKB(i);
|
||||||
TValue *rc = RKC(i);
|
TValue *rc = RKC(i);
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) {
|
if (ttisnumber(rb) && ttisnumber(rc)) {
|
||||||
@@ -503,6 +518,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_MOD: {
|
case OP_MOD: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RKB(i);
|
TValue *rb = RKB(i);
|
||||||
TValue *rc = RKC(i);
|
TValue *rc = RKC(i);
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) {
|
if (ttisnumber(rb) && ttisnumber(rc)) {
|
||||||
@@ -522,26 +538,27 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BAND: {
|
case OP_BAND: {
|
||||||
arith_op(luai_numand, TM_AND);
|
arith_op(luai_numand, TM_AND);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BOR: {
|
case OP_BOR: {
|
||||||
arith_op(luai_numor, TM_OR);
|
arith_op(luai_numor, TM_OR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BXOR: {
|
case OP_BXOR: {
|
||||||
arith_op(luai_numxor, TM_XOR);
|
arith_op(luai_numxor, TM_XOR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BSHL: {
|
case OP_BSHL: {
|
||||||
arith_op(luai_numshl, TM_SHL);
|
arith_op(luai_numshl, TM_SHL);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BSHR: {
|
case OP_BSHR: {
|
||||||
arith_op(luai_numshr, TM_SHR);
|
arith_op(luai_numshr, TM_SHR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BNOT: {
|
case OP_BNOT: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (ttisnumber(rb)) {
|
if (ttisnumber(rb)) {
|
||||||
lua_Number nb = nvalue(rb);
|
lua_Number nb = nvalue(rb);
|
||||||
@@ -553,6 +570,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_UNM: {
|
case OP_UNM: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (ttisnumber(rb)) {
|
if (ttisnumber(rb)) {
|
||||||
lua_Number nb = nvalue(rb);
|
lua_Number nb = nvalue(rb);
|
||||||
@@ -564,11 +582,13 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_NOT: {
|
case OP_NOT: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int res = l_isfalse(RB(i)); /* next assignment may change this value */
|
int res = l_isfalse(RB(i)); /* next assignment may change this value */
|
||||||
setbvalue(ra, res);
|
setbvalue(ra, res);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LEN: {
|
case OP_LEN: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
switch (ttype(rb)) {
|
switch (ttype(rb)) {
|
||||||
case LUA_TTABLE: {
|
case LUA_TTABLE: {
|
||||||
@@ -626,12 +646,14 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TEST: {
|
case OP_TEST: {
|
||||||
|
StkId ra = RA(i);
|
||||||
if (l_isfalse(ra) != GETARG_C(i))
|
if (l_isfalse(ra) != GETARG_C(i))
|
||||||
dojump(L, pc, GETARG_sBx(*pc));
|
dojump(L, pc, GETARG_sBx(*pc));
|
||||||
pc++;
|
pc++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TESTSET: {
|
case OP_TESTSET: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (l_isfalse(rb) != GETARG_C(i)) {
|
if (l_isfalse(rb) != GETARG_C(i)) {
|
||||||
setobjs2s(L, ra, rb);
|
setobjs2s(L, ra, rb);
|
||||||
@@ -641,6 +663,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CALL: {
|
case OP_CALL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
int nresults = GETARG_C(i) - 1;
|
int nresults = GETARG_C(i) - 1;
|
||||||
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
||||||
@@ -662,6 +685,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_TAILCALL: {
|
case OP_TAILCALL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
||||||
L->savedpc = pc;
|
L->savedpc = pc;
|
||||||
@@ -694,6 +718,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_RETURN: {
|
case OP_RETURN: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
if (b != 0) L->top = ra+b-1;
|
if (b != 0) L->top = ra+b-1;
|
||||||
if (L->openupval) luaF_close(L, base);
|
if (L->openupval) luaF_close(L, base);
|
||||||
@@ -709,6 +734,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_FORLOOP: {
|
case OP_FORLOOP: {
|
||||||
|
StkId ra = RA(i);
|
||||||
lua_Number step = nvalue(ra+2);
|
lua_Number step = nvalue(ra+2);
|
||||||
lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
|
lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
|
||||||
lua_Number limit = nvalue(ra+1);
|
lua_Number limit = nvalue(ra+1);
|
||||||
@@ -721,6 +747,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_FORPREP: {
|
case OP_FORPREP: {
|
||||||
|
StkId ra = RA(i);
|
||||||
const TValue *init = ra;
|
const TValue *init = ra;
|
||||||
const TValue *plimit = ra+1;
|
const TValue *plimit = ra+1;
|
||||||
const TValue *pstep = ra+2;
|
const TValue *pstep = ra+2;
|
||||||
@@ -737,6 +764,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TFORLOOP: {
|
case OP_TFORLOOP: {
|
||||||
|
StkId ra = RA(i);
|
||||||
StkId cb = ra + 3; /* call base */
|
StkId cb = ra + 3; /* call base */
|
||||||
setobjs2s(L, cb+2, ra+2);
|
setobjs2s(L, cb+2, ra+2);
|
||||||
setobjs2s(L, cb+1, ra+1);
|
setobjs2s(L, cb+1, ra+1);
|
||||||
@@ -753,6 +781,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETLIST: {
|
case OP_SETLIST: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int n = GETARG_B(i);
|
int n = GETARG_B(i);
|
||||||
int c = GETARG_C(i);
|
int c = GETARG_C(i);
|
||||||
int last;
|
int last;
|
||||||
@@ -775,10 +804,12 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CLOSE: {
|
case OP_CLOSE: {
|
||||||
|
StkId ra = RA(i);
|
||||||
luaF_close(L, ra);
|
luaF_close(L, ra);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CLOSURE: {
|
case OP_CLOSURE: {
|
||||||
|
StkId ra = RA(i);
|
||||||
Proto *p;
|
Proto *p;
|
||||||
Closure *ncl;
|
Closure *ncl;
|
||||||
int nup, j;
|
int nup, j;
|
||||||
@@ -799,6 +830,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_VARARG: {
|
case OP_VARARG: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i) - 1;
|
int b = GETARG_B(i) - 1;
|
||||||
int j;
|
int j;
|
||||||
CallInfo *ci = L->ci;
|
CallInfo *ci = L->ci;
|
||||||
|
|||||||
@@ -206,6 +206,15 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
|
|||||||
p += n; \
|
p += n; \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
#define WRITESKIN(p,b) WRITEUINT16(p,b)
|
||||||
|
#define READSKIN(p) READUINT16(p)
|
||||||
|
#else
|
||||||
|
#define WRITESKIN(p,b) WRITEUINT8(p,b)
|
||||||
|
#define READSKIN(p) READUINT8(p)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+116
-24
@@ -57,7 +57,6 @@ static void CV_EnforceExecVersion(void);
|
|||||||
static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr);
|
static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr);
|
||||||
|
|
||||||
static boolean CV_Command(void);
|
static boolean CV_Command(void);
|
||||||
consvar_t *CV_FindVar(const char *name);
|
|
||||||
static const char *CV_StringValue(const char *var_name);
|
static const char *CV_StringValue(const char *var_name);
|
||||||
static consvar_t *consvar_vars; // list of registered console variables
|
static consvar_t *consvar_vars; // list of registered console variables
|
||||||
|
|
||||||
@@ -114,18 +113,29 @@ static vsbuf_t com_text; // variable sized buffer
|
|||||||
* \param ptext The text to add.
|
* \param ptext The text to add.
|
||||||
* \sa COM_BufInsertText
|
* \sa COM_BufInsertText
|
||||||
*/
|
*/
|
||||||
void COM_BufAddText(const char *ptext)
|
void COM_BufAddTextEx(const char *ptext, size_t plen)
|
||||||
{
|
{
|
||||||
size_t l;
|
size_t l;
|
||||||
|
char *text;
|
||||||
|
|
||||||
l = strlen(ptext);
|
if (plen == 0)
|
||||||
|
plen = strlen(ptext);
|
||||||
|
|
||||||
|
text = Z_Malloc(sizeof(char) * (plen+1), PU_STATIC, NULL);
|
||||||
|
memcpy(text, ptext, plen);
|
||||||
|
text[plen] = '\0';
|
||||||
|
|
||||||
|
l = strlen(text);
|
||||||
|
|
||||||
if (com_text.cursize + l >= com_text.maxsize)
|
if (com_text.cursize + l >= com_text.maxsize)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Command buffer full!\n"));
|
CONS_Alert(CONS_WARNING, M_GetText("Command buffer full!\n"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
VS_Write(&com_text, ptext, l);
|
|
||||||
|
VS_Write(&com_text, text, l);
|
||||||
|
|
||||||
|
Z_Free(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Adds command text and executes it immediately.
|
/** Adds command text and executes it immediately.
|
||||||
@@ -133,8 +143,10 @@ void COM_BufAddText(const char *ptext)
|
|||||||
* \param ptext The text to execute. A newline is automatically added.
|
* \param ptext The text to execute. A newline is automatically added.
|
||||||
* \sa COM_BufAddText
|
* \sa COM_BufAddText
|
||||||
*/
|
*/
|
||||||
void COM_BufInsertText(const char *ptext)
|
void COM_BufInsertTextEx(const char *ptext, size_t plen)
|
||||||
{
|
{
|
||||||
|
const INT32 old_wait = com_wait;
|
||||||
|
|
||||||
char *temp = NULL;
|
char *temp = NULL;
|
||||||
size_t templen;
|
size_t templen;
|
||||||
|
|
||||||
@@ -146,10 +158,14 @@ void COM_BufInsertText(const char *ptext)
|
|||||||
VS_Clear(&com_text);
|
VS_Clear(&com_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
com_wait = 0;
|
||||||
|
|
||||||
// add the entire text of the file (or alias)
|
// add the entire text of the file (or alias)
|
||||||
COM_BufAddText(ptext);
|
COM_BufAddTextEx(ptext, plen);
|
||||||
COM_BufExecute(); // do it right away
|
COM_BufExecute(); // do it right away
|
||||||
|
|
||||||
|
com_wait += old_wait;
|
||||||
|
|
||||||
// add the copied off data
|
// add the copied off data
|
||||||
if (templen)
|
if (templen)
|
||||||
{
|
{
|
||||||
@@ -160,8 +176,7 @@ void COM_BufInsertText(const char *ptext)
|
|||||||
|
|
||||||
/** Progress the wait timer and flush waiting console commands when ready.
|
/** Progress the wait timer and flush waiting console commands when ready.
|
||||||
*/
|
*/
|
||||||
void
|
void COM_BufTicker(void)
|
||||||
COM_BufTicker(void)
|
|
||||||
{
|
{
|
||||||
if (com_wait)
|
if (com_wait)
|
||||||
{
|
{
|
||||||
@@ -238,10 +253,13 @@ void COM_ImmedExecute(const char *ptext)
|
|||||||
char line[1024] = "";
|
char line[1024] = "";
|
||||||
INT32 quotes;
|
INT32 quotes;
|
||||||
|
|
||||||
while (i < strlen(ptext))
|
const size_t txtlength = strlen(ptext);
|
||||||
|
|
||||||
|
while (i < txtlength)
|
||||||
{
|
{
|
||||||
quotes = 0;
|
quotes = 0;
|
||||||
for (j = 0; i < strlen(ptext); i++,j++)
|
|
||||||
|
for (j = 0; i < txtlength; i++,j++)
|
||||||
{
|
{
|
||||||
if (ptext[i] == '\"' && !quotes && i > 0 && ptext[i-1] != ' ') // Malformed command
|
if (ptext[i] == '\"' && !quotes && i > 0 && ptext[i-1] != ' ') // Malformed command
|
||||||
return;
|
return;
|
||||||
@@ -653,7 +671,7 @@ static void COM_Alias_f(void)
|
|||||||
CONS_Printf(M_GetText("All aliases that start with \x87'%s'\x80 are:\n"), begin);
|
CONS_Printf(M_GetText("All aliases that start with \x87'%s'\x80 are:\n"), begin);
|
||||||
|
|
||||||
int count = 0;
|
int count = 0;
|
||||||
for (cmdalias_t *head = com_alias; head->next != NULL; head = head->next)
|
for (cmdalias_t *head = com_alias; head != NULL; head = head->next)
|
||||||
{
|
{
|
||||||
if (strncmp(begin, head->name, szBegin) == 0)
|
if (strncmp(begin, head->name, szBegin) == 0)
|
||||||
{
|
{
|
||||||
@@ -674,7 +692,7 @@ static void COM_Alias_f(void)
|
|||||||
/* Display alias subtext, show all aliases. */
|
/* Display alias subtext, show all aliases. */
|
||||||
CONS_Printf(M_GetText("alias <name> <command>: create a shortcut command that executes other command(s)\n"));
|
CONS_Printf(M_GetText("alias <name> <command>: create a shortcut command that executes other command(s)\n"));
|
||||||
|
|
||||||
for (cmdalias_t *head = com_alias; head->next != NULL; head = head->next)
|
for (cmdalias_t *head = com_alias; head != NULL; head = head->next)
|
||||||
{
|
{
|
||||||
CONS_Printf(alias_format, head->name, head->value);
|
CONS_Printf(alias_format, head->name, head->value);
|
||||||
}
|
}
|
||||||
@@ -1163,6 +1181,39 @@ void VS_Print(vsbuf_t *buf, const char *data)
|
|||||||
//
|
//
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
|
#define NAME cvar_map_t
|
||||||
|
#define KEY_TY const char *
|
||||||
|
#define VAL_TY consvar_t *
|
||||||
|
#define HASH_FN FNV1a_HashLowercaseString
|
||||||
|
#define CMPR_FN vt_cmpr_casestring
|
||||||
|
#include "verstable.h"
|
||||||
|
|
||||||
|
#define NAME netvar_map_t
|
||||||
|
#define KEY_TY UINT16
|
||||||
|
#define VAL_TY consvar_t *
|
||||||
|
#define HASH_FN vt_hash_integer
|
||||||
|
#define CMPR_FN vt_cmpr_integer
|
||||||
|
#include "verstable.h"
|
||||||
|
|
||||||
|
static cvar_map_t cvar_map;
|
||||||
|
static netvar_map_t netvar_map;
|
||||||
|
|
||||||
|
CONSTRUCTOR static void CV_InitMap(void)
|
||||||
|
{
|
||||||
|
// ensure the map is initialized
|
||||||
|
cvar_map_t_init(&cvar_map);
|
||||||
|
cvar_map_t_reserve(&cvar_map, 512);
|
||||||
|
|
||||||
|
netvar_map_t_init(&netvar_map);
|
||||||
|
netvar_map_t_reserve(&netvar_map, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
DESTRUCTOR static void CV_DestroyMap(void)
|
||||||
|
{
|
||||||
|
cvar_map_t_cleanup(&cvar_map);
|
||||||
|
netvar_map_t_cleanup(&netvar_map);
|
||||||
|
}
|
||||||
|
|
||||||
static const char *cv_null_string = "";
|
static const char *cv_null_string = "";
|
||||||
|
|
||||||
/** Searches if a variable has been registered.
|
/** Searches if a variable has been registered.
|
||||||
@@ -1173,11 +1224,17 @@ static const char *cv_null_string = "";
|
|||||||
*/
|
*/
|
||||||
consvar_t *CV_FindVar(const char *name)
|
consvar_t *CV_FindVar(const char *name)
|
||||||
{
|
{
|
||||||
consvar_t *cvar;
|
cvar_map_t_itr it = cvar_map_t_get(&cvar_map, name);
|
||||||
|
if (!cvar_map_t_is_end(it))
|
||||||
|
return it.data->val;
|
||||||
|
|
||||||
|
// fallback linear search
|
||||||
|
/*
|
||||||
|
consvar_t *cvar;
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (fasticmp(name,cvar->name))
|
if (fasticmp(name, cvar->name))
|
||||||
return cvar;
|
return cvar;
|
||||||
|
*/
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -1192,7 +1249,7 @@ consvar_t *CV_FindVar(const char *name)
|
|||||||
static inline UINT16 CV_ComputeNetid(const char *s)
|
static inline UINT16 CV_ComputeNetid(const char *s)
|
||||||
{
|
{
|
||||||
UINT16 ret = 0, i = 0;
|
UINT16 ret = 0, i = 0;
|
||||||
static UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53};
|
static const UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53};
|
||||||
|
|
||||||
while (*s)
|
while (*s)
|
||||||
{
|
{
|
||||||
@@ -1211,11 +1268,17 @@ static inline UINT16 CV_ComputeNetid(const char *s)
|
|||||||
*/
|
*/
|
||||||
static consvar_t *CV_FindNetVar(UINT16 netid)
|
static consvar_t *CV_FindNetVar(UINT16 netid)
|
||||||
{
|
{
|
||||||
|
netvar_map_t_itr it = netvar_map_t_get(&netvar_map, netid);
|
||||||
|
if (!netvar_map_t_is_end(it))
|
||||||
|
return it.data->val;
|
||||||
|
|
||||||
|
/*
|
||||||
consvar_t *cvar;
|
consvar_t *cvar;
|
||||||
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (cvar->netid == netid)
|
if (cvar->netid == netid)
|
||||||
return cvar;
|
return cvar;
|
||||||
|
*/
|
||||||
|
|
||||||
if (netid == 44542) // ouch this hack
|
if (netid == 44542) // ouch this hack
|
||||||
return &cv_karteliminatelast;
|
return &cv_karteliminatelast;
|
||||||
@@ -1281,6 +1344,11 @@ void CV_RegisterVar(consvar_t *variable)
|
|||||||
|
|
||||||
// the SetValue will set this bit
|
// the SetValue will set this bit
|
||||||
variable->flags &= ~CV_MODIFIED;
|
variable->flags &= ~CV_MODIFIED;
|
||||||
|
|
||||||
|
cvar_map_t_insert(&cvar_map, variable->name, variable);
|
||||||
|
|
||||||
|
if (variable->flags & CV_NETVAR)
|
||||||
|
netvar_map_t_insert(&netvar_map, variable->netid, variable);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Finds the string value of a console variable.
|
/** Finds the string value of a console variable.
|
||||||
@@ -1544,7 +1612,9 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
|
|||||||
// send only changed cvars ...
|
// send only changed cvars ...
|
||||||
// the client will reset all netvars to default before loading
|
// the client will reset all netvars to default before loading
|
||||||
WRITEUINT16(*p, 0x0000);
|
WRITEUINT16(*p, 0x0000);
|
||||||
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
|
{
|
||||||
if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid))
|
if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid))
|
||||||
{
|
{
|
||||||
WRITEUINT16(*p, cvar->netid);
|
WRITEUINT16(*p, cvar->netid);
|
||||||
@@ -1562,7 +1632,7 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
char buf[9];
|
char buf[9];
|
||||||
sprintf(buf, "%d", mapheaderinfo[gamemap - 1]->numlaps);
|
snprintf(buf, sizeof(buf), "%d", mapheaderinfo[gamemap - 1]->numlaps);
|
||||||
WRITESTRING(*p, buf);
|
WRITESTRING(*p, buf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1574,6 +1644,8 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
|
|||||||
WRITEUINT8(*p, false);
|
WRITEUINT8(*p, false);
|
||||||
++count;
|
++count;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
WRITEUINT16(count_p, count);
|
WRITEUINT16(count_p, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1586,9 +1658,21 @@ size_t CV_LoadNetVars(const UINT8 *bufstart)
|
|||||||
// prevent "invalid command received"
|
// prevent "invalid command received"
|
||||||
serverloading = true;
|
serverloading = true;
|
||||||
|
|
||||||
|
// we can use our netvar map instead of going through all cvars each time
|
||||||
|
netvar_map_t_itr it;
|
||||||
|
for (it = netvar_map_t_first(&netvar_map);
|
||||||
|
!netvar_map_t_is_end(it);
|
||||||
|
it = netvar_map_t_next(it))
|
||||||
|
{
|
||||||
|
cvar = it.data->val;
|
||||||
|
Setvalue(cvar, cvar->defaultvalue, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (cvar->flags & CV_NETVAR)
|
if (cvar->flags & CV_NETVAR)
|
||||||
Setvalue(cvar, cvar->defaultvalue, true);
|
Setvalue(cvar, cvar->defaultvalue, true);
|
||||||
|
*/
|
||||||
|
|
||||||
count = READUINT16(p);
|
count = READUINT16(p);
|
||||||
while (count--)
|
while (count--)
|
||||||
@@ -1655,6 +1739,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
|
|||||||
// send the value of the variable
|
// send the value of the variable
|
||||||
UINT8 buf[128];
|
UINT8 buf[128];
|
||||||
UINT8 *p = buf;
|
UINT8 *p = buf;
|
||||||
|
|
||||||
if (!(server || (IsPlayerAdmin(consoleplayer))))
|
if (!(server || (IsPlayerAdmin(consoleplayer))))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, "Only the server or admin can change: %s %s\n", var->name, var->string);
|
CONS_Alert(CONS_NOTICE, "Only the server or admin can change: %s %s\n", var->name, var->string);
|
||||||
@@ -1718,8 +1803,7 @@ void CV_StealthSet(consvar_t *var, const char *value)
|
|||||||
void CV_StealthSetValue(consvar_t *var, INT32 value)
|
void CV_StealthSetValue(consvar_t *var, INT32 value)
|
||||||
{
|
{
|
||||||
char val[32];
|
char val[32];
|
||||||
|
snprintf(val, sizeof(val), "%d", value);
|
||||||
sprintf(val, "%d", value);
|
|
||||||
CV_SetCVar(var, val, true);
|
CV_SetCVar(var, val, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1739,8 +1823,7 @@ void CV_Set(consvar_t *var, const char *value)
|
|||||||
void CV_SetValue(consvar_t *var, INT32 value)
|
void CV_SetValue(consvar_t *var, INT32 value)
|
||||||
{
|
{
|
||||||
char val[32];
|
char val[32];
|
||||||
|
snprintf(val, sizeof(val), "%d", value);
|
||||||
sprintf(val, "%d", value);
|
|
||||||
CV_SetCVar(var, val, false);
|
CV_SetCVar(var, val, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1791,7 +1874,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
|
|||||||
if (newvalue == oldvalue)
|
if (newvalue == oldvalue)
|
||||||
break; // don't loop forever if there's none of a certain gametype
|
break; // don't loop forever if there's none of a certain gametype
|
||||||
|
|
||||||
if (newvalue >= 0 && !mapheaderinfo[newvalue])
|
if (newvalue >= 0 && newvalue < NUMMAPS && !mapheaderinfo[newvalue])
|
||||||
continue; // Don't allocate the header. That just makes memory usage skyrocket.
|
continue; // Don't allocate the header. That just makes memory usage skyrocket.
|
||||||
|
|
||||||
} while (!M_CanShowLevelInList(newvalue, gt));
|
} while (!M_CanShowLevelInList(newvalue, gt));
|
||||||
@@ -2138,6 +2221,7 @@ void CV_SaveVariables(FILE *f)
|
|||||||
consvar_t *cvar;
|
consvar_t *cvar;
|
||||||
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
|
{
|
||||||
if (cvar->flags & CV_SAVE)
|
if (cvar->flags & CV_SAVE)
|
||||||
{
|
{
|
||||||
char stringtowrite[MAXTEXTCMD+1];
|
char stringtowrite[MAXTEXTCMD+1];
|
||||||
@@ -2146,15 +2230,23 @@ void CV_SaveVariables(FILE *f)
|
|||||||
if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
|
if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
|
||||||
{
|
{
|
||||||
if (cvar->flags & CV_FLOAT)
|
if (cvar->flags & CV_FLOAT)
|
||||||
sprintf(stringtowrite, "%f", FixedToFloat(cvar->value));
|
{
|
||||||
|
snprintf(stringtowrite, sizeof(stringtowrite), "%f", FixedToFloat(cvar->value));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
sprintf(stringtowrite, "%d", cvar->value);
|
{
|
||||||
|
snprintf(stringtowrite, sizeof(stringtowrite), "%d", cvar->value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
strcpy(stringtowrite, cvar->string);
|
{
|
||||||
|
strncpy(stringtowrite, cvar->string, sizeof(stringtowrite)-1);
|
||||||
|
stringtowrite[sizeof(stringtowrite)-1] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
fprintf(f, "%s \"%s\"\n", cvar->name, stringtowrite);
|
fprintf(f, "%s \"%s\"\n", cvar->name, stringtowrite);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//============================================================================
|
//============================================================================
|
||||||
|
|||||||
+7
-5
@@ -13,13 +13,13 @@
|
|||||||
#ifndef __COMMAND_H__
|
#ifndef __COMMAND_H__
|
||||||
#define __COMMAND_H__
|
#define __COMMAND_H__
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include "doomdef.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include "doomdef.h"
|
|
||||||
|
|
||||||
//===================================
|
//===================================
|
||||||
// Command buffer & command execution
|
// Command buffer & command execution
|
||||||
//===================================
|
//===================================
|
||||||
@@ -52,10 +52,12 @@ size_t COM_FirstOption(void);
|
|||||||
const char *COM_CompleteCommand(const char *partial, INT32 skips);
|
const char *COM_CompleteCommand(const char *partial, INT32 skips);
|
||||||
|
|
||||||
// insert at queu (at end of other command)
|
// insert at queu (at end of other command)
|
||||||
void COM_BufAddText(const char *btext);
|
#define COM_BufAddText(s) COM_BufAddTextEx(s, 0)
|
||||||
|
void COM_BufAddTextEx(const char *ptext, size_t plen);
|
||||||
|
|
||||||
// insert in head (before other command)
|
// insert in head (before other command)
|
||||||
void COM_BufInsertText(const char *btext);
|
#define COM_BufInsertText(s) COM_BufInsertTextEx(s, 0)
|
||||||
|
void COM_BufInsertTextEx(const char *ptext, size_t plen);
|
||||||
|
|
||||||
// don't bother inserting, just do immediately
|
// don't bother inserting, just do immediately
|
||||||
void COM_ImmedExecute(const char *ptext);
|
void COM_ImmedExecute(const char *ptext);
|
||||||
|
|||||||
+3
-38
@@ -11,21 +11,6 @@
|
|||||||
|
|
||||||
#ifdef CMAKECONFIG
|
#ifdef CMAKECONFIG
|
||||||
|
|
||||||
// Base SRB2 hashes
|
|
||||||
#define ASSET_HASH_SRB2_SRB "${SRB2_ASSET_srb2.srb_HASH}"
|
|
||||||
#ifdef USE_PATCH_DTA
|
|
||||||
#define ASSET_HASH_PATCH_DTA "${SRB2_ASSET_patch.dta_HASH}"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// SRB2Kart-specific hashes
|
|
||||||
#define ASSET_HASH_GFX_KART "${SRB2_ASSET_gfx.kart_HASH}"
|
|
||||||
#define ASSET_HASH_TEXTURES_KART "${SRB2_ASSET_textures.kart_HASH}"
|
|
||||||
#define ASSET_HASH_CHARS_KART "${SRB2_ASSET_chars.kart_HASH}"
|
|
||||||
#define ASSET_HASH_MAPS_KART "${SRB2_ASSET_maps.kart_HASH}"
|
|
||||||
#ifdef USE_PATCH_KART
|
|
||||||
#define ASSET_HASH_PATCH_KART "00000000000000000000000000000000"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define SRB2_COMP_REVISION "${SRB2_COMP_REVISION}"
|
#define SRB2_COMP_REVISION "${SRB2_COMP_REVISION}"
|
||||||
#define SRB2_COMP_BRANCH "${SRB2_COMP_BRANCH}"
|
#define SRB2_COMP_BRANCH "${SRB2_COMP_BRANCH}"
|
||||||
|
|
||||||
@@ -33,30 +18,10 @@
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
/* Manually defined asset hashes for non-CMake builds
|
#define SRB2_COMP_REVISION ""
|
||||||
* Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb
|
#define SRB2_COMP_BRANCH ""
|
||||||
* Last updated 2018 / 12 / 23 - SRB2 v2.1.22 - patch.dta
|
|
||||||
* Last updated 2019 / 01 / 18 - Kart v1.0.2 - Main assets
|
|
||||||
* Last updated 2020 / 08 / 30 - Kart v1.3 - patch.kart
|
|
||||||
* Last updated 2022 / 08 / 16 - Kart v1.4 - Main assets
|
|
||||||
* Last updated 2022 / 08 / 19 - Kart v1.5 - gfx.kart
|
|
||||||
* Last updated 2022 / 11 / 01 - Kart v1.6 - gfx.kart, maps.kart
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Base SRB2 hashes
|
#define CMAKE_ASSETS_DIR ""
|
||||||
#define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7"
|
|
||||||
#ifdef USE_PATCH_DTA
|
|
||||||
#define ASSET_HASH_PATCH_DTA "b04fd9624bfd94dc96dcf4f400f7deb4"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// SRB2Kart-specific hashes
|
|
||||||
#define ASSET_HASH_GFX_KART "06f86ee16136eb8a7043b15001797034"
|
|
||||||
#define ASSET_HASH_TEXTURES_KART "abb53d56aba47c3a8cb0f764da1c8b80"
|
|
||||||
#define ASSET_HASH_CHARS_KART "e2c428347dde52858a3dacd29fc5b964"
|
|
||||||
#define ASSET_HASH_MAPS_KART "d051e55141ba736582228c456953cd98"
|
|
||||||
#ifdef USE_PATCH_KART
|
|
||||||
#define ASSET_HASH_PATCH_KART "00000000000000000000000000000000"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
+278
-116
@@ -33,6 +33,8 @@
|
|||||||
#include "d_main.h"
|
#include "d_main.h"
|
||||||
#include "m_menu.h"
|
#include "m_menu.h"
|
||||||
#include "m_textinput.h"
|
#include "m_textinput.h"
|
||||||
|
#include "m_emotes.h"
|
||||||
|
#include "i_time.h"
|
||||||
#include "filesrch.h"
|
#include "filesrch.h"
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
@@ -44,23 +46,23 @@
|
|||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_mutex con_mutex;
|
I_mutex con_mutex;
|
||||||
|
|
||||||
// g_in_exiting_signal_handler is an evil hack
|
// I_In_Exiting_Signal_Handler is an evil hack
|
||||||
// to avoid infinite SIGABRT recursion in the signal handler
|
// to avoid infinite SIGABRT recursion in the signal handler
|
||||||
// due to poisoned locks or mach-o kernel not supporting locks in signals
|
// due to poisoned locks or mach-o kernel not supporting locks in signals
|
||||||
// or something like that. idk
|
// or something like that. idk
|
||||||
# define Lock_state() if (!g_in_exiting_signal_handler) { I_lock_mutex(&con_mutex); }
|
# define Lock_state() if (!I_In_Exiting_Signal_Handler()) { I_lock_mutex(&con_mutex); }
|
||||||
# define Unlock_state() if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); }
|
# define Unlock_state() if (!I_In_Exiting_Signal_Handler()) { I_unlock_mutex(con_mutex); }
|
||||||
#else/*HAVE_THREADS*/
|
#else /*HAVE_THREADS*/
|
||||||
# define Lock_state()
|
# define Lock_state()
|
||||||
# define Unlock_state()
|
# define Unlock_state()
|
||||||
#endif/*HAVE_THREADS*/
|
#endif /*HAVE_THREADS*/
|
||||||
|
|
||||||
static boolean con_started = false; // console has been initialised
|
static boolean con_started = false; // console has been initialised
|
||||||
boolean con_startup = false; // true at game startup, screen need refreshing
|
boolean con_startup = false; // true at game startup, screen need refreshing
|
||||||
static boolean con_forcepic = true; // at startup toggle console translucency when first off
|
static boolean con_forcepic = true; // at startup toggle console translucency when first off
|
||||||
boolean con_recalc = false; // set true when screen size has changed
|
boolean con_recalc = false; // set true when screen size has changed
|
||||||
|
|
||||||
static tic_t con_tick; // console ticker for anim or blinking prompt cursor
|
static tic_t con_tick; // console ticker for blinking prompt cursor
|
||||||
// con_scrollup should use time (currenttime - lasttime)..
|
// con_scrollup should use time (currenttime - lasttime)..
|
||||||
|
|
||||||
static boolean consoletoggle; // true when console key pushed, ticker will handle
|
static boolean consoletoggle; // true when console key pushed, ticker will handle
|
||||||
@@ -101,6 +103,7 @@ static void CON_InputInit(void);
|
|||||||
static void CON_RecalcSize(void);
|
static void CON_RecalcSize(void);
|
||||||
static void CON_ChangeHeight(void);
|
static void CON_ChangeHeight(void);
|
||||||
|
|
||||||
|
static void CONS_height_Change(void);
|
||||||
static void CONS_hudlines_Change(void);
|
static void CONS_hudlines_Change(void);
|
||||||
static void CONS_backcolor_Change(void);
|
static void CONS_backcolor_Change(void);
|
||||||
|
|
||||||
@@ -129,7 +132,7 @@ static CV_PossibleValue_t speed_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}};
|
|||||||
static consvar_t cons_speed = {"con_speed", "8", CV_SAVE, speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
static consvar_t cons_speed = {"con_speed", "8", CV_SAVE, speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// percentage of screen height to use for console
|
// percentage of screen height to use for console
|
||||||
static consvar_t cons_height = {"con_height", "50", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
|
static consvar_t cons_height = {"con_height", "50", CV_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}};
|
static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}};
|
||||||
// whether to use console background picture, or translucent mode
|
// whether to use console background picture, or translucent mode
|
||||||
@@ -167,8 +170,22 @@ static CV_PossibleValue_t menuhighlight_cons_t[] =
|
|||||||
};
|
};
|
||||||
consvar_t cons_menuhighlight = {"menuhighlight", "Gametype Default", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cons_menuhighlight = {"menuhighlight", "Gametype Default", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
consvar_t cons_consoleprintinmenu = {"consoleprintinmenu", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static void CON_Print(char *msg);
|
static void CON_Print(char *msg);
|
||||||
|
|
||||||
|
// Change the console height on demand
|
||||||
|
//
|
||||||
|
static void CONS_height_Change(void)
|
||||||
|
{
|
||||||
|
Lock_state();
|
||||||
|
|
||||||
|
if (con_destlines > 0 && !con_startup) // If the console is open (as in, not using "bind")...
|
||||||
|
CON_ChangeHeight(); // ...update its height now, not only when it's closed and re-opened
|
||||||
|
|
||||||
|
Unlock_state();
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
static void CONS_hudlines_Change(void)
|
static void CONS_hudlines_Change(void)
|
||||||
@@ -204,14 +221,6 @@ static void CONS_Clear_f(void)
|
|||||||
Unlock_state();
|
Unlock_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Choose english keymap
|
|
||||||
//
|
|
||||||
/*static void CONS_English_f(void)
|
|
||||||
{
|
|
||||||
shiftxform = english_shiftxform;
|
|
||||||
CONS_Printf(M_GetText("%s keymap.\n"), M_GetText("English"));
|
|
||||||
}*/
|
|
||||||
|
|
||||||
static char *bindtable[NUMINPUTS];
|
static char *bindtable[NUMINPUTS];
|
||||||
|
|
||||||
static void CONS_Bind_f(void)
|
static void CONS_Bind_f(void)
|
||||||
@@ -424,6 +433,7 @@ void CON_Init(void)
|
|||||||
CV_RegisterVar(&cons_backpic);
|
CV_RegisterVar(&cons_backpic);
|
||||||
CV_RegisterVar(&cons_backcolor);
|
CV_RegisterVar(&cons_backcolor);
|
||||||
CV_RegisterVar(&cons_menuhighlight);
|
CV_RegisterVar(&cons_menuhighlight);
|
||||||
|
CV_RegisterVar(&cons_consoleprintinmenu);
|
||||||
COM_AddCommand("bind", CONS_Bind_f);
|
COM_AddCommand("bind", CONS_Bind_f);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -584,12 +594,18 @@ static void CON_ChangeHeight(void)
|
|||||||
|
|
||||||
// Handles Console moves in/out of screen (per frame)
|
// Handles Console moves in/out of screen (per frame)
|
||||||
//
|
//
|
||||||
static void CON_MoveConsole(void)
|
void CON_MoveConsole(void)
|
||||||
{
|
{
|
||||||
static fixed_t fracmovement = 0;
|
static fixed_t fracmovement = 0;
|
||||||
|
|
||||||
Lock_state();
|
Lock_state();
|
||||||
|
|
||||||
|
if (con_curlines == con_destlines)
|
||||||
|
{
|
||||||
|
Unlock_state();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// instant
|
// instant
|
||||||
if (!cons_speed.value)
|
if (!cons_speed.value)
|
||||||
{
|
{
|
||||||
@@ -622,72 +638,191 @@ static void CON_MoveConsole(void)
|
|||||||
Unlock_state();
|
Unlock_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//======================================================================
|
||||||
|
// KEYBOARD LAYOUTS FOR ENTERING TEXT
|
||||||
|
//======================================================================
|
||||||
|
|
||||||
|
static char english_shiftxform[] =
|
||||||
|
{
|
||||||
|
0,
|
||||||
|
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
||||||
|
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
||||||
|
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
||||||
|
31,
|
||||||
|
' ', '!', '"', '#', '$', '%', '&',
|
||||||
|
'"', // shift-'
|
||||||
|
'(', ')', '*', '+',
|
||||||
|
'<', // shift-,
|
||||||
|
'_', // shift--
|
||||||
|
'>', // shift-.
|
||||||
|
'?', // shift-/
|
||||||
|
')', // shift-0
|
||||||
|
'!', // shift-1
|
||||||
|
'@', // shift-2
|
||||||
|
'#', // shift-3
|
||||||
|
'$', // shift-4
|
||||||
|
'%', // shift-5
|
||||||
|
'^', // shift-6
|
||||||
|
'&', // shift-7
|
||||||
|
'*', // shift-8
|
||||||
|
'(', // shift-9
|
||||||
|
':',
|
||||||
|
':', // shift-;
|
||||||
|
'<',
|
||||||
|
'+', // shift-=
|
||||||
|
'>', '?', '@',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'{', // shift-[
|
||||||
|
'|', // shift-backslash - OH MY GOD DOES WATCOM SUCK
|
||||||
|
'}', // shift-]
|
||||||
|
'"', '_',
|
||||||
|
'~', // shift-`
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'{', '|', '}', '~', 127
|
||||||
|
};
|
||||||
|
|
||||||
|
static char french_shiftxform[] =
|
||||||
|
{
|
||||||
|
0,
|
||||||
|
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
||||||
|
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
||||||
|
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
||||||
|
31,
|
||||||
|
' ','$', //shift-!
|
||||||
|
'3', //shift-"
|
||||||
|
'#', '$', '%',
|
||||||
|
'1', //shift-&
|
||||||
|
'4', // shift-'
|
||||||
|
'5', // shift-(
|
||||||
|
')', // shift-)
|
||||||
|
'*', '+',
|
||||||
|
'?', // shift-,
|
||||||
|
'6', // shift--
|
||||||
|
'.', '/',
|
||||||
|
'0', '1', '2', '3', '4', '5',
|
||||||
|
'6', '7', '8', '9',
|
||||||
|
'/', // shitf-:
|
||||||
|
'.', // shift-;
|
||||||
|
'>', // shift-<
|
||||||
|
'+', // shift-=
|
||||||
|
'>', '?', '@',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'[', '\\', ']', '^',
|
||||||
|
'8', //shift-_
|
||||||
|
'`',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'{', '|', '}', '~', 127,
|
||||||
|
128, 129,
|
||||||
|
'2',
|
||||||
|
131, 132,
|
||||||
|
'0',
|
||||||
|
134,
|
||||||
|
'9',
|
||||||
|
136, 137,
|
||||||
|
'7',
|
||||||
|
139, 140,
|
||||||
|
'%'
|
||||||
|
};
|
||||||
|
|
||||||
|
static char french_altgrxform[] =
|
||||||
|
{
|
||||||
|
0,
|
||||||
|
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
||||||
|
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
||||||
|
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
||||||
|
31,
|
||||||
|
' ', '!',
|
||||||
|
'#', //altgr-"
|
||||||
|
'#', '$', '%', '&',
|
||||||
|
'{', //altgr-'
|
||||||
|
'[', //altgr-(
|
||||||
|
']', //altgr-)
|
||||||
|
'*', '+', ',',
|
||||||
|
'|', //altg--
|
||||||
|
'.', '/',
|
||||||
|
'0', '1', '2', '3', '4', '5',
|
||||||
|
'6', '7', '8', '9',
|
||||||
|
':', ';', '<',
|
||||||
|
'}', //altgr-=
|
||||||
|
'>', '?', '@',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'[', '\\', ']', '^',
|
||||||
|
'\\', //altgr-backslash
|
||||||
|
'`',
|
||||||
|
'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
|
||||||
|
'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
||||||
|
'{', '|', '}', '~', 127,
|
||||||
|
128, 129,
|
||||||
|
'~',
|
||||||
|
131, 132,
|
||||||
|
'@',
|
||||||
|
134,
|
||||||
|
'^',
|
||||||
|
136, 137,
|
||||||
|
'`',
|
||||||
|
139, 140,
|
||||||
|
KEY_FR_U_GRAVE
|
||||||
|
};
|
||||||
|
|
||||||
|
// fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
|
||||||
|
static INT32 CON_FallBackFrSpecialLetter(INT32 key)
|
||||||
|
{
|
||||||
|
switch (key)
|
||||||
|
{
|
||||||
|
case KEY_FR_E_AIGUE: return 'e';
|
||||||
|
case KEY_FR_E_GRAVE: return 'e';
|
||||||
|
case KEY_FR_C_CEDILLE: return 'c';
|
||||||
|
case KEY_FR_A_GRAVE: return 'a';
|
||||||
|
case KEY_FR_U_GRAVE: return 'u';
|
||||||
|
default: return key;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// goddang AZERTY
|
||||||
|
static size_t CON_GetShiftSize(void)
|
||||||
|
{
|
||||||
|
return ((cv_keyboardlayout.value == 3) ? sizeof(french_shiftxform) : sizeof(english_shiftxform));
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *CON_Shiftform(void)
|
||||||
|
{
|
||||||
|
return (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
|
||||||
|
}
|
||||||
|
|
||||||
INT32 CON_ShiftChar(INT32 ch)
|
INT32 CON_ShiftChar(INT32 ch)
|
||||||
{
|
{
|
||||||
if (I_UseNativeKeyboard())
|
if (I_UseNativeKeyboard() || ch >= (INT32)CON_GetShiftSize())
|
||||||
return ch;
|
return ch;
|
||||||
|
|
||||||
|
// warning: shiftdown is NOT a boolean, it's 1 or 2 for lshift/rshift
|
||||||
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
||||||
{
|
{
|
||||||
if (cv_keyboardlayout.value == 3)
|
return !!shiftdown != capslock ? CON_Shiftform()[ch] : ch;
|
||||||
{
|
|
||||||
if (shiftdown ^ capslock)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
else if (altdown & 0x2)
|
|
||||||
ch = french_altgrxform[ch];
|
|
||||||
else
|
|
||||||
ch = HU_FallBackFrSpecialLetter(ch);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (shiftdown ^ capslock)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else // if we're holding shift we should still shift non letter symbols
|
|
||||||
|
// if we're holding shift we should still shift non letter symbols
|
||||||
|
if (shiftdown)
|
||||||
{
|
{
|
||||||
if (cv_keyboardlayout.value == 3)
|
return CON_Shiftform()[ch];
|
||||||
{
|
}
|
||||||
if (shiftdown)
|
|
||||||
ch = shiftxform[ch];
|
// AZERTY
|
||||||
else if (altdown & 0x2)
|
if (cv_keyboardlayout.value == 3)
|
||||||
ch = french_altgrxform[ch];
|
{
|
||||||
else
|
if (altdown & 0x2)
|
||||||
ch = HU_FallBackFrSpecialLetter(ch);
|
return french_altgrxform[ch];
|
||||||
}
|
|
||||||
else
|
return CON_FallBackFrSpecialLetter(ch);
|
||||||
{
|
|
||||||
if (shiftdown)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
INT32 CON_ShitAndAltGrChar(INT32 ch)
|
|
||||||
{
|
|
||||||
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
|
||||||
{
|
|
||||||
if (shiftdown ^ capslock)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
}
|
|
||||||
else // if we're holding shift we should still shift non letter symbols
|
|
||||||
{
|
|
||||||
if (shiftdown)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
else if (altdown & 0x2)
|
|
||||||
{
|
|
||||||
ch = french_altgrxform[ch];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ch = HU_FallBackFrSpecialLetter(ch);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ch;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear time of console heads up messages
|
// Clear time of console heads up messages
|
||||||
//
|
//
|
||||||
@@ -881,7 +1016,7 @@ boolean CON_Responder(event_t *ev)
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
// ctrl modifier -- changes behavior, adds shortcuts
|
// ctrl modifier -- changes behavior, adds shortcuts
|
||||||
if ((cv_keyboardlayout.value != 3 && ctrldown) || (cv_keyboardlayout.value == 3 && ctrldown && !altdown))
|
if (ctrldown && (cv_keyboardlayout.value != 3 || !altdown))
|
||||||
{
|
{
|
||||||
// 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)
|
||||||
@@ -1211,19 +1346,10 @@ void CON_LogMessage(const char *msg)
|
|||||||
// Console print! Wahooo! Lots o fun!
|
// Console print! Wahooo! Lots o fun!
|
||||||
//
|
//
|
||||||
|
|
||||||
void CONS_Printf(const char *fmt, ...)
|
static inline void CONS_PrintMsg(char *txt)
|
||||||
{
|
{
|
||||||
va_list argptr;
|
|
||||||
static char *txt = NULL;
|
|
||||||
boolean startup;
|
boolean startup;
|
||||||
|
|
||||||
if (txt == NULL)
|
|
||||||
txt = malloc(8192);
|
|
||||||
|
|
||||||
va_start(argptr, fmt);
|
|
||||||
vsnprintf(txt, 8192, fmt, argptr);
|
|
||||||
va_end(argptr);
|
|
||||||
|
|
||||||
// echo console prints to log file
|
// echo console prints to log file
|
||||||
DEBFILE(txt);
|
DEBFILE(txt);
|
||||||
|
|
||||||
@@ -1249,6 +1375,21 @@ void CONS_Printf(const char *fmt, ...)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CONS_Printf(const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list argptr;
|
||||||
|
static char *txt = NULL;
|
||||||
|
|
||||||
|
if (txt == NULL)
|
||||||
|
txt = malloc(8192);
|
||||||
|
|
||||||
|
va_start(argptr, fmt);
|
||||||
|
vsnprintf(txt, 8192, fmt, argptr);
|
||||||
|
va_end(argptr);
|
||||||
|
|
||||||
|
CONS_PrintMsg(txt);
|
||||||
|
}
|
||||||
|
|
||||||
void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
@@ -1277,9 +1418,7 @@ void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// I am lazy and I feel like just letting CONS_Printf take care of things.
|
CONS_PrintMsg(txt);
|
||||||
// Is that okay?
|
|
||||||
CONS_Printf("%s", txt);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
||||||
@@ -1297,11 +1436,9 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
|||||||
vsnprintf(txt, 8192, fmt, argptr);
|
vsnprintf(txt, 8192, fmt, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
// Again I am lazy, oh well
|
CONS_PrintMsg(txt);
|
||||||
CONS_Printf("%s", txt);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Print an error message, and wait for ENTER key to continue.
|
// Print an error message, and wait for ENTER key to continue.
|
||||||
// To make sure the user has seen the message
|
// To make sure the user has seen the message
|
||||||
//
|
//
|
||||||
@@ -1313,6 +1450,8 @@ void CONS_Error(const char *msg)
|
|||||||
// dirty quick hack, but for the good cause
|
// dirty quick hack, but for the good cause
|
||||||
while (I_GetKey() != KEY_ENTER)
|
while (I_GetKey() != KEY_ENTER)
|
||||||
{
|
{
|
||||||
|
I_HandleInterrupt();
|
||||||
|
|
||||||
// Sleep so we don't take too much of cpu usage
|
// Sleep so we don't take too much of cpu usage
|
||||||
I_Sleep(1.f/TICRATE*1000);
|
I_Sleep(1.f/TICRATE*1000);
|
||||||
|
|
||||||
@@ -1453,7 +1592,18 @@ static void CON_DrawHudlines(void)
|
|||||||
}
|
}
|
||||||
if (c >= con_width)
|
if (c >= con_width)
|
||||||
break;
|
break;
|
||||||
if (*p < HU_FONTSTART)
|
|
||||||
|
int emotelen;
|
||||||
|
emote_t *emote;
|
||||||
|
|
||||||
|
if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
|
||||||
|
{
|
||||||
|
M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
|
||||||
|
p += emotelen-1;
|
||||||
|
c += emotelen-1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else if (*p < HU_FONTSTART)
|
||||||
;//charwidth = 4 * con_scalefactor;
|
;//charwidth = 4 * con_scalefactor;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1485,7 +1635,7 @@ static void CON_DrawConsole(void)
|
|||||||
// draw console background
|
// draw console background
|
||||||
if (cons_backpic.value || con_forcepic)
|
if (cons_backpic.value || con_forcepic)
|
||||||
{
|
{
|
||||||
patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY);
|
patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH);
|
||||||
|
|
||||||
// Jimita: CON_DrawBackpic just called V_DrawScaledPatch
|
// Jimita: CON_DrawBackpic just called V_DrawScaledPatch
|
||||||
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, con_backpic, NULL);
|
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, con_backpic, NULL);
|
||||||
@@ -1500,41 +1650,54 @@ static void CON_DrawConsole(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// draw console text lines from top to bottom
|
// draw console text lines from top to bottom
|
||||||
if (con_curlines < minheight)
|
if (con_curlines >= minheight)
|
||||||
return;
|
|
||||||
|
|
||||||
i = con_cy - con_scrollup;
|
|
||||||
|
|
||||||
// skip the last empty line due to the cursor being at the start of a new line
|
|
||||||
i--;
|
|
||||||
|
|
||||||
i -= (con_curlines - minheight) / charheight;
|
|
||||||
|
|
||||||
if (rendermode == render_none) return;
|
|
||||||
|
|
||||||
for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
|
|
||||||
{
|
{
|
||||||
INT32 x;
|
i = con_cy - con_scrollup;
|
||||||
size_t c;
|
|
||||||
|
|
||||||
p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];
|
// skip the last empty line due to the cursor being at the start of a new line
|
||||||
|
i--;
|
||||||
|
|
||||||
for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
|
i -= (con_curlines - minheight) / charheight;
|
||||||
|
|
||||||
|
if (rendermode == render_none)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
|
||||||
{
|
{
|
||||||
while (*p & 0x80)
|
INT32 x;
|
||||||
|
size_t c;
|
||||||
|
|
||||||
|
p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];
|
||||||
|
|
||||||
|
for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
|
||||||
{
|
{
|
||||||
charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
|
while (*p & 0x80)
|
||||||
p++;
|
{
|
||||||
c++;
|
charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
|
||||||
|
p++;
|
||||||
|
c++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c >= con_width)
|
||||||
|
break;
|
||||||
|
|
||||||
|
int emotelen;
|
||||||
|
emote_t *emote;
|
||||||
|
|
||||||
|
if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
|
||||||
|
{
|
||||||
|
M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
|
||||||
|
p += emotelen-1;
|
||||||
|
c += emotelen-1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
|
||||||
}
|
}
|
||||||
if (c >= con_width)
|
|
||||||
break;
|
|
||||||
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// draw prompt if enough place (not while game startup)
|
// draw prompt if enough place (not while game startup)
|
||||||
if ((con_curlines == con_destlines) && (con_curlines >= minheight) && !con_startup)
|
if ((con_curlines >= (minheight-charheight)) && !con_startup)
|
||||||
CON_DrawInput();
|
CON_DrawInput();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1559,13 +1722,12 @@ void CON_Drawer(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// console movement
|
// console movement
|
||||||
if (con_curlines != con_destlines)
|
CON_MoveConsole();
|
||||||
CON_MoveConsole();
|
|
||||||
|
|
||||||
if (con_curlines > 0)
|
if (con_curlines > 0)
|
||||||
CON_DrawConsole();
|
CON_DrawConsole();
|
||||||
else if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS
|
else if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS
|
||||||
|| gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS)
|
|| gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS || (cons_consoleprintinmenu.value && gamestate == GS_TITLESCREEN))
|
||||||
CON_DrawHudlines();
|
CON_DrawHudlines();
|
||||||
|
|
||||||
Unlock_state();
|
Unlock_state();
|
||||||
|
|||||||
+10
-1
@@ -13,6 +13,10 @@
|
|||||||
#ifndef __CONSOLE__
|
#ifndef __CONSOLE__
|
||||||
#define __CONSOLE__
|
#define __CONSOLE__
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "d_event.h"
|
#include "d_event.h"
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
#include "i_threads.h"
|
#include "i_threads.h"
|
||||||
@@ -36,6 +40,7 @@ extern INT32 con_destlines;
|
|||||||
extern UINT32 con_scalefactor; // console text scale factor
|
extern UINT32 con_scalefactor; // console text scale factor
|
||||||
|
|
||||||
extern consvar_t cons_backcolor, cons_menuhighlight;
|
extern consvar_t cons_backcolor, cons_menuhighlight;
|
||||||
|
extern consvar_t cons_consoleprintinmenu;
|
||||||
|
|
||||||
extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
|
extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
|
||||||
*skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
|
*skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
|
||||||
@@ -44,13 +49,13 @@ extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *or
|
|||||||
extern UINT8 *consolebgmap;
|
extern UINT8 *consolebgmap;
|
||||||
|
|
||||||
INT32 CON_ShiftChar(INT32 ch);
|
INT32 CON_ShiftChar(INT32 ch);
|
||||||
INT32 CON_ShitAndAltGrChar(INT32 ch);
|
|
||||||
|
|
||||||
void CON_SetupBackColormap(void);
|
void CON_SetupBackColormap(void);
|
||||||
void CON_ClearHUD(void); // clear heads up messages
|
void CON_ClearHUD(void); // clear heads up messages
|
||||||
|
|
||||||
void CON_Ticker(void);
|
void CON_Ticker(void);
|
||||||
void CON_Drawer(void);
|
void CON_Drawer(void);
|
||||||
|
void CON_MoveConsole(void);
|
||||||
void CONS_Error(const char *msg); // print out error msg, and wait a key
|
void CONS_Error(const char *msg); // print out error msg, and wait a key
|
||||||
|
|
||||||
// force console to move out
|
// force console to move out
|
||||||
@@ -61,4 +66,8 @@ boolean CON_Ready(void);
|
|||||||
|
|
||||||
void CON_LogMessage(const char *msg);
|
void CON_LogMessage(const char *msg);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} // extern "C"
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+6
-3
@@ -1,7 +1,7 @@
|
|||||||
// BLANKART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// This program is free software distributed under the
|
// This program is free software distributed under the
|
||||||
// terms of the GNU General Public License, version 2.
|
// terms of the GNU General Public License, version 2.
|
||||||
@@ -114,6 +114,7 @@ void* PoolAllocator::allocate()
|
|||||||
|
|
||||||
FreeBlock* ret = head_;
|
FreeBlock* ret = head_;
|
||||||
head_ = head_->next;
|
head_ = head_->next;
|
||||||
|
allocated_blocks_++;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,6 +126,7 @@ void PoolAllocator::deallocate(void* p)
|
|||||||
FreeBlock* block = reinterpret_cast<FreeBlock*>(p);
|
FreeBlock* block = reinterpret_cast<FreeBlock*>(p);
|
||||||
block->next = head_;
|
block->next = head_;
|
||||||
head_ = block;
|
head_ = block;
|
||||||
|
allocated_blocks_--;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PoolAllocator::release()
|
void PoolAllocator::release()
|
||||||
@@ -144,6 +146,7 @@ void PoolAllocator::release()
|
|||||||
|
|
||||||
first_chunk_ = nullptr;
|
first_chunk_ = nullptr;
|
||||||
head_ = nullptr;
|
head_ = nullptr;
|
||||||
|
allocated_blocks_ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static LinearMemory g_frame_memory {4 * 1024 * 1024};
|
static LinearMemory g_frame_memory {4 * 1024 * 1024};
|
||||||
|
|||||||
+7
-3
@@ -1,7 +1,7 @@
|
|||||||
// SONIC ROBO BLAST 2 KART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// This program is free software distributed under the
|
// This program is free software distributed under the
|
||||||
// terms of the GNU General Public License, version 2.
|
// terms of the GNU General Public License, version 2.
|
||||||
@@ -37,6 +37,7 @@ class PoolAllocator final
|
|||||||
FreeBlock* head_;
|
FreeBlock* head_;
|
||||||
size_t block_size_;
|
size_t block_size_;
|
||||||
size_t blocks_;
|
size_t blocks_;
|
||||||
|
size_t allocated_blocks_;
|
||||||
int32_t tag_;
|
int32_t tag_;
|
||||||
|
|
||||||
ChunkFooter* allocate_chunk();
|
ChunkFooter* allocate_chunk();
|
||||||
@@ -47,6 +48,7 @@ public:
|
|||||||
, head_(nullptr)
|
, head_(nullptr)
|
||||||
, block_size_(block_size)
|
, block_size_(block_size)
|
||||||
, blocks_(blocks)
|
, blocks_(blocks)
|
||||||
|
, allocated_blocks_(0)
|
||||||
, tag_(tag)
|
, tag_(tag)
|
||||||
{}
|
{}
|
||||||
PoolAllocator(const PoolAllocator&) = delete;
|
PoolAllocator(const PoolAllocator&) = delete;
|
||||||
@@ -59,6 +61,8 @@ public:
|
|||||||
void* allocate();
|
void* allocate();
|
||||||
void deallocate(void* p);
|
void deallocate(void* p);
|
||||||
constexpr size_t block_size() const noexcept { return block_size_; };
|
constexpr size_t block_size() const noexcept { return block_size_; };
|
||||||
|
constexpr size_t allocated_blocks() const noexcept { return allocated_blocks_; };
|
||||||
|
constexpr size_t allocated_bytes() const noexcept { return allocated_blocks_ * block_size_; };
|
||||||
|
|
||||||
void release();
|
void release();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// SONIC ROBO BLAST 2 KART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// This program is free software distributed under the
|
// This program is free software distributed under the
|
||||||
// terms of the GNU General Public License, version 2.
|
// terms of the GNU General Public License, version 2.
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// BLANKART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// This program is free software distributed under the
|
// This program is free software distributed under the
|
||||||
// terms of the GNU General Public License, version 2.
|
// terms of the GNU General Public License, version 2.
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// SONIC ROBO BLAST 2 KART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// This program is free software distributed under the
|
// This program is free software distributed under the
|
||||||
// terms of the GNU General Public License, version 2.
|
// terms of the GNU General Public License, version 2.
|
||||||
|
|||||||
+797
-551
File diff suppressed because it is too large.
Load diff
+17
-7
@@ -339,13 +339,17 @@ typedef struct
|
|||||||
UINT8 clientnode;
|
UINT8 clientnode;
|
||||||
UINT8 gamestate;
|
UINT8 gamestate;
|
||||||
|
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
// 0xFF == not in game; else player skin num
|
// 0xFF == not in game; else player skin num
|
||||||
UINT8 playerskins[MAXPLAYERS];
|
UINT8 playerskins[MAXPLAYERS];
|
||||||
UINT8 playercolor[MAXPLAYERS];
|
UINT8 playercolor[MAXPLAYERS];
|
||||||
|
#endif
|
||||||
|
|
||||||
UINT8 gametype;
|
UINT8 gametype;
|
||||||
UINT8 modifiedgame;
|
UINT8 modifiedgame;
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
SINT8 adminplayers[MAXPLAYERS]; // Needs to be signed
|
SINT8 adminplayers[MAXPLAYERS]; // Needs to be signed
|
||||||
|
#endif
|
||||||
|
|
||||||
char server_context[8]; // Unique context id, generated at server startup.
|
char server_context[8]; // Unique context id, generated at server startup.
|
||||||
|
|
||||||
@@ -354,7 +358,9 @@ typedef struct
|
|||||||
boolean allownewplayer;
|
boolean allownewplayer;
|
||||||
boolean discordinvites;
|
boolean discordinvites;
|
||||||
|
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
UINT8 varlengthinputs[0]; // Playernames and netvars
|
UINT8 varlengthinputs[0]; // Playernames and netvars
|
||||||
|
#endif
|
||||||
} ATTRPACK serverconfig_pak;
|
} ATTRPACK serverconfig_pak;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -444,7 +450,7 @@ typedef struct
|
|||||||
char name[MAXPLAYERNAME+1];
|
char name[MAXPLAYERNAME+1];
|
||||||
UINT8 address[4]; // sending another string would run us up against MAXPACKETLENGTH
|
UINT8 address[4]; // sending another string would run us up against MAXPACKETLENGTH
|
||||||
UINT8 team;
|
UINT8 team;
|
||||||
UINT8 skin;
|
skinnum_t skin;
|
||||||
UINT8 data; // Color is first four bits, hasflag, isit and issuper have one bit each, the last is unused.
|
UINT8 data; // Color is first four bits, hasflag, isit and issuper have one bit each, the last is unused.
|
||||||
UINT32 score;
|
UINT32 score;
|
||||||
UINT16 timeinserver; // In seconds.
|
UINT16 timeinserver; // In seconds.
|
||||||
@@ -454,7 +460,7 @@ typedef struct
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
char name[MAXPLAYERNAME+1];
|
char name[MAXPLAYERNAME+1];
|
||||||
UINT8 skin;
|
skinnum_t skin;
|
||||||
UINT8 color;
|
UINT8 color;
|
||||||
UINT32 pflags;
|
UINT32 pflags;
|
||||||
UINT32 score;
|
UINT32 score;
|
||||||
@@ -516,7 +522,6 @@ typedef struct
|
|||||||
|
|
||||||
extern serverelem_t serverlist[MAXSERVERLIST];
|
extern serverelem_t serverlist[MAXSERVERLIST];
|
||||||
extern UINT32 serverlistcount;
|
extern UINT32 serverlistcount;
|
||||||
extern UINT32 serverlistultimatecount;
|
|
||||||
extern INT32 mapchangepending;
|
extern INT32 mapchangepending;
|
||||||
|
|
||||||
// Points inside doomcom
|
// Points inside doomcom
|
||||||
@@ -601,6 +606,8 @@ extern consvar_t cv_discordinvites;
|
|||||||
|
|
||||||
extern consvar_t cv_serverinfoscreen;
|
extern consvar_t cv_serverinfoscreen;
|
||||||
|
|
||||||
|
extern consvar_t cv_serveraddoninfo;
|
||||||
|
|
||||||
// Used in d_net, the only dependence
|
// Used in d_net, the only dependence
|
||||||
//tic_t ExpandTics(INT32 low, tic_t basetic);
|
//tic_t ExpandTics(INT32 low, tic_t basetic);
|
||||||
void D_ClientServerInit(void);
|
void D_ClientServerInit(void);
|
||||||
@@ -627,7 +634,6 @@ void CL_ClearPlayer(INT32 playernum);
|
|||||||
void CL_RemovePlayer(INT32 playernum, INT32 reason);
|
void CL_RemovePlayer(INT32 playernum, INT32 reason);
|
||||||
void CL_QueryServerList(msg_server_t *list);
|
void CL_QueryServerList(msg_server_t *list);
|
||||||
void CL_UpdateServerList(void);
|
void CL_UpdateServerList(void);
|
||||||
void CL_TimeoutServerList(void);
|
|
||||||
|
|
||||||
void CL_AbortConnection(void);
|
void CL_AbortConnection(void);
|
||||||
|
|
||||||
@@ -650,21 +656,25 @@ extern UINT8 playernode[MAXPLAYERS];
|
|||||||
|
|
||||||
extern boolean player_muted[MAXPLAYERS];
|
extern boolean player_muted[MAXPLAYERS];
|
||||||
|
|
||||||
|
extern UINT32 localplayerping;
|
||||||
|
|
||||||
INT32 D_NumPlayers(void);
|
INT32 D_NumPlayers(void);
|
||||||
|
|
||||||
void D_ResetTiccmds(void);
|
void D_ResetTiccmds(void);
|
||||||
|
|
||||||
tic_t GetLag(INT32 node);
|
tic_t GetLag(INT32 node);
|
||||||
|
|
||||||
extern UINT8 hu_resynching;
|
extern boolean hu_resynching;
|
||||||
#ifdef SATURNPAK
|
#ifdef SATURNPAK
|
||||||
extern UINT8 hu_redownloadinggamestate;
|
extern boolean hu_redownloadinggamestate;
|
||||||
#endif
|
#endif
|
||||||
extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
|
extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
|
||||||
|
|
||||||
|
#define SAVEGAMESIZE (768*1024)
|
||||||
|
|
||||||
typedef struct rewind_s
|
typedef struct rewind_s
|
||||||
{
|
{
|
||||||
UINT8 savebuffer[(768*1024)];
|
UINT8 savebuffer[SAVEGAMESIZE];
|
||||||
tic_t leveltime;
|
tic_t leveltime;
|
||||||
size_t demopos;
|
size_t demopos;
|
||||||
|
|
||||||
|
|||||||
+171
-163
@@ -46,6 +46,7 @@
|
|||||||
#include "i_time.h"
|
#include "i_time.h"
|
||||||
#include "i_threads.h"
|
#include "i_threads.h"
|
||||||
#include "i_video.h"
|
#include "i_video.h"
|
||||||
|
#include "hu_stuff.h"
|
||||||
#include "m_argv.h"
|
#include "m_argv.h"
|
||||||
#include "m_menu.h"
|
#include "m_menu.h"
|
||||||
#include "m_misc.h"
|
#include "m_misc.h"
|
||||||
@@ -69,7 +70,7 @@
|
|||||||
#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, pathisdirectory
|
#include "filesrch.h" // pathisdirectory
|
||||||
#include "d_protocol.h"
|
#include "d_protocol.h"
|
||||||
#include "m_perfstats.h"
|
#include "m_perfstats.h"
|
||||||
#include "k_kart.h"
|
#include "k_kart.h"
|
||||||
@@ -78,6 +79,32 @@
|
|||||||
#include "core/memory.h"
|
#include "core/memory.h"
|
||||||
|
|
||||||
#include "lua_script.h"
|
#include "lua_script.h"
|
||||||
|
#include "lua_profile.h"
|
||||||
|
|
||||||
|
/* Manually defined asset hashes for non-CMake builds
|
||||||
|
* Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb
|
||||||
|
* Last updated 2018 / 12 / 23 - SRB2 v2.1.22 - patch.dta
|
||||||
|
* Last updated 2019 / 01 / 18 - Kart v1.0.2 - Main assets
|
||||||
|
* Last updated 2020 / 08 / 30 - Kart v1.3 - patch.kart
|
||||||
|
* Last updated 2022 / 08 / 16 - Kart v1.4 - Main assets
|
||||||
|
* Last updated 2022 / 08 / 19 - Kart v1.5 - gfx.kart
|
||||||
|
* Last updated 2022 / 11 / 01 - Kart v1.6 - gfx.kart, maps.kart
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Base SRB2 hashes
|
||||||
|
#define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7"
|
||||||
|
#ifdef USE_PATCH_DTA
|
||||||
|
#define ASSET_HASH_PATCH_DTA "b04fd9624bfd94dc96dcf4f400f7deb4"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// SRB2Kart-specific hashes
|
||||||
|
#define ASSET_HASH_GFX_KART "06f86ee16136eb8a7043b15001797034"
|
||||||
|
#define ASSET_HASH_TEXTURES_KART "abb53d56aba47c3a8cb0f764da1c8b80"
|
||||||
|
#define ASSET_HASH_CHARS_KART "e2c428347dde52858a3dacd29fc5b964"
|
||||||
|
#define ASSET_HASH_MAPS_KART "d051e55141ba736582228c456953cd98"
|
||||||
|
#ifdef USE_PATCH_KART
|
||||||
|
#define ASSET_HASH_PATCH_KART "00000000000000000000000000000000"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CMAKECONFIG
|
#ifdef CMAKECONFIG
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
@@ -104,14 +131,15 @@ static size_t startuppwadcount = 0;
|
|||||||
// autoloading
|
// autoloading
|
||||||
static char *autoloadwadfiles[MAX_WADFILES];
|
static char *autoloadwadfiles[MAX_WADFILES];
|
||||||
static char *autoloadwadfilespost[MAX_WADFILES];
|
static char *autoloadwadfilespost[MAX_WADFILES];
|
||||||
static size_t autoloadcount = 0;
|
static size_t autoloadwadcount = 0;
|
||||||
static size_t postloadcount = 0;
|
static size_t postloadwadcount = 0;
|
||||||
//
|
//
|
||||||
|
|
||||||
boolean devparm = false; // started game with -devparm
|
boolean devparm = false; // started game with -devparm
|
||||||
|
|
||||||
boolean singletics = false; // timedemo
|
boolean singletics = false; // timedemo
|
||||||
boolean lastdraw = false;
|
boolean lastdraw = false;
|
||||||
|
boolean intermissionbginit = false;
|
||||||
|
|
||||||
#ifdef MOTIONBLUR
|
#ifdef MOTIONBLUR
|
||||||
INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
||||||
@@ -127,7 +155,7 @@ boolean music_disabled = false;
|
|||||||
INT32 debugload = 0;
|
INT32 debugload = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char savegamename[256];
|
char savegamename[256] = {};
|
||||||
|
|
||||||
char srb2home[256] = ".";
|
char srb2home[256] = ".";
|
||||||
char srb2path[256] = ".";
|
char srb2path[256] = ".";
|
||||||
@@ -166,38 +194,6 @@ UINT8 ctrldown = 0; // 0x1 left, 0x2 right
|
|||||||
UINT8 altdown = 0; // 0x1 left, 0x2 right
|
UINT8 altdown = 0; // 0x1 left, 0x2 right
|
||||||
boolean capslock = 0; // gee i wonder what this does.
|
boolean capslock = 0; // gee i wonder what this does.
|
||||||
|
|
||||||
static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {};
|
|
||||||
|
|
||||||
static void D_DeviceLEDTick(void)
|
|
||||||
{
|
|
||||||
UINT8 i;
|
|
||||||
static UINT16 color[MAXSPLITSCREENPLAYERS] = {};
|
|
||||||
|
|
||||||
if (numcontrollers == 0)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i <= splitscreen; i++)
|
|
||||||
{
|
|
||||||
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
color[i] = G_GetSkinColor(i);
|
|
||||||
|
|
||||||
if (curcolor[i] == color[i]) // dont update if same colour
|
|
||||||
continue;
|
|
||||||
|
|
||||||
G_SetPlayerGamepadIndicatorColor(i, color[i]);
|
|
||||||
curcolor[i] = color[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void D_ResetDeviceLED(void)
|
|
||||||
{
|
|
||||||
memset(curcolor, 0, sizeof(curcolor));
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// D_ProcessEvents
|
// D_ProcessEvents
|
||||||
// Send all the events of the given timestamp down the responder chain
|
// Send all the events of the given timestamp down the responder chain
|
||||||
@@ -280,24 +276,6 @@ static void D_Renderview(void)
|
|||||||
|
|
||||||
R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));
|
R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));
|
||||||
|
|
||||||
if (rendermode == render_soft)
|
|
||||||
{
|
|
||||||
// if this is display player 1
|
|
||||||
if (cv_homremoval.value)
|
|
||||||
{
|
|
||||||
if (cv_homremoval.value == 1)
|
|
||||||
{
|
|
||||||
// Clear the software screen buffer to remove HOM
|
|
||||||
memset(vid.screens[0], 31, vid.width * vid.height);
|
|
||||||
}
|
|
||||||
else if (cv_homremoval.value == 2)
|
|
||||||
{
|
|
||||||
//'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
|
|
||||||
memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
|
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
|
||||||
@@ -328,7 +306,6 @@ static void D_Renderview(void)
|
|||||||
break;
|
break;
|
||||||
default: // Initialize for P1
|
default: // Initialize for P1
|
||||||
viewwindowy = viewwindowx = 0;
|
viewwindowy = viewwindowx = 0;
|
||||||
objectsdrawn = 0;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -339,19 +316,17 @@ static void D_Renderview(void)
|
|||||||
}
|
}
|
||||||
else if (rendermode == render_soft)
|
else if (rendermode == render_soft)
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
R_RenderPlayerView(&players[displayplayers[i]]);
|
R_RenderPlayerView(&players[displayplayers[i]]);
|
||||||
}
|
|
||||||
|
|
||||||
if (rendermode == render_soft)
|
|
||||||
{
|
|
||||||
if (i == 0)
|
|
||||||
R_ApplyViewMorph();
|
|
||||||
|
|
||||||
|
if (i == 0)
|
||||||
|
R_ApplyViewMorph();
|
||||||
#ifdef MOTIONBLUR
|
#ifdef MOTIONBLUR
|
||||||
V_DoPostProcessor(i, postimgparam[i]);
|
V_DoPostProcessor(i, postimgparam[i]);
|
||||||
#else
|
#else
|
||||||
V_DoPostProcessor(i, 0);
|
V_DoPostProcessor(i, 0);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -359,13 +334,12 @@ static void D_Renderview(void)
|
|||||||
if (splitscreen == 2)
|
if (splitscreen == 2)
|
||||||
{
|
{
|
||||||
// V_DrawPatchFill, but for the fourth screen only
|
// V_DrawPatchFill, but for the fourth screen only
|
||||||
patch_t *pat = W_CachePatchName("SRB2BACK", PU_PATCH);
|
INT32 x, y, pw = SHORT(srb2back->width) * vid.dup, ph = SHORT(srb2back->height) * vid.dup;
|
||||||
INT32 x, y, pw = SHORT(pat->width) * vid.dup, ph = SHORT(pat->height) * vid.dup;
|
|
||||||
|
|
||||||
for (x = vid.width>>1; x < vid.width; x += pw)
|
for (x = vid.width>>1; x < vid.width; x += pw)
|
||||||
{
|
{
|
||||||
for (y = vid.height>>1; y < vid.height; y += ph)
|
for (y = vid.height>>1; y < vid.height; y += ph)
|
||||||
V_DrawScaledPatch(x, y, V_NOSCALESTART, pat);
|
V_DrawScaledPatch(x, y, V_NOSCALESTART, srb2back);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -376,6 +350,33 @@ static void D_Renderview(void)
|
|||||||
// added comment : there is a wipe eatch change of the gamestate
|
// added comment : there is a wipe eatch change of the gamestate
|
||||||
gamestate_t wipegamestate = GS_LEVEL;
|
gamestate_t wipegamestate = GS_LEVEL;
|
||||||
|
|
||||||
|
static void D_MakeIntermissionBG(void)
|
||||||
|
{
|
||||||
|
if (!lastdraw)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (rendermode == render_none)
|
||||||
|
{
|
||||||
|
lastdraw = false;
|
||||||
|
intermissionbginit = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HWRENDER
|
||||||
|
if (rendermode == render_opengl)
|
||||||
|
{
|
||||||
|
HWR_MakeScreenTexture();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
|
||||||
|
}
|
||||||
|
|
||||||
|
lastdraw = false;
|
||||||
|
intermissionbginit = true;
|
||||||
|
}
|
||||||
|
|
||||||
static boolean D_Display(void)
|
static boolean D_Display(void)
|
||||||
{
|
{
|
||||||
boolean ranwipe = false;
|
boolean ranwipe = false;
|
||||||
@@ -407,10 +408,6 @@ static boolean D_Display(void)
|
|||||||
R_ExecuteSetViewSize();
|
R_ExecuteSetViewSize();
|
||||||
forcerefresh = true; // force background redraw
|
forcerefresh = true; // force background redraw
|
||||||
}
|
}
|
||||||
|
|
||||||
// draw buffered stuff to screen
|
|
||||||
// Used only by linux GGI version
|
|
||||||
I_UpdateNoBlit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// save the current screen if about to wipe
|
// save the current screen if about to wipe
|
||||||
@@ -545,16 +542,8 @@ static boolean D_Display(void)
|
|||||||
PS_START_TIMING(ps_rendercalltime);
|
PS_START_TIMING(ps_rendercalltime);
|
||||||
D_Renderview();
|
D_Renderview();
|
||||||
PS_STOP_TIMING(ps_rendercalltime);
|
PS_STOP_TIMING(ps_rendercalltime);
|
||||||
}
|
|
||||||
|
|
||||||
if (lastdraw)
|
D_MakeIntermissionBG();
|
||||||
{
|
|
||||||
if (rendermode == render_soft)
|
|
||||||
{
|
|
||||||
VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
|
|
||||||
}
|
|
||||||
|
|
||||||
lastdraw = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
PS_START_TIMING(ps_uitime);
|
PS_START_TIMING(ps_uitime);
|
||||||
@@ -656,6 +645,11 @@ static boolean D_Display(void)
|
|||||||
|
|
||||||
CON_Drawer(); // Ha, i LIED!
|
CON_Drawer(); // Ha, i LIED!
|
||||||
|
|
||||||
|
if (cv_lua_profile.value > 0)
|
||||||
|
{
|
||||||
|
LUA_RenderTimers();
|
||||||
|
}
|
||||||
|
|
||||||
PS_START_TIMING(ps_swaptime);
|
PS_START_TIMING(ps_swaptime);
|
||||||
I_FinishUpdate(); // page flip or blit buffer
|
I_FinishUpdate(); // page flip or blit buffer
|
||||||
PS_STOP_TIMING(ps_swaptime);
|
PS_STOP_TIMING(ps_swaptime);
|
||||||
@@ -675,7 +669,7 @@ void D_SRB2Loop(void)
|
|||||||
tic_t entertic = 0, oldentertics = 0, realtics = 0, rendertimeout = INFTICS;
|
tic_t entertic = 0, oldentertics = 0, realtics = 0, rendertimeout = INFTICS;
|
||||||
double deltatics = 0.0;
|
double deltatics = 0.0;
|
||||||
double deltasecs = 0.0;
|
double deltasecs = 0.0;
|
||||||
UINT64 precision;
|
UINT64 precision = 0;
|
||||||
|
|
||||||
boolean interp = false;
|
boolean interp = false;
|
||||||
boolean doDisplay = false;
|
boolean doDisplay = false;
|
||||||
@@ -708,7 +702,7 @@ void D_SRB2Loop(void)
|
|||||||
COM_ImmedExecute("cls;version");
|
COM_ImmedExecute("cls;version");
|
||||||
|
|
||||||
if (rendermode == render_soft)
|
if (rendermode == render_soft)
|
||||||
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, W_CachePatchNum(W_GetNumForName("KARTKREW"), PU_PATCH_LOWPRIORITY), NULL);
|
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, W_CachePatchNum(W_GetNumForName("KARTKREW"), PU_PATCH), NULL);
|
||||||
I_FinishUpdate(); // page flip or blit buffer
|
I_FinishUpdate(); // page flip or blit buffer
|
||||||
|
|
||||||
precision = I_GetPrecisePrecision();
|
precision = I_GetPrecisePrecision();
|
||||||
@@ -720,8 +714,12 @@ void D_SRB2Loop(void)
|
|||||||
precise_t elapsed;
|
precise_t elapsed;
|
||||||
precise_t enterprecise, finishprecise;
|
precise_t enterprecise, finishprecise;
|
||||||
|
|
||||||
|
boolean ranwipe = false;
|
||||||
|
|
||||||
enterprecise = I_GetPreciseTime();
|
enterprecise = I_GetPreciseTime();
|
||||||
|
|
||||||
|
I_HandleInterrupt();
|
||||||
|
|
||||||
memset(&g_dc, 0, sizeof(g_dc));
|
memset(&g_dc, 0, sizeof(g_dc));
|
||||||
Z_Frame_Reset();
|
Z_Frame_Reset();
|
||||||
|
|
||||||
@@ -729,8 +727,6 @@ void D_SRB2Loop(void)
|
|||||||
const UINT32 framecap = R_GetFramerateCap();
|
const UINT32 framecap = R_GetFramerateCap();
|
||||||
capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round
|
capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round
|
||||||
|
|
||||||
boolean ranwipe = false;
|
|
||||||
|
|
||||||
I_UpdateTime(cv_timescale.value);
|
I_UpdateTime(cv_timescale.value);
|
||||||
|
|
||||||
if (lastwipetic)
|
if (lastwipetic)
|
||||||
@@ -761,8 +757,6 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
renderisnewtic = (realtics > 0 || singletics);
|
renderisnewtic = (realtics > 0 || singletics);
|
||||||
|
|
||||||
refreshdirmenu = 0; // not sure where to put this, here as good as any?
|
|
||||||
|
|
||||||
if (renderisnewtic)
|
if (renderisnewtic)
|
||||||
{
|
{
|
||||||
// don't skip more than 10 frames at a time
|
// don't skip more than 10 frames at a time
|
||||||
@@ -796,11 +790,6 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
doDisplay = true;
|
doDisplay = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dedicated)
|
|
||||||
{
|
|
||||||
D_DeviceLEDTick();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interp)
|
if (interp)
|
||||||
@@ -830,9 +819,9 @@ void D_SRB2Loop(void)
|
|||||||
}
|
}
|
||||||
else if (!dedicated)
|
else if (!dedicated)
|
||||||
{
|
{
|
||||||
// always update console and hud
|
// always update console movement
|
||||||
// otherwise it may take minutes to open it
|
// otherwise it will takes literal ages to open
|
||||||
CON_Drawer();
|
CON_MoveConsole();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -842,6 +831,13 @@ void D_SRB2Loop(void)
|
|||||||
if (takescreenshot)
|
if (takescreenshot)
|
||||||
M_DoScreenShot();
|
M_DoScreenShot();
|
||||||
|
|
||||||
|
#ifndef DEDICATED
|
||||||
|
if (!dedicated && renderisnewtic)
|
||||||
|
{
|
||||||
|
G_DeviceLEDTick();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// consoleplayer -> displayplayers (hear sounds from viewpoint)
|
// consoleplayer -> displayplayers (hear sounds from viewpoint)
|
||||||
S_UpdateSounds(); // move positional sounds
|
S_UpdateSounds(); // move positional sounds
|
||||||
|
|
||||||
@@ -920,10 +916,11 @@ void D_ClearState(void)
|
|||||||
|
|
||||||
// okay, stop now
|
// okay, stop now
|
||||||
// (otherwise the game still thinks we're playing!)
|
// (otherwise the game still thinks we're playing!)
|
||||||
|
#ifdef HAVE_CURL
|
||||||
CURLAbortFile();
|
CURLAbortFile();
|
||||||
|
#endif
|
||||||
SV_StopServer();
|
SV_StopServer();
|
||||||
SV_ResetServer();
|
SV_ResetServer();
|
||||||
serverlistultimatecount = 0;
|
|
||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
CL_ClearPlayer(i);
|
CL_ClearPlayer(i);
|
||||||
@@ -977,7 +974,7 @@ void D_ClearState(void)
|
|||||||
M_ClearMenus(true);
|
M_ClearMenus(true);
|
||||||
|
|
||||||
// map palettes affect this
|
// map palettes affect this
|
||||||
D_ResetDeviceLED();
|
G_ResetDeviceLED();
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -985,6 +982,9 @@ void D_ClearState(void)
|
|||||||
//
|
//
|
||||||
void D_StartTitle(void)
|
void D_StartTitle(void)
|
||||||
{
|
{
|
||||||
|
if (dedicated)
|
||||||
|
I_Error("D_StartTitle is called on dedicated server");
|
||||||
|
|
||||||
D_ClearState();
|
D_ClearState();
|
||||||
multiplayer = netgame = false; // title menu shouldnt be a netgame or multiplayer lmao
|
multiplayer = netgame = false; // title menu shouldnt be a netgame or multiplayer lmao
|
||||||
F_StartTitleScreen();
|
F_StartTitleScreen();
|
||||||
@@ -1046,25 +1046,38 @@ static INT32 D_DetectFileType(const char* filename)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// autoload that shit
|
// autoload that shit
|
||||||
static void D_AutoloadFile(const char *file, char **filearray, size_t index)
|
static void D_AutoloadFile(const char *file, char **filearray, size_t *index)
|
||||||
{
|
{
|
||||||
char *newfile;
|
char *newfile;
|
||||||
INT32 fileType = D_DetectFileType(file);
|
INT32 fileType = D_DetectFileType(file);
|
||||||
|
|
||||||
|
if (*index >= MAX_WADFILES)
|
||||||
|
{
|
||||||
|
CONS_Printf("D_AutoloadFile: Failed to add file %s! Too many autoloaded files\n", file);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!fileType)
|
if (!fileType)
|
||||||
{
|
{
|
||||||
CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
|
CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (fileType == 1)
|
||||||
|
{
|
||||||
|
CONS_Printf("D_AutoloadFile: File %s is a directory\n", file);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (fileType <= 6)
|
if (fileType <= 6)
|
||||||
{
|
{
|
||||||
newfile = malloc(strlen(file) + 1);
|
newfile = malloc(strlen(file) + 1);
|
||||||
if (!newfile)
|
if (!newfile)
|
||||||
I_Error("No more free memory to AutoloadFile %s",file);
|
I_Error("D_AutoloadFile: No more free memory to autoload file %s", file);
|
||||||
|
|
||||||
strcpy(newfile, file);
|
strcpy(newfile, file);
|
||||||
filearray[index] = newfile;
|
filearray[*index] = newfile;
|
||||||
|
(*index)++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1107,7 +1120,7 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
// If the file is found, run our shit
|
// If the file is found, run our shit
|
||||||
if (!autoloadconfigfile) // nope outta here
|
if (!autoloadconfigfile) // nope outta here
|
||||||
{
|
{
|
||||||
autoloadcount = postloadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
|
autoloadwadcount = postloadwadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1133,27 +1146,40 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
if (newline)
|
if (newline)
|
||||||
*newline = '\0';
|
*newline = '\0';
|
||||||
|
|
||||||
if (!postload && W_CheckPostLoadList(wadsToAutoload))
|
// ok so theres still issues with players adding stuff to autoload by accident
|
||||||
|
// sometimes this stuff contains maps
|
||||||
|
// you can probably imagine how that goes in a netgame....
|
||||||
|
int retmap = W_CheckAutoLoadContainsMap(wadsToAutoload);
|
||||||
|
if (retmap == -1)
|
||||||
{
|
{
|
||||||
CONS_Printf("forcing postload for file %s\n", wadsToAutoload);
|
CONS_Alert(CONS_WARNING, "Autoload: file %s was not found or not valid.\n", wadsToAutoload);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (retmap > 0)
|
||||||
|
{
|
||||||
|
CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!postload && W_CheckPostLoadList(wadsToAutoload) > 0)
|
||||||
|
{
|
||||||
|
CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload);
|
||||||
postload = true;
|
postload = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// LOAD IT
|
// LOAD IT
|
||||||
if (!postload)
|
if (!postload)
|
||||||
{
|
{
|
||||||
D_AutoloadFile(wadsToAutoload, autoloadwadfiles, autoloadcount);
|
D_AutoloadFile(wadsToAutoload, autoloadwadfiles, &autoloadwadcount);
|
||||||
autoloadcount++;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, postloadcount);
|
D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, &postloadwadcount);
|
||||||
postloadcount++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
autoloadwadfiles[autoloadcount] = NULL;
|
autoloadwadfiles[autoloadwadcount] = NULL;
|
||||||
autoloadwadfilespost[postloadcount] = NULL;
|
autoloadwadfilespost[postloadwadcount] = NULL;
|
||||||
|
|
||||||
// we dont want memory leaks around here do we?
|
// we dont want memory leaks around here do we?
|
||||||
fclose(autoloadconfigfile);
|
fclose(autoloadconfigfile);
|
||||||
@@ -1162,7 +1188,7 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
static void D_AddAutoloadFiles(void)
|
static void D_AddAutoloadFiles(void)
|
||||||
{
|
{
|
||||||
// nothing to autoload
|
// nothing to autoload
|
||||||
if (autoloadcount == 0)
|
if (autoloadwadcount == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
|
CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
|
||||||
@@ -1170,15 +1196,15 @@ static void D_AddAutoloadFiles(void)
|
|||||||
if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
|
if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
|
||||||
CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
|
CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
|
||||||
|
|
||||||
D_CleanFile(autoloadwadfiles, autoloadcount);
|
D_CleanFile(autoloadwadfiles, autoloadwadcount);
|
||||||
|
|
||||||
autoloadcount = 0;
|
autoloadwadcount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void D_AddPostloadFiles(void)
|
void D_AddPostloadFiles(void)
|
||||||
{
|
{
|
||||||
// nothing to postload
|
// nothing to postload
|
||||||
if (postloadcount == 0 || !netgame)
|
if (postloadwadcount == 0 || !netgame)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
|
CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
|
||||||
@@ -1186,9 +1212,9 @@ void D_AddPostloadFiles(void)
|
|||||||
if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
|
if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
|
||||||
CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
|
CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
|
||||||
|
|
||||||
D_CleanFile(autoloadwadfilespost, postloadcount);
|
D_CleanFile(autoloadwadfilespost, postloadwadcount);
|
||||||
|
|
||||||
postloadcount = 0;
|
postloadwadcount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@@ -1197,7 +1223,7 @@ void D_AddPostloadFiles(void)
|
|||||||
|
|
||||||
static boolean AddIWAD(const char * file, const char *dir)
|
static boolean AddIWAD(const char * file, const char *dir)
|
||||||
{
|
{
|
||||||
char * path = va(pandf, dir, file);
|
char *path = va(pandf, dir, file);
|
||||||
|
|
||||||
if (FIL_ReadFileOK(path))
|
if (FIL_ReadFileOK(path))
|
||||||
{
|
{
|
||||||
@@ -1218,22 +1244,20 @@ static void IdentifyVersion(void)
|
|||||||
const char *srb2waddir = NULL;
|
const char *srb2waddir = NULL;
|
||||||
|
|
||||||
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
||||||
|
CLEANUP(pfree) const char *allocwaddir = NULL; // here so we dont potentially free stack memory
|
||||||
// change to the directory where 'srb2.srb' is found
|
// change to the directory where 'srb2.srb' is found
|
||||||
srb2waddir = I_LocateWad();
|
allocwaddir = I_LocateWad();
|
||||||
|
srb2waddir = allocwaddir;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char tempsrb2path[256] = ".";
|
char tempsrb2path[256] = ".";
|
||||||
getcwd(tempsrb2path, 256);
|
if (I_GetCwd(tempsrb2path, 256) == NULL)
|
||||||
|
strcpy(tempsrb2path, ".");
|
||||||
|
|
||||||
// get the current directory (possible problem on NT with "." as current dir)
|
// get the current directory (possible problem on NT with "." as current dir)
|
||||||
if (!srb2waddir)
|
if (!srb2waddir)
|
||||||
{
|
{
|
||||||
if (tempsrb2path[0])
|
srb2waddir = tempsrb2path;
|
||||||
srb2waddir = tempsrb2path;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
srb2waddir = ".";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (1) // reduce the amount of findfile by only using full cwd in this func
|
#if (1) // reduce the amount of findfile by only using full cwd in this func
|
||||||
@@ -1327,20 +1351,24 @@ static void IdentifyVersion(void)
|
|||||||
//
|
//
|
||||||
// search for maps
|
// search for maps
|
||||||
//
|
//
|
||||||
static void D_CheckMaps(boolean checkreplaced)
|
static void D_CheckMapReplacements(boolean pwad)
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
char *name;
|
char *name;
|
||||||
UINT16 wadnum;
|
UINT16 wadnum;
|
||||||
lumpinfo_t *lumpinfo;
|
lumpinfo_t *lumpinfo;
|
||||||
|
size_t numfiles;
|
||||||
|
|
||||||
for (wadnum = 0; wadnum < mainwads; wadnum++)
|
wadnum = pwad ? (mainwads+1) : 0;
|
||||||
|
numfiles = pwad ? numwadfiles : mainwads;
|
||||||
|
|
||||||
|
for (; wadnum < numfiles; wadnum++)
|
||||||
{
|
{
|
||||||
lumpinfo = wadfiles[wadnum]->lumpinfo;
|
lumpinfo = wadfiles[wadnum]->lumpinfo;
|
||||||
for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
|
for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
|
||||||
{
|
{
|
||||||
name = lumpinfo->name;
|
name = lumpinfo->name;
|
||||||
P_CheckMapReplacements(name, checkreplaced);
|
P_CheckMapReplacements(name, pwad);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1376,8 +1404,6 @@ static inline void D_MakeTitleString(char *s)
|
|||||||
// extra graphic patches for saturn specific thingies
|
// extra graphic patches for saturn specific thingies
|
||||||
boolean xtra_speedo = false; // extra speedometer check
|
boolean xtra_speedo = false; // extra speedometer check
|
||||||
boolean xtra_speedo_clr = false; // extra speedometer colour check
|
boolean xtra_speedo_clr = false; // extra speedometer colour check
|
||||||
boolean xtra_speedo3 = false; // 80x 11 extra speedometer check
|
|
||||||
boolean xtra_speedo_clr3 = false; // 80x 11 extra speedometer colour check
|
|
||||||
boolean achi_speedo = false; // achiiro speedometer check
|
boolean achi_speedo = false; // achiiro speedometer check
|
||||||
boolean achi_speedo_clr = false; // extra speedometer colour check
|
boolean achi_speedo_clr = false; // extra speedometer colour check
|
||||||
boolean dial_speedo = false; // dial speedometer check
|
boolean dial_speedo = false; // dial speedometer check
|
||||||
@@ -1407,7 +1433,6 @@ static void D_CheckSaturnExtraFiles(void)
|
|||||||
CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
|
CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
|
||||||
|
|
||||||
unsigned last_speedo_i = 0;
|
unsigned last_speedo_i = 0;
|
||||||
unsigned last_driftgauge_i = 3;
|
|
||||||
unsigned last_inputdisplay_i = 2;
|
unsigned last_inputdisplay_i = 2;
|
||||||
unsigned last_minimapdot_i = 0;
|
unsigned last_minimapdot_i = 0;
|
||||||
#define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; }
|
#define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; }
|
||||||
@@ -1566,20 +1591,6 @@ static void D_CheckSaturnExtraFiles(void)
|
|||||||
if (found_extra3_kart)
|
if (found_extra3_kart)
|
||||||
{
|
{
|
||||||
mainwads++;
|
mainwads++;
|
||||||
|
|
||||||
// 80x11 speedometer crap
|
|
||||||
if (W_LumpExists("SP_SM3TC"))
|
|
||||||
{
|
|
||||||
xtra_speedo3 = true;
|
|
||||||
PUSHCONS(speedo_cons_temp, last_speedo_i, 7, "Extra");
|
|
||||||
PUSHCONS(driftgaugestyle_cons_temp, last_driftgauge_i, 5, "Extra");
|
|
||||||
}
|
|
||||||
|
|
||||||
// 80x11 speedometer crap but colour
|
|
||||||
if (W_LumpExists("SC_SM3TC"))
|
|
||||||
{
|
|
||||||
xtra_speedo_clr3 = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef PUSHCONS
|
#undef PUSHCONS
|
||||||
@@ -1654,12 +1665,6 @@ void D_SRB2Main(void)
|
|||||||
strcpy(srb2, "SRB2Kart");
|
strcpy(srb2, "SRB2Kart");
|
||||||
D_MakeTitleString(srb2);
|
D_MakeTitleString(srb2);
|
||||||
|
|
||||||
#if defined (__OS2__) && !defined (HAVE_SDL)
|
|
||||||
// set PM window title
|
|
||||||
snprintf(pmData->title, sizeof (pmData->title), "SRB2Kart" VERSIONSTRING ": %s", title);
|
|
||||||
pmData->title[sizeof (pmData->title) - 1] = '\0';
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (devparm)
|
if (devparm)
|
||||||
CONS_Printf(M_GetText("Development mode ON.\n"));
|
CONS_Printf(M_GetText("Development mode ON.\n"));
|
||||||
|
|
||||||
@@ -1783,10 +1788,6 @@ void D_SRB2Main(void)
|
|||||||
// Setup default unlockable conditions
|
// Setup default unlockable conditions
|
||||||
M_SetupDefaultConditionSets();
|
M_SetupDefaultConditionSets();
|
||||||
|
|
||||||
// Setup character tables
|
|
||||||
// Have to be done here before files are loaded
|
|
||||||
M_InitCharacterTables();
|
|
||||||
|
|
||||||
// load wad, including the main wad file
|
// load wad, including the main wad file
|
||||||
CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
|
CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
|
||||||
|
|
||||||
@@ -1830,17 +1831,19 @@ void D_SRB2Main(void)
|
|||||||
// conversion sometimes needs the palette
|
// conversion sometimes needs the palette
|
||||||
V_ReloadPalette();
|
V_ReloadPalette();
|
||||||
|
|
||||||
D_CheckMaps(false);
|
D_CheckMapReplacements(false);
|
||||||
|
|
||||||
W_InitMultipleFiles(startuppwads, startuppwadcount, true);
|
|
||||||
|
|
||||||
// Only search for pwad maps if we actually have a pwad added
|
|
||||||
if (startuppwadcount > 0)
|
if (startuppwadcount > 0)
|
||||||
{
|
{
|
||||||
D_CheckMaps(true);
|
CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n");
|
||||||
|
W_InitMultipleFiles(startuppwads, startuppwadcount, true);
|
||||||
|
|
||||||
|
// Only search for pwad maps if we actually have a pwad added
|
||||||
|
D_CheckMapReplacements(true);
|
||||||
|
|
||||||
|
D_CleanFile(startuppwads, startuppwadcount);
|
||||||
}
|
}
|
||||||
|
|
||||||
D_CleanFile(startuppwads, startuppwadcount);
|
|
||||||
startuppwadcount = 0;
|
startuppwadcount = 0;
|
||||||
|
|
||||||
cht_Init();
|
cht_Init();
|
||||||
@@ -1906,7 +1909,8 @@ void D_SRB2Main(void)
|
|||||||
if (M_CheckParm("-warp") && M_IsNextParm())
|
if (M_CheckParm("-warp") && M_IsNextParm())
|
||||||
{
|
{
|
||||||
const char *word = M_GetNextParm();
|
const char *word = M_GetNextParm();
|
||||||
pstartmap = G_FindMapByNameOrCode(word, 0);
|
pstartmap = G_FindMapByNameOrCode(word, NULL);
|
||||||
|
|
||||||
if (! pstartmap)
|
if (! pstartmap)
|
||||||
I_Error("Cannot find a map remotely named '%s'\n", word);
|
I_Error("Cannot find a map remotely named '%s'\n", word);
|
||||||
else
|
else
|
||||||
@@ -1926,7 +1930,7 @@ void D_SRB2Main(void)
|
|||||||
CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
|
CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
|
||||||
R_Init();
|
R_Init();
|
||||||
|
|
||||||
#if SOUND==SOUND_DUMMY
|
#if SOUND == SOUND_DUMMY
|
||||||
sound_disabled = true;
|
sound_disabled = true;
|
||||||
music_disabled = true;
|
music_disabled = true;
|
||||||
#else
|
#else
|
||||||
@@ -2039,9 +2043,13 @@ void D_SRB2Main(void)
|
|||||||
if (M_CheckProtoParam("replay"))
|
if (M_CheckProtoParam("replay"))
|
||||||
{
|
{
|
||||||
const char *replayurl = M_GetProtoParam();
|
const char *replayurl = M_GetProtoParam();
|
||||||
char *replayname = strrchr(replayurl, '/');
|
|
||||||
|
|
||||||
if (!replayname || !replayurl)
|
if (!replayurl)
|
||||||
|
I_Error("REPLAY: Invalid URL.");
|
||||||
|
|
||||||
|
gconst char *replayname = strrchr(replayurl, '/');
|
||||||
|
|
||||||
|
if (!replayname)
|
||||||
I_Error("REPLAY: Invalid URL.");
|
I_Error("REPLAY: Invalid URL.");
|
||||||
|
|
||||||
#define REPLAYDIR "/DownloadedReplays/"
|
#define REPLAYDIR "/DownloadedReplays/"
|
||||||
@@ -2155,8 +2163,8 @@ void D_SRB2Main(void)
|
|||||||
|
|
||||||
if (dedicated && server)
|
if (dedicated && server)
|
||||||
{
|
{
|
||||||
levelstarttic = gametic;
|
|
||||||
G_SetGamestate(GS_LEVEL);
|
G_SetGamestate(GS_LEVEL);
|
||||||
|
|
||||||
if (!P_SetupLevel(false, false))
|
if (!P_SetupLevel(false, false))
|
||||||
I_Quit(); // fail so reset game stuff
|
I_Quit(); // fail so reset game stuff
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,8 +38,6 @@ extern boolean found_extra3_kart; // for use in k_kart.c
|
|||||||
|
|
||||||
extern boolean xtra_speedo; // extra speedometer check
|
extern boolean xtra_speedo; // extra speedometer check
|
||||||
extern boolean xtra_speedo_clr; // extra speedometer colour check
|
extern boolean xtra_speedo_clr; // extra speedometer colour check
|
||||||
extern boolean xtra_speedo3; // 80x11 extra speedometer check
|
|
||||||
extern boolean xtra_speedo_clr3; // 80x11 extra speedometer colour check
|
|
||||||
extern boolean achi_speedo; // achiiro speedometer check
|
extern boolean achi_speedo; // achiiro speedometer check
|
||||||
extern boolean achi_speedo_clr; // extra speedometer colour check
|
extern boolean achi_speedo_clr; // extra speedometer colour check
|
||||||
extern boolean dial_speedo; // dial speedometer check
|
extern boolean dial_speedo; // dial speedometer check
|
||||||
@@ -80,8 +78,6 @@ void D_ProcessEvents(void);
|
|||||||
|
|
||||||
const char *D_Home(void);
|
const char *D_Home(void);
|
||||||
|
|
||||||
void D_ResetDeviceLED(void);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// BASE LEVEL
|
// BASE LEVEL
|
||||||
//
|
//
|
||||||
|
|||||||
+13
-9
@@ -59,7 +59,7 @@ static INT16 reboundsize[MAXREBOUND];
|
|||||||
static INT32 rebound_head, rebound_tail;
|
static INT32 rebound_head, rebound_tail;
|
||||||
|
|
||||||
/// \brief max length per packet
|
/// \brief max length per packet
|
||||||
INT16 hardware_MAXPACKETLENGTH;
|
INT16 hardware_MAXPACKETLENGTH = 0;
|
||||||
|
|
||||||
boolean (*I_NetGet)(void) = NULL;
|
boolean (*I_NetGet)(void) = NULL;
|
||||||
void (*I_NetSend)(void) = NULL;
|
void (*I_NetSend)(void) = NULL;
|
||||||
@@ -96,7 +96,7 @@ INT32 ticruned = 0, ticmiss = 0;
|
|||||||
|
|
||||||
// globals
|
// globals
|
||||||
INT32 getbps = 0, sendbps = 0;
|
INT32 getbps = 0, sendbps = 0;
|
||||||
float lostpercent = 0, duppercent = 0, gamelostpercent = 0;
|
float lostpercent = 0.0f, duppercent = 0.0f, gamelostpercent = 0.0f;
|
||||||
INT32 packetheaderlength = 0;
|
INT32 packetheaderlength = 0;
|
||||||
|
|
||||||
boolean Net_GetNetStat(void)
|
boolean Net_GetNetStat(void)
|
||||||
@@ -492,6 +492,7 @@ void Net_AckTicker(void)
|
|||||||
ackpak[i].acknum = 0;
|
ackpak[i].acknum = 0;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
|
DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
|
||||||
NODETIMEOUT, I_GetTime()));
|
NODETIMEOUT, I_GetTime()));
|
||||||
memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
|
memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
|
||||||
@@ -611,12 +612,8 @@ void Net_WaitAllAckReceived(UINT32 timeout)
|
|||||||
|
|
||||||
static void InitNode(node_t *node)
|
static void InitNode(node_t *node)
|
||||||
{
|
{
|
||||||
node->acktosend_head = node->acktosend_tail = 0;
|
memset(node, 0, sizeof(node_t));
|
||||||
memset(node->acktosend, 0, sizeof(node->acktosend));
|
|
||||||
node->firstacktosend = 0;
|
|
||||||
node->nextacknum = 1;
|
node->nextacknum = 1;
|
||||||
node->remotefirstack = 0;
|
|
||||||
node->flags = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void InitAck(void)
|
static void InitAck(void)
|
||||||
@@ -1224,7 +1221,7 @@ void D_SetDoomcom(void)
|
|||||||
if (doomcom)
|
if (doomcom)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
doomcom = Z_Calloc(sizeof (doomcom_t), PU_STATIC, NULL);
|
doomcom = Z_Calloc(sizeof(doomcom_t), PU_STATIC, NULL);
|
||||||
doomcom->id = DOOMCOM_ID;
|
doomcom->id = DOOMCOM_ID;
|
||||||
doomcom->numslots = doomcom->numnodes = 1;
|
doomcom->numslots = doomcom->numnodes = 1;
|
||||||
}
|
}
|
||||||
@@ -1266,6 +1263,7 @@ boolean D_CheckNetGame(void)
|
|||||||
ret = true;
|
ret = true;
|
||||||
if (client && netgame)
|
if (client && netgame)
|
||||||
netgame = false;
|
netgame = false;
|
||||||
|
|
||||||
server = true; // WTF? server always true???
|
server = true; // WTF? server always true???
|
||||||
// no! The deault mode is server. Client is set elsewhere
|
// no! The deault mode is server. Client is set elsewhere
|
||||||
// when the client executes connect command.
|
// when the client executes connect command.
|
||||||
@@ -1301,6 +1299,7 @@ boolean D_CheckNetGame(void)
|
|||||||
|
|
||||||
if (doomcom->id != DOOMCOM_ID)
|
if (doomcom->id != DOOMCOM_ID)
|
||||||
I_Error("Doomcom buffer invalid!");
|
I_Error("Doomcom buffer invalid!");
|
||||||
|
|
||||||
if (doomcom->numnodes > MAXNETNODES)
|
if (doomcom->numnodes > MAXNETNODES)
|
||||||
I_Error("Too many nodes (%d), max:%d", doomcom->numnodes, MAXNETNODES);
|
I_Error("Too many nodes (%d), max:%d", doomcom->numnodes, MAXNETNODES);
|
||||||
|
|
||||||
@@ -1309,14 +1308,19 @@ boolean D_CheckNetGame(void)
|
|||||||
{
|
{
|
||||||
char filename[21];
|
char filename[21];
|
||||||
INT32 k = doomcom->consoleplayer - 1;
|
INT32 k = doomcom->consoleplayer - 1;
|
||||||
|
|
||||||
if (M_IsNextParm())
|
if (M_IsNextParm())
|
||||||
k = atoi(M_GetNextParm()) - 1;
|
k = atoi(M_GetNextParm()) - 1;
|
||||||
|
|
||||||
while (!debugfile && k < MAXPLAYERS)
|
while (!debugfile && k < MAXPLAYERS)
|
||||||
{
|
{
|
||||||
k++;
|
k++;
|
||||||
sprintf(filename, "debug%d.txt", k);
|
|
||||||
|
snprintf(filename, sizeof(filename), "debug%d.txt", k);
|
||||||
|
|
||||||
debugfile = fopen(va("%s" PATHSEP "%s", srb2home, filename), "w");
|
debugfile = fopen(va("%s" PATHSEP "%s", srb2home, filename), "w");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (debugfile)
|
if (debugfile)
|
||||||
CONS_Printf(M_GetText("debug output to: %s\n"), va("%s" PATHSEP "%s", srb2home, filename));
|
CONS_Printf(M_GetText("debug output to: %s\n"), va("%s" PATHSEP "%s", srb2home, filename));
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ extern "C" {
|
|||||||
// SINT8 is used for nodes sometimes >:(
|
// SINT8 is used for nodes sometimes >:(
|
||||||
#define MAXNETNODES 127
|
#define MAXNETNODES 127
|
||||||
#define BROADCASTADDR MAXNETNODES
|
#define BROADCASTADDR MAXNETNODES
|
||||||
#define NETSPLITSCREEN // Kart's splitscreen netgame feature
|
|
||||||
|
|
||||||
#define STATLENGTH (TICRATE*2)
|
#define STATLENGTH (TICRATE*2)
|
||||||
|
|
||||||
|
|||||||
+386
-563
File diff suppressed because it is too large.
Load diff
+6
-14
@@ -21,10 +21,7 @@ extern "C" {
|
|||||||
|
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
|
|
||||||
void SendWeaponPref(void);
|
void SendWeaponPref(UINT8 splitplayer);
|
||||||
void SendWeaponPref2(void);
|
|
||||||
void SendWeaponPref3(void);
|
|
||||||
void SendWeaponPref4(void);
|
|
||||||
|
|
||||||
// console vars
|
// console vars
|
||||||
extern consvar_t cv_playername;
|
extern consvar_t cv_playername;
|
||||||
@@ -54,10 +51,6 @@ extern consvar_t cv_mousevisible;
|
|||||||
//WTF
|
//WTF
|
||||||
extern consvar_t cv_mouseturn;
|
extern consvar_t cv_mouseturn;
|
||||||
extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS
|
extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS
|
||||||
#ifdef LJOYSTICK
|
|
||||||
extern consvar_t cv_joyport;
|
|
||||||
extern consvar_t cv_joyport2;
|
|
||||||
#endif
|
|
||||||
extern consvar_t cv_joyscale[4]; //MAXSPLITSCREENPLAYERS
|
extern consvar_t cv_joyscale[4]; //MAXSPLITSCREENPLAYERS
|
||||||
|
|
||||||
// normally in p_mobj but the .h is not read
|
// normally in p_mobj but the .h is not read
|
||||||
@@ -96,11 +89,6 @@ extern consvar_t cv_pause;
|
|||||||
extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_ingamecap, cv_respawntime;
|
extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_ingamecap, cv_respawntime;
|
||||||
extern consvar_t cv_spectatorreentry, cv_antigrief;
|
extern consvar_t cv_spectatorreentry, cv_antigrief;
|
||||||
|
|
||||||
/*extern consvar_t cv_teleporters, cv_superring, cv_supersneakers, cv_invincibility;
|
|
||||||
extern consvar_t cv_jumpshield, cv_watershield, cv_ringshield, cv_forceshield, cv_bombshield;
|
|
||||||
extern consvar_t cv_1up, cv_eggmanbox;
|
|
||||||
extern consvar_t cv_recycler;*/
|
|
||||||
|
|
||||||
// SRB2kart items
|
// SRB2kart items
|
||||||
extern consvar_t cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
|
extern consvar_t cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
|
||||||
extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine;
|
extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine;
|
||||||
@@ -158,8 +146,10 @@ extern consvar_t cv_pingstyle;
|
|||||||
|
|
||||||
//extern consvar_t cv_smallpos;
|
//extern consvar_t cv_smallpos;
|
||||||
extern consvar_t cv_showminimapnames;
|
extern consvar_t cv_showminimapnames;
|
||||||
|
extern consvar_t cv_showminimapfinished;
|
||||||
extern consvar_t cv_minihead;
|
extern consvar_t cv_minihead;
|
||||||
extern consvar_t cv_showminimapangle;
|
extern consvar_t cv_showminimapangle;
|
||||||
|
extern consvar_t cv_spinoutroll;
|
||||||
|
|
||||||
extern consvar_t cv_showlapemblem;
|
extern consvar_t cv_showlapemblem;
|
||||||
|
|
||||||
@@ -199,6 +189,8 @@ extern consvar_t cv_ps_thinkframe_page;
|
|||||||
extern consvar_t cv_ps_samplesize;
|
extern consvar_t cv_ps_samplesize;
|
||||||
extern consvar_t cv_ps_descriptor;
|
extern consvar_t cv_ps_descriptor;
|
||||||
|
|
||||||
|
extern consvar_t cv_lua_profile;
|
||||||
|
|
||||||
extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud;
|
extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud;
|
||||||
|
|
||||||
extern consvar_t cv_showtrackaddon;
|
extern consvar_t cv_showtrackaddon;
|
||||||
@@ -295,7 +287,7 @@ typedef union {
|
|||||||
// add game commands, needs cleanup
|
// add game commands, needs cleanup
|
||||||
void D_RegisterServerCommands(void);
|
void D_RegisterServerCommands(void);
|
||||||
void D_RegisterClientCommands(void);
|
void D_RegisterClientCommands(void);
|
||||||
void D_SendPlayerConfig(void);
|
void D_SendPlayerConfig(UINT8 splitplayer);
|
||||||
void Command_ExitGame_f(void);
|
void Command_ExitGame_f(void);
|
||||||
void Command_Retry_f(void);
|
void Command_Retry_f(void);
|
||||||
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
|
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
|
||||||
|
|||||||
+125
-51
@@ -64,7 +64,6 @@
|
|||||||
static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid);
|
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);
|
|
||||||
#if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 35)
|
#if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 35)
|
||||||
static int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
|
static int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
|
||||||
#else
|
#else
|
||||||
@@ -117,6 +116,8 @@ static I_mutex downloadmutex;
|
|||||||
#endif
|
#endif
|
||||||
char downloaddir[512] = "DOWNLOAD";
|
char downloaddir[512] = "DOWNLOAD";
|
||||||
|
|
||||||
|
INT32 addontypes[NUMADDONTYPES] = {0};
|
||||||
|
|
||||||
file_download_t filedownload = {};
|
file_download_t filedownload = {};
|
||||||
|
|
||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
@@ -132,8 +133,12 @@ static UINT32 curl_origtotalfilesize;
|
|||||||
static char *curl_realname = NULL;
|
static char *curl_realname = NULL;
|
||||||
fileneeded_t *curl_curfile = NULL;
|
fileneeded_t *curl_curfile = NULL;
|
||||||
HTTP_login *curl_logins = NULL;
|
HTTP_login *curl_logins = NULL;
|
||||||
|
|
||||||
|
static void CURLGetFile(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static addontype_t GetAddonType(const char *name);
|
||||||
|
|
||||||
/** Fills a serverinfo packet with information about wad files loaded.
|
/** Fills a serverinfo packet with information about wad files loaded.
|
||||||
*
|
*
|
||||||
* \todo Give this function a better name since it is in global scope.
|
* \todo Give this function a better name since it is in global scope.
|
||||||
@@ -162,7 +167,9 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
nameonly(strcpy(wadfilename, wadfiles[i]->filename));
|
strncpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH);
|
||||||
|
wadfilename[MAX_WADPATH-1] = '\0';
|
||||||
|
nameonly(wadfilename);
|
||||||
|
|
||||||
// Look below at the WRITE macros to understand what these numbers mean.
|
// Look below at the WRITE macros to understand what these numbers mean.
|
||||||
const size_t len = strlen(wadfilename) + 1;
|
const size_t len = strlen(wadfilename) + 1;
|
||||||
@@ -224,8 +231,11 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
|
|||||||
fileneeded[i].willsend = (UINT8)(filestatus >> 4);
|
fileneeded[i].willsend = (UINT8)(filestatus >> 4);
|
||||||
fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
|
fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
|
||||||
fileneeded[i].file = NULL; // The file isn't open yet
|
fileneeded[i].file = NULL; // The file isn't open yet
|
||||||
READSTRINGN(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
|
READSTRINGL(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
|
||||||
READMEM(p, fileneeded[i].md5sum, 16); // The last 16 bytes are the file checksum
|
READMEM(p, fileneeded[i].md5sum, 16); // The last 16 bytes are the file checksum
|
||||||
|
|
||||||
|
// Should be good place to calculate that?
|
||||||
|
fileneeded[i].type = GetAddonType(fileneeded[i].filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,9 +259,10 @@ void CL_PrepareDownloadSaveGame(const char *tmpsave)
|
|||||||
*/
|
*/
|
||||||
boolean CL_CheckDownloadable(void)
|
boolean CL_CheckDownloadable(void)
|
||||||
{
|
{
|
||||||
UINT8 i,dlstatus = 0;
|
UINT8 i, dlstatus = 0;
|
||||||
|
|
||||||
for (i = 0; i < fileneedednum; i++)
|
for (i = 0; i < fileneedednum; i++)
|
||||||
|
{
|
||||||
if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
|
if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
|
||||||
{
|
{
|
||||||
if (fileneeded[i].willsend == 1)
|
if (fileneeded[i].willsend == 1)
|
||||||
@@ -262,6 +273,7 @@ boolean CL_CheckDownloadable(void)
|
|||||||
else //if (fileneeded[i].willsend == 2)
|
else //if (fileneeded[i].willsend == 2)
|
||||||
dlstatus = 2;
|
dlstatus = 2;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Downloading locally disabled
|
// Downloading locally disabled
|
||||||
if (!dlstatus && M_CheckParm("-nodownload"))
|
if (!dlstatus && M_CheckParm("-nodownload"))
|
||||||
@@ -272,25 +284,31 @@ boolean CL_CheckDownloadable(void)
|
|||||||
|
|
||||||
// not downloadable, put reason in console
|
// not downloadable, put reason in console
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n"));
|
||||||
|
|
||||||
for (i = 0; i < fileneedednum; i++)
|
for (i = 0; i < fileneedednum; i++)
|
||||||
|
{
|
||||||
if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
|
if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
|
||||||
{
|
{
|
||||||
CONS_Printf(" * \"%s\" (%dK)", fileneeded[i].filename, fileneeded[i].totalsize >> 10);
|
CONS_Printf(" * \"%s\" (%dK)", fileneeded[i].filename, fileneeded[i].totalsize >> 10);
|
||||||
|
|
||||||
if (fileneeded[i].status == FS_MD5SUMBAD)
|
if (fileneeded[i].status == FS_MD5SUMBAD)
|
||||||
CONS_Printf(M_GetText(" wrong version, md5: "));
|
CONS_Printf(M_GetText(" wrong version, md5: "));
|
||||||
else
|
else
|
||||||
CONS_Printf(M_GetText(" not found, md5: "));
|
CONS_Printf(M_GetText(" not found, md5: "));
|
||||||
|
|
||||||
{
|
{
|
||||||
INT32 j;
|
INT32 j;
|
||||||
char md5tmp[33];
|
char md5tmp[33];
|
||||||
|
|
||||||
for (j = 0; j < 16; j++)
|
for (j = 0; j < 16; j++)
|
||||||
sprintf(&md5tmp[j*2], "%02x", fileneeded[i].md5sum[j]);
|
snprintf(&md5tmp[j*2], 3, "%02x", fileneeded[i].md5sum[j]);
|
||||||
|
|
||||||
CONS_Printf("%s", md5tmp);
|
CONS_Printf("%s", md5tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
CONS_Printf("\n");
|
CONS_Printf("\n");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (dlstatus)
|
switch (dlstatus)
|
||||||
{
|
{
|
||||||
@@ -304,6 +322,7 @@ boolean CL_CheckDownloadable(void)
|
|||||||
CONS_Printf(M_GetText("All files downloadable, but you have chosen to disable downloading locally.\n"));
|
CONS_Printf(M_GetText("All files downloadable, but you have chosen to disable downloading locally.\n"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -541,7 +560,7 @@ INT32 CL_CheckFiles(void)
|
|||||||
if (fileneeded[i].status != FS_OPEN)
|
if (fileneeded[i].status != FS_OPEN)
|
||||||
filestoload++;
|
filestoload++;
|
||||||
|
|
||||||
if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
|
if (fileneeded[i].status != FS_NOTCHECKED) // since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
|
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
|
||||||
@@ -549,14 +568,18 @@ INT32 CL_CheckFiles(void)
|
|||||||
// Check in already loaded files
|
// Check in already loaded files
|
||||||
for (j = mainwads+1; j < numwadfiles; j++)
|
for (j = mainwads+1; j < numwadfiles; j++)
|
||||||
{
|
{
|
||||||
nameonly(strcpy(wadfilename, wadfiles[j]->filename));
|
if (!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
|
||||||
|
|
||||||
if (fasticmp(wadfilename, fileneeded[i].filename) &&
|
|
||||||
!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
|
|
||||||
{
|
{
|
||||||
CONS_Debug(DBG_NETPLAY, "already loaded\n");
|
strncpy(wadfilename, wadfiles[j]->filename, MAX_WADPATH);
|
||||||
fileneeded[i].status = FS_OPEN;
|
wadfilename[MAX_WADPATH-1] = '\0';
|
||||||
return 4;
|
nameonly(wadfilename);
|
||||||
|
|
||||||
|
if (fasticmp(wadfilename, fileneeded[i].filename))
|
||||||
|
{
|
||||||
|
CONS_Debug(DBG_NETPLAY, "already loaded\n");
|
||||||
|
fileneeded[i].status = FS_OPEN;
|
||||||
|
return 4;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -574,6 +597,48 @@ INT32 CL_CheckFiles(void)
|
|||||||
return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading
|
return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static addontype_t GetAddonType(const char *name)
|
||||||
|
{
|
||||||
|
const char *prefix = strchr(name, '_');
|
||||||
|
|
||||||
|
// Doesn't have prefix (no '_' character or it is too far and is probably not for prefix but for something like version)
|
||||||
|
// KRBCL_ is longest prefix i can think of so this should be enough
|
||||||
|
if (prefix == NULL || prefix - name > 5)
|
||||||
|
return ADDON_MISC;
|
||||||
|
|
||||||
|
// Skip 'K'
|
||||||
|
if (*name == 'K')
|
||||||
|
++name;
|
||||||
|
|
||||||
|
switch (*name)
|
||||||
|
{
|
||||||
|
case 'L':
|
||||||
|
return ADDON_SCRIPT;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'R':
|
||||||
|
case 'B':
|
||||||
|
return ADDON_MAP;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'C':
|
||||||
|
return ADDON_CHARACTER;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ADDON_MISC;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CL_CheckAddonTypes(void)
|
||||||
|
{
|
||||||
|
memset(&addontypes, 0, sizeof(addontypes));
|
||||||
|
|
||||||
|
for (INT32 i = 0; i < fileneedednum; i++)
|
||||||
|
{
|
||||||
|
addontypes[fileneeded[i].type]++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Load it now
|
// Load it now
|
||||||
boolean CL_LoadServerFiles(void)
|
boolean CL_LoadServerFiles(void)
|
||||||
{
|
{
|
||||||
@@ -595,7 +660,7 @@ boolean CL_LoadServerFiles(void)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
const char *s;
|
const char *s;
|
||||||
switch(fileneeded[i].status)
|
switch (fileneeded[i].status)
|
||||||
{
|
{
|
||||||
case FS_NOTFOUND:
|
case FS_NOTFOUND:
|
||||||
s = "FS_NOTFOUND";
|
s = "FS_NOTFOUND";
|
||||||
@@ -638,7 +703,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
|
|||||||
|
|
||||||
char wadfilename[MAX_WADPATH];
|
char wadfilename[MAX_WADPATH];
|
||||||
|
|
||||||
if (cv_noticedownload.value)
|
if (cv_noticedownload.value && I_GetNodeAddress)
|
||||||
CONS_Printf("Sending file \"%s\" (id %d) to node %d (%s)\n", filename, fileid, node, I_GetNodeAddress(node));
|
CONS_Printf("Sending file \"%s\" (id %d) to node %d (%s)\n", filename, fileid, node, I_GetNodeAddress(node));
|
||||||
|
|
||||||
// Find the last file in the list and set a pointer to its "next" field
|
// Find the last file in the list and set a pointer to its "next" field
|
||||||
@@ -663,7 +728,9 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
|
|||||||
// Look for the requested file through all loaded files
|
// Look for the requested file through all loaded files
|
||||||
for (wadnum = 0; wadfiles[wadnum]; wadnum++)
|
for (wadnum = 0; wadfiles[wadnum]; wadnum++)
|
||||||
{
|
{
|
||||||
strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
|
// im a certified strlcpy hater
|
||||||
|
strncpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
|
||||||
|
wadfilename[MAX_WADPATH-1] = '\0';
|
||||||
nameonly(wadfilename);
|
nameonly(wadfilename);
|
||||||
|
|
||||||
if (fasticmp(wadfilename, p->id.filename))
|
if (fasticmp(wadfilename, p->id.filename))
|
||||||
@@ -959,7 +1026,7 @@ void Got_Filetxpak(void)
|
|||||||
|| fastcmp(filename, "music.kart")
|
|| fastcmp(filename, "music.kart")
|
||||||
|| fastcmp(filename, "patch.kart")
|
|| fastcmp(filename, "patch.kart")
|
||||||
))
|
))
|
||||||
I_Error("Tried to download \"%s\"", filename);
|
I_Error("Tried to download base-game file: \"%s\"", filename);
|
||||||
|
|
||||||
if (filenum >= fileneedednum)
|
if (filenum >= fileneedednum)
|
||||||
{
|
{
|
||||||
@@ -1016,23 +1083,23 @@ void Got_Filetxpak(void)
|
|||||||
{
|
{
|
||||||
const char *s;
|
const char *s;
|
||||||
|
|
||||||
switch(file->status)
|
switch (file->status)
|
||||||
{
|
{
|
||||||
case FS_NOTFOUND:
|
case FS_NOTFOUND:
|
||||||
s = "FS_NOTFOUND";
|
s = "FS_NOTFOUND";
|
||||||
break;
|
break;
|
||||||
case FS_FOUND:
|
case FS_FOUND:
|
||||||
s = "FS_FOUND";
|
s = "FS_FOUND";
|
||||||
break;
|
break;
|
||||||
case FS_OPEN:
|
case FS_OPEN:
|
||||||
s = "FS_OPEN";
|
s = "FS_OPEN";
|
||||||
break;
|
break;
|
||||||
case FS_MD5SUMBAD:
|
case FS_MD5SUMBAD:
|
||||||
s = "FS_MD5SUMBAD";
|
s = "FS_MD5SUMBAD";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
s = "unknown";
|
s = "unknown";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
|
I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
|
||||||
@@ -1080,12 +1147,14 @@ void CloseNetFile(void)
|
|||||||
|
|
||||||
// Receiving a file?
|
// Receiving a file?
|
||||||
for (i = 0; i < MAX_WADFILES; i++)
|
for (i = 0; i < MAX_WADFILES; i++)
|
||||||
|
{
|
||||||
if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file)
|
if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file)
|
||||||
{
|
{
|
||||||
fclose(fileneeded[i].file);
|
fclose(fileneeded[i].file);
|
||||||
// File is not complete delete it
|
// File is not complete delete it
|
||||||
remove(fileneeded[i].filename);
|
remove(fileneeded[i].filename);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Remove PT_FILEFRAGMENT from acknowledge list
|
// Remove PT_FILEFRAGMENT from acknowledge list
|
||||||
Net_AbortPacketType(PT_FILEFRAGMENT);
|
Net_AbortPacketType(PT_FILEFRAGMENT);
|
||||||
@@ -1099,17 +1168,16 @@ void nameonly(char *s)
|
|||||||
void *ns;
|
void *ns;
|
||||||
|
|
||||||
for (j = strlen(s); j != (size_t)-1; j--)
|
for (j = strlen(s); j != (size_t)-1; j--)
|
||||||
|
{
|
||||||
if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
|
if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
|
||||||
{
|
{
|
||||||
ns = &(s[j+1]);
|
ns = &(s[j+1]);
|
||||||
len = strlen(ns);
|
len = strlen(ns);
|
||||||
#if 0
|
memmove(s, ns, len+1);
|
||||||
memcpy(s, ns, len+1);
|
|
||||||
#else
|
|
||||||
memmove(s, ns, len+1);
|
|
||||||
#endif
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the length in characters of the last element of a path.
|
// Returns the length in characters of the last element of a path.
|
||||||
@@ -1143,7 +1211,7 @@ filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum)
|
|||||||
fhandle = fopen(filename, "rb");
|
fhandle = fopen(filename, "rb");
|
||||||
if (fhandle)
|
if (fhandle)
|
||||||
{
|
{
|
||||||
md5_stream(fhandle,md5sum);
|
md5_stream(fhandle, md5sum);
|
||||||
fclose(fhandle);
|
fclose(fhandle);
|
||||||
if (!memcmp(wantedmd5sum, md5sum, 16))
|
if (!memcmp(wantedmd5sum, md5sum, 16))
|
||||||
return FS_FOUND;
|
return FS_FOUND;
|
||||||
@@ -1163,8 +1231,12 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
|
|||||||
filestatus_t homecheck; // store result of last file search
|
filestatus_t homecheck; // store result of last file search
|
||||||
boolean badmd5 = false; // store whether md5 was bad from either of the first two searches (if nothing was found in the third)
|
boolean badmd5 = false; // store whether md5 was bad from either of the first two searches (if nothing was found in the third)
|
||||||
|
|
||||||
// skip for startup, our mainwads wont be in there
|
// see IdentifyVersion
|
||||||
if (loaded_config)
|
// Iwads skip findfile due to passing fullpath to W_OpenWadFile
|
||||||
|
#if 0
|
||||||
|
// skip for Iwads, as they wont be in there
|
||||||
|
if (!startupiwadcount)
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
|
if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
|
||||||
{
|
{
|
||||||
@@ -1301,6 +1373,7 @@ void CURLPrepareFile(const char* url, int dfilenum)
|
|||||||
if (!multi_handle)
|
if (!multi_handle)
|
||||||
{
|
{
|
||||||
cc = curl_global_init(CURL_GLOBAL_ALL);
|
cc = curl_global_init(CURL_GLOBAL_ALL);
|
||||||
|
|
||||||
if (cc < 0)
|
if (cc < 0)
|
||||||
{
|
{
|
||||||
I_OutputMsg("libcurl: curl_global_init() returned %d\n", cc);
|
I_OutputMsg("libcurl: curl_global_init() returned %d\n", cc);
|
||||||
@@ -1309,6 +1382,7 @@ void CURLPrepareFile(const char* url, int dfilenum)
|
|||||||
{
|
{
|
||||||
multi_handle = curl_multi_init();
|
multi_handle = curl_multi_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!multi_handle)
|
if (!multi_handle)
|
||||||
{
|
{
|
||||||
I_OutputMsg("libcurl: curl_multi_init() failed\n");
|
I_OutputMsg("libcurl: curl_multi_init() failed\n");
|
||||||
@@ -1437,7 +1511,7 @@ void CURLAbortFile(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void CURLGetFile(void)
|
static void CURLGetFile(void)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_lock_mutex(&downloadmutex);
|
I_lock_mutex(&downloadmutex);
|
||||||
@@ -1479,7 +1553,8 @@ void CURLGetFile(void)
|
|||||||
e = m->easy_handle;
|
e = m->easy_handle;
|
||||||
easyres = m->data.result;
|
easyres = m->data.result;
|
||||||
|
|
||||||
char *filename = Z_StrDup(curl_realname);
|
char *filename = malloc(strlen(curl_realname)+1);
|
||||||
|
strcpy(filename, curl_realname);
|
||||||
nameonly(filename);
|
nameonly(filename);
|
||||||
|
|
||||||
if (easyres != CURLE_OK)
|
if (easyres != CURLE_OK)
|
||||||
@@ -1517,7 +1592,7 @@ void CURLGetFile(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Z_Free(filename);
|
free(filename);
|
||||||
curl_curfile->file = NULL;
|
curl_curfile->file = NULL;
|
||||||
filedownload.remaining--;
|
filedownload.remaining--;
|
||||||
mc = curl_multi_remove_handle(multi_handle, e);
|
mc = curl_multi_remove_handle(multi_handle, e);
|
||||||
@@ -1544,8 +1619,7 @@ void CURLGetFile(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
HTTP_login *
|
HTTP_login *CURLGetLogin(const char *url, HTTP_login ***return_prev_next)
|
||||||
CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
|
|
||||||
{
|
{
|
||||||
HTTP_login * login;
|
HTTP_login * login;
|
||||||
HTTP_login ** prev_next;
|
HTTP_login ** prev_next;
|
||||||
@@ -1555,7 +1629,7 @@ CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
|
|||||||
( login = (*prev_next));
|
( login = (*prev_next));
|
||||||
prev_next = &login->next
|
prev_next = &login->next
|
||||||
){
|
){
|
||||||
if (fastcmp(login->url, url) != 0)
|
if (fastcmp(login->url, url))
|
||||||
{
|
{
|
||||||
if (return_prev_next)
|
if (return_prev_next)
|
||||||
(*return_prev_next) = prev_next;
|
(*return_prev_next) = prev_next;
|
||||||
|
|||||||
+12
-1
@@ -40,6 +40,15 @@ typedef enum
|
|||||||
FS_FALLBACK, // HTTP failed
|
FS_FALLBACK, // HTTP failed
|
||||||
} filestatus_t;
|
} filestatus_t;
|
||||||
|
|
||||||
|
typedef enum addontype_e
|
||||||
|
{
|
||||||
|
ADDON_SCRIPT,
|
||||||
|
ADDON_MAP,
|
||||||
|
ADDON_CHARACTER,
|
||||||
|
ADDON_MISC,
|
||||||
|
NUMADDONTYPES,
|
||||||
|
} addontype_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
UINT8 willsend; // Is the server willing to send it?
|
UINT8 willsend; // Is the server willing to send it?
|
||||||
@@ -51,11 +60,13 @@ typedef struct
|
|||||||
UINT32 totalsize;
|
UINT32 totalsize;
|
||||||
filestatus_t status; // The value returned by recsearch
|
filestatus_t status; // The value returned by recsearch
|
||||||
boolean justdownloaded; // To prevent late fragments from causing an I_Error
|
boolean justdownloaded; // To prevent late fragments from causing an I_Error
|
||||||
|
addontype_t type;
|
||||||
} fileneeded_t;
|
} fileneeded_t;
|
||||||
|
|
||||||
extern INT32 fileneedednum;
|
extern INT32 fileneedednum;
|
||||||
extern fileneeded_t fileneeded[MAX_WADFILES];
|
extern fileneeded_t fileneeded[MAX_WADFILES];
|
||||||
extern char downloaddir[512];
|
extern char downloaddir[512];
|
||||||
|
extern INT32 addontypes[NUMADDONTYPES];
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@@ -91,6 +102,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
|
|||||||
void CL_PrepareDownloadSaveGame(const char *tmpsave);
|
void CL_PrepareDownloadSaveGame(const char *tmpsave);
|
||||||
|
|
||||||
INT32 CL_CheckFiles(void);
|
INT32 CL_CheckFiles(void);
|
||||||
|
void CL_CheckAddonTypes(void);
|
||||||
boolean CL_LoadServerFiles(void);
|
boolean CL_LoadServerFiles(void);
|
||||||
void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod,
|
void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod,
|
||||||
UINT8 fileid);
|
UINT8 fileid);
|
||||||
@@ -119,7 +131,6 @@ size_t nameonlylength(const char *s);
|
|||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
void CURLPrepareFile(const char* url, int dfilenum);
|
void CURLPrepareFile(const char* url, int dfilenum);
|
||||||
void CURLAbortFile(void);
|
void CURLAbortFile(void);
|
||||||
void CURLGetFile(void);
|
|
||||||
HTTP_login * CURLGetLogin (const char *url, HTTP_login ***return_prev_next);
|
HTTP_login * CURLGetLogin (const char *url, HTTP_login ***return_prev_next);
|
||||||
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);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+14
-3
@@ -361,11 +361,17 @@ typedef struct squishdance_s
|
|||||||
{
|
{
|
||||||
tic_t countdown; // hold "custom 3" for 2 seconds to engange le dance
|
tic_t countdown; // hold "custom 3" for 2 seconds to engange le dance
|
||||||
tic_t time;
|
tic_t time;
|
||||||
fixed_t work;
|
|
||||||
fixed_t ang;
|
|
||||||
fixed_t bounce; // hehe squishy
|
|
||||||
} squishdance_t;
|
} squishdance_t;
|
||||||
|
|
||||||
|
typedef struct salty_s
|
||||||
|
{
|
||||||
|
bool ready;
|
||||||
|
bool tapping;
|
||||||
|
fixed_t zoffset;
|
||||||
|
fixed_t momz;
|
||||||
|
bool jump;
|
||||||
|
} salty_t;
|
||||||
|
|
||||||
// ========================================================================
|
// ========================================================================
|
||||||
// PLAYER STRUCTURE
|
// PLAYER STRUCTURE
|
||||||
// ========================================================================
|
// ========================================================================
|
||||||
@@ -561,11 +567,16 @@ typedef struct player_s
|
|||||||
|
|
||||||
fixed_t spinoutrot; // When a player spins out, this value increments modulus 360.
|
fixed_t spinoutrot; // When a player spins out, this value increments modulus 360.
|
||||||
|
|
||||||
|
// saltyhop! hardcode edition
|
||||||
|
salty_t salty;
|
||||||
|
|
||||||
squishdance_t squishdance;
|
squishdance_t squishdance;
|
||||||
|
|
||||||
fixed_t fovadd; // adjust FOV for hw rendering
|
fixed_t fovadd; // adjust FOV for hw rendering
|
||||||
|
|
||||||
SINT8 driftlevel; // just for controller rumble for now
|
SINT8 driftlevel; // just for controller rumble for now
|
||||||
|
|
||||||
|
UINT8 stairjank;
|
||||||
} player_t;
|
} player_t;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+2
-2
@@ -211,12 +211,12 @@ void D_SetupProtocol(void)
|
|||||||
|
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
if (!fastcmp(buffer, "no"))
|
if (fastcmp(buffer, "no"))
|
||||||
{
|
{
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (fastcmp(buffer, exe_path))
|
else if (!fastcmp(buffer, exe_path))
|
||||||
{
|
{
|
||||||
// overwrite
|
// overwrite
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|||||||
+8
-3
@@ -46,15 +46,20 @@ typedef enum
|
|||||||
// Mainly movements/button commands per game tick,
|
// Mainly movements/button commands per game tick,
|
||||||
// plus a checksum for internal state consistency.
|
// plus a checksum for internal state consistency.
|
||||||
|
|
||||||
|
// ticcmd turning bits
|
||||||
|
#define TICCMD_REDUCE 16
|
||||||
|
|
||||||
|
// ticcmd latency mask
|
||||||
|
#define TICCMD_LATENCYMASK 0xFF
|
||||||
|
|
||||||
// bits in angleturn
|
// bits in angleturn
|
||||||
#define TICCMD_RECEIVED 1
|
#define TICCMD_RECEIVED (0x01) /* Actual tic recieved from client */
|
||||||
#define TICCMD_XY 2
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
SINT8 forwardmove; // -MAXPLMOVE to MAXPLMOVE (50)
|
SINT8 forwardmove; // -MAXPLMOVE to MAXPLMOVE (50)
|
||||||
SINT8 sidemove; // -MAXPLMOVE to MAXPLMOVE (50)
|
SINT8 sidemove; // -MAXPLMOVE to MAXPLMOVE (50)
|
||||||
INT16 angleturn; // <<16 for angle delta - saved as 1 byte into demos
|
INT16 angleturn; // << TICCMD_REDUCE for angle delta - saved as 1 byte into demos
|
||||||
INT16 aiming; // vertical aiming, see G_BuildTicCmd
|
INT16 aiming; // vertical aiming, see G_BuildTicCmd
|
||||||
UINT16 buttons;
|
UINT16 buttons;
|
||||||
INT16 driftturn; // SRB2Kart: Used for getting drift turn speed
|
INT16 driftturn; // SRB2Kart: Used for getting drift turn speed
|
||||||
|
|||||||
@@ -1,21 +1,75 @@
|
|||||||
# Declare dedicated interface sources
|
# Declare dedicated interface sources
|
||||||
|
|
||||||
target_sourcefile(c)
|
set(SRB2_DEDICATED_SOURCES
|
||||||
|
i_system.c
|
||||||
|
i_main.c
|
||||||
|
i_video.c
|
||||||
|
i_sound.c
|
||||||
|
i_threads.c
|
||||||
|
dosstr.c
|
||||||
|
endtxt.c
|
||||||
|
)
|
||||||
|
|
||||||
target_sources(SRB2SDL2 PRIVATE)
|
set(SRB2_DEDICATED_HEADERS
|
||||||
|
endtxt.h
|
||||||
|
)
|
||||||
|
|
||||||
|
source_group("Interface Code" FILES ${SRB2_DEDICATED_SOURCES} ${SRB2_DEDICATED_HEADERS})
|
||||||
|
|
||||||
|
set(SRB2_DEDICATED_TOTAL_SOURCES
|
||||||
|
${SRB2_CORE_SOURCES}
|
||||||
|
${SRB2_CORE_HEADERS}
|
||||||
|
${SRB2_PNG_SOURCES}
|
||||||
|
${SRB2_PNG_HEADERS}
|
||||||
|
${SRB2_CORE_RENDER_SOURCES}
|
||||||
|
${SRB2_CORE_GAME_SOURCES}
|
||||||
|
${SRB2_LUA_SOURCES}
|
||||||
|
${SRB2_LUA_HEADERS}
|
||||||
|
${SRB2_BLUA_SOURCES}
|
||||||
|
${SRB2_BLUA_HEADERS}
|
||||||
|
${SRB2_DEDICATED_SOURCES}
|
||||||
|
${SRB2_DEDICATED_HEADERS}
|
||||||
|
)
|
||||||
|
|
||||||
|
source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
|
||||||
|
source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
|
||||||
|
source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
|
||||||
|
source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS})
|
||||||
|
source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS})
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows)
|
if(${CMAKE_SYSTEM} MATCHES Windows)
|
||||||
target_sources(SRB2SDL2 PRIVATE
|
set(SRB2_DEDICATED_TOTAL_SOURCES ${SRB2_DEDICATED_TOTAL_SOURCES}
|
||||||
../win32/win_dbg.c
|
${CMAKE_SOURCE_DIR}/src/win32/win_dbg.c
|
||||||
../win32/Srb2win.rc)
|
${CMAKE_SOURCE_DIR}/src/win32/Srb2win.rc
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 ${SRB2_DEDICATED_TOTAL_SOURCES})
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows)
|
if(${CMAKE_SYSTEM} MATCHES Windows)
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2kartd)
|
||||||
elseif(${CMAKE_SYSTEM} MATCHES Linux)
|
elseif(${CMAKE_SYSTEM} MATCHES Linux)
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2dlegacy)
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2kartd)
|
||||||
else()
|
else()
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2kartd)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
||||||
|
find_library(CORE_FOUNDATION_LIBRARY "CoreFoundation")
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
|
${CORE_FOUNDATION_LIBRARY}
|
||||||
|
)
|
||||||
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
|
||||||
|
|
||||||
|
# Configure the app bundle icon and plist properties
|
||||||
|
target_sources(SRB2SDL2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns")
|
||||||
|
set_target_properties(SRB2SDL2 PROPERTIES
|
||||||
|
MACOSX_BUNDLE_ICON_FILE "Srb2mac"
|
||||||
|
MACOSX_BUNDLE_BUNDLE_NAME "Sonic Robo Blast 2"
|
||||||
|
MACOSX_BUNDLE_BUNDLE_VERSION ${SRB2_VERSION}
|
||||||
|
|
||||||
|
RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns"
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
||||||
@@ -24,25 +78,27 @@ if(${CMAKE_SYSTEM} MATCHES Darwin)
|
|||||||
${CORE_LIB}
|
${CORE_LIB}
|
||||||
${PNG_LIBRARIES}
|
${PNG_LIBRARIES}
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
|
${CURL_LIBRARIES}
|
||||||
)
|
)
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
|
||||||
else()
|
else()
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
${PNG_LIBRARIES}
|
${PNG_LIBRARIES}
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
|
${CURL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Linux)
|
if(${CMAKE_SYSTEM} MATCHES Linux)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
m
|
m
|
||||||
rt
|
rt
|
||||||
|
pthread
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#target_link_libraries(SRB2SDL2 PRIVATE SRB2Core)
|
if(${SRB2_HAVE_LIBBACKTRACE})
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE ${LIBBACKTRACE_LIBRARIES})
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES VERSION ${SRB2_VERSION})
|
endif()
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows)
|
if(${CMAKE_SYSTEM} MATCHES Windows)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
@@ -60,20 +116,40 @@ target_include_directories(SRB2SDL2 PRIVATE
|
|||||||
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE
|
target_compile_definitions(SRB2SDL2 PRIVATE
|
||||||
-DDEDICATED
|
-DDEDICATED
|
||||||
|
-DHAVE_THREADS
|
||||||
)
|
)
|
||||||
|
|
||||||
## strip debug symbols into separate file when using gcc
|
if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE AND NOT SRB2_CONFIG_ASAN AND NOT SRB2_CONFIG_UBSAN AND NOT SRB2_CONFIG_TSAN)
|
||||||
if(CMAKE_COMPILER_IS_GNUCC)
|
set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||||
if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
|
||||||
message(STATUS "Will make separate debug symbols in *.debug")
|
|
||||||
add_custom_command(TARGET SRB2SDL2 POST_BUILD
|
|
||||||
COMMAND ${OBJCOPY} --only-keep-debug $<TARGET_FILE:SRB2SDL2> $<TARGET_FILE:SRB2SDL2>.debug
|
|
||||||
COMMAND ${OBJCOPY} --strip-debug $<TARGET_FILE:SRB2SDL2>
|
|
||||||
COMMAND ${OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE_NAME:SRB2SDL2>.debug $<TARGET_FILE:SRB2SDL2>
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(SRB2_CONFIG_ASAN)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=address -fno-omit-frame-pointer -fno-common)
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(SRB2_CONFIG_UBSAN)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=undefined -fno-omit-frame-pointer)
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(SRB2_CONFIG_TSAN)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=thread -fno-omit-frame-pointer)
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=thread)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
## strip debug symbols into separate file when using gcc
|
||||||
|
# if(CMAKE_COMPILER_IS_GNUCC)
|
||||||
|
# if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
||||||
|
# message(STATUS "Will make separate debug symbols in *.debug")
|
||||||
|
# add_custom_command(TARGET SRB2SDL2 POST_BUILD
|
||||||
|
# COMMAND ${OBJCOPY} --only-keep-debug $<TARGET_FILE:SRB2SDL2> $<TARGET_FILE:SRB2SDL2>.debug
|
||||||
|
# COMMAND ${OBJCOPY} --strip-debug $<TARGET_FILE:SRB2SDL2>
|
||||||
|
# COMMAND ${OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE_NAME:SRB2SDL2>.debug $<TARGET_FILE:SRB2SDL2>
|
||||||
|
# )
|
||||||
|
# endif()
|
||||||
|
# endif()
|
||||||
|
|
||||||
#### Installation ####
|
#### Installation ####
|
||||||
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
||||||
install(TARGETS SRB2SDL2
|
install(TARGETS SRB2SDL2
|
||||||
|
|||||||
+246
-210
@@ -68,6 +68,12 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
|
|||||||
#include <time.h>
|
#include <time.h>
|
||||||
#if defined (__linux__)
|
#if defined (__linux__)
|
||||||
#include <sys/vfs.h>
|
#include <sys/vfs.h>
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <sys/mount.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/sysctl.h>
|
||||||
|
#include <mach/mach.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/mount.h>
|
#include <sys/mount.h>
|
||||||
@@ -127,21 +133,36 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
|
|||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
// Locations for searching the srb2.srb
|
/// Locations to directly check for srb2.srb in
|
||||||
|
const char *wadDefaultPaths[] = {
|
||||||
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
||||||
#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
|
"/usr/local/share/games/SRB2Kart",
|
||||||
#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
|
"/usr/local/games/SRB2Kart",
|
||||||
#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
|
"/usr/share/games/SRB2Kart",
|
||||||
#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
|
"/usr/games/SRB2Kart",
|
||||||
#define DEFAULTSEARCHPATH1 "/usr/local/games"
|
#elif defined (_WIN32)
|
||||||
#define DEFAULTSEARCHPATH2 "/usr/games"
|
"c:\\games\\srb2kart",
|
||||||
#define DEFAULTSEARCHPATH3 "/usr/local"
|
"\\games\\srb2kart",
|
||||||
#endif
|
#endif
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
|
// Folders to recurse through looking for srb2.srb
|
||||||
|
const char *wadSearchPaths[] = {
|
||||||
|
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
||||||
|
"/usr/local/games",
|
||||||
|
"/usr/games",
|
||||||
|
"/usr/local",
|
||||||
|
#elif defined (_WIN32)
|
||||||
|
"c:\\games",
|
||||||
|
"\\games",
|
||||||
|
#endif
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
/** \brief WAD file to look for
|
/** \brief WAD file to look for
|
||||||
*/
|
*/
|
||||||
#define WADKEYWORD1 "srb2.srb"
|
#define WADKEYWORD "srb2.srb"
|
||||||
#define WADKEYWORD2 "srb2.wad"
|
|
||||||
/** \brief holds wad path
|
/** \brief holds wad path
|
||||||
*/
|
*/
|
||||||
static char returnWadPath[256];
|
static char returnWadPath[256];
|
||||||
@@ -151,6 +172,8 @@ static char returnWadPath[256];
|
|||||||
#include "../i_video.h"
|
#include "../i_video.h"
|
||||||
#include "../i_sound.h"
|
#include "../i_sound.h"
|
||||||
#include "../i_system.h"
|
#include "../i_system.h"
|
||||||
|
#include "../i_time.h"
|
||||||
|
#include "../i_net.h"
|
||||||
#include "../screen.h" //vid.WndParent
|
#include "../screen.h" //vid.WndParent
|
||||||
#include "../d_net.h"
|
#include "../d_net.h"
|
||||||
#include "../g_game.h"
|
#include "../g_game.h"
|
||||||
@@ -162,10 +185,6 @@ static char returnWadPath[256];
|
|||||||
|
|
||||||
#include "../m_argv.h"
|
#include "../m_argv.h"
|
||||||
|
|
||||||
#ifdef MAC_ALERT
|
|
||||||
#include "macosx/mac_alert.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "../d_main.h"
|
#include "../d_main.h"
|
||||||
|
|
||||||
#if !defined(NOMUMBLE) && defined(HAVE_MUMBLE)
|
#if !defined(NOMUMBLE) && defined(HAVE_MUMBLE)
|
||||||
@@ -180,8 +199,6 @@ UINT8 keyboard_started = false;
|
|||||||
|
|
||||||
#ifdef HAVE_TERMIOS
|
#ifdef HAVE_TERMIOS
|
||||||
// TERMIOS console code from Quake3: thank you!
|
// TERMIOS console code from Quake3: thank you!
|
||||||
boolean stdin_active = true;
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
size_t cursor;
|
size_t cursor;
|
||||||
@@ -508,17 +525,24 @@ void I_OutputMsg(const char *fmt, ...)
|
|||||||
{
|
{
|
||||||
size_t len;
|
size_t len;
|
||||||
char *txt;
|
char *txt;
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
|
|
||||||
va_start(argptr,fmt);
|
if (!fmt)
|
||||||
|
return;
|
||||||
|
|
||||||
|
va_start(argptr, fmt);
|
||||||
len = vsnprintf(NULL, 0, fmt, argptr);
|
len = vsnprintf(NULL, 0, fmt, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
if (len == 0)
|
if (len == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
txt = malloc(len+1);
|
txt = (char*)(malloc(len+1));
|
||||||
va_start(argptr,fmt);
|
|
||||||
vsprintf(txt, fmt, argptr);
|
if (!txt)
|
||||||
|
I_Error("I_OutputMsg: Out of memory!\n");
|
||||||
|
|
||||||
|
va_start(argptr, fmt);
|
||||||
|
vsnprintf(txt, len+1, fmt, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
#ifdef HAVE_TTF
|
#ifdef HAVE_TTF
|
||||||
@@ -526,7 +550,7 @@ void I_OutputMsg(const char *fmt, ...)
|
|||||||
DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt);
|
DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
len = strlen(txt);
|
len = strnlen(txt, len+1);
|
||||||
|
|
||||||
#ifdef LOGMESSAGES
|
#ifdef LOGMESSAGES
|
||||||
if (logstream)
|
if (logstream)
|
||||||
@@ -683,11 +707,7 @@ void I_JoyScale4(void)
|
|||||||
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
void I_ShutdownJoystick(void)
|
void I_ShutdownJoystick(UINT8 index)
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_GetJoystickEvents(UINT8 index)
|
|
||||||
{
|
{
|
||||||
(void)index;
|
(void)index;
|
||||||
}
|
}
|
||||||
@@ -727,6 +747,22 @@ const char *I_GetJoyName(INT32 joyindex)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void I_SetJoystickFocus(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean I_GamepadHasLED(INT32 playernum)
|
||||||
|
{
|
||||||
|
(void)playernum;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean I_GamepadHasRumble(INT32 playernum)
|
||||||
|
{
|
||||||
|
(void)playernum;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
|
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
|
||||||
{
|
{
|
||||||
(void)playernum;
|
(void)playernum;
|
||||||
@@ -932,14 +968,18 @@ void I_Sleep(UINT32 ms)
|
|||||||
|
|
||||||
void I_SleepDuration(precise_t duration)
|
void I_SleepDuration(precise_t duration)
|
||||||
{
|
{
|
||||||
#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__)
|
#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__) || defined(__OpenBSD__)
|
||||||
UINT64 precision = I_GetPrecisePrecision();
|
UINT64 precision = I_GetPrecisePrecision();
|
||||||
struct timespec ts = {
|
struct timespec ts = {
|
||||||
.tv_sec = duration / precision,
|
.tv_sec = duration / precision,
|
||||||
.tv_nsec = duration * 1000000000 / precision % 1000000000,
|
.tv_nsec = duration * 1000000000 / precision % 1000000000,
|
||||||
};
|
};
|
||||||
int status;
|
int status;
|
||||||
|
#ifdef __OpenBSD__
|
||||||
|
do status = nanosleep(&ts, &ts);
|
||||||
|
#else
|
||||||
do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
|
do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
|
||||||
|
#endif
|
||||||
while (status == EINTR);
|
while (status == EINTR);
|
||||||
#elif defined (MIN_SLEEP_DURATION_MS)
|
#elif defined (MIN_SLEEP_DURATION_MS)
|
||||||
UINT64 precision = I_GetPrecisePrecision();
|
UINT64 precision = I_GetPrecisePrecision();
|
||||||
@@ -976,7 +1016,7 @@ void I_SleepDuration(precise_t duration)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean g_in_exiting_signal_handler = false;
|
static volatile sig_atomic_t g_in_exiting_signal_handler = false;
|
||||||
|
|
||||||
static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
|
static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
|
||||||
{
|
{
|
||||||
@@ -999,8 +1039,13 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
|
|||||||
sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close.");
|
sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close.");
|
||||||
break;
|
break;
|
||||||
#ifdef SIGTERM
|
#ifdef SIGTERM
|
||||||
case SIGTERM: // Software termination signal from kill
|
case SIGTERM: // Software termination signal from terminate
|
||||||
sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a kill signal.");
|
sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a terminate signal.");
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef SIGKILL
|
||||||
|
case SIGKILL: // Software termination signal from kill
|
||||||
|
sigmsg = ("SIGKILL - SRB2Kart-Saturn was terminated by a kill signal.");
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#ifdef SIGBREAK
|
#ifdef SIGBREAK
|
||||||
@@ -1012,7 +1057,7 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
|
|||||||
sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal.");
|
sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal.");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
sprintf(signal_msg, "Signal number %d", signal_num);
|
snprintf(signal_msg, 512, "Signal number %d", signal_num);
|
||||||
sigmsg = (core_dumped ? "Unknown signal" : signal_msg);
|
sigmsg = (core_dumped ? "Unknown signal" : signal_msg);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -1020,13 +1065,17 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
|
|||||||
if (core_dumped)
|
if (core_dumped)
|
||||||
{
|
{
|
||||||
if (sigmsg)
|
if (sigmsg)
|
||||||
sprintf(signal_msg, "%s (core dumped)", sigmsg);
|
{
|
||||||
|
snprintf(signal_msg, 512, "%s (core dumped)", sigmsg);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
strcat(signal_msg, " (core dumped)");
|
strcat(signal_msg, " (core dumped)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf(signal_msg, "%s", sigmsg);
|
snprintf(signal_msg, 512, "%s", sigmsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1040,6 +1089,11 @@ static void I_ReportSignal(int num, int coredumped)
|
|||||||
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
|
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean I_In_Exiting_Signal_Handler(void)
|
||||||
|
{
|
||||||
|
return g_in_exiting_signal_handler;
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef NEWSIGNALHANDLER
|
#ifndef NEWSIGNALHANDLER
|
||||||
FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
||||||
{
|
{
|
||||||
@@ -1059,11 +1113,17 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
|
static volatile sig_atomic_t interrupted = 0;
|
||||||
|
|
||||||
|
boolean I_Interrupted(void)
|
||||||
{
|
{
|
||||||
signal(num, SIG_DFL); //default signal action
|
return interrupted;
|
||||||
raise(num);
|
}
|
||||||
I_Quit();
|
|
||||||
|
static void quit_handler(int num)
|
||||||
|
{
|
||||||
|
(void)num;
|
||||||
|
interrupted = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_LIBBACKTRACE
|
#ifdef HAVE_LIBBACKTRACE
|
||||||
@@ -1292,7 +1352,7 @@ FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr)
|
|||||||
{
|
{
|
||||||
char text[128];
|
char text[128];
|
||||||
|
|
||||||
snprintf(text, sizeof text,
|
snprintf(text, sizeof(text),
|
||||||
"Error while setting up signal reporting: %s: %s",
|
"Error while setting up signal reporting: %s: %s",
|
||||||
pr,
|
pr,
|
||||||
strerror(errno)
|
strerror(errno)
|
||||||
@@ -1322,18 +1382,28 @@ static void I_Fork(void)
|
|||||||
I_RegisterChildSignals();
|
I_RegisterChildSignals();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
// ignore those, those are handled by child process
|
||||||
|
// otherwise parent might exit before it
|
||||||
|
// and the below stuff wont run and your terminal will be left in an awkward state
|
||||||
|
#ifdef SIGINT
|
||||||
|
signal(SIGINT, SIG_IGN);
|
||||||
|
#endif
|
||||||
|
#ifdef SIGBREAK
|
||||||
|
signal(SIGBREAK, SIG_IGN);
|
||||||
|
#endif
|
||||||
|
#ifdef SIGTERM
|
||||||
|
signal(SIGTERM, SIG_IGN);
|
||||||
|
#endif
|
||||||
if (logstream)
|
if (logstream)
|
||||||
fclose(logstream);/* the child has this */
|
fclose(logstream);/* the child has this */
|
||||||
|
|
||||||
c = wait(&status);
|
c = wait(&status);
|
||||||
|
|
||||||
#ifdef LOGMESSAGES
|
#ifdef LOGMESSAGES
|
||||||
/* By the way, exit closes files. */
|
/* By the way, exit closes files. */
|
||||||
logstream = fopen(logfilename, "at");
|
logstream = fopen(logfilename, "at");
|
||||||
#else
|
#else
|
||||||
logstream = 0;
|
logstream = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (c == -1)
|
if (c == -1)
|
||||||
{
|
{
|
||||||
kill(child, SIGKILL);
|
kill(child, SIGKILL);
|
||||||
@@ -1363,6 +1433,12 @@ static void I_Fork(void)
|
|||||||
}
|
}
|
||||||
#endif/*NEWSIGNALHANDLER*/
|
#endif/*NEWSIGNALHANDLER*/
|
||||||
|
|
||||||
|
int I_OpenURL(const char *url)
|
||||||
|
{
|
||||||
|
(void)url;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
INT32 I_StartupSystem(void)
|
INT32 I_StartupSystem(void)
|
||||||
{
|
{
|
||||||
I_StartupConsole();
|
I_StartupConsole();
|
||||||
@@ -1393,8 +1469,8 @@ void I_Quit(void)
|
|||||||
/* prevent recursive I_Quit() */
|
/* prevent recursive I_Quit() */
|
||||||
if (quiting)
|
if (quiting)
|
||||||
goto death;
|
goto death;
|
||||||
|
|
||||||
quiting = false;
|
quiting = false;
|
||||||
I_ShutdownConsole();
|
|
||||||
M_SaveConfig(NULL); //save game config, cvars..
|
M_SaveConfig(NULL); //save game config, cvars..
|
||||||
D_SaveBan(); // save the ban list
|
D_SaveBan(); // save the ban list
|
||||||
G_SaveGameData(false); // Tails 12-08-2002
|
G_SaveGameData(false); // Tails 12-08-2002
|
||||||
@@ -1410,33 +1486,21 @@ void I_Quit(void)
|
|||||||
// use this for 1.28 19990220 by Kin
|
// use this for 1.28 19990220 by Kin
|
||||||
I_ShutdownGraphics();
|
I_ShutdownGraphics();
|
||||||
I_ShutdownSystem();
|
I_ShutdownSystem();
|
||||||
|
|
||||||
/* if option -noendtxt is set, don't print the text */
|
/* if option -noendtxt is set, don't print the text */
|
||||||
if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR)
|
if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR)
|
||||||
{
|
{
|
||||||
printf("\r");
|
printf("\r");
|
||||||
ShowEndTxt();
|
ShowEndTxt();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myargmalloc)
|
if (myargmalloc)
|
||||||
free(myargv); // Deallocate allocated memory
|
free(myargv); // Deallocate allocated memory
|
||||||
|
|
||||||
death:
|
death:
|
||||||
W_Shutdown();
|
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_WaitVBL(INT32 count)
|
|
||||||
{
|
|
||||||
count = 1;
|
|
||||||
I_Sleep(count);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_BeginRead(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_EndRead(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// I_Error
|
// I_Error
|
||||||
//
|
//
|
||||||
@@ -1474,12 +1538,11 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
if (errorcount > 20)
|
if (errorcount > 20)
|
||||||
{
|
{
|
||||||
va_start(argptr, error);
|
va_start(argptr, error);
|
||||||
vsnprintf(buffer, 8192, error, argptr);
|
vsnprintf(buffer, sizeof(buffer), error, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
|
I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
|
||||||
|
|
||||||
W_Shutdown();
|
|
||||||
exit(-1); // recursive errors detected
|
exit(-1); // recursive errors detected
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1488,7 +1551,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
|
|
||||||
// Display error message in the console before we start shutting it down
|
// Display error message in the console before we start shutting it down
|
||||||
va_start(argptr, error);
|
va_start(argptr, error);
|
||||||
vsnprintf(buffer, 8192, error, argptr);
|
vsnprintf(buffer, sizeof(buffer), error, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
I_OutputMsg("\nI_Error(): %s\n", buffer);
|
I_OutputMsg("\nI_Error(): %s\n", buffer);
|
||||||
|
|
||||||
@@ -1497,8 +1560,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
#endif
|
#endif
|
||||||
// ---
|
// ---
|
||||||
|
|
||||||
I_ShutdownConsole();
|
|
||||||
|
|
||||||
M_SaveConfig(NULL); // save game config, cvars..
|
M_SaveConfig(NULL); // save game config, cvars..
|
||||||
D_SaveBan(); // save the ban list
|
D_SaveBan(); // save the ban list
|
||||||
G_SaveGameData(false); // Tails 12-08-2002
|
G_SaveGameData(false); // Tails 12-08-2002
|
||||||
@@ -1514,8 +1575,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
I_ShutdownGraphics();
|
I_ShutdownGraphics();
|
||||||
I_ShutdownSystem();
|
I_ShutdownSystem();
|
||||||
|
|
||||||
W_Shutdown();
|
|
||||||
|
|
||||||
#if defined (PARANOIA) && defined (__CYGWIN__)
|
#if defined (PARANOIA) && defined (__CYGWIN__)
|
||||||
*(INT32 *)2 = 4; //Alam: Debug!
|
*(INT32 *)2 = 4; //Alam: Debug!
|
||||||
#endif
|
#endif
|
||||||
@@ -1621,9 +1680,10 @@ void I_ShutdownSystem(void)
|
|||||||
{
|
{
|
||||||
INT32 c;
|
INT32 c;
|
||||||
|
|
||||||
#ifndef NEWSIGNALHANDLER
|
#ifdef NEWSIGNALHANDLER
|
||||||
I_ShutdownConsole();
|
if (M_CheckParm("-nofork"))
|
||||||
#endif
|
#endif
|
||||||
|
I_ShutdownConsole();
|
||||||
|
|
||||||
for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
|
for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
|
||||||
if (quit_funcs[c])
|
if (quit_funcs[c])
|
||||||
@@ -1712,7 +1772,8 @@ char *I_GetUserName(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
strncpy(username, p, MAXPLAYERNAME);
|
|
||||||
|
snprintf(username, sizeof(username), "%s", p);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!fastcmp(username, ""))
|
if (!fastcmp(username, ""))
|
||||||
@@ -1736,6 +1797,24 @@ INT32 I_mkdir(const char *dirname, INT32 unixright)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INT32 I_ChDir(const char *path)
|
||||||
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
|
return (SetCurrentDirectoryA(path) ? 0 : -1);
|
||||||
|
#else
|
||||||
|
return chdir(path);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
char *I_GetCwd(char *buf, size_t size)
|
||||||
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
|
return (GetCurrentDirectoryA((DWORD)size, buf) ? buf : NULL);
|
||||||
|
#else
|
||||||
|
return getcwd(buf, size);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
char *I_GetEnv(const char *name)
|
char *I_GetEnv(const char *name)
|
||||||
{
|
{
|
||||||
return getenv(name);
|
return getenv(name);
|
||||||
@@ -1768,42 +1847,34 @@ const char *I_ClipboardPaste(void)
|
|||||||
*/
|
*/
|
||||||
static boolean isWadPathOk(const char *path)
|
static boolean isWadPathOk(const char *path)
|
||||||
{
|
{
|
||||||
char *wad3path = malloc(256);
|
char wad3path[256];
|
||||||
|
|
||||||
if (!wad3path)
|
snprintf(wad3path, sizeof(wad3path), pandf, path, WADKEYWORD);
|
||||||
return false;
|
|
||||||
|
|
||||||
sprintf(wad3path, pandf, path, WADKEYWORD1);
|
|
||||||
|
|
||||||
if (FIL_ReadFileOK(wad3path))
|
if (FIL_ReadFileOK(wad3path))
|
||||||
{
|
{
|
||||||
free(wad3path);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(wad3path, pandf, path, WADKEYWORD2);
|
|
||||||
|
|
||||||
if (FIL_ReadFileOK(wad3path))
|
|
||||||
{
|
|
||||||
free(wad3path);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
free(wad3path);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pathonly(char *s)
|
static void pathonly(char *s, size_t size)
|
||||||
{
|
{
|
||||||
size_t j;
|
size_t j;
|
||||||
|
|
||||||
for (j = strlen(s); j != (size_t)-1; j--)
|
for (j = strnlen(s, size); j != (size_t)-1; j--)
|
||||||
|
{
|
||||||
if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
|
if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
|
||||||
{
|
{
|
||||||
if (s[j] == ':') s[j+1] = 0;
|
if (s[j] == ':')
|
||||||
else s[j] = 0;
|
s[j+1] = 0;
|
||||||
|
else
|
||||||
|
s[j] = 0;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief search for srb2.srb in the given path
|
/** \brief search for srb2.srb in the given path
|
||||||
@@ -1819,24 +1890,32 @@ static const char *searchWad(const char *searchDir)
|
|||||||
static char tempsw[256] = "";
|
static char tempsw[256] = "";
|
||||||
filestatus_t fstemp;
|
filestatus_t fstemp;
|
||||||
|
|
||||||
strcpy(tempsw, WADKEYWORD1);
|
snprintf(tempsw, sizeof(tempsw), "%s", WADKEYWORD);
|
||||||
fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
|
fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
|
||||||
|
|
||||||
if (fstemp == FS_FOUND)
|
if (fstemp == FS_FOUND)
|
||||||
{
|
{
|
||||||
pathonly(tempsw);
|
pathonly(tempsw, sizeof(tempsw));
|
||||||
return tempsw;
|
return tempsw;
|
||||||
}
|
}
|
||||||
|
|
||||||
strcpy(tempsw, WADKEYWORD2);
|
|
||||||
fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
|
|
||||||
if (fstemp == FS_FOUND)
|
|
||||||
{
|
|
||||||
pathonly(tempsw);
|
|
||||||
return tempsw;
|
|
||||||
}
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define CHECKWADPATH(ret) \
|
||||||
|
do { \
|
||||||
|
I_OutputMsg(",%s", ret); \
|
||||||
|
if (isWadPathOk(ret)) \
|
||||||
|
return ret; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SEARCHWAD(str) \
|
||||||
|
do { \
|
||||||
|
WadPath = searchWad(str); \
|
||||||
|
if (WadPath) \
|
||||||
|
return WadPath; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
/** \brief go through all possible paths and look for srb2.srb
|
/** \brief go through all possible paths and look for srb2.srb
|
||||||
|
|
||||||
\return path to srb2.srb if any
|
\return path to srb2.srb if any
|
||||||
@@ -1845,6 +1924,7 @@ static const char *locateWad(void)
|
|||||||
{
|
{
|
||||||
const char *envstr;
|
const char *envstr;
|
||||||
const char *WadPath;
|
const char *WadPath;
|
||||||
|
int i;
|
||||||
|
|
||||||
I_OutputMsg("SRB2WADDIR");
|
I_OutputMsg("SRB2WADDIR");
|
||||||
// does SRB2WADDIR exist?
|
// does SRB2WADDIR exist?
|
||||||
@@ -1852,132 +1932,51 @@ static const char *locateWad(void)
|
|||||||
return envstr;
|
return envstr;
|
||||||
|
|
||||||
#ifndef NOCWD
|
#ifndef NOCWD
|
||||||
I_OutputMsg(",.");
|
|
||||||
// examine current dir
|
// examine current dir
|
||||||
strcpy(returnWadPath, ".");
|
snprintf(returnWadPath, sizeof(returnWadPath), "%s", ".");
|
||||||
|
I_OutputMsg(",%s", returnWadPath);
|
||||||
if (isWadPathOk(returnWadPath))
|
if (isWadPathOk(returnWadPath))
|
||||||
return NULL;
|
return NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef NOHOME
|
||||||
#ifdef DEFAULTDIR
|
#ifdef DEFAULTDIR
|
||||||
I_OutputMsg(",HOME/" DEFAULTDIR);
|
I_OutputMsg(",HOME/" DEFAULTDIR);
|
||||||
// examine user jart directory
|
// examine user jart directory
|
||||||
if ((envstr = I_GetEnv("HOME")) != NULL)
|
if ((envstr = I_GetEnv("HOME")) != NULL)
|
||||||
{
|
{
|
||||||
sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
|
snprintf(returnWadPath, sizeof(returnWadPath), "%s" PATHSEP DEFAULTDIR, envstr);
|
||||||
if (isWadPathOk(returnWadPath))
|
CHECKWADPATH(returnWadPath);
|
||||||
return returnWadPath;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef CMAKECONFIG
|
|
||||||
#ifndef NDEBUG
|
|
||||||
I_OutputMsg(","CMAKE_ASSETS_DIR);
|
|
||||||
strcpy(returnWadPath, CMAKE_ASSETS_DIR);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
{
|
|
||||||
return returnWadPath;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
OSX_GetResourcesPath(returnWadPath);
|
OSX_GetResourcesPath(returnWadPath);
|
||||||
I_OutputMsg(",%s", returnWadPath);
|
CHECKWADPATH(returnWadPath);
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
{
|
|
||||||
return returnWadPath;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// examine default dirs
|
// examine default dirs
|
||||||
#ifdef DEFAULTWADLOCATION1
|
for (i = 0; wadDefaultPaths[i]; i++)
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION1);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION1);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION2
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION2);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION2);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION3
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION3);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION3);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION4
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION4);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION4);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION5
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION5);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION5);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION6
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION6);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION6);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION7
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION7);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION7);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifndef NOHOME
|
|
||||||
// find in $HOME
|
|
||||||
I_OutputMsg(",HOME/" DEFAULTDIR);
|
|
||||||
if ((envstr = I_GetEnv("HOME")) != NULL)
|
|
||||||
{
|
{
|
||||||
char *tmp = malloc(strlen(envstr) + sizeof(PATHSEP) + sizeof(DEFAULTDIR));
|
snprintf(returnWadPath, sizeof(returnWadPath), "%s", wadDefaultPaths[i]);
|
||||||
strcpy(tmp, envstr);
|
CHECKWADPATH(returnWadPath);
|
||||||
strcat(tmp, PATHSEP);
|
|
||||||
strcat(tmp, DEFAULTDIR);
|
|
||||||
WadPath = searchWad(tmp);
|
|
||||||
free(tmp);
|
|
||||||
if (WadPath)
|
|
||||||
return WadPath;
|
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTSEARCHPATH1
|
// search paths
|
||||||
// find in /usr/local
|
for (i = 0; wadSearchPaths[i]; i++)
|
||||||
I_OutputMsg(", in:"DEFAULTSEARCHPATH1);
|
{
|
||||||
WadPath = searchWad(DEFAULTSEARCHPATH1);
|
I_OutputMsg(", in:%s", wadSearchPaths[i]);
|
||||||
if (WadPath)
|
SEARCHWAD(wadSearchPaths[i]);
|
||||||
return WadPath;
|
}
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTSEARCHPATH2
|
|
||||||
// find in /usr/games
|
|
||||||
I_OutputMsg(", in:"DEFAULTSEARCHPATH2);
|
|
||||||
WadPath = searchWad(DEFAULTSEARCHPATH2);
|
|
||||||
if (WadPath)
|
|
||||||
return WadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTSEARCHPATH3
|
|
||||||
// find in ???
|
|
||||||
I_OutputMsg(", in:"DEFAULTSEARCHPATH3);
|
|
||||||
WadPath = searchWad(DEFAULTSEARCHPATH3);
|
|
||||||
if (WadPath)
|
|
||||||
return WadPath;
|
|
||||||
#endif
|
|
||||||
// if nothing was found
|
// if nothing was found
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *I_LocateWad(void)
|
const char *I_LocateWad(void)
|
||||||
{
|
{
|
||||||
const char *waddir;
|
const char *waddir = NULL;
|
||||||
|
|
||||||
I_OutputMsg("Looking for WADs in: ");
|
I_OutputMsg("Looking for WADs in: ");
|
||||||
waddir = locateWad();
|
waddir = locateWad();
|
||||||
@@ -1987,12 +1986,14 @@ const char *I_LocateWad(void)
|
|||||||
{
|
{
|
||||||
// change to the directory where we found srb2.srb
|
// change to the directory where we found srb2.srb
|
||||||
#if defined (_WIN32)
|
#if defined (_WIN32)
|
||||||
SetCurrentDirectoryA(waddir);
|
waddir = _fullpath(NULL, waddir, MAX_PATH);
|
||||||
#else
|
#else
|
||||||
if (waddir == NULL || chdir(waddir) == -1)
|
waddir = realpath(waddir, NULL);
|
||||||
I_OutputMsg("Couldn't change working directory\n");
|
|
||||||
#endif
|
#endif
|
||||||
|
if (waddir == NULL || I_ChDir(waddir) == -1)
|
||||||
|
I_OutputMsg("Couldn't change working directory\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
return waddir;
|
return waddir;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2010,17 +2011,22 @@ const char *I_LocateWad(void)
|
|||||||
static long get_entry(const char* name, const char* buf)
|
static long get_entry(const char* name, const char* buf)
|
||||||
{
|
{
|
||||||
long val;
|
long val;
|
||||||
char* hit = strstr(buf, name);
|
const char* hit = strstr(buf, name);
|
||||||
if (hit == NULL) {
|
|
||||||
|
if (hit == NULL)
|
||||||
|
{
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
val = strtol(hit + strlen(name), NULL, 10);
|
val = strtol(hit + strlen(name), NULL, 10);
|
||||||
if (errno != 0) {
|
|
||||||
|
if (errno != 0)
|
||||||
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
|
CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -2045,13 +2051,13 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
*total = 32 << 20;
|
*total = 32 << 20;
|
||||||
return 32 << 20;
|
return 32 << 20;
|
||||||
#elif defined (_WIN32)
|
#elif defined (_WIN32)
|
||||||
MEMORYSTATUS info;
|
MEMORYSTATUSEX info;
|
||||||
|
|
||||||
info.dwLength = sizeof (MEMORYSTATUS);
|
info.dwLength = sizeof (MEMORYSTATUSEX);
|
||||||
GlobalMemoryStatus( &info );
|
GlobalMemoryStatusEx( &info );
|
||||||
if (total)
|
if (total)
|
||||||
*total = (size_t)info.dwTotalPhys;
|
*total = (size_t)info.ullTotalPhys;
|
||||||
return (size_t)info.dwAvailPhys;
|
return (size_t)info.ullAvailPhys;
|
||||||
#elif defined (__OS2__)
|
#elif defined (__OS2__)
|
||||||
UINT32 pr_arena;
|
UINT32 pr_arena;
|
||||||
|
|
||||||
@@ -2084,7 +2090,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
if (total)
|
if (total)
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2093,12 +2099,12 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
if (total)
|
if (total)
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
memTag += sizeof (MEMTOTAL);
|
memTag += sizeof (MEMTOTAL);
|
||||||
totalKBytes = (size_t)atoi(memTag);
|
totalKBytes = strtoul(memTag, NULL, 10);
|
||||||
|
|
||||||
if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
|
if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
|
||||||
{
|
{
|
||||||
@@ -2112,7 +2118,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
if (total)
|
if (total)
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
freeKBytes = MemAvailable;
|
freeKBytes = MemAvailable;
|
||||||
@@ -2120,16 +2126,46 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
memTag += sizeof (MEMAVAILABLE);
|
memTag += sizeof (MEMAVAILABLE);
|
||||||
freeKBytes = atoi(memTag);
|
freeKBytes = strtoul(memTag, NULL, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (total)
|
if (total)
|
||||||
*total = totalKBytes << 10;
|
*total = totalKBytes << 10;
|
||||||
return freeKBytes << 10;
|
return freeKBytes << 10;
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
/* macOS */
|
||||||
|
mach_port_t host = mach_host_self();
|
||||||
|
kern_return_t kr;
|
||||||
|
mach_msg_type_number_t count;
|
||||||
|
vm_size_t v_page_size;
|
||||||
|
struct vm_statistics64 vm_stats;
|
||||||
|
uint64_t total_mem, free_mem;
|
||||||
|
size_t size;
|
||||||
|
|
||||||
|
size = sizeof(total_mem);
|
||||||
|
if (sysctlbyname("hw.memsize", &total_mem, &size, NULL, 0) < 0)
|
||||||
|
total_mem = 0;
|
||||||
|
|
||||||
|
kr = host_page_size(host, &v_page_size);
|
||||||
|
if (kr != KERN_SUCCESS)
|
||||||
|
v_page_size = 4096;
|
||||||
|
|
||||||
|
count = HOST_VM_INFO64_COUNT;
|
||||||
|
kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stats, &count);
|
||||||
|
if (kr == KERN_SUCCESS)
|
||||||
|
free_mem = (uint64_t)(vm_stats.free_count + vm_stats.inactive_count) * v_page_size;
|
||||||
|
else
|
||||||
|
free_mem = 0;
|
||||||
|
|
||||||
|
if (total)
|
||||||
|
*total = (size_t)total_mem;
|
||||||
|
return (size_t)free_mem;
|
||||||
#else
|
#else
|
||||||
// Guess 48 MB.
|
// Guess 48 MB.
|
||||||
if (total)
|
if (total)
|
||||||
|
{
|
||||||
*total = 48<<20;
|
*total = 48<<20;
|
||||||
|
}
|
||||||
return 48<<20;
|
return 48<<20;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,13 +65,6 @@ void I_OsPolling(void)
|
|||||||
I_GetConsoleEvents();
|
I_GetConsoleEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// I_UpdateNoBlit
|
|
||||||
//
|
|
||||||
void I_UpdateNoBlit(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// I_FinishUpdate
|
// I_FinishUpdate
|
||||||
//
|
//
|
||||||
|
|||||||
+296
-335
File diff suppressed because it is too large.
Load diff
@@ -13,6 +13,10 @@
|
|||||||
#ifndef __DEHACKED_H__
|
#ifndef __DEHACKED_H__
|
||||||
#define __DEHACKED_H__
|
#define __DEHACKED_H__
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "m_fixed.h" // for get_number
|
#include "m_fixed.h" // for get_number
|
||||||
#include "info.h"
|
#include "info.h"
|
||||||
|
|
||||||
@@ -71,4 +75,9 @@ typedef struct
|
|||||||
} MYFILE;
|
} MYFILE;
|
||||||
#define myfeof(a) (a->data + a->size <= a->curpos)
|
#define myfeof(a) (a->data + a->size <= a->curpos)
|
||||||
char *myfgets(char *buf, size_t bufsize, MYFILE *f);
|
char *myfgets(char *buf, size_t bufsize, MYFILE *f);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} // extern "C"
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+5
-2
@@ -402,7 +402,7 @@ static void Discordrp_OnChange(void)
|
|||||||
static void DRPC_GotServerIP(UINT32 address)
|
static void DRPC_GotServerIP(UINT32 address)
|
||||||
{
|
{
|
||||||
const unsigned char * p = (const unsigned char *)&address;
|
const unsigned char * p = (const unsigned char *)&address;
|
||||||
sprintf(self_ip, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port);
|
snprintf(self_ip, IP_SIZE+1, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------
|
/*--------------------------------------------------
|
||||||
@@ -474,6 +474,7 @@ void DRPC_UpdatePresence(void)
|
|||||||
char charname[11+SKINNAMESIZE+1];
|
char charname[11+SKINNAMESIZE+1];
|
||||||
|
|
||||||
boolean joinSecretSet = false;
|
boolean joinSecretSet = false;
|
||||||
|
char *clientJoinSecret = NULL;
|
||||||
|
|
||||||
DiscordRichPresence discordPresence;
|
DiscordRichPresence discordPresence;
|
||||||
memset(&discordPresence, 0, sizeof(discordPresence));
|
memset(&discordPresence, 0, sizeof(discordPresence));
|
||||||
@@ -530,7 +531,8 @@ void DRPC_UpdatePresence(void)
|
|||||||
// Grab the host's IP for joining.
|
// Grab the host's IP for joining.
|
||||||
if ((join = DRPC_GetServerIP()) != NULL)
|
if ((join = DRPC_GetServerIP()) != NULL)
|
||||||
{
|
{
|
||||||
discordPresence.joinSecret = DRPC_XORIPString(join);
|
clientJoinSecret = DRPC_XORIPString(join);
|
||||||
|
discordPresence.joinSecret = clientJoinSecret;
|
||||||
joinSecretSet = true;
|
joinSecretSet = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -712,6 +714,7 @@ void DRPC_UpdatePresence(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
Discord_UpdatePresence(&discordPresence);
|
Discord_UpdatePresence(&discordPresence);
|
||||||
|
free(clientJoinSecret);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // HAVE_DISCORDRPC
|
#endif // HAVE_DISCORDRPC
|
||||||
+4
-2
@@ -61,7 +61,7 @@ enum
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
INT16 x, y;
|
INT16 x, y;
|
||||||
}ATTRPACK mapvertex_t;
|
} ATTRPACK mapvertex_t;
|
||||||
|
|
||||||
// A SideDef, defining the visual appearance of a wall,
|
// A SideDef, defining the visual appearance of a wall,
|
||||||
// by setting textures and offsets.
|
// by setting textures and offsets.
|
||||||
@@ -81,10 +81,12 @@ typedef struct
|
|||||||
INT16 flags;
|
INT16 flags;
|
||||||
INT16 special;
|
INT16 special;
|
||||||
INT16 tag;
|
INT16 tag;
|
||||||
// sidenum[1] will be 0xffff if one sided
|
// sidenum[1] will be NO_INDEX if one sided
|
||||||
UINT16 sidenum[2];
|
UINT16 sidenum[2];
|
||||||
} ATTRPACK maplinedef_t;
|
} ATTRPACK maplinedef_t;
|
||||||
|
|
||||||
|
#define NO_INDEX 0xffff
|
||||||
|
|
||||||
//
|
//
|
||||||
// LineDef attributes.
|
// LineDef attributes.
|
||||||
//
|
//
|
||||||
|
|||||||
+76
-29
@@ -40,22 +40,45 @@
|
|||||||
#define ASMCALL
|
#define ASMCALL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "doomtype.h"
|
#include "doomtype.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus /* Only when compiled as C++ */
|
||||||
|
#include <algorithm> /* std::min, std::max, std::sort, … */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
// Force libc++ to expose std::min/std::max even when <cmath> is included first (Apple clang quirk)
|
||||||
|
#ifndef _LIBCPP_ENABLE_CXX17_REMOVED_FEATURES
|
||||||
|
#define _LIBCPP_ENABLE_CXX17_REMOVED_FEATURES
|
||||||
|
#endif
|
||||||
|
#ifndef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
|
||||||
|
#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Optional: only try <version> if it actually exists (newer Xcode)
|
||||||
|
#if __has_include(<version>)
|
||||||
|
#include <version>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define _USE_MATH_DEFINES
|
||||||
|
#include <cmath>
|
||||||
|
#include <cstdarg>
|
||||||
|
#include <cstdio>
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstring>
|
||||||
|
#include <climits>
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
#else
|
||||||
|
#include <math.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stddef.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#define _USE_MATH_DEFINES // fixes M_PI errors in r_plane.c for Visual Studio
|
#include <limits.h>
|
||||||
#ifdef __cplusplus
|
|
||||||
#include <cmath>
|
|
||||||
#else
|
|
||||||
#include <math.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@@ -105,12 +128,26 @@ extern char logfilename[1024];
|
|||||||
// most interface strings are ignored in development mode.
|
// most interface strings are ignored in development mode.
|
||||||
// we use comprevision and compbranch instead.
|
// we use comprevision and compbranch instead.
|
||||||
#else
|
#else
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
#define VERSION 1 // Game version
|
||||||
|
#define SUBVERSION 69 // more precise version number
|
||||||
|
#else
|
||||||
#define VERSION 1 // Game version
|
#define VERSION 1 // Game version
|
||||||
#define SUBVERSION 6 // more precise version number
|
#define SUBVERSION 6 // more precise version number
|
||||||
#define VERSIONSTRING "Saturn v9.1"
|
#endif
|
||||||
#define VERSIONSTRINGW L"Saturn v9.1"
|
|
||||||
|
|
||||||
//#define SATURN_TESTING // comment out for saturn release builds!
|
#ifdef PHOBOS_BUILD
|
||||||
|
#define CLIENTNAME "Phobos"
|
||||||
|
#define CLIENTNAMEW L"Phobos"
|
||||||
|
#else
|
||||||
|
#define CLIENTNAME "Saturn"
|
||||||
|
#define CLIENTNAMEW L"Saturn"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define VERSIONSTRING CLIENTNAME " v10.1"
|
||||||
|
#define VERSIONSTRINGW CLIENTNAMEW L" v10.1"
|
||||||
|
|
||||||
|
#define SATURN_TESTING // comment out for saturn release builds!
|
||||||
|
|
||||||
// Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
|
// Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
|
||||||
// And change CMakeLists.txt (not src/, but in root), for CMake users!
|
// And change CMakeLists.txt (not src/, but in root), for CMake users!
|
||||||
@@ -477,7 +514,7 @@ extern INT32 cv_debug;
|
|||||||
// Misc stuff for later...
|
// Misc stuff for later...
|
||||||
// =======================
|
// =======================
|
||||||
|
|
||||||
#define ANG2RAD(angle) ((float)((angle)*M_PI)/ANGLE_180)
|
#define ANG2RAD(angle) ((float)((angle)*M_PIf) / (float)ANGLE_180)
|
||||||
|
|
||||||
// Modifier key variables, accessible anywhere
|
// Modifier key variables, accessible anywhere
|
||||||
extern UINT8 shiftdown, ctrldown, altdown;
|
extern UINT8 shiftdown, ctrldown, altdown;
|
||||||
@@ -493,22 +530,6 @@ extern boolean capslock;
|
|||||||
// i_system.c, replace getchar() once the keyboard has been appropriated
|
// i_system.c, replace getchar() once the keyboard has been appropriated
|
||||||
INT32 I_GetKey(void);
|
INT32 I_GetKey(void);
|
||||||
|
|
||||||
/* http://www.cse.yorku.ca/~oz/hash.html */
|
|
||||||
static inline
|
|
||||||
UINT32 quickncasehash (const char *p, size_t n)
|
|
||||||
{
|
|
||||||
size_t i = 0;
|
|
||||||
UINT32 x = 5381;
|
|
||||||
|
|
||||||
while (i < n && p[i])
|
|
||||||
{
|
|
||||||
x = (x * 33) ^ tolower(p[i]);
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus
|
||||||
#ifndef min // Double-Check with WATTCP-32's cdefs.h
|
#ifndef min // Double-Check with WATTCP-32's cdefs.h
|
||||||
#define min(x, y) (((x) < (y)) ? (x) : (y))
|
#define min(x, y) (((x) < (y)) ? (x) : (y))
|
||||||
@@ -526,6 +547,10 @@ UINT32 quickncasehash (const char *p, size_t n)
|
|||||||
#define M_PIl 3.1415926535897932384626433832795029L
|
#define M_PIl 3.1415926535897932384626433832795029L
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef M_PIf
|
||||||
|
#define M_PIf 3.14159265f
|
||||||
|
#endif
|
||||||
|
|
||||||
// Floating point comparison epsilons from float.h
|
// Floating point comparison epsilons from float.h
|
||||||
#ifndef FLT_EPSILON
|
#ifndef FLT_EPSILON
|
||||||
#define FLT_EPSILON 1.1920928955078125e-7f
|
#define FLT_EPSILON 1.1920928955078125e-7f
|
||||||
@@ -562,6 +587,13 @@ UINT32 quickncasehash (const char *p, size_t n)
|
|||||||
// NOTE: you WILL have nasal troubles if the variable is not initialized
|
// NOTE: you WILL have nasal troubles if the variable is not initialized
|
||||||
#define CLEANUP(f) __attribute__((__cleanup__(f)))
|
#define CLEANUP(f) __attribute__((__cleanup__(f)))
|
||||||
|
|
||||||
|
// the GNU constructor and destructor attributes
|
||||||
|
// The constructor attribute causes the function to be called automatically before execution enters main ().
|
||||||
|
// Similarly, the destructor attribute causes the function to be called automatically after main () has completed or exit () has been called.
|
||||||
|
// Functions with these attributes are useful for initializing data that will be used implicitly during the execution of the program.
|
||||||
|
#define CONSTRUCTOR __attribute__((constructor, used))
|
||||||
|
#define DESTRUCTOR __attribute__((destructor, used))
|
||||||
|
|
||||||
// An assert-type mechanism.
|
// An assert-type mechanism.
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
#define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
|
#define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
|
||||||
@@ -584,6 +616,21 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
|
|||||||
// None of these that are disabled in the normal build are guaranteed to work perfectly
|
// None of these that are disabled in the normal build are guaranteed to work perfectly
|
||||||
// Compile them at your own risk!
|
// Compile them at your own risk!
|
||||||
|
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
// we want 32 players yesss
|
||||||
|
#undef MAXPLAYERS
|
||||||
|
#define MAXPLAYERS 32
|
||||||
|
|
||||||
|
// raise skinlimit to 1024
|
||||||
|
#undef MAXSKINS
|
||||||
|
#define MAXSKINS 1024
|
||||||
|
|
||||||
|
// overwrite some of those
|
||||||
|
// when not compiling in vanilla compat mode
|
||||||
|
#define SATURNJOIN
|
||||||
|
#define SATURNPAK
|
||||||
|
#endif
|
||||||
|
|
||||||
//-- SATURN __
|
//-- SATURN __
|
||||||
/// Detect if a client is on Saturn in the clientconfig.
|
/// Detect if a client is on Saturn in the clientconfig.
|
||||||
/// To seperately allow them to join or block joining from vanilla clients.
|
/// To seperately allow them to join or block joining from vanilla clients.
|
||||||
|
|||||||
+5
-47
@@ -54,7 +54,6 @@ extern INT16 maptol;
|
|||||||
extern UINT8 globalweather;
|
extern UINT8 globalweather;
|
||||||
extern INT32 curWeather;
|
extern INT32 curWeather;
|
||||||
extern INT32 cursaveslot;
|
extern INT32 cursaveslot;
|
||||||
extern INT16 lastmapsaved;
|
|
||||||
extern boolean gamecomplete;
|
extern boolean gamecomplete;
|
||||||
|
|
||||||
#define PRECIP_NONE 0
|
#define PRECIP_NONE 0
|
||||||
@@ -78,7 +77,6 @@ extern boolean imcontinuing; // Temporary flag while continuing
|
|||||||
extern UINT8 modeattacking;
|
extern UINT8 modeattacking;
|
||||||
|
|
||||||
// menu demo things
|
// menu demo things
|
||||||
extern UINT8 numDemos;
|
|
||||||
extern UINT32 demoDelayTime;
|
extern UINT32 demoDelayTime;
|
||||||
extern UINT32 demoIdleTime;
|
extern UINT32 demoIdleTime;
|
||||||
|
|
||||||
@@ -114,8 +112,8 @@ extern UINT8 paused; // Game paused?
|
|||||||
extern UINT8 window_notinfocus; // are we in focus? (backend independant -- handles auto pausing and display of "focus lost" message)
|
extern UINT8 window_notinfocus; // are we in focus? (backend independant -- handles auto pausing and display of "focus lost" message)
|
||||||
|
|
||||||
extern boolean nodrawers;
|
extern boolean nodrawers;
|
||||||
extern boolean noblit;
|
|
||||||
extern boolean lastdraw;
|
extern boolean lastdraw;
|
||||||
|
extern boolean intermissionbginit;
|
||||||
|
|
||||||
#ifdef MOTIONBLUR
|
#ifdef MOTIONBLUR
|
||||||
extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
||||||
@@ -205,12 +203,6 @@ extern struct quake
|
|||||||
fixed_t radius, intensity;
|
fixed_t radius, intensity;
|
||||||
} quake;
|
} quake;
|
||||||
|
|
||||||
// NiGHTS grades
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
UINT32 grade[6]; // D, C, B, A, S, X (F: failed to reach any of these)
|
|
||||||
} nightsgrades_t;
|
|
||||||
|
|
||||||
// Custom Lua values
|
// Custom Lua values
|
||||||
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
||||||
typedef struct
|
typedef struct
|
||||||
@@ -261,28 +253,16 @@ typedef struct
|
|||||||
UINT8 numlaps; ///< Number of laps in circuit mode, unless overridden.
|
UINT8 numlaps; ///< Number of laps in circuit mode, unless overridden.
|
||||||
SINT8 unlockrequired; ///< Is an unlockable required to play this level? -1 if no.
|
SINT8 unlockrequired; ///< Is an unlockable required to play this level? -1 if no.
|
||||||
UINT8 levelselect; ///< Is this map available in the level select? If so, which map list is it available in?
|
UINT8 levelselect; ///< Is this map available in the level select? If so, which map list is it available in?
|
||||||
SINT8 bonustype; ///< What type of bonus does this level have? (-1 for null.)
|
|
||||||
SINT8 saveoverride; ///< Set how the game is allowed to save (1 for always, -1 for never, 0 is 2.1 default)
|
|
||||||
|
|
||||||
UINT8 levelflags; ///< LF_flags: merged eight booleans into one UINT8 for space, see below
|
UINT8 levelflags; ///< LF_flags: merged eight booleans into one UINT8 for space, see below
|
||||||
UINT8 menuflags; ///< LF2_flags: options that affect record attack / nights mode menus
|
UINT8 menuflags; ///< LF2_flags: options that affect record attack / nights mode menus
|
||||||
|
|
||||||
// NiGHTS stuff.
|
|
||||||
UINT8 numGradedMares; ///< Internal. For grade support.
|
|
||||||
nightsgrades_t *grades; ///< NiGHTS grades. Allocated dynamically for space reasons. Be careful.
|
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
//boolean automap; ///< Displays a level's white map outline in modified games
|
|
||||||
fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
|
fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
|
||||||
|
|
||||||
mapheader_lighting_t lighting; ///< Wall and sprite lighting
|
mapheader_lighting_t lighting; ///< Wall and sprite lighting
|
||||||
mapheader_lighting_t lighting_encore; ///< Alternative lighting for Encore mode
|
mapheader_lighting_t lighting_encore; ///< Alternative lighting for Encore mode
|
||||||
boolean use_encore_lighting; ///< Whether to use separate Encore lighting
|
boolean use_encore_lighting; ///< Whether to use separate Encore lighting
|
||||||
|
|
||||||
// Music stuff.
|
|
||||||
UINT32 musinterfadeout; ///< Fade out level music on intermission screen in milliseconds
|
|
||||||
char musintername[7]; ///< Intermission screen music.
|
|
||||||
|
|
||||||
// Lua stuff.
|
// Lua stuff.
|
||||||
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
||||||
UINT8 numCustomOptions; ///< Internal. For Lua custom value support.
|
UINT8 numCustomOptions; ///< Internal. For Lua custom value support.
|
||||||
@@ -379,8 +359,6 @@ typedef struct
|
|||||||
{
|
{
|
||||||
tic_t time; ///< Time in which the level was finished.
|
tic_t time; ///< Time in which the level was finished.
|
||||||
tic_t lap; ///< Best lap time for this level.
|
tic_t lap; ///< Best lap time for this level.
|
||||||
//UINT32 score; ///< Score when the level was finished.
|
|
||||||
//UINT16 rings; ///< Rings when the level was finished.
|
|
||||||
} recorddata_t;
|
} recorddata_t;
|
||||||
|
|
||||||
/** Setup for one NiGHTS map.
|
/** Setup for one NiGHTS map.
|
||||||
@@ -394,34 +372,19 @@ typedef struct
|
|||||||
#define GRADE_A 5
|
#define GRADE_A 5
|
||||||
#define GRADE_S 6
|
#define GRADE_S 6
|
||||||
|
|
||||||
/*typedef struct
|
|
||||||
{
|
|
||||||
// 8 mares, 1 overall (0)
|
|
||||||
UINT8 nummares;
|
|
||||||
UINT32 score[9];
|
|
||||||
UINT8 grade[9];
|
|
||||||
tic_t time[9];
|
|
||||||
} nightsdata_t;*/
|
|
||||||
|
|
||||||
//extern nightsdata_t *nightsrecords[NUMMAPS];
|
|
||||||
extern recorddata_t *mainrecords[NUMMAPS];
|
extern recorddata_t *mainrecords[NUMMAPS];
|
||||||
|
|
||||||
// mapvisited is now a set of flags that says what we've done in the map.
|
// mapvisited is now a set of flags that says what we've done in the map.
|
||||||
#define MV_VISITED 1
|
#define MV_VISITED 1
|
||||||
#define MV_BEATEN 2
|
#define MV_BEATEN 2
|
||||||
#define MV_ALLEMERALDS 4
|
#define MV_ALLEMERALDS 4
|
||||||
//#define MV_ULTIMATE 8
|
|
||||||
//#define MV_PERFECT 16
|
|
||||||
#define MV_MAX 7 // used in gamedata check
|
#define MV_MAX 7 // used in gamedata check
|
||||||
extern UINT8 mapvisited[NUMMAPS];
|
extern UINT8 mapvisited[NUMMAPS];
|
||||||
|
|
||||||
// Temporary holding place for nights data for the current map
|
extern UINT32 token; ///< Number of tokens collected in a level
|
||||||
//nightsdata_t ntemprecords;
|
|
||||||
|
|
||||||
extern UINT32 token; ///< Number of tokens collected in a level
|
|
||||||
extern UINT32 tokenlist; ///< List of tokens collected
|
extern UINT32 tokenlist; ///< List of tokens collected
|
||||||
extern INT32 tokenbits; ///< Used for setting token bits
|
extern INT32 tokenbits; ///< Used for setting token bits
|
||||||
extern INT32 sstimer; ///< Time allotted in the special stage
|
extern INT32 sstimer; ///< Time allotted in the special stage
|
||||||
extern UINT32 bluescore; ///< Blue Team Scores
|
extern UINT32 bluescore; ///< Blue Team Scores
|
||||||
extern UINT32 redscore; ///< Red Team Scores
|
extern UINT32 redscore; ///< Red Team Scores
|
||||||
|
|
||||||
@@ -437,9 +400,6 @@ extern boolean CheckForReverseGravity;
|
|||||||
extern UINT16 invulntics;
|
extern UINT16 invulntics;
|
||||||
extern UINT16 sneakertics;
|
extern UINT16 sneakertics;
|
||||||
extern UINT16 flashingtics;
|
extern UINT16 flashingtics;
|
||||||
extern UINT16 tailsflytics;
|
|
||||||
extern UINT16 underwatertics;
|
|
||||||
extern UINT16 spacetimetics;
|
|
||||||
extern UINT16 extralifetics;
|
extern UINT16 extralifetics;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
@@ -461,7 +421,6 @@ extern UINT8 introtoplay;
|
|||||||
extern UINT8 creditscutscene;
|
extern UINT8 creditscutscene;
|
||||||
|
|
||||||
extern UINT8 use1upSound;
|
extern UINT8 use1upSound;
|
||||||
extern UINT8 maxXtraLife; // Max extra lives from rings
|
|
||||||
|
|
||||||
extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations
|
extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations
|
||||||
|
|
||||||
@@ -526,7 +485,6 @@ extern UINT32 timesBeatenWithEmeralds;
|
|||||||
// WAD, partly set at startup time.
|
// WAD, partly set at startup time.
|
||||||
|
|
||||||
extern tic_t gametic;
|
extern tic_t gametic;
|
||||||
#define localgametic leveltime
|
|
||||||
|
|
||||||
// Player spawn spots.
|
// Player spawn spots.
|
||||||
extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative
|
extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative
|
||||||
@@ -542,7 +500,7 @@ extern mapthing_t *redctfstarts[MAXPLAYERS]; // CTF
|
|||||||
#else
|
#else
|
||||||
#define DEBUGFILE
|
#define DEBUGFILE
|
||||||
#ifdef DEBUGFILE
|
#ifdef DEBUGFILE
|
||||||
#define DEBFILE(msg) { if (debugfile) { fputs(msg, debugfile); fflush(debugfile); } }
|
#define DEBFILE(msg) { if (UNLIKELY(debugfile)) { fputs(msg, debugfile); fflush(debugfile); } }
|
||||||
#else
|
#else
|
||||||
#define DEBFILE(msg) {}
|
#define DEBFILE(msg) {}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+26
-7
@@ -42,6 +42,12 @@ extern "C" {
|
|||||||
#define INT64 int64_t
|
#define INT64 int64_t
|
||||||
#define UINT64 uint64_t
|
#define UINT64 uint64_t
|
||||||
|
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
typedef uint16_t skinnum_t;
|
||||||
|
#else
|
||||||
|
typedef uint8_t skinnum_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __APPLE_CC__
|
#ifdef __APPLE_CC__
|
||||||
#define DEBUG_LOG
|
#define DEBUG_LOG
|
||||||
#define NOIPX
|
#define NOIPX
|
||||||
@@ -68,10 +74,25 @@ extern "C" {
|
|||||||
#define strnicmp(x,y,n) strncasecmp(x,y,n)
|
#define strnicmp(x,y,n) strncasecmp(x,y,n)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __cplusplus
|
// glibc 2.43 made alot of standard lib functions propagate the constness of its input pointers
|
||||||
char *strcasestr(const char *in, const char *what);
|
// to not cause warnings or compile issues on older glibc versions we do this silly thing
|
||||||
#define stristr strcasestr
|
// to not have a gazillion glibc version checks
|
||||||
|
#if defined(__GLIBC_PREREQ)
|
||||||
|
#if __GLIBC_PREREQ(2, 43)
|
||||||
|
#define gconst const
|
||||||
|
#else
|
||||||
|
#define gconst
|
||||||
#endif
|
#endif
|
||||||
|
#else
|
||||||
|
#define gconst
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _GNU_SOURCE
|
||||||
|
char *nongnu_strcasestr(const char *in, const char *what);
|
||||||
|
#define strcasestr nongnu_strcasestr
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define stristr strcasestr
|
||||||
|
|
||||||
#if defined (macintosh) //|| defined (__APPLE__) //skip all boolean/Boolean crap
|
#if defined (macintosh) //|| defined (__APPLE__) //skip all boolean/Boolean crap
|
||||||
#define true 1
|
#define true 1
|
||||||
@@ -125,9 +146,9 @@ size_t strlcpy(char *dst, const char *src, size_t dsize);
|
|||||||
#define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst)
|
#define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst)
|
||||||
|
|
||||||
/* Boolean type definition */
|
/* Boolean type definition */
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#include <stdbool.h>
|
|
||||||
// dont use stdbools _BOOL type
|
// dont use stdbools _BOOL type
|
||||||
// its smaller (1 byte) than the old interger bool (4 bytes)
|
// its smaller (1 byte) than the old interger bool (4 bytes)
|
||||||
// which results in packed struct sizes being mismatched between vanilla and this
|
// which results in packed struct sizes being mismatched between vanilla and this
|
||||||
@@ -135,9 +156,7 @@ size_t strlcpy(char *dst, const char *src, size_t dsize);
|
|||||||
// which we cant use as enumeration constants
|
// which we cant use as enumeration constants
|
||||||
typedef int32_t boolean;
|
typedef int32_t boolean;
|
||||||
#else
|
#else
|
||||||
#define false FALSE
|
#define boolean int32_t
|
||||||
#define true TRUE
|
|
||||||
#define boolean BOOL
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* 7.18.2.1 Limits of exact-width integer types */
|
/* 7.18.2.1 Limits of exact-width integer types */
|
||||||
|
|||||||
+32
-48
@@ -166,8 +166,8 @@ static void F_SkyScroll(INT32 scrollspeed)
|
|||||||
patch_t *pat, *pat2;
|
patch_t *pat, *pat2;
|
||||||
INT32 anim2 = 0;
|
INT32 anim2 = 0;
|
||||||
|
|
||||||
pat = W_CachePatchName("TITLEBG1", PU_PATCH_LOWPRIORITY);
|
pat = W_CachePatchName("TITLEBG1", PU_PATCH);
|
||||||
pat2 = W_CachePatchName("TITLEBG2", PU_PATCH_LOWPRIORITY);
|
pat2 = W_CachePatchName("TITLEBG2", PU_PATCH);
|
||||||
|
|
||||||
w = (vid.scaledwidth << FRACBITS);
|
w = (vid.scaledwidth << FRACBITS);
|
||||||
|
|
||||||
@@ -215,9 +215,6 @@ static tic_t introscenetime[NUMINTROSCENES] =
|
|||||||
4*TICRATE, // KART KR(eW
|
4*TICRATE, // KART KR(eW
|
||||||
};
|
};
|
||||||
|
|
||||||
// custom intros
|
|
||||||
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer);
|
|
||||||
|
|
||||||
void F_StartIntro(void)
|
void F_StartIntro(void)
|
||||||
{
|
{
|
||||||
if (gamestate)
|
if (gamestate)
|
||||||
@@ -257,26 +254,21 @@ void F_StartIntro(void)
|
|||||||
//
|
//
|
||||||
void F_IntroDrawer(void)
|
void F_IntroDrawer(void)
|
||||||
{
|
{
|
||||||
boolean highres = false;
|
|
||||||
INT32 cx = 8, cy = 128;
|
INT32 cx = 8, cy = 128;
|
||||||
patch_t *background = NULL;
|
patch_t *background = NULL;
|
||||||
INT32 bgxoffs = 0;
|
INT32 bgxoffs = 0;
|
||||||
|
|
||||||
|
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120);
|
||||||
|
|
||||||
// DRAW A FULL PIC INSTEAD OF FLAT!
|
// DRAW A FULL PIC INSTEAD OF FLAT!
|
||||||
if (intro_scenenum == 0)
|
if (intro_scenenum == 0)
|
||||||
{
|
{
|
||||||
background = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY);
|
background = W_CachePatchName("KARTKREW", PU_PATCH);
|
||||||
highres = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120);
|
if (background)
|
||||||
|
{
|
||||||
if (background)
|
|
||||||
{
|
|
||||||
if (highres)
|
|
||||||
V_DrawSmallScaledPatch(bgxoffs, 0, 0, background);
|
V_DrawSmallScaledPatch(bgxoffs, 0, 0, background);
|
||||||
else
|
}
|
||||||
V_DrawScaledPatch(bgxoffs, 0, 0, background);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
W_UnlockCachedPatch(background);
|
W_UnlockCachedPatch(background);
|
||||||
@@ -324,6 +316,7 @@ void F_IntroTicker(void)
|
|||||||
D_StartTitle();
|
D_StartTitle();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (finalecount == 8)
|
if (finalecount == 8)
|
||||||
S_StartSound(NULL, sfx_vroom);
|
S_StartSound(NULL, sfx_vroom);
|
||||||
else if (finalecount == 47)
|
else if (finalecount == 47)
|
||||||
@@ -626,7 +619,6 @@ void F_StartCredits(void)
|
|||||||
timetonext = 2*TICRATE;
|
timetonext = 2*TICRATE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void F_CreditDrawer(void)
|
void F_CreditDrawer(void)
|
||||||
{
|
{
|
||||||
UINT16 i;
|
UINT16 i;
|
||||||
@@ -661,22 +653,23 @@ void F_CreditDrawer(void)
|
|||||||
// Draw credits text on top
|
// Draw credits text on top
|
||||||
for (i = 0; credits[i]; i++)
|
for (i = 0; credits[i]; i++)
|
||||||
{
|
{
|
||||||
switch(credits[i][0])
|
switch (credits[i][0])
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
y += 80<<FRACBITS;
|
y += 80<<FRACBITS;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
if (y>>FRACBITS > -20)
|
if (y>>FRACBITS > -20)
|
||||||
V_DrawCreditString((160 - (V_CreditStringWidth(&credits[i][1])>>1))<<FRACBITS, y, 0, &credits[i][1]);
|
V_DrawCreditString((160 - (V_CreditStringWidth(&credits[i][1])>>1))<<FRACBITS, y, 0, &credits[i][1]);
|
||||||
y += 30<<FRACBITS;
|
y += 30<<FRACBITS;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (y>>FRACBITS > -10)
|
if (y>>FRACBITS > -10)
|
||||||
V_DrawStringAtFixed(32<<FRACBITS, y, V_ALLOWLOWERCASE, credits[i]);
|
V_DrawStringAtFixed(32<<FRACBITS, y, V_ALLOWLOWERCASE, credits[i]);
|
||||||
y += 12<<FRACBITS;
|
y += 12<<FRACBITS;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((y>>FRACBITS) * vid.dup) > vid.height)
|
if (((y>>FRACBITS) * vid.dup) > vid.height)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -701,7 +694,7 @@ void F_CreditTicker(void)
|
|||||||
// Draw credits text on top
|
// Draw credits text on top
|
||||||
for (i = 0; credits[i]; i++)
|
for (i = 0; credits[i]; i++)
|
||||||
{
|
{
|
||||||
switch(credits[i][0])
|
switch (credits[i][0])
|
||||||
{
|
{
|
||||||
case 0: y += 80<<FRACBITS; break;
|
case 0: y += 80<<FRACBITS; break;
|
||||||
case 1: y += 30<<FRACBITS; break;
|
case 1: y += 30<<FRACBITS; break;
|
||||||
@@ -979,10 +972,10 @@ void F_StartTitleScreen(void)
|
|||||||
demoDelayLeft = demoDelayTime;
|
demoDelayLeft = demoDelayTime;
|
||||||
demoIdleLeft = demoIdleTime;
|
demoIdleLeft = demoIdleTime;
|
||||||
|
|
||||||
ttbanner = W_CachePatchName("TTKBANNR", PU_PATCH_LOWPRIORITY);
|
ttbanner = W_CachePatchName("TTKBANNR", PU_PATCH);
|
||||||
ttkart = W_CachePatchName("TTKART", PU_PATCH_LOWPRIORITY);
|
ttkart = W_CachePatchName("TTKART", PU_PATCH);
|
||||||
ttcheckers = W_CachePatchName("TTCHECK", PU_PATCH_LOWPRIORITY);
|
ttcheckers = W_CachePatchName("TTCHECK", PU_PATCH);
|
||||||
ttkflash = W_CachePatchName("TTKFLASH", PU_PATCH_LOWPRIORITY);
|
ttkflash = W_CachePatchName("TTKFLASH", PU_PATCH);
|
||||||
}
|
}
|
||||||
|
|
||||||
// (no longer) De-Demo'd Title Screen
|
// (no longer) De-Demo'd Title Screen
|
||||||
@@ -1117,14 +1110,6 @@ void F_TitleScreenTicker(boolean run)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Replay intro when done cycling through demos
|
|
||||||
/*if (curDemo == numDemos) -- uuuh... we have a LOT of maps AND a big devteam... probably not gonna see a repeat unless you're super unlucky :V
|
|
||||||
{
|
|
||||||
curDemo = 0;
|
|
||||||
F_StartIntro();
|
|
||||||
return;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
mapname = G_BuildMapName(G_RandMap(TOL_RACE, -2, false, 0, false, NULL)+1);
|
mapname = G_BuildMapName(G_RandMap(TOL_RACE, -2, false, 0, false, NULL)+1);
|
||||||
|
|
||||||
numstaff = 1;
|
numstaff = 1;
|
||||||
@@ -1179,9 +1164,7 @@ void F_StartWaitingPlayers(void)
|
|||||||
randskin = M_RandomKey(numskins);
|
randskin = M_RandomKey(numskins);
|
||||||
boolean waithires = skins[randskin].flags && SF_HIRES;
|
boolean waithires = skins[randskin].flags && SF_HIRES;
|
||||||
|
|
||||||
if (waitcolormap)
|
Z_Free(waitcolormap);
|
||||||
Z_Free(waitcolormap);
|
|
||||||
|
|
||||||
waitcolormap = R_GetTranslationColormap(randskin, skins[randskin].prefcolor, 0);
|
waitcolormap = R_GetTranslationColormap(randskin, skins[randskin].prefcolor, 0);
|
||||||
|
|
||||||
if (waithires)
|
if (waithires)
|
||||||
@@ -1325,7 +1308,7 @@ boolean F_ContinueResponder(event_t *event)
|
|||||||
keypressed = true;
|
keypressed = true;
|
||||||
imcontinuing = true;
|
imcontinuing = true;
|
||||||
continuetime = TICRATE;
|
continuetime = TICRATE;
|
||||||
S_StartSound(0, sfx_itemup);
|
S_StartSound(NULL, sfx_itemup);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1419,6 +1402,7 @@ void F_EndCutScene(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// custom intros
|
||||||
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer)
|
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer)
|
||||||
{
|
{
|
||||||
if (!cutscenes[cutscenenum])
|
if (!cutscenes[cutscenenum])
|
||||||
|
|||||||
+4
-2
@@ -111,7 +111,8 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum)
|
|||||||
goto freemask;
|
goto freemask;
|
||||||
|
|
||||||
// SRB2Kart: This suddenly triggers ERRORMODE now
|
// SRB2Kart: This suddenly triggers ERRORMODE now
|
||||||
//sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum);
|
//snprintf(&lumpname[4], 3, "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum);
|
||||||
|
//lumpname[8] = 0;
|
||||||
|
|
||||||
lumpname[4] = '0'+(masknum/10);
|
lumpname[4] = '0'+(masknum/10);
|
||||||
lumpname[5] = '0'+(masknum%10);
|
lumpname[5] = '0'+(masknum%10);
|
||||||
@@ -361,6 +362,8 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
|||||||
// on for fade-to-black
|
// on for fade-to-black
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
|
I_HandleInterrupt();
|
||||||
|
|
||||||
// get fademask first so we can tell if it exists or not
|
// get fademask first so we can tell if it exists or not
|
||||||
fmask = F_GetFadeMask(wipetype, wipeframe++);
|
fmask = F_GetFadeMask(wipetype, wipeframe++);
|
||||||
|
|
||||||
@@ -384,7 +387,6 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
|||||||
F_DoWipe(fmask);
|
F_DoWipe(fmask);
|
||||||
|
|
||||||
I_OsPolling();
|
I_OsPolling();
|
||||||
I_UpdateNoBlit();
|
|
||||||
|
|
||||||
if (rendermode != render_none && drawMenu)
|
if (rendermode != render_none && drawMenu)
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -10,7 +10,7 @@ FUNCINLINE static ATTRINLINE boolean fasticmp(const char *s, const char *c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// case-sensitive of the above
|
// case-sensitive of the above
|
||||||
FUNCINLINE static ATTRINLINE boolean fastcmp(const char *s, const char *c)
|
FUNCINLINE static ATTRINLINE PUREFUNC boolean fastcmp(const char *s, const char *c)
|
||||||
{
|
{
|
||||||
for (; *s && *s == *c; s++, c++) ;
|
for (; *s && *s == *c; s++, c++) ;
|
||||||
return (*s == *c); // make sure both strings ended
|
return (*s == *c); // make sure both strings ended
|
||||||
@@ -18,7 +18,7 @@ FUNCINLINE static ATTRINLINE boolean fastcmp(const char *s, const char *c)
|
|||||||
|
|
||||||
// length-limited of the above
|
// length-limited of the above
|
||||||
// only true if both strings are at least l characters long AND match, case-sensitively!
|
// only true if both strings are at least l characters long AND match, case-sensitively!
|
||||||
FUNCINLINE static ATTRINLINE boolean fastncmp(const char *s, const char *c, UINT16 l)
|
FUNCINLINE static ATTRINLINE PUREFUNC boolean fastncmp(const char *s, const char *c, UINT16 l)
|
||||||
{
|
{
|
||||||
for (; *s && *s == *c && --l; s++, c++) ;
|
for (; *s && *s == *c && --l; s++, c++) ;
|
||||||
return !l; // make sure you reached the end
|
return !l; // make sure you reached the end
|
||||||
|
|||||||
+14
-11
@@ -49,7 +49,7 @@ size_t menupathindex[menudepth] = {};
|
|||||||
size_t menudepthleft = menudepth;
|
size_t menudepthleft = menudepth;
|
||||||
|
|
||||||
char menusearchbuf[MAXSTRINGLENGTH+1];
|
char menusearchbuf[MAXSTRINGLENGTH+1];
|
||||||
textinput_t menusearch;
|
textinput_t menusearch = {};
|
||||||
|
|
||||||
char **dirmenu = NULL, **coredirmenu = NULL; // core only local for this file
|
char **dirmenu = NULL, **coredirmenu = NULL; // core only local for this file
|
||||||
size_t sizedirmenu = 0, sizecoredirmenu = 0; // ditto
|
size_t sizedirmenu = 0, sizecoredirmenu = 0; // ditto
|
||||||
@@ -111,10 +111,12 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
|
|||||||
char *searchname;
|
char *searchname;
|
||||||
int depthleft = maxsearchdepth;
|
int depthleft = maxsearchdepth;
|
||||||
char searchpath[MAXFILEPATH];
|
char searchpath[MAXFILEPATH];
|
||||||
size_t *searchpathindex;
|
size_t *searchpathindex = NULL;
|
||||||
|
|
||||||
dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
|
dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
|
||||||
searchpathindex = (size_t *)malloc(maxsearchdepth * sizeof(size_t));
|
searchpathindex = (size_t *)malloc(maxsearchdepth * sizeof(size_t));
|
||||||
|
if (!searchpathindex)
|
||||||
|
I_Error("out of memory while searching for file %s\n", filename);
|
||||||
|
|
||||||
strcpy(searchpath, startpath);
|
strcpy(searchpath, startpath);
|
||||||
searchpathindex[--depthleft] = strlen(searchpath) + 1;
|
searchpathindex[--depthleft] = strlen(searchpath) + 1;
|
||||||
@@ -271,10 +273,13 @@ static boolean filemenucmp(char *haystack, char *needle)
|
|||||||
{
|
{
|
||||||
static char localhaystack[128];
|
static char localhaystack[128];
|
||||||
strlcpy(localhaystack, haystack, 128);
|
strlcpy(localhaystack, haystack, 128);
|
||||||
|
|
||||||
if (!cv_addons_search_case.value)
|
if (!cv_addons_search_case.value)
|
||||||
strupr(localhaystack);
|
strupr(localhaystack);
|
||||||
|
|
||||||
if (cv_addons_search_type.value)
|
if (cv_addons_search_type.value)
|
||||||
return (strstr(localhaystack, needle) != 0);
|
return (strstr(localhaystack, needle) != NULL);
|
||||||
|
|
||||||
return (!strncmp(localhaystack, needle, menusearch.length));
|
return (!strncmp(localhaystack, needle, menusearch.length));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -314,8 +319,7 @@ void closefilemenu(boolean validsize)
|
|||||||
coredirmenu = NULL;
|
coredirmenu = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (refreshdirname)
|
Z_Free(refreshdirname);
|
||||||
Z_Free(refreshdirname);
|
|
||||||
refreshdirname = NULL;
|
refreshdirname = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -343,8 +347,7 @@ void searchfilemenu(char *tempname)
|
|||||||
|
|
||||||
if (!menusearch.length)
|
if (!menusearch.length)
|
||||||
{
|
{
|
||||||
if (dirmenu)
|
Z_Free(dirmenu);
|
||||||
Z_Free(dirmenu);
|
|
||||||
dirmenu = coredirmenu;
|
dirmenu = coredirmenu;
|
||||||
sizedirmenu = sizecoredirmenu;
|
sizedirmenu = sizecoredirmenu;
|
||||||
|
|
||||||
@@ -386,8 +389,8 @@ void searchfilemenu(char *tempname)
|
|||||||
I_Error("searchfilemenu(): could not create \"No results...\".");
|
I_Error("searchfilemenu(): could not create \"No results...\".");
|
||||||
sizedirmenu = 1;
|
sizedirmenu = 1;
|
||||||
dir_on[menudepthleft] = 0;
|
dir_on[menudepthleft] = 0;
|
||||||
if (tempname)
|
Z_Free(tempname);
|
||||||
Z_Free(tempname);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -502,8 +505,8 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
|
|||||||
{
|
{
|
||||||
closedir(dirhandle);
|
closedir(dirhandle);
|
||||||
closefilemenu(false);
|
closefilemenu(false);
|
||||||
if (tempname)
|
Z_Free(tempname);
|
||||||
Z_Free(tempname);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+309
-269
File diff suppressed because it is too large.
Load diff
+4
-2
@@ -82,7 +82,8 @@ typedef struct menudemo_s {
|
|||||||
struct {
|
struct {
|
||||||
UINT8 ranking;
|
UINT8 ranking;
|
||||||
char name[17];
|
char name[17];
|
||||||
UINT8 skin, color;
|
skinnum_t skin;
|
||||||
|
UINT8 color;
|
||||||
UINT32 timeorscore;
|
UINT32 timeorscore;
|
||||||
} standings[MAXPLAYERS];
|
} standings[MAXPLAYERS];
|
||||||
} menudemo_t;
|
} menudemo_t;
|
||||||
@@ -97,7 +98,7 @@ void G_SetDemoTime(UINT32 ptime, UINT32 plap);
|
|||||||
UINT8 G_CmpDemoTime(char *oldname, char *newname);
|
UINT8 G_CmpDemoTime(char *oldname, char *newname);
|
||||||
|
|
||||||
void G_LoadDemoInfo(menudemo_t *pdemo);
|
void G_LoadDemoInfo(menudemo_t *pdemo);
|
||||||
void G_LoadDemoTitle(menudemo_t *pdemo); // For use in replay search feature
|
void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat); // For use in replay search feature
|
||||||
void G_DeferedPlayDemo(const char *demo);
|
void G_DeferedPlayDemo(const char *demo);
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
@@ -149,6 +150,7 @@ typedef struct demoghost {
|
|||||||
UINT8 checksum[16];
|
UINT8 checksum[16];
|
||||||
UINT8 *buffer, *p, color;
|
UINT8 *buffer, *p, color;
|
||||||
UINT16 version;
|
UINT16 version;
|
||||||
|
boolean done;
|
||||||
mobj_t oldmo, *mo;
|
mobj_t oldmo, *mo;
|
||||||
struct demoghost *next;
|
struct demoghost *next;
|
||||||
} demoghost;
|
} demoghost;
|
||||||
|
|||||||
+155
-119
@@ -61,17 +61,11 @@
|
|||||||
|
|
||||||
gameaction_t gameaction = 0;
|
gameaction_t gameaction = 0;
|
||||||
gamestate_t gamestate = GS_NULL;
|
gamestate_t gamestate = GS_NULL;
|
||||||
UINT8 ultimatemode = false;
|
|
||||||
|
|
||||||
boolean botingame = false;
|
boolean botingame = false;
|
||||||
UINT8 botskin = 0;
|
skinnum_t botskin = 0;
|
||||||
UINT8 botcolor = 0;
|
UINT8 botcolor = 0;
|
||||||
|
|
||||||
JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
|
|
||||||
|
|
||||||
// 1024 bytes is plenty for a savegame
|
|
||||||
#define SAVEGAMESIZE (1024)
|
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
char gamedatafilename[64] = "kartdata.dat";
|
char gamedatafilename[64] = "kartdata.dat";
|
||||||
char timeattackfolder[64] = "kart";
|
char timeattackfolder[64] = "kart";
|
||||||
@@ -90,7 +84,6 @@ INT16 maptol = 0;
|
|||||||
UINT8 globalweather = 0;
|
UINT8 globalweather = 0;
|
||||||
INT32 curWeather = PRECIP_NONE;
|
INT32 curWeather = PRECIP_NONE;
|
||||||
INT32 cursaveslot = -1; // Auto-save 1p savegame slot
|
INT32 cursaveslot = -1; // Auto-save 1p savegame slot
|
||||||
INT16 lastmapsaved = 0; // Last map we auto-saved at
|
|
||||||
boolean gamecomplete = false;
|
boolean gamecomplete = false;
|
||||||
|
|
||||||
UINT16 mainwads = 0;
|
UINT16 mainwads = 0;
|
||||||
@@ -100,7 +93,6 @@ boolean savemoddata = false;
|
|||||||
UINT8 paused = 0;
|
UINT8 paused = 0;
|
||||||
UINT8 modeattacking = ATTACKING_NONE;
|
UINT8 modeattacking = ATTACKING_NONE;
|
||||||
boolean imcontinuing = false;
|
boolean imcontinuing = false;
|
||||||
boolean runemeraldmanager = false;
|
|
||||||
|
|
||||||
boolean netgame = false; // only true if packets are broadcast
|
boolean netgame = false; // only true if packets are broadcast
|
||||||
boolean multiplayer = false;
|
boolean multiplayer = false;
|
||||||
@@ -112,7 +104,6 @@ INT32 consoleplayer = 0; // player taking events and displaying
|
|||||||
INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
|
INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
|
||||||
|
|
||||||
tic_t gametic = 0;
|
tic_t gametic = 0;
|
||||||
tic_t levelstarttic = 0; // gametic at level start
|
|
||||||
UINT32 totalrings = 0; // for intermission
|
UINT32 totalrings = 0; // for intermission
|
||||||
INT16 lastmap = 0; // last level you were at (returning from special stages)
|
INT16 lastmap = 0; // last level you were at (returning from special stages)
|
||||||
tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
|
tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
|
||||||
@@ -132,7 +123,7 @@ UINT8 skincolor_bluering = SKINCOLOR_STEEL;
|
|||||||
tic_t countdowntimer = 0;
|
tic_t countdowntimer = 0;
|
||||||
boolean countdowntimeup = false;
|
boolean countdowntimeup = false;
|
||||||
|
|
||||||
cutscene_t *cutscenes[128];
|
cutscene_t *cutscenes[128] = {};
|
||||||
|
|
||||||
INT16 nextmapoverride = 0;
|
INT16 nextmapoverride = 0;
|
||||||
boolean skipstats = false;
|
boolean skipstats = false;
|
||||||
@@ -144,7 +135,7 @@ mobj_t *blueflag = NULL;
|
|||||||
mapthing_t *rflagpoint = NULL;
|
mapthing_t *rflagpoint = NULL;
|
||||||
mapthing_t *bflagpoint = NULL;
|
mapthing_t *bflagpoint = NULL;
|
||||||
|
|
||||||
struct quake quake;
|
struct quake quake = {};
|
||||||
|
|
||||||
// Map Header Information
|
// Map Header Information
|
||||||
mapheader_t* mapheaderinfo[NUMMAPS] = {};
|
mapheader_t* mapheaderinfo[NUMMAPS] = {};
|
||||||
@@ -190,9 +181,6 @@ boolean CheckForReverseGravity = false;
|
|||||||
UINT16 invulntics = 20*TICRATE;
|
UINT16 invulntics = 20*TICRATE;
|
||||||
UINT16 sneakertics = 20*TICRATE;
|
UINT16 sneakertics = 20*TICRATE;
|
||||||
UINT16 flashingtics = 3*TICRATE/2; // SRB2kart
|
UINT16 flashingtics = 3*TICRATE/2; // SRB2kart
|
||||||
UINT16 tailsflytics = 8*TICRATE;
|
|
||||||
UINT16 underwatertics = 30*TICRATE;
|
|
||||||
UINT16 spacetimetics = 11*TICRATE + (TICRATE/2);
|
|
||||||
UINT16 extralifetics = 4*TICRATE;
|
UINT16 extralifetics = 4*TICRATE;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
@@ -210,10 +198,7 @@ const INT32 wipeoutslowtime = 20;
|
|||||||
const INT32 wantedreduce = 5*TICRATE;
|
const INT32 wantedreduce = 5*TICRATE;
|
||||||
const INT32 wantedfrequency = 10*TICRATE;
|
const INT32 wantedfrequency = 10*TICRATE;
|
||||||
|
|
||||||
INT32 gameovertics = 15*TICRATE;
|
|
||||||
|
|
||||||
UINT8 use1upSound = 0;
|
UINT8 use1upSound = 0;
|
||||||
UINT8 maxXtraLife = 2; // Max extra lives from rings
|
|
||||||
|
|
||||||
UINT8 introtoplay = 0;
|
UINT8 introtoplay = 0;
|
||||||
UINT8 creditscutscene = 0;
|
UINT8 creditscutscene = 0;
|
||||||
@@ -228,7 +213,7 @@ tic_t racecountdown = 0, exitcountdown = 0; // for racing
|
|||||||
fixed_t gravity = 0;
|
fixed_t gravity = 0;
|
||||||
fixed_t mapobjectscale = FRACUNIT;
|
fixed_t mapobjectscale = FRACUNIT;
|
||||||
|
|
||||||
struct maplighting maplighting;
|
struct maplighting maplighting = {};
|
||||||
|
|
||||||
INT16 autobalance = 0; //for CTF team balance
|
INT16 autobalance = 0; //for CTF team balance
|
||||||
INT16 teamscramble = 0; //for CTF team scramble
|
INT16 teamscramble = 0; //for CTF team scramble
|
||||||
@@ -276,12 +261,6 @@ UINT32 timesBeatenWithEmeralds = 0;
|
|||||||
|
|
||||||
INT16 prevmap = 0, nextmap = 0;
|
INT16 prevmap = 0, nextmap = 0;
|
||||||
|
|
||||||
// Analog Control
|
|
||||||
void SendWeaponPref(void);
|
|
||||||
void SendWeaponPref2(void);
|
|
||||||
void SendWeaponPref3(void);
|
|
||||||
void SendWeaponPref4(void);
|
|
||||||
|
|
||||||
// don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler.
|
// don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler.
|
||||||
|
|
||||||
// chat timer thingy
|
// chat timer thingy
|
||||||
@@ -318,6 +297,8 @@ consvar_t cv_pauseifunfocused = {"pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, N
|
|||||||
static CV_PossibleValue_t songcredits_cons_t[] = {{0, "Off"}, {1, "Default"}, {2, "Box"}, {0, NULL}};
|
static CV_PossibleValue_t songcredits_cons_t[] = {{0, "Off"}, {1, "Default"}, {2, "Box"}, {0, NULL}};
|
||||||
consvar_t cv_songcredits = {"songcredits", "Default", CV_SAVE, songcredits_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_songcredits = {"songcredits", "Default", CV_SAVE, songcredits_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
consvar_t cv_pausesongcredits = {"pausesongcredits", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// Show "FREE PLAY" when you're alone. :(
|
// Show "FREE PLAY" when you're alone. :(
|
||||||
consvar_t cv_showfreeplay = { "showfreeplay", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showfreeplay = { "showfreeplay", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -458,40 +439,27 @@ consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS] = {
|
|||||||
{"litesteer4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
|
{"litesteer4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//static CV_PossibleValue_t autoaccelcons_t[] = {{0, "Off"}, {1, "Manual"}, {2, "Automatic"}, {0, NULL}};
|
||||||
|
consvar_t cv_autoaccel[MAXSPLITSCREENPLAYERS] = {
|
||||||
|
{"kartautoaccel", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"kartautoaccel2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"kartautoaccel3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"kartautoaccel4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t cechotoggle_t[] = {{0, "Off"}, {1, "On"}, {2, "Console"}, {0, NULL}};
|
static CV_PossibleValue_t cechotoggle_t[] = {{0, "Off"}, {1, "On"}, {2, "Console"}, {0, NULL}};
|
||||||
consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
#if MAXPLAYERS > 16
|
|
||||||
#error "please update player_name table using the new value for MAXPLAYERS"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
player_t *seenplayer = NULL; // player we're aiming at right now
|
player_t *seenplayer = NULL; // player we're aiming at right now
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
|
// now automatically allocated in D_RegisterServerCommands
|
||||||
{
|
// so that it doesn't have to be updated depending on the value of MAXPLAYERS
|
||||||
"Player 1",
|
char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
|
||||||
"Player 2",
|
|
||||||
"Player 3",
|
|
||||||
"Player 4",
|
|
||||||
"Player 5",
|
|
||||||
"Player 6",
|
|
||||||
"Player 7",
|
|
||||||
"Player 8",
|
|
||||||
"Player 9",
|
|
||||||
"Player 10",
|
|
||||||
"Player 11",
|
|
||||||
"Player 12",
|
|
||||||
"Player 13",
|
|
||||||
"Player 14",
|
|
||||||
"Player 15",
|
|
||||||
"Player 16"
|
|
||||||
}; // SRB2kart - removed Players 17 through 32
|
|
||||||
|
|
||||||
INT32 player_name_changes[MAXPLAYERS] = {};
|
INT32 player_name_changes[MAXPLAYERS] = {};
|
||||||
|
|
||||||
INT16 rw_maximums[NUM_WEAPONS] =
|
INT16 rw_maximums[NUM_WEAPONS] =
|
||||||
@@ -519,11 +487,8 @@ void G_ClearRecords(void)
|
|||||||
INT16 i;
|
INT16 i;
|
||||||
for (i = 0; i < NUMMAPS; ++i)
|
for (i = 0; i < NUMMAPS; ++i)
|
||||||
{
|
{
|
||||||
if (mainrecords[i])
|
Z_Free(mainrecords[i]);
|
||||||
{
|
mainrecords[i] = NULL;
|
||||||
Z_Free(mainrecords[i]);
|
|
||||||
mainrecords[i] = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -639,14 +604,18 @@ const char *G_BuildMapName(INT32 map)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (map < 100 && map >= 0) // ...but why use signed integer in first place? idk but this prevents warning (and potential buffer overflow lol)
|
if (map < 100 && map >= 0) // ...but why use signed integer in first place? idk but this prevents warning (and potential buffer overflow lol)
|
||||||
sprintf(&mapname[3], "%.2d", map);
|
{
|
||||||
|
snprintf(&mapname[3], sizeof(mapname)-3, "%.2d", map);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mapname[3] = (char)('A' + (char)((map - 100) / 36));
|
mapname[3] = (char)('A' + (char)((map - 100) / 36));
|
||||||
|
|
||||||
if ((map - 100) % 36 < 10)
|
if ((map - 100) % 36 < 10)
|
||||||
mapname[4] = (char)('0' + (char)((map - 100) % 36));
|
mapname[4] = (char)('0' + (char)((map - 100) % 36));
|
||||||
else
|
else
|
||||||
mapname[4] = (char)('A' + (char)((map - 100) % 36) - 10);
|
mapname[4] = (char)('A' + (char)((map - 100) % 36) - 10);
|
||||||
|
|
||||||
mapname[5] = '\0';
|
mapname[5] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -668,7 +637,7 @@ INT16 G_ClipAimingPitch(INT32 *aiming)
|
|||||||
else if (*aiming < -limitangle)
|
else if (*aiming < -limitangle)
|
||||||
*aiming = -limitangle;
|
*aiming = -limitangle;
|
||||||
|
|
||||||
return (INT16)((*aiming)>>16);
|
return (INT16)((*aiming) >> TICCMD_REDUCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
INT16 G_SoftwareClipAimingPitch(INT32 *aiming)
|
INT16 G_SoftwareClipAimingPitch(INT32 *aiming)
|
||||||
@@ -681,7 +650,7 @@ INT16 G_SoftwareClipAimingPitch(INT32 *aiming)
|
|||||||
else if (*aiming < -limitangle)
|
else if (*aiming < -limitangle)
|
||||||
*aiming = -limitangle;
|
*aiming = -limitangle;
|
||||||
|
|
||||||
return (INT16)((*aiming)>>16);
|
return (INT16)((*aiming) >> TICCMD_REDUCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
INT32 JoyAxis(axis_input_e axissel, UINT8 player)
|
INT32 JoyAxis(axis_input_e axissel, UINT8 player)
|
||||||
@@ -767,7 +736,7 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
|
|||||||
if (retaxis > (+JOYAXISRANGE))
|
if (retaxis > (+JOYAXISRANGE))
|
||||||
retaxis = +JOYAXISRANGE;
|
retaxis = +JOYAXISRANGE;
|
||||||
|
|
||||||
if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
|
if (!DigitalGamepadStyle(pnum) && axissel < AXISDEAD)
|
||||||
{
|
{
|
||||||
const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
|
const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
|
||||||
|
|
||||||
@@ -804,6 +773,10 @@ static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
|
|||||||
static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
|
static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
|
||||||
static fixed_t angleturn[3] = {KART_FULLTURN/2, KART_FULLTURN, KART_FULLTURN/4}; // + slow turn
|
static fixed_t angleturn[3] = {KART_FULLTURN/2, KART_FULLTURN, KART_FULLTURN/4}; // + slow turn
|
||||||
|
|
||||||
|
//
|
||||||
|
// G_HandleLocalDriftturn
|
||||||
|
// Hack for Lua menus that check directional inputs with driftturn
|
||||||
|
//
|
||||||
static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
|
static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
|
||||||
{
|
{
|
||||||
INT32 axis = 0;
|
INT32 axis = 0;
|
||||||
@@ -811,8 +784,8 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
|
|||||||
|
|
||||||
const UINT8 forplayer = (ssplayer-1);
|
const UINT8 forplayer = (ssplayer-1);
|
||||||
|
|
||||||
const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
|
const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer);
|
||||||
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;
|
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer);
|
||||||
|
|
||||||
turnright = InputDown(gc_turnright, ssplayer);
|
turnright = InputDown(gc_turnright, ssplayer);
|
||||||
turnleft = InputDown(gc_turnleft, ssplayer);
|
turnleft = InputDown(gc_turnleft, ssplayer);
|
||||||
@@ -866,9 +839,9 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
|
|||||||
//
|
//
|
||||||
static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
|
static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
|
||||||
{
|
{
|
||||||
boolean moveinput = false;
|
|
||||||
INT32 axis = 0;
|
INT32 axis = 0;
|
||||||
const boolean usejoystick = (cv_usejoystick[(ssplayer-1)].value);
|
const UINT8 forplayer = (ssplayer-1);
|
||||||
|
const boolean usejoystick = cv_usejoystick[forplayer].value;
|
||||||
|
|
||||||
// check for inputs and return button commands
|
// check for inputs and return button commands
|
||||||
// for stuff like joining with item button, saltyhop, honking, etc.
|
// for stuff like joining with item button, saltyhop, honking, etc.
|
||||||
@@ -903,15 +876,11 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
|
|||||||
|
|
||||||
#undef CHECKINPUT
|
#undef CHECKINPUT
|
||||||
|
|
||||||
moveinput = (InputDown(gc_turnleft, ssplayer) || InputDown(gc_turnright, ssplayer)
|
|
||||||
|| InputDown(gc_aimforward, ssplayer) || InputDown(gc_aimbackward, ssplayer) ||
|
|
||||||
(usejoystick && JoyAxis(AXISAIM, ssplayer) != 0) || (usejoystick && JoyAxis(AXISTURN, ssplayer) != 0));
|
|
||||||
|
|
||||||
axis = JoyAxis(AXISLOOKBACK, ssplayer);
|
axis = JoyAxis(AXISLOOKBACK, ssplayer);
|
||||||
camspin[ssplayer-1] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
|
camspin[forplayer] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
|
||||||
|
|
||||||
// Reset to our spec player if we watch someone else.
|
// Reset to our spec player if we watch someone else.
|
||||||
if ((moveinput || cmd->buttons)
|
if ((cmd->driftturn || cmd->buttons)
|
||||||
&& displayplayers[0] != consoleplayer && ssplayer == 1)
|
&& displayplayers[0] != consoleplayer && ssplayer == 1)
|
||||||
{
|
{
|
||||||
if (cv_director.value)
|
if (cv_director.value)
|
||||||
@@ -923,6 +892,63 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// G_HandleAutoAcceleration
|
||||||
|
//
|
||||||
|
static void G_HandleAutoAcceleration(ticcmd_t *cmd, player_t *player, UINT8 forplayer)
|
||||||
|
{
|
||||||
|
if (!cv_autoaccel[forplayer].value)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (gamestate != GS_LEVEL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// dont accel before and during countdown
|
||||||
|
if (leveltime <= starttime)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// dont do this in menus or when console is onscreen
|
||||||
|
if (menuactive || CON_Ready())
|
||||||
|
return;
|
||||||
|
|
||||||
|
// gotta have a player that aint respawning
|
||||||
|
if (!player->mo || player->kartstuff[k_respawn])
|
||||||
|
return;
|
||||||
|
|
||||||
|
// dont need for "finished" players
|
||||||
|
if (player->exiting || (player->pflags & PF_TIMEOVER))
|
||||||
|
return;
|
||||||
|
|
||||||
|
// dont do during spinout
|
||||||
|
if (player->kartstuff[k_spinouttimer])
|
||||||
|
return;
|
||||||
|
|
||||||
|
// spectators and freecam dont need special handling, see G_BuildTiccmd
|
||||||
|
|
||||||
|
if (cmd->buttons & BT_BRAKE)
|
||||||
|
{
|
||||||
|
if (cmd->buttons & BT_DRIFT ||
|
||||||
|
player->kartstuff[k_sneakertimer] ||
|
||||||
|
player->kartstuff[k_squishedtimer])
|
||||||
|
{
|
||||||
|
cmd->forwardmove = (SINT8)forwardmove[0];
|
||||||
|
cmd->buttons |= BT_ACCELERATE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// allows us to drive backwards if we need to
|
||||||
|
if (cmd->forwardmove > 0)
|
||||||
|
cmd->forwardmove = 0;
|
||||||
|
cmd->buttons &= ~BT_ACCELERATE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cmd->forwardmove = (SINT8)forwardmove[1];
|
||||||
|
cmd->buttons |= BT_ACCELERATE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// G_BuildTiccmd
|
// G_BuildTiccmd
|
||||||
// Builds a ticcmd from all of the available inputs
|
// Builds a ticcmd from all of the available inputs
|
||||||
@@ -948,10 +974,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
player_t *player = P_GetLocalPlayerForNum(forplayer);
|
player_t *player = P_GetLocalPlayerForNum(forplayer);
|
||||||
|
|
||||||
camera_t *thiscam = &camera[forplayer];
|
camera_t *thiscam = &camera[forplayer];
|
||||||
const boolean freecam = camera[forplayer].freecam;
|
const boolean freecam = thiscam->freecam;
|
||||||
|
|
||||||
const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
|
|
||||||
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;
|
|
||||||
|
|
||||||
lang = localangle[forplayer];
|
lang = localangle[forplayer];
|
||||||
laim = localaiming[forplayer];
|
laim = localaiming[forplayer];
|
||||||
@@ -965,7 +988,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
// Kart, don't build a ticcmd if someone is resynching or the server is stopped too so we don't fly off course in bad conditions
|
// Kart, don't build a ticcmd if someone is resynching or the server is stopped too so we don't fly off course in bad conditions
|
||||||
if (paused || P_AutoPause() || (gamestate == GS_LEVEL && player->playerstate == PST_REBORN) || hu_resynching)
|
if (paused || P_AutoPause() || (gamestate == GS_LEVEL && player->playerstate == PST_REBORN) || hu_resynching)
|
||||||
{
|
{
|
||||||
cmd->angleturn = (INT16)(lang >> 16);
|
cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE);
|
||||||
cmd->aiming = G_ClipAimingPitch(&laim);
|
cmd->aiming = G_ClipAimingPitch(&laim);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -973,7 +996,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
// dumbass thing so we can use a few buttons but dont accidentally drive away
|
// dumbass thing so we can use a few buttons but dont accidentally drive away
|
||||||
if (player->spectator || freecam)
|
if (player->spectator || freecam)
|
||||||
{
|
{
|
||||||
cmd->angleturn = (INT16)(lang >> 16);
|
cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE);
|
||||||
G_BuildLocalTiccmd(cmd, ssplayer, freecam);
|
G_BuildLocalTiccmd(cmd, ssplayer, freecam);
|
||||||
|
|
||||||
// let lua override everything
|
// let lua override everything
|
||||||
@@ -983,6 +1006,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer);
|
||||||
|
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer);
|
||||||
|
|
||||||
usejoystick = (analogjoystickmove || gamepadjoystickmove);
|
usejoystick = (analogjoystickmove || gamepadjoystickmove);
|
||||||
turnright = InputDown(gc_turnright, ssplayer);
|
turnright = InputDown(gc_turnright, ssplayer);
|
||||||
turnleft = InputDown(gc_turnleft, ssplayer);
|
turnleft = InputDown(gc_turnleft, ssplayer);
|
||||||
@@ -1070,7 +1096,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
if (InputDown(gc_accelerate, ssplayer) || (gamepadjoystickmove && axis > 0) || player->kartstuff[k_sneakertimer])
|
if (InputDown(gc_accelerate, ssplayer) || (gamepadjoystickmove && axis > 0) || player->kartstuff[k_sneakertimer])
|
||||||
{
|
{
|
||||||
cmd->buttons |= BT_ACCELERATE;
|
cmd->buttons |= BT_ACCELERATE;
|
||||||
forward = forwardmove[1]; // 50
|
forward = forwardmove[1]; // 50
|
||||||
}
|
}
|
||||||
else if (analogjoystickmove && axis > 0)
|
else if (analogjoystickmove && axis > 0)
|
||||||
{
|
{
|
||||||
@@ -1133,7 +1159,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
|
|
||||||
cmd->aiming = G_ClipAimingPitch(&laim);
|
cmd->aiming = G_ClipAimingPitch(&laim);
|
||||||
|
|
||||||
mousex = mousey = mlooky = 0;
|
mousex = mousey = 0;
|
||||||
|
|
||||||
if (forward > MAXPLMOVE)
|
if (forward > MAXPLMOVE)
|
||||||
forward = MAXPLMOVE;
|
forward = MAXPLMOVE;
|
||||||
@@ -1151,6 +1177,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
cmd->sidemove = (SINT8)(cmd->sidemove + side);
|
cmd->sidemove = (SINT8)(cmd->sidemove + side);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
G_HandleAutoAcceleration(cmd, player, forplayer);
|
||||||
|
|
||||||
//{ SRB2kart - Drift support
|
//{ SRB2kart - Drift support
|
||||||
// Not grouped with the rest of turn stuff because it needs to know what buttons you're pressing for rubber-burn turn
|
// Not grouped with the rest of turn stuff because it needs to know what buttons you're pressing for rubber-burn turn
|
||||||
// limit turning to angleturn[1] to stop mouselook letting you look too fast
|
// limit turning to angleturn[1] to stop mouselook letting you look too fast
|
||||||
@@ -1172,10 +1200,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|
||||||
|| (player->kartstuff[k_respawn]) // Respawning
|
|| (player->kartstuff[k_respawn]) // Respawning
|
||||||
|| (player->spectator || objectplacing))) // Not a physical player
|
|| (player->spectator || objectplacing))) // Not a physical player
|
||||||
lang += (cmd->angleturn<<16);
|
lang += (cmd->angleturn << TICCMD_REDUCE);
|
||||||
|
|
||||||
cmd->angleturn = (INT16)(lang >> 16);
|
cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE);
|
||||||
cmd->latency = modeattacking ? 0 : (leveltime & 0xFF); // Send leveltime when this tic was generated to the server for control lag calculations
|
cmd->latency = modeattacking ? 0 : (leveltime & TICCMD_LATENCYMASK); // Send leveltime when this tic was generated to the server for control lag calculations
|
||||||
|
|
||||||
if (!hu_stopped)
|
if (!hu_stopped)
|
||||||
{
|
{
|
||||||
@@ -1244,8 +1272,6 @@ static void G_DoLoadLevel(boolean resetplayer)
|
|||||||
// Make sure objectplace is OFF when you first start the level!
|
// Make sure objectplace is OFF when you first start the level!
|
||||||
OP_ResetObjectplace();
|
OP_ResetObjectplace();
|
||||||
|
|
||||||
levelstarttic = gametic; // for time calculation
|
|
||||||
|
|
||||||
if (wipegamestate == GS_LEVEL)
|
if (wipegamestate == GS_LEVEL)
|
||||||
wipegamestate = -1; // force a wipe
|
wipegamestate = -1; // force a wipe
|
||||||
|
|
||||||
@@ -1267,6 +1293,7 @@ static void G_DoLoadLevel(boolean resetplayer)
|
|||||||
{
|
{
|
||||||
// fail so reset game stuff
|
// fail so reset game stuff
|
||||||
Command_ExitGame_f();
|
Command_ExitGame_f();
|
||||||
|
P_FreeCorruptMapWarnings();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1300,6 +1327,8 @@ static void G_DoLoadLevel(boolean resetplayer)
|
|||||||
|
|
||||||
// clear hud messages remains (usually from game startup)
|
// clear hud messages remains (usually from game startup)
|
||||||
CON_ClearHUD();
|
CON_ClearHUD();
|
||||||
|
// print any map errors now due to clearhud above :chaosleep:
|
||||||
|
P_PrintCorruptMapWarnings();
|
||||||
|
|
||||||
server_lagless = !cv_gentlemens.value;
|
server_lagless = !cv_gentlemens.value;
|
||||||
|
|
||||||
@@ -1756,14 +1785,15 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive)
|
|||||||
// Increment a viewpoint by offset from the current player. A negative value
|
// Increment a viewpoint by offset from the current player. A negative value
|
||||||
// decrements.
|
// decrements.
|
||||||
//
|
//
|
||||||
void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive)
|
void G_AdjustViewEx(UINT8 viewnum, INT32 offset, boolean onlyactive, boolean resetfreecam)
|
||||||
{
|
{
|
||||||
INT32 *displayplayerp, oldview;
|
INT32 *displayplayerp, oldview;
|
||||||
displayplayerp = &displayplayers[viewnum-1];
|
displayplayerp = &displayplayers[viewnum-1];
|
||||||
oldview = (*displayplayerp);
|
oldview = (*displayplayerp);
|
||||||
|
|
||||||
// turn off the freecam
|
// turn off the freecam
|
||||||
camera[viewnum-1].freecam = false;
|
if (resetfreecam)
|
||||||
|
camera[viewnum-1].freecam = false;
|
||||||
|
|
||||||
G_ResetView(viewnum, ( (*displayplayerp) + offset ), onlyactive);
|
G_ResetView(viewnum, ( (*displayplayerp) + offset ), onlyactive);
|
||||||
|
|
||||||
@@ -1777,7 +1807,7 @@ void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive)
|
|||||||
// Ensures all viewpoints are valid
|
// Ensures all viewpoints are valid
|
||||||
// Also demotes splitscreen down to one player.
|
// Also demotes splitscreen down to one player.
|
||||||
//
|
//
|
||||||
void G_ResetViews(void)
|
void G_ResetViews(boolean resetfreecam)
|
||||||
{
|
{
|
||||||
UINT8 splits;
|
UINT8 splits;
|
||||||
UINT8 viewd;
|
UINT8 viewd;
|
||||||
@@ -1801,7 +1831,7 @@ void G_ResetViews(void)
|
|||||||
*/
|
*/
|
||||||
for (viewd = 1; viewd <= splits; ++viewd)
|
for (viewd = 1; viewd <= splits; ++viewd)
|
||||||
{
|
{
|
||||||
G_AdjustView(viewd, 0, false);
|
G_AdjustViewEx(viewd, 0, false, resetfreecam);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1882,7 +1912,7 @@ void G_Ticker(boolean run)
|
|||||||
G_CopyTiccmd(cmd, &netcmds[buf][i], 1);
|
G_CopyTiccmd(cmd, &netcmds[buf][i], 1);
|
||||||
|
|
||||||
// Use the leveltime sent in the player's ticcmd to determine control lag
|
// Use the leveltime sent in the player's ticcmd to determine control lag
|
||||||
cmd->latency = modeattacking ? 0 : min(((leveltime & 0xFF) - cmd->latency) & 0xFF, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
|
cmd->latency = modeattacking ? 0 : min(((leveltime & TICCMD_LATENCYMASK) - cmd->latency) & TICCMD_LATENCYMASK, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1890,7 +1920,6 @@ void G_Ticker(boolean run)
|
|||||||
switch (gamestate)
|
switch (gamestate)
|
||||||
{
|
{
|
||||||
case GS_LEVEL:
|
case GS_LEVEL:
|
||||||
|
|
||||||
for (; ra_timeskip < starttime - TICRATE*4; ra_timeskip++) // this looks weird but this is done to not break compability with older demos for now.
|
for (; ra_timeskip < starttime - TICRATE*4; ra_timeskip++) // this looks weird but this is done to not break compability with older demos for now.
|
||||||
{
|
{
|
||||||
if (demo.title)
|
if (demo.title)
|
||||||
@@ -2601,12 +2630,18 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
|
|||||||
// Just spawn there.
|
// Just spawn there.
|
||||||
//return playerstarts[0];
|
//return playerstarts[0];
|
||||||
|
|
||||||
|
#if MAXPLAYERS > 16
|
||||||
|
//this section courtesy of fickle - v1.1 battle royale
|
||||||
|
// screw collision chex
|
||||||
|
return playerstarts[pos % numcoopstarts];
|
||||||
|
#else
|
||||||
if (P_IsLocalPlayerNum(playernum))
|
if (P_IsLocalPlayerNum(playernum))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, "Could not spawn at any Race starts!\n");
|
CONS_Alert(CONS_WARNING, "Could not spawn at any Race starts!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (P_IsLocalPlayerNum(playernum))
|
if (P_IsLocalPlayerNum(playernum))
|
||||||
@@ -3025,7 +3060,8 @@ tryagain:
|
|||||||
|
|
||||||
void G_AddMapToBuffer(INT16 map)
|
void G_AddMapToBuffer(INT16 map)
|
||||||
{
|
{
|
||||||
INT16 bufx, refreshnum = max(0, TOLMaps(G_TOLFlag(gametype))-3);
|
const INT32 tolmaps = TOLMaps(G_TOLFlag(gametype));
|
||||||
|
INT16 bufx, refreshnum = max(0, tolmaps-3);
|
||||||
|
|
||||||
// Add the map to the buffer.
|
// Add the map to the buffer.
|
||||||
for (bufx = NUMMAPS-1; bufx > 0; bufx--)
|
for (bufx = NUMMAPS-1; bufx > 0; bufx--)
|
||||||
@@ -3298,18 +3334,6 @@ static void G_DoStartVote(void)
|
|||||||
gameaction = ga_nothing;
|
gameaction = ga_nothing;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// G_UseContinue
|
|
||||||
//
|
|
||||||
void G_UseContinue(void)
|
|
||||||
{
|
|
||||||
if (gamestate == GS_LEVEL && !netgame && !multiplayer)
|
|
||||||
{
|
|
||||||
gameaction = ga_startcont;
|
|
||||||
lastdraw = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void G_DoStartContinue(void)
|
static void G_DoStartContinue(void)
|
||||||
{
|
{
|
||||||
I_Assert(!netgame && !multiplayer);
|
I_Assert(!netgame && !multiplayer);
|
||||||
@@ -3348,7 +3372,7 @@ static void G_DoContinued(void)
|
|||||||
token = 0;
|
token = 0;
|
||||||
|
|
||||||
// Reset # of lives
|
// Reset # of lives
|
||||||
pl->lives = (ultimatemode) ? 1 : 3;
|
pl->lives = 3;
|
||||||
|
|
||||||
D_MapChange(gamemap, gametype, false, false, 0, false, false);
|
D_MapChange(gamemap, gametype, false, false, 0, false, false);
|
||||||
|
|
||||||
@@ -3438,7 +3462,7 @@ void G_LoadGameData(void)
|
|||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
UINT8 modded = false;
|
UINT8 modded = false;
|
||||||
UINT8 rtemp;
|
UINT8 rtemp;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {};
|
||||||
|
|
||||||
//For records
|
//For records
|
||||||
tic_t rectime;
|
tic_t rectime;
|
||||||
@@ -3571,7 +3595,7 @@ void G_SaveGameData(boolean force)
|
|||||||
size_t length;
|
size_t length;
|
||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
UINT8 btemp;
|
UINT8 btemp;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {};
|
||||||
(void)force;
|
(void)force;
|
||||||
char backupfile[MAX_WADPATH+4];
|
char backupfile[MAX_WADPATH+4];
|
||||||
|
|
||||||
@@ -3742,7 +3766,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
|
|||||||
size_t length;
|
size_t length;
|
||||||
char vcheck[VERSIONSIZE];
|
char vcheck[VERSIONSIZE];
|
||||||
char savename[255];
|
char savename[255];
|
||||||
savebuffer_t save;
|
savebuffer_t save = {};
|
||||||
|
|
||||||
// memset savedata to all 0, fixes calling perfectly valid saves corrupt because of bots
|
// memset savedata to all 0, fixes calling perfectly valid saves corrupt because of bots
|
||||||
memset(&savedata, 0, sizeof(savedata));
|
memset(&savedata, 0, sizeof(savedata));
|
||||||
@@ -3752,7 +3776,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
|
|||||||
startonmapnum = mapoverride;
|
startonmapnum = mapoverride;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
sprintf(savename, savegamename, slot);
|
snprintf(savename, sizeof(savename), savegamename, slot);
|
||||||
|
|
||||||
length = FIL_ReadFile(savename, &save.buffer);
|
length = FIL_ReadFile(savename, &save.buffer);
|
||||||
if (!length)
|
if (!length)
|
||||||
@@ -3764,7 +3788,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
|
|||||||
save.p = save.buffer;
|
save.p = save.buffer;
|
||||||
|
|
||||||
memset(vcheck, 0, sizeof (vcheck));
|
memset(vcheck, 0, sizeof (vcheck));
|
||||||
sprintf(vcheck, "version %d", VERSION);
|
snprintf(vcheck, sizeof(vcheck), "version %d", VERSION);
|
||||||
|
|
||||||
if (!fastcmp((const char *)save.p, (const char *)vcheck))
|
if (!fastcmp((const char *)save.p, (const char *)vcheck))
|
||||||
{
|
{
|
||||||
@@ -3828,10 +3852,10 @@ void G_SaveGame(UINT32 savegameslot)
|
|||||||
boolean saved;
|
boolean saved;
|
||||||
char savename[256] = "";
|
char savename[256] = "";
|
||||||
const char *backup;
|
const char *backup;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {};
|
||||||
|
|
||||||
sprintf(savename, savegamename, savegameslot);
|
snprintf(savename, sizeof(savename), savegamename, savegameslot);
|
||||||
backup = va("%s",savename);
|
backup = va("%s", savename);
|
||||||
|
|
||||||
// save during evaluation or credits? game's over, folks!
|
// save during evaluation or credits? game's over, folks!
|
||||||
if (gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
|
if (gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
|
||||||
@@ -3842,15 +3866,15 @@ void G_SaveGame(UINT32 savegameslot)
|
|||||||
char name[VERSIONSIZE];
|
char name[VERSIONSIZE];
|
||||||
size_t length;
|
size_t length;
|
||||||
|
|
||||||
save.p = save.buffer = (UINT8 *)Z_Malloc(SAVEGAMESIZE, PU_STATIC, NULL);
|
save.p = save.buffer = (UINT8 *)Z_Malloc(1024, PU_STATIC, NULL); // 1024 bytes is plenty for a savegame
|
||||||
if (!save.p)
|
if (!save.p)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
|
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(name, 0, sizeof (name));
|
memset(name, 0, sizeof(name));
|
||||||
sprintf(name, "version %d", VERSION);
|
snprintf(name, sizeof(name), "version %d", VERSION);
|
||||||
WRITEMEM(save.p, name, VERSIONSIZE);
|
WRITEMEM(save.p, name, VERSIONSIZE);
|
||||||
|
|
||||||
P_SaveGame(&save);
|
P_SaveGame(&save);
|
||||||
@@ -3992,7 +4016,6 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
|
|||||||
if (W_CheckNumForName(mapname) == LUMPERROR)
|
if (W_CheckNumForName(mapname) == LUMPERROR)
|
||||||
{
|
{
|
||||||
I_Error("Internal game map '%s' not found\n", mapname);
|
I_Error("Internal game map '%s' not found\n", mapname);
|
||||||
Command_ExitGame_f();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4012,6 +4035,12 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
|
|||||||
automapactive = false;
|
automapactive = false;
|
||||||
imcontinuing = false;
|
imcontinuing = false;
|
||||||
|
|
||||||
|
// HACK: this doesent reset if you change the map from within a replay and may cause crashes or the replayhut to be non functional
|
||||||
|
if (!demo.playback && demo.inreplayhut)
|
||||||
|
{
|
||||||
|
M_ResetDemoList();
|
||||||
|
}
|
||||||
|
|
||||||
if (!skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking) // Start a custom cutscene.
|
if (!skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking) // Start a custom cutscene.
|
||||||
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer);
|
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer);
|
||||||
else
|
else
|
||||||
@@ -4051,6 +4080,7 @@ char *G_BuildMapTitle(INT32 mapnum)
|
|||||||
const char *actnum = NULL;
|
const char *actnum = NULL;
|
||||||
|
|
||||||
len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
|
len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
|
||||||
|
|
||||||
if (strlen(mapheaderinfo[mapnum-1]->zonttl) > 0)
|
if (strlen(mapheaderinfo[mapnum-1]->zonttl) > 0)
|
||||||
{
|
{
|
||||||
zonetext = M_GetText(mapheaderinfo[mapnum-1]->zonttl);
|
zonetext = M_GetText(mapheaderinfo[mapnum-1]->zonttl);
|
||||||
@@ -4061,6 +4091,7 @@ char *G_BuildMapTitle(INT32 mapnum)
|
|||||||
zonetext = M_GetText("Zone");
|
zonetext = M_GetText("Zone");
|
||||||
len += strlen(zonetext) + 1; // ' ' + zonetext
|
len += strlen(zonetext) + 1; // ' ' + zonetext
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen(mapheaderinfo[mapnum-1]->actnum) > 0)
|
if (strlen(mapheaderinfo[mapnum-1]->actnum) > 0)
|
||||||
{
|
{
|
||||||
actnum = M_GetText(mapheaderinfo[mapnum-1]->actnum);
|
actnum = M_GetText(mapheaderinfo[mapnum-1]->actnum);
|
||||||
@@ -4072,10 +4103,12 @@ char *G_BuildMapTitle(INT32 mapnum)
|
|||||||
if (!title)
|
if (!title)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
|
snprintf(title, len, "%s", mapheaderinfo[mapnum-1]->lvlttl);
|
||||||
|
|
||||||
if (zonetext) sprintf(title + strlen(title), " %s", zonetext);
|
if (zonetext)
|
||||||
if (actnum) sprintf(title + strlen(title), " %s", actnum);
|
snprintf(title + strlen(title), len - strlen(title), " %s", zonetext);
|
||||||
|
if (actnum)
|
||||||
|
snprintf(title + strlen(title), len - strlen(title), " %s", actnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
return title;
|
return title;
|
||||||
@@ -4087,12 +4120,13 @@ static void measurekeywords(mapsearchfreq_t *fr,
|
|||||||
{
|
{
|
||||||
char *qp;
|
char *qp;
|
||||||
char *sp;
|
char *sp;
|
||||||
|
|
||||||
if (wanttable)
|
if (wanttable)
|
||||||
(*dimp) = Z_Realloc((*dimp), 255 * sizeof (struct searchdim),
|
(*dimp) = Z_Realloc((*dimp), 255 * sizeof (struct searchdim),
|
||||||
PU_STATIC, NULL);
|
PU_STATIC, NULL);
|
||||||
for (qp = strtok(va("%s", q), " ");
|
for (qp = strtok(va("%s", q), " ");
|
||||||
qp && fr->total < 255;
|
qp && fr->total < 255;
|
||||||
qp = strtok(0, " "))
|
qp = strtok(NULL, " "))
|
||||||
{
|
{
|
||||||
if (( sp = strcasestr(s, qp) ))
|
if (( sp = strcasestr(s, qp) ))
|
||||||
{
|
{
|
||||||
@@ -4101,10 +4135,12 @@ static void measurekeywords(mapsearchfreq_t *fr,
|
|||||||
(*dimp)[(*cuntp)].pos = sp - s;
|
(*dimp)[(*cuntp)].pos = sp - s;
|
||||||
(*dimp)[(*cuntp)].siz = strlen(qp);
|
(*dimp)[(*cuntp)].siz = strlen(qp);
|
||||||
}
|
}
|
||||||
|
|
||||||
(*cuntp)++;
|
(*cuntp)++;
|
||||||
fr->total++;
|
fr->total++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wanttable)
|
if (wanttable)
|
||||||
(*dimp) = Z_Realloc((*dimp), (*cuntp) * sizeof (struct searchdim),
|
(*dimp) = Z_Realloc((*dimp), (*cuntp) * sizeof (struct searchdim),
|
||||||
PU_STATIC, NULL);
|
PU_STATIC, NULL);
|
||||||
@@ -4173,7 +4209,7 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep,
|
|||||||
{
|
{
|
||||||
newmapnum = mapnum;
|
newmapnum = mapnum;
|
||||||
newmapname = realmapname;
|
newmapname = realmapname;
|
||||||
realmapname = 0;
|
realmapname = NULL;
|
||||||
Z_Free(apromapname);
|
Z_Free(apromapname);
|
||||||
if (!wanttable)
|
if (!wanttable)
|
||||||
break;
|
break;
|
||||||
@@ -4194,7 +4230,7 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep,
|
|||||||
{
|
{
|
||||||
apromapnum = mapnum;
|
apromapnum = mapnum;
|
||||||
apromapname = realmapname;
|
apromapname = realmapname;
|
||||||
realmapname = 0;
|
realmapname = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else/* ...match individual keywords */
|
else/* ...match individual keywords */
|
||||||
|
|||||||
+14
-13
@@ -39,18 +39,14 @@ extern INT32 player_name_changes[MAXPLAYERS];
|
|||||||
extern player_t players[MAXPLAYERS];
|
extern player_t players[MAXPLAYERS];
|
||||||
extern boolean playeringame[MAXPLAYERS];
|
extern boolean playeringame[MAXPLAYERS];
|
||||||
|
|
||||||
// gametic at level start
|
|
||||||
extern tic_t levelstarttic;
|
|
||||||
|
|
||||||
// for modding?
|
// for modding?
|
||||||
extern INT16 prevmap, nextmap;
|
extern INT16 prevmap, nextmap;
|
||||||
extern INT32 gameovertics;
|
|
||||||
extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
|
extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
|
||||||
extern INT16 rw_maximums[NUM_WEAPONS];
|
extern INT16 rw_maximums[NUM_WEAPONS];
|
||||||
|
|
||||||
// used in game menu
|
// used in game menu
|
||||||
extern consvar_t cv_chatwidth, cv_chatnotifications, cv_chatheight, cv_chattime, cv_consolechat, cv_chatbacktint, cv_chatspamprotection, cv_chatcentertext/*, cv_compactscoreboard*/;
|
extern consvar_t cv_chatwidth, cv_chatnotifications, cv_chatheight, cv_chattime, cv_consolechat, cv_chatbacktint, cv_chatspamprotection, cv_chatcentertext/*, cv_compactscoreboard*/;
|
||||||
extern consvar_t cv_songcredits;
|
extern consvar_t cv_songcredits, cv_pausesongcredits;
|
||||||
extern consvar_t cv_showfreeplay;
|
extern consvar_t cv_showfreeplay;
|
||||||
extern consvar_t cv_growmusic, cv_supermusic;
|
extern consvar_t cv_growmusic, cv_supermusic;
|
||||||
extern consvar_t cv_pauseifunfocused;
|
extern consvar_t cv_pauseifunfocused;
|
||||||
@@ -74,6 +70,8 @@ extern consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS];
|
|||||||
|
|
||||||
extern consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS];
|
||||||
|
|
||||||
|
extern consvar_t cv_autoaccel[MAXSPLITSCREENPLAYERS];
|
||||||
|
|
||||||
extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff;
|
extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff;
|
||||||
|
|
||||||
// Hud offsets
|
// Hud offsets
|
||||||
@@ -120,14 +118,16 @@ extern consvar_t cv_driftsparkpulse;
|
|||||||
extern consvar_t cv_gravstretch;
|
extern consvar_t cv_gravstretch;
|
||||||
extern consvar_t cv_sloperoll;
|
extern consvar_t cv_sloperoll;
|
||||||
extern consvar_t cv_sliptideroll;
|
extern consvar_t cv_sliptideroll;
|
||||||
|
extern consvar_t cv_stairjank;
|
||||||
|
extern consvar_t cv_stairjanksfx;
|
||||||
extern consvar_t cv_slamsound;
|
extern consvar_t cv_slamsound;
|
||||||
extern consvar_t cv_sloperolldist;
|
extern consvar_t cv_sloperolldist;
|
||||||
extern consvar_t cv_sparkroll;
|
extern consvar_t cv_sparkroll;
|
||||||
extern consvar_t cv_spinoutroll;
|
|
||||||
|
|
||||||
extern consvar_t cv_squishdance, cv_squishdancespeed;
|
extern consvar_t cv_squishdance, cv_squishdancespeed;
|
||||||
|
|
||||||
extern consvar_t cv_playerblendeffects;
|
extern consvar_t cv_playerblendeffects;
|
||||||
|
extern consvar_t cv_reducevfx;
|
||||||
|
|
||||||
extern consvar_t cv_cechotoggle;
|
extern consvar_t cv_cechotoggle;
|
||||||
|
|
||||||
@@ -160,7 +160,7 @@ typedef enum
|
|||||||
const char *G_BuildMapName(INT32 map);
|
const char *G_BuildMapName(INT32 map);
|
||||||
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer);
|
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer);
|
||||||
|
|
||||||
// copy ticcmd_t to and fro the normal way
|
// copy ticcmd_t to and from the normal way
|
||||||
ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
||||||
// copy ticcmd_t to and fro network packets
|
// copy ticcmd_t to and fro network packets
|
||||||
ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
||||||
@@ -228,10 +228,11 @@ void G_SaveGameData(boolean force);
|
|||||||
|
|
||||||
void G_SaveGame(UINT32 slot);
|
void G_SaveGame(UINT32 slot);
|
||||||
|
|
||||||
#define G_GametypeHasTeams() (G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF))
|
#define G_RaceGametype() (G_IsGameType(GT_RACE))
|
||||||
#define G_BattleGametype() (G_IsGameType(GT_MATCH))
|
#define G_BattleGametype() (G_IsGameType(GT_MATCH))
|
||||||
#define G_RaceGametype() (G_IsGameType(GT_RACE))
|
|
||||||
#define G_TagGametype() (G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK))
|
#define G_GametypeHasTeams() (UNLIKELY(G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF)))
|
||||||
|
#define G_TagGametype() (UNLIKELY(G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK)))
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE boolean G_IsGameType(int type)
|
FUNCINLINE static ATTRINLINE boolean G_IsGameType(int type)
|
||||||
{
|
{
|
||||||
@@ -249,7 +250,6 @@ UINT8 G_GetGametypeColor(INT16 gt);
|
|||||||
void G_ExitLevel(void);
|
void G_ExitLevel(void);
|
||||||
void G_NextLevel(void);
|
void G_NextLevel(void);
|
||||||
void G_Continue(void);
|
void G_Continue(void);
|
||||||
void G_UseContinue(void);
|
|
||||||
void G_AfterIntermission(void);
|
void G_AfterIntermission(void);
|
||||||
void G_EndGame(void); // moved from y_inter.c/h and renamed
|
void G_EndGame(void); // moved from y_inter.c/h and renamed
|
||||||
|
|
||||||
@@ -262,9 +262,10 @@ boolean G_CanView(INT32 playernum, UINT8 viewnum, boolean onlyactive);
|
|||||||
INT32 G_FindView(INT32 startview, UINT8 viewnum, boolean onlyactive, boolean reverse);
|
INT32 G_FindView(INT32 startview, UINT8 viewnum, boolean onlyactive, boolean reverse);
|
||||||
INT32 G_CountPlayersPotentiallyViewable(boolean active);
|
INT32 G_CountPlayersPotentiallyViewable(boolean active);
|
||||||
|
|
||||||
void G_ResetViews(void);
|
void G_ResetViews(boolean resetfreecam);
|
||||||
void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive);
|
void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive);
|
||||||
void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive);
|
void G_AdjustViewEx(UINT8 viewnum, INT32 offset, boolean onlyactive, boolean resetfreecam);
|
||||||
|
#define G_AdjustView(v,o,oa) G_AdjustViewEx(v,o,oa, true)
|
||||||
|
|
||||||
void G_AddPlayer(INT32 playernum);
|
void G_AddPlayer(INT32 playernum);
|
||||||
|
|
||||||
|
|||||||
+263
-24
@@ -34,7 +34,7 @@ static CV_PossibleValue_t onecontrolperkey_cons_t[] = {{1, "One"}, {2, "Several"
|
|||||||
static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "Off"}, {0, NULL}};
|
static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "Off"}, {0, NULL}};
|
||||||
|
|
||||||
// mouse values are used once
|
// mouse values are used once
|
||||||
consvar_t cv_mousesens = {"mousesens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mousexsens = {"mousexsens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -58,12 +58,38 @@ static void led_off_handle3(void);
|
|||||||
static void led_off_handle4(void);
|
static void led_off_handle4(void);
|
||||||
|
|
||||||
consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"rumble", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
{"rumble", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumble2", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle2, 0, NULL, NULL, 0, 0, NULL},
|
{"rumble2", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle2, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumble3", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle3, 0, NULL, NULL, 0, 0, NULL},
|
{"rumble3", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle3, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumble4", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle4, 0, NULL, NULL, 0, 0, NULL}
|
{"rumble4", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle4, 0, NULL, NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}};
|
||||||
|
|
||||||
|
consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS] = {
|
||||||
|
{"rumblestrength", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
#define IMPL_RUMBLE_TYPE(type)\
|
||||||
|
consvar_t cv_rumble_##type [MAXSPLITSCREENPLAYERS] = {\
|
||||||
|
{"rumble_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
|
||||||
|
{"rumble2_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
|
||||||
|
{"rumble3_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
|
||||||
|
{"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\
|
||||||
|
};
|
||||||
|
|
||||||
|
IMPL_RUMBLE_TYPE(spinout);
|
||||||
|
IMPL_RUMBLE_TYPE(sneakerboost);
|
||||||
|
IMPL_RUMBLE_TYPE(offroad);
|
||||||
|
IMPL_RUMBLE_TYPE(bananadrag);
|
||||||
|
IMPL_RUMBLE_TYPE(stairjank);
|
||||||
|
IMPL_RUMBLE_TYPE(brakedrift);
|
||||||
|
IMPL_RUMBLE_TYPE(driftcharge);
|
||||||
|
|
||||||
|
|
||||||
static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
|
static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
|
||||||
consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
{"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
||||||
@@ -72,6 +98,10 @@ consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
|||||||
{"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL}
|
{"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
consvar_t cv_gamepadifunfocused = {"gamepadunfocused", "Off", CV_SAVE|CV_CALL, CV_OnOff, I_SetJoystickFocus, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_gamepadledifunfocused = {"gamepadledunfocused", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_rumbleifunfocused = {"rumbleifunfocused", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static void rumble_off_handle(void)
|
static void rumble_off_handle(void)
|
||||||
{
|
{
|
||||||
if (!cv_rumble[0].value)
|
if (!cv_rumble[0].value)
|
||||||
@@ -116,17 +146,17 @@ static void led_off_handle4(void)
|
|||||||
G_ResetPlayerGamepadIndicatorColor(3);
|
G_ResetPlayerGamepadIndicatorColor(3);
|
||||||
}
|
}
|
||||||
|
|
||||||
INT32 mousex, mousey;
|
INT32 mousex = 0, mousey = 0;
|
||||||
INT32 mlooky; // like mousey but with a custom sensitivity for mlook
|
|
||||||
|
|
||||||
// joystick values are repeated
|
// joystick values are repeated
|
||||||
INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
|
INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET] = {};
|
||||||
|
INT32 joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET] = {};
|
||||||
|
|
||||||
// current state of the keys: true if pushed
|
// current state of the keys: true if pushed
|
||||||
UINT8 gamekeydown[NUMINPUTS];
|
UINT8 gamekeydown[NUMINPUTS] = {};
|
||||||
|
|
||||||
// two key codes (or virtual key) per game control
|
// two key codes (or virtual key) per game control
|
||||||
INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2];
|
INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2] = {};
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@@ -183,9 +213,8 @@ void G_MapEventsToControls(event_t *ev)
|
|||||||
case ev_mouse: // buttons are virtual keys
|
case ev_mouse: // buttons are virtual keys
|
||||||
if (menuactive || CON_Ready() || chat_on)
|
if (menuactive || CON_Ready() || chat_on)
|
||||||
break;
|
break;
|
||||||
mousex = (INT32)(ev->data2*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f));
|
mousex = (INT32)(ev->data2*((cv_mousexsens.value*cv_mousexsens.value)/110.0f + 0.1f));
|
||||||
mousey = (INT32)(ev->data3*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f));
|
mousey = (INT32)(ev->data3*((cv_mouseysens.value*cv_mouseysens.value)/110.0f + 0.1f));
|
||||||
mlooky = (INT32)(ev->data3*((cv_mouseysens.value*cv_mousesens.value)/110.0f + 0.1f));
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ev_joystick: // buttons are virtual keys
|
case ev_joystick: // buttons are virtual keys
|
||||||
@@ -206,7 +235,7 @@ void G_MapEventsToControls(event_t *ev)
|
|||||||
|
|
||||||
case ev_joystick3:
|
case ev_joystick3:
|
||||||
i = ev->data1;
|
i = ev->data1;
|
||||||
if (i >= JOYAXISSET)
|
if (i >= JOYAXISSET || menuactive)
|
||||||
break;
|
break;
|
||||||
if (ev->data2 != INT32_MAX) joyxmove[2][i] = ev->data2;
|
if (ev->data2 != INT32_MAX) joyxmove[2][i] = ev->data2;
|
||||||
if (ev->data3 != INT32_MAX) joyymove[2][i] = ev->data3;
|
if (ev->data3 != INT32_MAX) joyymove[2][i] = ev->data3;
|
||||||
@@ -214,7 +243,7 @@ void G_MapEventsToControls(event_t *ev)
|
|||||||
|
|
||||||
case ev_joystick4:
|
case ev_joystick4:
|
||||||
i = ev->data1;
|
i = ev->data1;
|
||||||
if (i >= JOYAXISSET)
|
if (i >= JOYAXISSET || menuactive)
|
||||||
break;
|
break;
|
||||||
if (ev->data2 != INT32_MAX) joyxmove[3][i] = ev->data2;
|
if (ev->data2 != INT32_MAX) joyxmove[3][i] = ev->data2;
|
||||||
if (ev->data3 != INT32_MAX) joyymove[3][i] = ev->data3;
|
if (ev->data3 != INT32_MAX) joyymove[3][i] = ev->data3;
|
||||||
@@ -875,11 +904,13 @@ static const char *gamecontrolname[num_gamecontrols] =
|
|||||||
|
|
||||||
#include "k_kart.h"
|
#include "k_kart.h"
|
||||||
|
|
||||||
UINT16 G_GetSkinColor(INT32 playernum)
|
UINT8 G_GetSkinColorForGamepad(INT32 playernum)
|
||||||
{
|
{
|
||||||
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (gamestate == GS_LEVEL)
|
if (gamestate == GS_LEVEL)
|
||||||
{
|
{
|
||||||
player_t *player = &players[displayplayers[playernum]];
|
const player_t *player = &players[displayplayers[playernum]];
|
||||||
|
|
||||||
if (player)
|
if (player)
|
||||||
{
|
{
|
||||||
@@ -897,13 +928,13 @@ UINT16 G_GetSkinColor(INT32 playernum)
|
|||||||
switch (playernum)
|
switch (playernum)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
return cv_playercolor.value;
|
return (UINT8)cv_playercolor.value;
|
||||||
case 1:
|
case 1:
|
||||||
return cv_playercolor2.value;
|
return (UINT8)cv_playercolor2.value;
|
||||||
case 2:
|
case 2:
|
||||||
return cv_playercolor3.value;
|
return (UINT8)cv_playercolor3.value;
|
||||||
case 3:
|
case 3:
|
||||||
return cv_playercolor4.value;
|
return (UINT8)cv_playercolor4.value;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -911,19 +942,28 @@ UINT16 G_GetSkinColor(INT32 playernum)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 color)
|
// Sets the Indicator LED on supported gamepads to a desired skincolor
|
||||||
|
// pass SKINCOLOR_NONE/0 to set the players skin color
|
||||||
|
void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
|
||||||
{
|
{
|
||||||
UINT16 skincolor;
|
UINT8 skincolor;
|
||||||
byteColor_t byte_color;
|
byteColor_t byte_color;
|
||||||
|
|
||||||
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (cv_gamepadled[playernum].value == 0)
|
if (cv_gamepadled[playernum].value == 0 || (window_notinfocus && cv_gamepadledifunfocused.value == 0)
|
||||||
|
|| color >= MAXTRANSLATIONS)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
skincolor = color ? color : G_GetSkinColor(playernum);
|
if (!I_GamepadHasLED(playernum))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// so we can override this
|
||||||
|
skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
|
||||||
byte_color = V_GetColor(colortranslations[skincolor][8]).s;
|
byte_color = V_GetColor(colortranslations[skincolor][8]).s;
|
||||||
|
|
||||||
I_SetGamepadIndicatorColor(playernum, byte_color.red, byte_color.green, byte_color.blue);
|
I_SetGamepadIndicatorColor(playernum, byte_color.red, byte_color.green, byte_color.blue);
|
||||||
@@ -931,16 +971,63 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 color)
|
|||||||
|
|
||||||
static void G_ResetPlayerGamepadIndicatorColor(INT32 playernum)
|
static void G_ResetPlayerGamepadIndicatorColor(INT32 playernum)
|
||||||
{
|
{
|
||||||
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (cv_gamepadled[playernum].value == 0)
|
if (cv_gamepadled[playernum].value == 0)
|
||||||
{
|
{
|
||||||
I_SetGamepadIndicatorColor(playernum, 0, 0, 255);
|
I_SetGamepadIndicatorColor(playernum, 0, 0, 255);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
G_SetPlayerGamepadIndicatorColor(playernum, 0);
|
G_SetPlayerGamepadIndicatorColor(playernum, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static UINT8 curcolor[MAXSPLITSCREENPLAYERS] = {};
|
||||||
|
|
||||||
|
void G_DeviceLEDTick(void)
|
||||||
|
{
|
||||||
|
UINT8 i, newcolor;
|
||||||
|
|
||||||
|
if (numcontrollers == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i <= splitscreen; i++)
|
||||||
|
{
|
||||||
|
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// does not have a configurable led! :c
|
||||||
|
if (!I_GamepadHasLED(i))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
newcolor = G_GetSkinColorForGamepad(i);
|
||||||
|
|
||||||
|
if (curcolor[i] == newcolor) // dont update if same colour
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
G_SetPlayerGamepadIndicatorColor(i, newcolor);
|
||||||
|
curcolor[i] = newcolor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensures next call to G_DeviceLEDTick will refresh the gamepad led
|
||||||
|
void G_ResetDeviceLED(void)
|
||||||
|
{
|
||||||
|
memset(curcolor, 0, sizeof(curcolor));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void G_ResetPlayerDeviceRumble(INT32 playernum)
|
static void G_ResetPlayerDeviceRumble(INT32 playernum)
|
||||||
{
|
{
|
||||||
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
I_GamepadRumble(playernum, 0, 0, 0);
|
I_GamepadRumble(playernum, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -958,14 +1045,165 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
|
|||||||
{
|
{
|
||||||
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (cv_rumble[playernum].value == 0)
|
if (cv_rumble[playernum].value == 0 || (window_notinfocus && cv_rumbleifunfocused.value == 0))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// doesent need to be super precise
|
||||||
|
// but ensure this is within range (0-65535)
|
||||||
|
// placed here so it applies to lua aswell
|
||||||
|
low_strength = (UINT16)min(FixedMul(low_strength, cv_rumble_strength[playernum].value), UINT16_MAX);
|
||||||
|
high_strength = (UINT16)min(FixedMul(high_strength, cv_rumble_strength[playernum].value), UINT16_MAX);
|
||||||
|
|
||||||
I_GamepadRumble(playernum, low_strength, high_strength, duration);
|
I_GamepadRumble(playernum, low_strength, high_strength, duration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// rumble strengths
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
RUMBLE_VERYSTRONG = FRACUNIT / 4, // 16384
|
||||||
|
RUMBLE_STRONG = FRACUNIT / 8, // 8192
|
||||||
|
RUMBLE_MODERATE = FRACUNIT / 64, // 1024
|
||||||
|
RUMBLE_WEAK = FRACUNIT / 128, // 512
|
||||||
|
RUMBLE_VERYWEAK = FRACUNIT / 256, // 256
|
||||||
|
};
|
||||||
|
|
||||||
|
// Controller rumble!
|
||||||
|
// this keeps track of a bunch of things
|
||||||
|
// and makes your controller rumble accordingly
|
||||||
|
void G_DeviceRumbleTick(void)
|
||||||
|
{
|
||||||
|
UINT8 i;
|
||||||
|
|
||||||
|
if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i <= splitscreen; i++)
|
||||||
|
{
|
||||||
|
if (!cv_usejoystick[i].value || !cv_rumble[i].value)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// does not support rumble! :c
|
||||||
|
if (!I_GamepadHasRumble(i))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (camera[i].freecam)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// SDL rumble strength goes from a range or 0-65535 respectively
|
||||||
|
// the higher, the stronger it is
|
||||||
|
UINT16 low = 0, high = 0;
|
||||||
|
// for how long the action should rumble, in ms
|
||||||
|
UINT16 lenght = 57; // 57ms is a short pulse, matches super well with this updating once per tic
|
||||||
|
|
||||||
|
const player_t *player = P_GetLocalPlayerForNum(i);
|
||||||
|
|
||||||
|
if (!player)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// allow lua to do some crap for spectators
|
||||||
|
if (player->spectator || !player->mo)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// reset the rumble if you exit or are ded lel
|
||||||
|
if (player->exiting ||
|
||||||
|
player->playerstate == PST_DEAD ||
|
||||||
|
player->kartstuff[k_respawn] > 1)
|
||||||
|
{
|
||||||
|
G_PlayerDeviceRumble(i, low, high, 0);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cv_rumble_spinout[i].value
|
||||||
|
&& player->kartstuff[k_spinouttimer])
|
||||||
|
{
|
||||||
|
//low = high = FRACUNIT / 6;
|
||||||
|
low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
|
||||||
|
}
|
||||||
|
else if (cv_rumble_sneakerboost[i].value
|
||||||
|
&& (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
|
||||||
|
{
|
||||||
|
low = high = RUMBLE_STRONG;
|
||||||
|
}
|
||||||
|
else if (cv_rumble_offroad[i].value
|
||||||
|
&& (player->kartstuff[k_offroad])
|
||||||
|
&& (player->speed != 0)
|
||||||
|
&& P_IsObjectOnGround(player->mo))
|
||||||
|
{
|
||||||
|
// weaken this depending on if you got hyu or invinc
|
||||||
|
if (player->kartstuff[k_hyudorotimer])
|
||||||
|
{
|
||||||
|
high = RUMBLE_WEAK;
|
||||||
|
}
|
||||||
|
else if (player->kartstuff[k_invincibilitytimer])
|
||||||
|
{
|
||||||
|
high = RUMBLE_MODERATE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
low = high = RUMBLE_MODERATE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (cv_rumble_bananadrag[i].value
|
||||||
|
&& (player->kartstuff[k_bananadrag] > TICRATE)
|
||||||
|
&& (player->speed != 0)
|
||||||
|
&& P_IsObjectOnGround(player->mo))
|
||||||
|
{
|
||||||
|
if (leveltime & 1) // this is actually funny lel
|
||||||
|
high = RUMBLE_MODERATE;
|
||||||
|
}
|
||||||
|
else if (cv_rumble_stairjank[i].value
|
||||||
|
&& (player->stairjank > 8)
|
||||||
|
&& (player->speed != 0)
|
||||||
|
&& P_IsObjectOnGround(player->mo))
|
||||||
|
{
|
||||||
|
low = high = RUMBLE_VERYWEAK;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cv_rumble_brakedrift[i].value
|
||||||
|
&& player->kartstuff[k_brakedrift])
|
||||||
|
{
|
||||||
|
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
||||||
|
}
|
||||||
|
|
||||||
|
// pulse when gettin new driftlevel
|
||||||
|
// let this come last
|
||||||
|
if (cv_rumble_driftcharge[i].value
|
||||||
|
&& player->kartstuff[k_driftcharge]
|
||||||
|
&& player->driftlevel)
|
||||||
|
{
|
||||||
|
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
||||||
|
|
||||||
|
// make it rumble slightly longer the higher your driftlevel!
|
||||||
|
if (player->driftlevel == 2)
|
||||||
|
lenght = 114;
|
||||||
|
else if (player->driftlevel == 3)
|
||||||
|
lenght = 174;
|
||||||
|
}
|
||||||
|
|
||||||
|
// hack alert! i just dont want this thing constantly resetting the rumble lol
|
||||||
|
if (low == 0 && high == 0)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
G_PlayerDeviceRumble(i, low, high, lenght);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// Detach any keys associated to the given game control
|
// Detach any keys associated to the given game control
|
||||||
// - pass the pointer to the gamecontrol table for the player being edited
|
// - pass the pointer to the gamecontrol table for the player being edited
|
||||||
@@ -1012,7 +1250,8 @@ const char *G_KeynumToString(INT32 keynum)
|
|||||||
return keynames[j].name;
|
return keynames[j].name;
|
||||||
|
|
||||||
// create a name for unknown keys
|
// create a name for unknown keys
|
||||||
sprintf(keynamestr, "KEY%d", keynum);
|
snprintf(keynamestr, sizeof(keynamestr), "KEY%d", keynum);
|
||||||
|
|
||||||
return keynamestr;
|
return keynamestr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+28
-10
@@ -100,23 +100,37 @@ typedef enum
|
|||||||
gc_custom2, // Lua scriptable
|
gc_custom2, // Lua scriptable
|
||||||
gc_custom3, // Lua scriptable
|
gc_custom3, // Lua scriptable
|
||||||
gc_director,
|
gc_director,
|
||||||
gc_freecam, // Toggle for freecam while ingame
|
// freecam specific controls
|
||||||
gc_camfloat, // alternative button for raising cam
|
gc_freecam, // Toggle for freecam while ingame
|
||||||
gc_camsink, // alternative button for sinking
|
gc_camfloat, // alternative button for raising camera
|
||||||
|
gc_camsink, // alternative button for sinking camera
|
||||||
gc_strafeleft,
|
gc_strafeleft,
|
||||||
gc_straferight,
|
gc_straferight,
|
||||||
num_gamecontrols
|
num_gamecontrols
|
||||||
} gamecontrols_e;
|
} gamecontrols_e;
|
||||||
|
|
||||||
// mouse values are used once
|
// mouse values are used once
|
||||||
extern consvar_t cv_mousesens, cv_mouseysens;
|
extern consvar_t cv_mousexsens, cv_mouseysens;
|
||||||
extern consvar_t cv_controlperkey;
|
extern consvar_t cv_controlperkey;
|
||||||
extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
|
||||||
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
||||||
|
|
||||||
|
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_bananadrag[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_stairjank[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_brakedrift[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_driftcharge[MAXSPLITSCREENPLAYERS];
|
||||||
|
|
||||||
|
extern consvar_t cv_gamepadifunfocused;
|
||||||
|
extern consvar_t cv_gamepadledifunfocused;
|
||||||
|
extern consvar_t cv_rumbleifunfocused;
|
||||||
|
|
||||||
extern INT32 mousex, mousey;
|
extern INT32 mousex, mousey;
|
||||||
extern INT32 mlooky; //mousey with mlookSensitivity
|
|
||||||
|
|
||||||
extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
|
extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
|
||||||
|
|
||||||
@@ -131,13 +145,17 @@ extern INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2];
|
|||||||
#define PLAYER3INPUTDOWN(gc) (gamekeydown[gamecontrol[2][gc][0]] || gamekeydown[gamecontrol[2][gc][1]])
|
#define PLAYER3INPUTDOWN(gc) (gamekeydown[gamecontrol[2][gc][0]] || gamekeydown[gamecontrol[2][gc][1]])
|
||||||
#define PLAYER4INPUTDOWN(gc) (gamekeydown[gamecontrol[3][gc][0]] || gamekeydown[gamecontrol[3][gc][1]])
|
#define PLAYER4INPUTDOWN(gc) (gamekeydown[gamecontrol[3][gc][0]] || gamekeydown[gamecontrol[3][gc][1]])
|
||||||
|
|
||||||
// peace to my little coder fingers!
|
UINT8 G_GetSkinColorForGamepad(INT32 playernum);
|
||||||
// check a gamecontrol being active or not
|
void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color);
|
||||||
|
void G_DeviceLEDTick(void);
|
||||||
|
void G_ResetDeviceLED(void);
|
||||||
|
|
||||||
UINT16 G_GetSkinColor(INT32 playernum);
|
|
||||||
void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 color);
|
|
||||||
void G_ResetAllDeviceRumbles(void);
|
void G_ResetAllDeviceRumbles(void);
|
||||||
void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
|
void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
|
||||||
|
void G_DeviceRumbleTick(void);
|
||||||
|
|
||||||
|
// peace to my little coder fingers!
|
||||||
|
// check a gamecontrol being active or not
|
||||||
|
|
||||||
// remaps the input event to a game control.
|
// remaps the input event to a game control.
|
||||||
void G_MapEventsToControls(event_t *ev);
|
void G_MapEventsToControls(event_t *ev);
|
||||||
|
|||||||
+2
-2
@@ -52,10 +52,10 @@ typedef enum
|
|||||||
} gameaction_t;
|
} gameaction_t;
|
||||||
|
|
||||||
extern gamestate_t gamestate;
|
extern gamestate_t gamestate;
|
||||||
extern UINT8 ultimatemode; // was sk_insane
|
|
||||||
extern gameaction_t gameaction;
|
extern gameaction_t gameaction;
|
||||||
|
|
||||||
extern boolean botingame;
|
extern boolean botingame;
|
||||||
extern UINT8 botskin, botcolor;
|
extern skinnum_t botskin;
|
||||||
|
extern UINT8 botcolor;
|
||||||
|
|
||||||
#endif //__G_STATE__
|
#endif //__G_STATE__
|
||||||
+32
-25
@@ -21,28 +21,28 @@
|
|||||||
|
|
||||||
// The texture for the next polygon given to HWR_ProcessPolygon.
|
// The texture for the next polygon given to HWR_ProcessPolygon.
|
||||||
// Set with HWR_SetCurrentTexture.
|
// Set with HWR_SetCurrentTexture.
|
||||||
GLMipmap_t *current_texture = NULL;
|
static GLMipmap_t *current_texture = NULL;
|
||||||
|
|
||||||
boolean currently_batching = false;
|
static boolean currently_batching = false;
|
||||||
|
|
||||||
FOutVector* finalVertexArray = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu
|
static FOutVector* finalVertexArray = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu
|
||||||
UINT32* finalVertexIndexArray = NULL;// contains indexes for glDrawElements, taking into account fan->triangles conversion
|
static UINT32* finalVertexIndexArray = NULL;// contains indexes for glDrawElements, taking into account fan->triangles conversion
|
||||||
// NOTE have this alloced as 3x finalVertexArray size
|
// NOTE have this alloced as 3x finalVertexArray size
|
||||||
int finalVertexArrayAllocSize = 65536;
|
static int finalVertexArrayAllocSize = 65536;
|
||||||
|
|
||||||
//GLubyte* colorArray = NULL;// contains color data to be sent to gpu, if needed
|
//GLubyte* colorArray = NULL;// contains color data to be sent to gpu, if needed
|
||||||
//int colorArrayAllocSize = 65536;
|
//int colorArrayAllocSize = 65536;
|
||||||
// not gonna use this for now, just sort by color and change state when it changes
|
// not gonna use this for now, just sort by color and change state when it changes
|
||||||
// later maybe when using vertex attributes if it's needed
|
// later maybe when using vertex attributes if it's needed
|
||||||
|
|
||||||
PolygonArrayEntry* polygonArray = NULL ;// contains the polygon data from DrawPolygon, waiting to be processed
|
static PolygonArrayEntry* polygonArray = NULL; // contains the polygon data from DrawPolygon, waiting to be processed
|
||||||
PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
|
static PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
|
||||||
int polygonArraySize = 0;
|
static int polygonArraySize = 0;
|
||||||
int polygonArrayAllocSize = 65536;
|
static int polygonArrayAllocSize = 65536;
|
||||||
|
|
||||||
FOutVector* unsortedVertexArray = NULL; // contains unsorted vertices and texture coordinates from DrawPolygon
|
static FOutVector* unsortedVertexArray = NULL; // contains unsorted vertices and texture coordinates from DrawPolygon
|
||||||
int unsortedVertexArraySize = 0;
|
static int unsortedVertexArraySize = 0;
|
||||||
int unsortedVertexArrayAllocSize = 65536;
|
static int unsortedVertexArrayAllocSize = 65536;
|
||||||
|
|
||||||
// Enables batching mode. HWR_ProcessPolygon will collect polygons instead of passing them directly to the rendering backend.
|
// Enables batching mode. HWR_ProcessPolygon will collect polygons instead of passing them directly to the rendering backend.
|
||||||
// Call HWR_RenderBatches to render all the collected geometry.
|
// Call HWR_RenderBatches to render all the collected geometry.
|
||||||
@@ -126,8 +126,9 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
|
|||||||
if (!(PolyFlags & PF_NoTexture) && !horizonSpecial)
|
if (!(PolyFlags & PF_NoTexture) && !horizonSpecial)
|
||||||
{
|
{
|
||||||
// use FNV-1a to hash polygons for later sorting.
|
// use FNV-1a to hash polygons for later sorting.
|
||||||
INT32 hash = 0x811c9dc5;
|
UINT32 hash = 0x811c9dc5;
|
||||||
#define DIGEST(h, x) h ^= (x); h *= 0x01000193
|
UINT32 prime = 0x1000193;
|
||||||
|
#define DIGEST(h, x) h ^= ((UINT32)(x)); h *= prime
|
||||||
if (current_texture)
|
if (current_texture)
|
||||||
{
|
{
|
||||||
DIGEST(hash, current_texture->downloaded);
|
DIGEST(hash, current_texture->downloaded);
|
||||||
@@ -148,7 +149,7 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
|
|||||||
}
|
}
|
||||||
#undef DIGEST
|
#undef DIGEST
|
||||||
// remove the sign bit to ensure that skybox and horizon line comes first.
|
// remove the sign bit to ensure that skybox and horizon line comes first.
|
||||||
polygonArray[polygonArraySize-1].hash = (hash & INT32_MAX);
|
polygonArray[polygonArraySize-1].hash = (INT32)(hash & INT32_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(&unsortedVertexArray[unsortedVertexArraySize], pOutVerts, iNumPts * sizeof(FOutVector));
|
memcpy(&unsortedVertexArray[unsortedVertexArraySize], pOutVerts, iNumPts * sizeof(FOutVector));
|
||||||
@@ -168,8 +169,10 @@ static int comparePolygons(const void *p1, const void *p2)
|
|||||||
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
||||||
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
||||||
|
|
||||||
const int shader1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? -1 : poly1->shader;
|
// special case with signedness to prevent overflowing
|
||||||
const int shader2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? -1 : poly2->shader;
|
// FIXME: check for prediction slowdowns!
|
||||||
|
const int shader1 = (poly1->hash & 0x80000000) ? -1 : poly1->shader;
|
||||||
|
const int shader2 = (poly2->hash & 0x80000000) ? -1 : poly2->shader;
|
||||||
|
|
||||||
// skywalls and horizon lines must retain their order for horizon lines to work
|
// skywalls and horizon lines must retain their order for horizon lines to work
|
||||||
if (shader1 == -1 && shader2 == -1)
|
if (shader1 == -1 && shader2 == -1)
|
||||||
@@ -180,6 +183,7 @@ static int comparePolygons(const void *p1, const void *p2)
|
|||||||
|
|
||||||
UINT32 downloaded1 = poly1->texture ? poly1->texture->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
|
UINT32 downloaded1 = poly1->texture ? poly1->texture->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
|
||||||
UINT32 downloaded2 = poly2->texture ? poly2->texture->downloaded : 0;
|
UINT32 downloaded2 = poly2->texture ? poly2->texture->downloaded : 0;
|
||||||
|
|
||||||
diff64 = downloaded1 - downloaded2;
|
diff64 = downloaded1 - downloaded2;
|
||||||
if (diff64 != 0) return diff64;
|
if (diff64 != 0) return diff64;
|
||||||
|
|
||||||
@@ -210,8 +214,8 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
|
|||||||
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
||||||
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
||||||
|
|
||||||
const GLMipmap_t *texture1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? NULL : poly1->texture;
|
const GLMipmap_t *texture1 = (poly1->hash & 0x80000000) ? NULL : poly1->texture;
|
||||||
const GLMipmap_t *texture2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? NULL : poly2->texture;
|
const GLMipmap_t *texture2 = (poly2->hash & 0x80000000) ? NULL : poly2->texture;
|
||||||
|
|
||||||
// skywalls and horizon lines must retain their order for horizon lines to work
|
// skywalls and horizon lines must retain their order for horizon lines to work
|
||||||
if (!texture1 && !texture2)
|
if (!texture1 && !texture2)
|
||||||
@@ -219,6 +223,7 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
|
|||||||
|
|
||||||
UINT32 downloaded1 = texture1 ? texture1->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
|
UINT32 downloaded1 = texture1 ? texture1->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
|
||||||
UINT32 downloaded2 = texture2 ? texture2->downloaded : 0;
|
UINT32 downloaded2 = texture2 ? texture2->downloaded : 0;
|
||||||
|
|
||||||
diff64 = downloaded1 - downloaded2;
|
diff64 = downloaded1 - downloaded2;
|
||||||
if (diff64 != 0) return diff64;
|
if (diff64 != 0) return diff64;
|
||||||
|
|
||||||
@@ -260,7 +265,7 @@ void HWR_RenderBatches(void)
|
|||||||
nextSurfaceInfo.LightInfo.light_level = 0;
|
nextSurfaceInfo.LightInfo.light_level = 0;
|
||||||
nextSurfaceInfo.LightInfo.directional = false;
|
nextSurfaceInfo.LightInfo.directional = false;
|
||||||
|
|
||||||
currently_batching = false;// no longer collecting batches
|
currently_batching = false; // no longer collecting batches
|
||||||
|
|
||||||
if (!polygonArraySize)
|
if (!polygonArraySize)
|
||||||
{
|
{
|
||||||
@@ -270,6 +275,8 @@ void HWR_RenderBatches(void)
|
|||||||
return;// nothing to draw
|
return;// nothing to draw
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const boolean useshader = HWR_UseShader();
|
||||||
|
|
||||||
// init stats vars
|
// init stats vars
|
||||||
ps_hw_numpolys.value.i = polygonArraySize;
|
ps_hw_numpolys.value.i = polygonArraySize;
|
||||||
ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0;
|
ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0;
|
||||||
@@ -284,7 +291,7 @@ void HWR_RenderBatches(void)
|
|||||||
|
|
||||||
// sort polygons
|
// sort polygons
|
||||||
PS_START_TIMING(ps_hw_batchsorttime);
|
PS_START_TIMING(ps_hw_batchsorttime);
|
||||||
qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), (HWR_UseShader() ? comparePolygons : comparePolygonsNoShaders));
|
qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), (useshader ? comparePolygons : comparePolygonsNoShaders));
|
||||||
PS_STOP_TIMING(ps_hw_batchsorttime);
|
PS_STOP_TIMING(ps_hw_batchsorttime);
|
||||||
|
|
||||||
// sort order
|
// sort order
|
||||||
@@ -305,7 +312,7 @@ void HWR_RenderBatches(void)
|
|||||||
|
|
||||||
// set state for first batch
|
// set state for first batch
|
||||||
|
|
||||||
if (HWR_UseShader())
|
if (useshader)
|
||||||
{
|
{
|
||||||
GL_SetShader(currentShader);
|
GL_SetShader(currentShader);
|
||||||
}
|
}
|
||||||
@@ -385,9 +392,9 @@ void HWR_RenderBatches(void)
|
|||||||
nextSurfaceInfo = nextEntry->surf;
|
nextSurfaceInfo = nextEntry->surf;
|
||||||
|
|
||||||
if (nextPolyFlags & PF_NoTexture)
|
if (nextPolyFlags & PF_NoTexture)
|
||||||
nextTexture = 0;
|
nextTexture = NULL;
|
||||||
|
|
||||||
if (currentShader != nextShader && HWR_UseShader())
|
if (useshader && currentShader != nextShader)
|
||||||
{
|
{
|
||||||
changeState = true;
|
changeState = true;
|
||||||
changeShader = true;
|
changeShader = true;
|
||||||
@@ -405,7 +412,7 @@ void HWR_RenderBatches(void)
|
|||||||
changePolyFlags = true;
|
changePolyFlags = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HWR_UseShader())
|
if (useshader)
|
||||||
{
|
{
|
||||||
if (currentSurfaceInfo.PolyColor.rgba != nextSurfaceInfo.PolyColor.rgba ||
|
if (currentSurfaceInfo.PolyColor.rgba != nextSurfaceInfo.PolyColor.rgba ||
|
||||||
currentSurfaceInfo.TintColor.rgba != nextSurfaceInfo.TintColor.rgba ||
|
currentSurfaceInfo.TintColor.rgba != nextSurfaceInfo.TintColor.rgba ||
|
||||||
|
|||||||
+382
-248
File diff suppressed because it is too large.
Load diff
+118
-69
@@ -36,7 +36,7 @@
|
|||||||
INT32 patchformat = GL_TEXFMT_AP_88; // use alpha for holes
|
INT32 patchformat = GL_TEXFMT_AP_88; // use alpha for holes
|
||||||
INT32 textureformat = GL_TEXFMT_P_8; // use chromakey for hole
|
INT32 textureformat = GL_TEXFMT_P_8; // use chromakey for hole
|
||||||
|
|
||||||
RGBA_t mapPalette[256] = {0}; // the palette for the currently loaded level or menu etc.
|
RGBA_t mapPalette[256] = {}; // the palette for the currently loaded level or menu etc.
|
||||||
|
|
||||||
static void HWR_FreeTextureColormaps(patch_t *patch);
|
static void HWR_FreeTextureColormaps(patch_t *patch);
|
||||||
|
|
||||||
@@ -162,7 +162,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
|
|||||||
fixed_t xfrac, xfracstep;
|
fixed_t xfrac, xfracstep;
|
||||||
fixed_t yfracstep, scale_y;
|
fixed_t yfracstep, scale_y;
|
||||||
const column_t *patchcol;
|
const column_t *patchcol;
|
||||||
UINT8 *block = mipmap->data;
|
UINT8 *block = (UINT8 *)(mipmap->data);
|
||||||
INT32 bpp;
|
INT32 bpp;
|
||||||
INT32 blockmodulo;
|
INT32 blockmodulo;
|
||||||
RGBA_t *palette;
|
RGBA_t *palette;
|
||||||
@@ -212,7 +212,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
|
|||||||
fixed_t xfrac, xfracstep;
|
fixed_t xfrac, xfracstep;
|
||||||
fixed_t yfracstep, scale_y;
|
fixed_t yfracstep, scale_y;
|
||||||
const column_t *patchcol;
|
const column_t *patchcol;
|
||||||
UINT8 *block = mipmap->data;
|
UINT8 *block = (UINT8 *)(mipmap->data);
|
||||||
INT32 bpp;
|
INT32 bpp;
|
||||||
INT32 blockmodulo;
|
INT32 blockmodulo;
|
||||||
INT32 width, height;
|
INT32 width, height;
|
||||||
@@ -287,8 +287,8 @@ static UINT8 *MakeBlock(GLMipmap_t *glMipmap)
|
|||||||
UINT16 bu16 = ((0x00 <<8) | HWR_PATCHES_CHROMAKEY_COLORINDEX);
|
UINT16 bu16 = ((0x00 <<8) | HWR_PATCHES_CHROMAKEY_COLORINDEX);
|
||||||
INT32 blocksize = (glMipmap->width * glMipmap->height);
|
INT32 blocksize = (glMipmap->width * glMipmap->height);
|
||||||
|
|
||||||
bpp = format2bpp(glMipmap->format);
|
bpp = format2bpp(glMipmap->format);
|
||||||
block = Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data));
|
block = (UINT8 *)(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));
|
||||||
|
|
||||||
switch (bpp)
|
switch (bpp)
|
||||||
{
|
{
|
||||||
@@ -325,7 +325,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
texture = textures[texnum];
|
texture = textures[texnum];
|
||||||
|
|
||||||
gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
|
gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
|
||||||
gltex->mipmap.format = textureformat;
|
gltex->mipmap.format = (GLTextureFormat_t)(textureformat);
|
||||||
|
|
||||||
// hack the Legacy skies..
|
// hack the Legacy skies..
|
||||||
if (UNLIKELY(memcmp(texture->name, "SKY", 3) == 0 &&
|
if (UNLIKELY(memcmp(texture->name, "SKY", 3) == 0 &&
|
||||||
@@ -344,7 +344,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
colormap += COLORMAP_REMAPOFFSET;
|
colormap += COLORMAP_REMAPOFFSET;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gltex->mipmap.colormap = Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
gltex->mipmap.colormap = (GLColormap_t *)(Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
gltex->mipmap.colormap->source = colormap;
|
gltex->mipmap.colormap->source = colormap;
|
||||||
memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
@@ -377,7 +377,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
// Composite the columns together.
|
// Composite the columns together.
|
||||||
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
|
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
|
||||||
{
|
{
|
||||||
pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
|
pdata = (UINT8 *)(W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL));
|
||||||
realpatch = (softwarepatch_t *)pdata;
|
realpatch = (softwarepatch_t *)pdata;
|
||||||
|
|
||||||
HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
|
HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
|
||||||
@@ -413,7 +413,7 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
|
|||||||
glMipmap->flags = 0;
|
glMipmap->flags = 0;
|
||||||
|
|
||||||
// setup the texture info
|
// setup the texture info
|
||||||
glMipmap->format = patchformat;
|
glMipmap->format = (GLTextureFormat_t)(patchformat);
|
||||||
|
|
||||||
glPatch->max_s = (float)patch->width / (float)glMipmap->width;
|
glPatch->max_s = (float)patch->width / (float)glMipmap->width;
|
||||||
glPatch->max_t = (float)patch->height / (float)glMipmap->height;
|
glPatch->max_t = (float)patch->height / (float)glMipmap->height;
|
||||||
@@ -446,7 +446,7 @@ typedef struct
|
|||||||
} GLMapTextureSet_t; // idk i suck at naming things
|
} GLMapTextureSet_t; // idk i suck at naming things
|
||||||
|
|
||||||
static size_t gl_numtextures = 0; // Texture count
|
static size_t gl_numtextures = 0; // Texture count
|
||||||
static GLMapTextureSet_t *gl_textures; // For all textures
|
static GLMapTextureSet_t *gl_textures = NULL; // For all textures
|
||||||
|
|
||||||
static void HWR_FreeTextureData(patch_t *patch)
|
static void HWR_FreeTextureData(patch_t *patch)
|
||||||
{
|
{
|
||||||
@@ -455,12 +455,13 @@ static void HWR_FreeTextureData(patch_t *patch)
|
|||||||
if (!patch || !patch->hardware)
|
if (!patch || !patch->hardware)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
glPatch = patch->hardware;
|
glPatch = (GLPatch_t *)(patch->hardware);
|
||||||
|
|
||||||
if (vid.glstate == VID_GL_LIBRARY_LOADED)
|
if (vid.glstate == VID_GL_LIBRARY_LOADED)
|
||||||
GL_DeleteTexture(glPatch->mipmap);
|
GL_DeleteTexture(glPatch->mipmap);
|
||||||
|
|
||||||
Z_Free(glPatch->mipmap->data);
|
Z_Free(glPatch->mipmap->data);
|
||||||
|
glPatch->mipmap->data = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HWR_FreeTexture(patch_t *patch)
|
void HWR_FreeTexture(patch_t *patch)
|
||||||
@@ -470,7 +471,7 @@ void HWR_FreeTexture(patch_t *patch)
|
|||||||
|
|
||||||
if (patch->hardware)
|
if (patch->hardware)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = patch->hardware;
|
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
||||||
|
|
||||||
HWR_FreeTextureColormaps(patch);
|
HWR_FreeTextureColormaps(patch);
|
||||||
|
|
||||||
@@ -478,6 +479,7 @@ void HWR_FreeTexture(patch_t *patch)
|
|||||||
{
|
{
|
||||||
HWR_FreeTextureData(patch);
|
HWR_FreeTextureData(patch);
|
||||||
Z_Free(glPatch->mipmap);
|
Z_Free(glPatch->mipmap);
|
||||||
|
glPatch->mipmap = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
Z_Free(patch->hardware);
|
Z_Free(patch->hardware);
|
||||||
@@ -495,7 +497,7 @@ static void HWR_FreeTextureColormaps(patch_t *patch)
|
|||||||
if (!patch)
|
if (!patch)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pat = patch->hardware;
|
pat = (GLPatch_t *)(patch->hardware);
|
||||||
if (!pat)
|
if (!pat)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -553,7 +555,8 @@ static void HWR_FreePatchCache(boolean freeall)
|
|||||||
callback = FreeColormapsCallback;
|
callback = FreeColormapsCallback;
|
||||||
|
|
||||||
//Z_IterateTags(PU_PATCH, PU_PATCH_ROTATED, callback);
|
//Z_IterateTags(PU_PATCH, PU_PATCH_ROTATED, callback);
|
||||||
Z_IterateTags(PU_PATCH, PU_PATCH, callback);
|
//Z_IterateTags(PU_PATCH, PU_PATCH_LOWPRIORITY, callback); // we dont really need to free low priority patches here as P_FreeLevelState takes care of them
|
||||||
|
Z_IterateTag(PU_PATCH, callback);
|
||||||
Z_IterateTags(PU_SPRITE, PU_HUDGFX, callback);
|
Z_IterateTags(PU_SPRITE, PU_HUDGFX, callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -568,7 +571,8 @@ void HWR_ClearAllTextures(void)
|
|||||||
/*static void HWR_FreeColormapCache(void)
|
/*static void HWR_FreeColormapCache(void)
|
||||||
{
|
{
|
||||||
HWR_FreePatchCache(false);
|
HWR_FreePatchCache(false);
|
||||||
}*/
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
void HWR_InitMapTextures(void)
|
void HWR_InitMapTextures(void)
|
||||||
{
|
{
|
||||||
@@ -577,6 +581,9 @@ void HWR_InitMapTextures(void)
|
|||||||
|
|
||||||
static void FreeMapTexture(GLMapTexture_t *tex)
|
static void FreeMapTexture(GLMapTexture_t *tex)
|
||||||
{
|
{
|
||||||
|
if (!tex)
|
||||||
|
return;
|
||||||
|
|
||||||
GL_DeleteTexture(&tex->mipmap);
|
GL_DeleteTexture(&tex->mipmap);
|
||||||
Z_Free(tex->mipmap.data);
|
Z_Free(tex->mipmap.data);
|
||||||
tex->mipmap.data = NULL;
|
tex->mipmap.data = NULL;
|
||||||
@@ -586,6 +593,12 @@ void HWR_FreeMapTextures(void)
|
|||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
|
if (!gl_textures)
|
||||||
|
{
|
||||||
|
gl_numtextures = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < gl_numtextures; i++)
|
for (i = 0; i < gl_numtextures; i++)
|
||||||
{
|
{
|
||||||
FreeMapTexture(&gl_textures[i].normal);
|
FreeMapTexture(&gl_textures[i].normal);
|
||||||
@@ -596,25 +609,33 @@ void HWR_FreeMapTextures(void)
|
|||||||
|
|
||||||
// now the heap don't have any 'user' pointing to our
|
// now the heap don't have any 'user' pointing to our
|
||||||
// texturecache info, we can free it
|
// texturecache info, we can free it
|
||||||
if (gl_textures)
|
free(gl_textures);
|
||||||
free(gl_textures);
|
|
||||||
gl_textures = NULL;
|
gl_textures = NULL;
|
||||||
gl_numtextures = 0;
|
gl_numtextures = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HWR_PrecacheLevelFlats(void)
|
static void HWR_PrecacheLevelFlats(void)
|
||||||
{
|
{
|
||||||
lumpnum_t lump;
|
size_t i;
|
||||||
size_t i, j;
|
|
||||||
INT32 k;
|
INT32 k;
|
||||||
|
|
||||||
|
// FIXME: this needs to account for FOFs to properly work
|
||||||
|
#ifdef GLENCORE
|
||||||
|
if (encoremap)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// special case for encore
|
// special case for encore
|
||||||
|
#if 0
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
if (encoremap)
|
if (encoremap)
|
||||||
{
|
{
|
||||||
// go through all sectors to determine if it should be remapped for encore
|
// go through all sectors to determine if it should be remapped for encore
|
||||||
for (i = 0; i < numsectors; i++)
|
for (i = 0; i < numsectors; i++)
|
||||||
{
|
{
|
||||||
|
size_t j;
|
||||||
sector_t *sec = §ors[i];
|
sector_t *sec = §ors[i];
|
||||||
|
|
||||||
// gotta check sector floor and ceiling
|
// gotta check sector floor and ceiling
|
||||||
@@ -625,21 +646,30 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
|
|
||||||
const levelflat_t *levelflat = &levelflats[pic];
|
const levelflat_t *levelflat = &levelflats[pic];
|
||||||
|
|
||||||
lump = levelflat->lumpnum;
|
if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
|
||||||
HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
|
|
||||||
|
|
||||||
if (levelflat->speed) // it is an animated flat
|
|
||||||
{
|
{
|
||||||
for (k = 1; k < levelflat->numpics; k++)
|
HWR_GetFlat(levelflat->lumpnum, R_NoEncore(sec, ceiling));
|
||||||
|
flatcheck_insert(&flatpresent, levelflat->lumpnum);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
|
{
|
||||||
|
// start from 0, occasionally basenumlump != flat->lumpnum
|
||||||
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
{
|
{
|
||||||
lump = levelflat->baselumpnum + k;
|
lumpnum_t lump = levelflat->baselumpnum + k;
|
||||||
HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
|
if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
|
||||||
|
{
|
||||||
|
HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
|
||||||
|
flatcheck_insert(&flatpresent, lump);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
// on non encore we have it simple
|
// on non encore we have it simple
|
||||||
@@ -647,17 +677,17 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
for (i = 0; i < numlevelflats; i++)
|
for (i = 0; i < numlevelflats; i++)
|
||||||
{
|
{
|
||||||
const levelflat_t *levelflat = &levelflats[i];
|
const levelflat_t *levelflat = &levelflats[i];
|
||||||
lump = levelflat->lumpnum;
|
|
||||||
|
|
||||||
HWR_GetFlat(lump, false);
|
HWR_GetFlat(levelflat->lumpnum, false);
|
||||||
|
|
||||||
if (!levelflat->speed) // is it an animated flat ?
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
continue;
|
|
||||||
|
|
||||||
for (k = 1; k < levelflat->numpics; k++)
|
|
||||||
{
|
{
|
||||||
lump = levelflat->baselumpnum + k;
|
// start from 0, occasionally basenumlump != flat->lumpnum
|
||||||
HWR_GetFlat(lump, false);
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
|
{
|
||||||
|
lumpnum_t lump = levelflat->baselumpnum + k;
|
||||||
|
HWR_GetFlat(lump, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -670,7 +700,7 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
size_t i, j, f;
|
size_t i, j, f;
|
||||||
INT32 h;
|
INT32 h;
|
||||||
|
|
||||||
texturepresent = calloc(numtextures, sizeof (*texturepresent));
|
texturepresent = (char *)(calloc(gl_numtextures, sizeof(*texturepresent)));
|
||||||
if (texturepresent == NULL)
|
if (texturepresent == NULL)
|
||||||
I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
|
I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
|
||||||
|
|
||||||
@@ -684,13 +714,13 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
{
|
{
|
||||||
const line_t *line = &lines[i];
|
const line_t *line = &lines[i];
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
const int noencoremap = ((encoremap && (line->flags & ML_TFERLINE)) ? 2 : 1);
|
const boolean noencoremap = (encoremap && (line->flags & ML_TFERLINE));
|
||||||
#endif
|
#endif
|
||||||
// two sides
|
// two sides
|
||||||
for (j = 0; j < 2; j++)
|
for (j = 0; j < 2; j++)
|
||||||
{
|
{
|
||||||
// check if single-sided linedef
|
// check if single-sided linedef
|
||||||
if (line->sidenum[j] == 0xffff)
|
if (line->sidenum[j] == NO_INDEX)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
const side_t *side = &sides[line->sidenum[j]];
|
const side_t *side = &sides[line->sidenum[j]];
|
||||||
@@ -701,22 +731,27 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
{
|
{
|
||||||
const INT32 texnum = sidetex[f];
|
const INT32 texnum = sidetex[f];
|
||||||
|
|
||||||
if (texnum < 0 || texnum >= numtextures || texturepresent[texnum])
|
if (texnum <= 0 || (unsigned)texnum >= gl_numtextures)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (!(texturepresent[texnum] & 1))
|
||||||
|
{
|
||||||
|
texturepresent[texnum] |= 1;
|
||||||
|
HWR_GetTexture(texnum, false);
|
||||||
|
}
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
texturepresent[texnum] = 1|noencoremap;
|
if (noencoremap
|
||||||
#else
|
&& !(texturepresent[texnum] & 2))
|
||||||
texturepresent[texnum] = 1;
|
{
|
||||||
#endif
|
texturepresent[texnum] |= 2;
|
||||||
HWR_GetTexture(texnum, false);
|
|
||||||
#ifdef GLENCORE
|
|
||||||
if (noencoremap & 2)
|
|
||||||
HWR_GetTexture(texnum, true);
|
HWR_GetTexture(texnum, true);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check for animated textures
|
||||||
for (anim = anims; anim < lastanim; anim++)
|
for (anim = anims; anim < lastanim; anim++)
|
||||||
{
|
{
|
||||||
if (!anim->istexture)
|
if (!anim->istexture)
|
||||||
@@ -729,14 +764,17 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
|
|
||||||
for (h = 1; h < anim->numpics; h++)
|
for (h = 1; h < anim->numpics; h++)
|
||||||
{
|
{
|
||||||
|
const INT32 animtexnum = anim->basepic+h;
|
||||||
|
|
||||||
if (texpresent & 1)
|
if (texpresent & 1)
|
||||||
{
|
{
|
||||||
HWR_GetTexture(anim->basepic+h, false);
|
HWR_GetTexture(animtexnum, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
if (texpresent & 2)
|
if (texpresent & 2)
|
||||||
{
|
{
|
||||||
HWR_GetTexture(anim->basepic+h, true);
|
HWR_GetTexture(animtexnum, true);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -840,7 +878,7 @@ void HWR_LoadMapTextures(size_t pnumtextures)
|
|||||||
HWR_FreeMapTextures();
|
HWR_FreeMapTextures();
|
||||||
|
|
||||||
gl_numtextures = pnumtextures;
|
gl_numtextures = pnumtextures;
|
||||||
gl_textures = calloc(gl_numtextures, sizeof(*gl_textures)); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
|
gl_textures = (GLMapTextureSet_t *)(calloc(gl_numtextures, sizeof(*gl_textures))); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
|
||||||
|
|
||||||
if (gl_textures == NULL)
|
if (gl_textures == NULL)
|
||||||
I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
|
I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
|
||||||
@@ -852,8 +890,9 @@ void HWR_LoadMapTextures(size_t pnumtextures)
|
|||||||
GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
|
GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
|
||||||
{
|
{
|
||||||
GLMapTexture_t *gltex;
|
GLMapTexture_t *gltex;
|
||||||
|
GLMipmap_t *glMipmap;
|
||||||
|
|
||||||
if (tex < 0 || tex >= (signed)gl_numtextures)
|
if (tex < 0 || (unsigned)tex >= gl_numtextures)
|
||||||
{
|
{
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
I_Error("HWR_GetTexture: Invalid texture ID %d", tex);
|
I_Error("HWR_GetTexture: Invalid texture ID %d", tex);
|
||||||
@@ -870,19 +909,22 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
|
|||||||
gltex = &gl_textures[tex];
|
gltex = &gl_textures[tex];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
glMipmap = &gltex->mipmap;
|
||||||
|
|
||||||
// Generate texture if missing from the cache
|
// Generate texture if missing from the cache
|
||||||
if (!gltex->mipmap.downloaded)
|
if (!glMipmap->downloaded)
|
||||||
{
|
{
|
||||||
if (!gltex->mipmap.data)
|
if (!gltex->mipmap.data)
|
||||||
HWR_GenerateTexture(tex, gltex, noencore);
|
HWR_GenerateTexture(tex, gltex, noencore);
|
||||||
|
|
||||||
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
||||||
GL_SetTexture(&gltex->mipmap);
|
GL_SetTexture(glMipmap);
|
||||||
}
|
}
|
||||||
HWR_SetCurrentTexture(&gltex->mipmap);
|
|
||||||
|
HWR_SetCurrentTexture(glMipmap);
|
||||||
|
|
||||||
// The system-memory data can be purged now.
|
// The system-memory data can be purged now.
|
||||||
Z_ChangeTag(gltex->mipmap.data, PU_HWRCACHE_UNLOCKED);
|
Z_ChangeTag(glMipmap->data, PU_HWRCACHE_UNLOCKED);
|
||||||
|
|
||||||
return gltex;
|
return gltex;
|
||||||
}
|
}
|
||||||
@@ -933,7 +975,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
|
|||||||
W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));
|
W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));
|
||||||
|
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
flat = glMipmap->data;
|
flat = (UINT8 *)(glMipmap->data);
|
||||||
for (steppy = 0; steppy < size; steppy++)
|
for (steppy = 0; steppy < size; steppy++)
|
||||||
{
|
{
|
||||||
if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
|
if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
|
||||||
@@ -944,18 +986,18 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
|
|||||||
|
|
||||||
flat[steppy] = glMipmap->colormap->source[flat[steppy]];
|
flat[steppy] = glMipmap->colormap->source[flat[steppy]];
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (haschromakey)
|
if (haschromakey)
|
||||||
{
|
{
|
||||||
const char *flatname = W_CheckNameForNum(flatlumpnum);
|
const char *flatname = W_CheckNameForNum(flatlumpnum);
|
||||||
|
|
||||||
// hack for gba rainbow roads cyan floors
|
// hack for gba rainbow roads cyan floors
|
||||||
if (UNLIKELY(memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
|
if (UNLIKELY(flatname && memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
|
||||||
{
|
{
|
||||||
glMipmap->flags &= ~TF_CHROMAKEYED;
|
glMipmap->flags &= ~TF_CHROMAKEYED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Download a Doom 'flat' to the hardware cache and make it ready for use
|
// Download a Doom 'flat' to the hardware cache and make it ready for use
|
||||||
@@ -977,7 +1019,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
|
|||||||
if (!noencoremap && encoremap)
|
if (!noencoremap && encoremap)
|
||||||
colormap += COLORMAP_REMAPOFFSET;
|
colormap += COLORMAP_REMAPOFFSET;
|
||||||
#endif
|
#endif
|
||||||
glMipmap->colormap = Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
glMipmap->colormap = (GLColormap_t *)(Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
glMipmap->colormap->source = colormap;
|
glMipmap->colormap->source = colormap;
|
||||||
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
}
|
}
|
||||||
@@ -1001,7 +1043,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
|
|||||||
// --------------------+
|
// --------------------+
|
||||||
static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = patch->hardware;
|
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
||||||
|
|
||||||
if (!glMipmap->downloaded)
|
if (!glMipmap->downloaded)
|
||||||
{
|
{
|
||||||
@@ -1022,8 +1064,8 @@ static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
|||||||
// ----------------------+
|
// ----------------------+
|
||||||
static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
||||||
{
|
{
|
||||||
GLPatch_t *grPatch = patch->hardware;
|
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
||||||
HWR_MakePatch(patch, grPatch, glMipmap, true);
|
HWR_MakePatch(patch, glPatch, glMipmap, true);
|
||||||
|
|
||||||
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
||||||
// If it does have the texture, then call GL_UpdateTexture to update it
|
// If it does have the texture, then call GL_UpdateTexture to update it
|
||||||
@@ -1031,6 +1073,7 @@ static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
|||||||
GL_SetTexture(glMipmap);
|
GL_SetTexture(glMipmap);
|
||||||
else
|
else
|
||||||
GL_UpdateTexture(glMipmap);
|
GL_UpdateTexture(glMipmap);
|
||||||
|
|
||||||
HWR_SetCurrentTexture(glMipmap);
|
HWR_SetCurrentTexture(glMipmap);
|
||||||
|
|
||||||
// The system-memory data can be purged now.
|
// The system-memory data can be purged now.
|
||||||
@@ -1057,7 +1100,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
|
|
||||||
if (!patch->hardware)
|
if (!patch->hardware)
|
||||||
Patch_CreateGL(patch);
|
Patch_CreateGL(patch);
|
||||||
glPatch = patch->hardware;
|
glPatch = (GLPatch_t *)(patch->hardware);
|
||||||
|
|
||||||
// Blatant hack for encore colormapping aside...
|
// Blatant hack for encore colormapping aside...
|
||||||
if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
|
if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
|
||||||
@@ -1081,7 +1124,9 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
HWR_UpdatePatchMipmap(patch, glMipmap);
|
HWR_UpdatePatchMipmap(patch, glMipmap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
HWR_LoadPatchMipmap(patch, glMipmap);
|
HWR_LoadPatchMipmap(patch, glMipmap);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1093,12 +1138,12 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
// (it have a liste of mipmap)
|
// (it have a liste of mipmap)
|
||||||
// this malloc is cleared in HWR_FreeColormapCache
|
// this malloc is cleared in HWR_FreeColormapCache
|
||||||
// (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
|
// (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
|
||||||
newMipmap = calloc(1, sizeof (*newMipmap));
|
newMipmap = (GLMipmap_t *)(calloc(1, sizeof (*newMipmap)));
|
||||||
if (newMipmap == NULL)
|
if (newMipmap == NULL)
|
||||||
I_Error("%s: Out of memory", "HWR_GetMappedPatch");
|
I_Error("%s: Out of memory", "HWR_GetMappedPatch");
|
||||||
glMipmap->nextcolormap = newMipmap;
|
glMipmap->nextcolormap = newMipmap;
|
||||||
|
|
||||||
newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
newMipmap->colormap = (GLColormap_t *)(Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
newMipmap->colormap->source = colormap;
|
newMipmap->colormap->source = colormap;
|
||||||
memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
@@ -1121,7 +1166,7 @@ patch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
|
|||||||
{
|
{
|
||||||
void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
|
void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
|
||||||
Patch_Create(NULL, 0, ptr);
|
Patch_Create(NULL, 0, ptr);
|
||||||
Patch_AllocateHardwarePatch(ptr);
|
Patch_AllocateHardwarePatch((patch_t *)(ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
return (patch_t *)(lumpcache[lumpnum]);
|
return (patch_t *)(lumpcache[lumpnum]);
|
||||||
@@ -1138,7 +1183,7 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
|
|||||||
{
|
{
|
||||||
INT32 i,j;
|
INT32 i,j;
|
||||||
fixed_t posx, posy, stepx, stepy;
|
fixed_t posx, posy, stepx, stepy;
|
||||||
UINT8 *block = mipmap->data; // places the data directly into here
|
UINT8 *block = (UINT8 *)(mipmap->data); // places the data directly into here
|
||||||
UINT8 *flat;
|
UINT8 *flat;
|
||||||
UINT8 *dest, *src, texel;
|
UINT8 *dest, *src, texel;
|
||||||
RGBA_t col;
|
RGBA_t col;
|
||||||
@@ -1263,6 +1308,7 @@ void HWR_SetPalette(RGBA_t *palette)
|
|||||||
crushed_palette[i].s.blue = (UINT8)(fblue / 31.0f * 255.0f);
|
crushed_palette[i].s.blue = (UINT8)(fblue / 31.0f * 255.0f);
|
||||||
crushed_palette[i].s.alpha = 255;
|
crushed_palette[i].s.alpha = 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
GL_SetScreenPalette(crushed_palette);
|
GL_SetScreenPalette(crushed_palette);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1294,9 +1340,9 @@ void HWR_SetPalette(RGBA_t *palette)
|
|||||||
static void HWR_SetPaletteLookup(RGBA_t *palette)
|
static void HWR_SetPaletteLookup(RGBA_t *palette)
|
||||||
{
|
{
|
||||||
int r, g, b;
|
int r, g, b;
|
||||||
UINT8 *lut = Z_Malloc(
|
UINT8 *lut = (UINT8 *)(Z_Malloc(
|
||||||
HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*sizeof(UINT8),
|
HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*sizeof(UINT8),
|
||||||
PU_STATIC, NULL);
|
PU_STATIC, NULL));
|
||||||
#define STEP_SIZE (256/HWR_PALETTE_LUT_SIZE)
|
#define STEP_SIZE (256/HWR_PALETTE_LUT_SIZE)
|
||||||
for (b = 0; b < HWR_PALETTE_LUT_SIZE; b++)
|
for (b = 0; b < HWR_PALETTE_LUT_SIZE; b++)
|
||||||
{
|
{
|
||||||
@@ -1339,7 +1385,8 @@ void HWR_SetMapPalette(void)
|
|||||||
if (palsize < 768) // 256 * 3
|
if (palsize < 768) // 256 * 3
|
||||||
I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
|
I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
|
||||||
|
|
||||||
RGB_data = W_CacheLumpNum(lumpnum, PU_CACHE);
|
RGB_data = (UINT8 *)(W_CacheLumpNum(lumpnum, PU_CACHE));
|
||||||
|
|
||||||
// we got the RGB palette now, but we need it in RGBA format.
|
// we got the RGB palette now, but we need it in RGBA format.
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
@@ -1348,6 +1395,7 @@ void HWR_SetMapPalette(void)
|
|||||||
RGBA_converted[i].s.blue = *(RGB_data++);
|
RGBA_converted[i].s.blue = *(RGB_data++);
|
||||||
RGBA_converted[i].s.alpha = 255;
|
RGBA_converted[i].s.alpha = 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
palette = RGBA_converted;
|
palette = RGBA_converted;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1355,6 +1403,7 @@ void HWR_SetMapPalette(void)
|
|||||||
if (memcmp(mapPalette, palette, sizeof(mapPalette)))
|
if (memcmp(mapPalette, palette, sizeof(mapPalette)))
|
||||||
{
|
{
|
||||||
memcpy(mapPalette, palette, sizeof(mapPalette));
|
memcpy(mapPalette, palette, sizeof(mapPalette));
|
||||||
|
|
||||||
// in palette rendering mode, this means that all rgba textures now have wrong colors
|
// in palette rendering mode, this means that all rgba textures now have wrong colors
|
||||||
// and the lookup table is outdated
|
// and the lookup table is outdated
|
||||||
HWR_SetPaletteLookup(mapPalette);
|
HWR_SetPaletteLookup(mapPalette);
|
||||||
@@ -1374,7 +1423,7 @@ static UINT32 HWR_CreateLightTable(UINT8 *lighttable)
|
|||||||
{
|
{
|
||||||
UINT32 i, id;
|
UINT32 i, id;
|
||||||
RGBA_t *palette = HWR_GetTexturePalette();
|
RGBA_t *palette = HWR_GetTexturePalette();
|
||||||
RGBA_t *hw_lighttable = Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL);
|
RGBA_t *hw_lighttable = (RGBA_t *)(Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL));
|
||||||
|
|
||||||
// To make the palette index -> RGBA mapping easier for the shader,
|
// To make the palette index -> RGBA mapping easier for the shader,
|
||||||
// the hardware lighttable is composed of RGBA colors instead of palette indices.
|
// the hardware lighttable is composed of RGBA colors instead of palette indices.
|
||||||
|
|||||||
+26
-25
@@ -166,6 +166,7 @@ static void gld_clipper_RemoveRange(clipnode_t *range)
|
|||||||
{
|
{
|
||||||
range->prev->next = range->next;
|
range->prev->next = range->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (range->next)
|
if (range->next)
|
||||||
{
|
{
|
||||||
range->next->prev = range->prev;
|
range->next->prev = range->prev;
|
||||||
@@ -177,7 +178,7 @@ static void gld_clipper_RemoveRange(clipnode_t *range)
|
|||||||
|
|
||||||
void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle)
|
void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle)
|
||||||
{
|
{
|
||||||
if(startangle > endangle)
|
if (startangle > endangle)
|
||||||
{
|
{
|
||||||
// The range has to added in two parts.
|
// The range has to added in two parts.
|
||||||
gld_clipper_AddClipRange(startangle, ANGLE_MAX);
|
gld_clipper_AddClipRange(startangle, ANGLE_MAX);
|
||||||
@@ -318,23 +319,24 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
|
|||||||
double clipfov;
|
double clipfov;
|
||||||
double floatangle;
|
double floatangle;
|
||||||
angle_t a1;
|
angle_t a1;
|
||||||
|
float tilt;
|
||||||
float tilt = (float)fabs(((double)(int)tiltangle) / ANG1);
|
|
||||||
|
|
||||||
if (tilt > 90.0f)
|
|
||||||
tilt = 90.0f;
|
|
||||||
|
|
||||||
// If the pitch is larger than this you can look all around at a FOV of 90
|
// If the pitch is larger than this you can look all around at a FOV of 90
|
||||||
if (abs((signed)tiltangle) > 46 * ANG1)
|
if (abs((signed)tiltangle) > 46 * ANG1)
|
||||||
return 0xffffffff;
|
return 0xffffffff;
|
||||||
|
|
||||||
|
tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
|
||||||
|
|
||||||
|
if (tilt > 90.0f)
|
||||||
|
tilt = 90.0f;
|
||||||
|
|
||||||
// ok, this is a gross hack that barely works...
|
// ok, this is a gross hack that barely works...
|
||||||
// but at least it doesn't overestimate too much...
|
// but at least it doesn't overestimate too much...
|
||||||
clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PIl;
|
clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI;
|
||||||
floatangle = 2.0 + (45.0 + ((double)tilt / 1.9)) * clipfov / 90.0;
|
floatangle = 2.0 + (45.0 + ((double)tilt / 1.9)) * clipfov / 90.0;
|
||||||
if (floatangle >= 180.0)
|
if (floatangle >= 180.0)
|
||||||
return 0xffffffff;
|
return 0xffffffff;
|
||||||
a1 = (angle_t)xs_CRoundToInt(ANG1 * floatangle);
|
a1 = (angle_t)lrint(ANG1 * floatangle);
|
||||||
return a1;
|
return a1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -348,33 +350,32 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
|
|||||||
// gld_FrustumSetup
|
// gld_FrustumSetup
|
||||||
//
|
//
|
||||||
|
|
||||||
static GLdouble viewMatrix[16];
|
static float frustum[6][4];
|
||||||
static GLdouble projMatrix[16];
|
|
||||||
float frustum[6][4];
|
|
||||||
|
|
||||||
#define CALCMATRIX(a, b, c, d, e, f, g, h)\
|
#define CALCMATRIX(a, b, c, d, e, f, g, h)\
|
||||||
(float)(viewMatrix[a] * projMatrix[b] + \
|
(modelMatrix[a] * projMatrix[b] + \
|
||||||
viewMatrix[c] * projMatrix[d] + \
|
modelMatrix[c] * projMatrix[d] + \
|
||||||
viewMatrix[e] * projMatrix[f] + \
|
modelMatrix[e] * projMatrix[f] + \
|
||||||
viewMatrix[g] * projMatrix[h])
|
modelMatrix[g] * projMatrix[h])
|
||||||
|
|
||||||
#define NORMALIZE_PLANE(i)\
|
#define NORMALIZE_PLANE(i)\
|
||||||
t = (float)sqrt(\
|
t = sqrtf(\
|
||||||
frustum[i][0] * frustum[i][0] + \
|
frustum[i][0] * frustum[i][0] + \
|
||||||
frustum[i][1] * frustum[i][1] + \
|
frustum[i][1] * frustum[i][1] + \
|
||||||
frustum[i][2] * frustum[i][2]); \
|
frustum[i][2] * frustum[i][2]); \
|
||||||
frustum[i][0] /= t; \
|
frustum[i][0] /= t; \
|
||||||
frustum[i][1] /= t; \
|
frustum[i][1] /= t; \
|
||||||
frustum[i][2] /= t; \
|
frustum[i][2] /= t; \
|
||||||
frustum[i][3] /= t
|
frustum[i][3] /= t
|
||||||
|
|
||||||
void gld_FrustumSetup(void)
|
void gld_FrustumSetup(void)
|
||||||
{
|
{
|
||||||
float t;
|
float t;
|
||||||
float clip[16];
|
float clip[16];
|
||||||
|
|
||||||
pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix);
|
// HWR_SetTransform will take care of this!
|
||||||
pglGetFloatv(GL_MODELVIEW_MATRIX, viewMatrix);
|
//pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix);
|
||||||
|
//pglGetFloatv(GL_MODELVIEW_MATRIX, modelMatrix);
|
||||||
|
|
||||||
clip[0] = CALCMATRIX(0, 0, 1, 4, 2, 8, 3, 12);
|
clip[0] = CALCMATRIX(0, 0, 1, 4, 2, 8, 3, 12);
|
||||||
clip[1] = CALCMATRIX(0, 1, 1, 5, 2, 9, 3, 13);
|
clip[1] = CALCMATRIX(0, 1, 1, 5, 2, 9, 3, 13);
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ extern "C" {
|
|||||||
#include "../tables.h"
|
#include "../tables.h"
|
||||||
#include "../doomtype.h"
|
#include "../doomtype.h"
|
||||||
|
|
||||||
//#define HAVE_SPHEREFRUSTRUM // enable if you want gld_SphereInFrustum and related code
|
#define HAVE_SPHEREFRUSTRUM // enable if you want gld_SphereInFrustum and related code
|
||||||
|
|
||||||
boolean gld_clipper_SafeCheckRange(angle_t startAngle, angle_t endAngle);
|
boolean gld_clipper_SafeCheckRange(angle_t startAngle, angle_t endAngle);
|
||||||
void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle);
|
void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle);
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ struct GLMipmap_s
|
|||||||
UINT16 width, height;
|
UINT16 width, height;
|
||||||
UINT32 downloaded; // The GPU has this texture.
|
UINT32 downloaded; // The GPU has this texture.
|
||||||
|
|
||||||
struct GLMipmap_s *nextcolormap;
|
struct GLMipmap_s *nextcolormap;
|
||||||
struct GLColormap_s *colormap;
|
struct GLColormap_s *colormap;
|
||||||
};
|
};
|
||||||
typedef struct GLMipmap_s GLMipmap_t;
|
typedef struct GLMipmap_s GLMipmap_t;
|
||||||
@@ -65,7 +65,7 @@ typedef struct GLMipmap_s GLMipmap_t;
|
|||||||
struct GLMapTexture_s
|
struct GLMapTexture_s
|
||||||
{
|
{
|
||||||
GLMipmap_t mipmap;
|
GLMipmap_t mipmap;
|
||||||
float scaleX; //used for scaling textures on walls
|
float scaleX; // used for scaling textures on walls
|
||||||
float scaleY;
|
float scaleY;
|
||||||
};
|
};
|
||||||
typedef struct GLMapTexture_s GLMapTexture_t;
|
typedef struct GLMapTexture_s GLMapTexture_t;
|
||||||
@@ -74,7 +74,7 @@ typedef struct GLMapTexture_s GLMapTexture_t;
|
|||||||
struct GLPatch_s
|
struct GLPatch_s
|
||||||
{
|
{
|
||||||
GLMipmap_t *mipmap;
|
GLMipmap_t *mipmap;
|
||||||
float max_s,max_t;
|
float max_s, max_t;
|
||||||
};
|
};
|
||||||
typedef struct GLPatch_s GLPatch_t;
|
typedef struct GLPatch_s GLPatch_t;
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ typedef struct FColorARGB FColorARGB;
|
|||||||
// Simple 2D coordinate
|
// Simple 2D coordinate
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
FLOAT x,y;
|
FLOAT x, y;
|
||||||
} F2DCoord, v2d_t;
|
} F2DCoord, v2d_t;
|
||||||
|
|
||||||
// ======================
|
// ======================
|
||||||
@@ -96,7 +96,6 @@ typedef struct
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
float x, y, z;
|
float x, y, z;
|
||||||
fixed_t x2, y2, z2;
|
|
||||||
} polyvertex_t;
|
} polyvertex_t;
|
||||||
|
|
||||||
// a convex 'plane' polygon, clockwise order
|
// a convex 'plane' polygon, clockwise order
|
||||||
@@ -142,8 +141,8 @@ enum
|
|||||||
// Transformed vector, as passed to HWR API
|
// Transformed vector, as passed to HWR API
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
FLOAT x,y,z;
|
FLOAT x, y, z;
|
||||||
FLOAT s,t;
|
FLOAT s, t;
|
||||||
} FOutVector;
|
} FOutVector;
|
||||||
|
|
||||||
typedef struct vbo_vertex_s
|
typedef struct vbo_vertex_s
|
||||||
@@ -173,7 +172,7 @@ typedef struct
|
|||||||
int rows, columns;
|
int rows, columns;
|
||||||
int loopcount;
|
int loopcount;
|
||||||
|
|
||||||
int detail, vertex_count;
|
int vertex_count;
|
||||||
int texture, width, height;
|
int texture, width, height;
|
||||||
boolean rebuild; // VBO needs to be rebuilt
|
boolean rebuild; // VBO needs to be rebuilt
|
||||||
|
|
||||||
|
|||||||
@@ -1,67 +0,0 @@
|
|||||||
// Emacs style mode select -*- C++ -*-
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// Copyright (C) 2005 by SRB2 Jr. Team.
|
|
||||||
//
|
|
||||||
// This program is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU General Public License
|
|
||||||
// as published by the Free Software Foundation; either version 2
|
|
||||||
// of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
/// \file
|
|
||||||
/// \brief Win32 DLL and Shared Objects API definitions
|
|
||||||
|
|
||||||
#ifndef __HWR_DLL_H__
|
|
||||||
#define __HWR_DLL_H__
|
|
||||||
|
|
||||||
// Function declaration for exports from the DLL :
|
|
||||||
// EXPORT <return-type> HWRAPI(<function-name>) (<arguments>);
|
|
||||||
// If _CREATE_DLL_ is defined the above declaration translates to :
|
|
||||||
// __declspec(dllexport) <return-type> WINAPI <function-name> (<arguments>);
|
|
||||||
// If _CREATE_DLL_ is NOT DEFINED the above declaration translates to :
|
|
||||||
// __declspec(dllexport) <return->type> (WINAPI *<function-name>) (<arguments>);
|
|
||||||
|
|
||||||
#ifdef _CREATE_DLL_
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#define EXPORT extern "C"
|
|
||||||
#else
|
|
||||||
#define EXPORT
|
|
||||||
#endif
|
|
||||||
#ifdef _WIN32
|
|
||||||
#define HWRAPI(fn) WINAPI fn
|
|
||||||
#else
|
|
||||||
#define HWRAPI(fn) fn
|
|
||||||
#endif
|
|
||||||
#else // _CREATE_DLL_
|
|
||||||
#define EXPORT typedef
|
|
||||||
#ifdef _WIN32
|
|
||||||
#define HWRAPI(fn) (WINAPI *fn)
|
|
||||||
#else
|
|
||||||
#define HWRAPI(fn) (*fn)
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ==========================================================================
|
|
||||||
// MATHS
|
|
||||||
// ==========================================================================
|
|
||||||
|
|
||||||
// Constants
|
|
||||||
#define DEGREE (0.017453292519943295769236907684883l) // 2*PI/360
|
|
||||||
|
|
||||||
void GL_DBG_Printf(const char *format, ...) /*FUNCPRINTF*/;
|
|
||||||
#define DBG_Printf GL_DBG_Printf
|
|
||||||
|
|
||||||
#if defined (__CYGWIN__)
|
|
||||||
void _init() __attribute__((constructor));
|
|
||||||
void _fini() __attribute__((destructor));
|
|
||||||
#else
|
|
||||||
void _init();
|
|
||||||
void _fini();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+31
-27
@@ -32,20 +32,6 @@
|
|||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
UINT8 id_field_length ; // 1
|
|
||||||
UINT8 color_map_type ; // 2
|
|
||||||
UINT8 image_type ; // 3
|
|
||||||
UINT8 dummy[5] ; // 4, 8
|
|
||||||
INT16 x_origin ; // 9, 10
|
|
||||||
INT16 y_origin ; //11, 12
|
|
||||||
INT16 width ; //13, 14
|
|
||||||
INT16 height ; //15, 16
|
|
||||||
UINT8 image_pix_size ; //17
|
|
||||||
UINT8 image_descriptor; //18
|
|
||||||
} ATTRPACK TGAHeader; // sizeof is 18
|
|
||||||
|
|
||||||
static const UINT8 softwaretranstogl[11] = { 0, 25, 51, 76,102,127,153,178,204,229,255};
|
static const UINT8 softwaretranstogl[11] = { 0, 25, 51, 76,102,127,153,178,204,229,255};
|
||||||
static const UINT8 softwaretranstogl_hi[11] = { 0, 51,102,153,204,255,255,255,255,255,255};
|
static const UINT8 softwaretranstogl_hi[11] = { 0, 51,102,153,204,255,255,255,255,255,255};
|
||||||
static const UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
|
static const UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
|
||||||
@@ -57,8 +43,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FBITFIELD flags;
|
FBITFIELD flags;
|
||||||
float cx = FIXED_TO_FLOAT(x);
|
float cx, cy;
|
||||||
float cy = FIXED_TO_FLOAT(y);
|
|
||||||
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
|
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
|
||||||
UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
|
UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
|
||||||
GLPatch_t *hwrPatch;
|
GLPatch_t *hwrPatch;
|
||||||
@@ -72,6 +57,9 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
if (alphalevel >= 10 && alphalevel < 13)
|
if (alphalevel >= 10 && alphalevel < 13)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
cx = FIXED_TO_FLOAT(x);
|
||||||
|
cy = FIXED_TO_FLOAT(y);
|
||||||
|
|
||||||
const float fvw = (float)vid.width;
|
const float fvw = (float)vid.width;
|
||||||
const float fvh = (float)vid.height;
|
const float fvh = (float)vid.height;
|
||||||
|
|
||||||
@@ -150,7 +138,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
if (!column->topdelta)
|
if (!column->topdelta)
|
||||||
{
|
{
|
||||||
const UINT8 *source = (const UINT8 *)(column) + 3;
|
const UINT8 *source = (const UINT8 *)(column) + 3;
|
||||||
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
|
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -222,7 +210,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
|
|
||||||
if (alphalevel)
|
if (alphalevel)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
||||||
|
|
||||||
switch (alphalevel)
|
switch (alphalevel)
|
||||||
@@ -244,8 +232,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FBITFIELD flags;
|
FBITFIELD flags;
|
||||||
float cx = FIXED_TO_FLOAT(x);
|
float cx, cy;
|
||||||
float cy = FIXED_TO_FLOAT(y);
|
|
||||||
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
|
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
|
||||||
GLPatch_t *hwrPatch;
|
GLPatch_t *hwrPatch;
|
||||||
|
|
||||||
@@ -258,6 +245,9 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
if (alphalevel >= 10 && alphalevel < 13)
|
if (alphalevel >= 10 && alphalevel < 13)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
cx = FIXED_TO_FLOAT(x);
|
||||||
|
cy = FIXED_TO_FLOAT(y);
|
||||||
|
|
||||||
const float fvw = (float)vid.width;
|
const float fvw = (float)vid.width;
|
||||||
const float fvh = (float)vid.height;
|
const float fvh = (float)vid.height;
|
||||||
|
|
||||||
@@ -302,7 +292,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
if (!column->topdelta)
|
if (!column->topdelta)
|
||||||
{
|
{
|
||||||
const UINT8 *source = (const UINT8 *)(column) + 3;
|
const UINT8 *source = (const UINT8 *)(column) + 3;
|
||||||
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
|
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -385,7 +375,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
// clip it since it is used for bunny scroll in doom I
|
// clip it since it is used for bunny scroll in doom I
|
||||||
if (alphalevel)
|
if (alphalevel)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
||||||
|
|
||||||
switch (alphalevel)
|
switch (alphalevel)
|
||||||
@@ -490,7 +480,7 @@ void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum)
|
|||||||
void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
FBITFIELD poly_flags = PF_NoTexture|PF_Modulated|PF_NoDepthTest;
|
FBITFIELD poly_flags = PF_NoTexture|PF_Modulated|PF_NoDepthTest;
|
||||||
|
|
||||||
v[0].x = v[3].x = -1.0f;
|
v[0].x = v[3].x = -1.0f;
|
||||||
@@ -543,7 +533,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
|||||||
void HWR_DrawConsoleBack(UINT32 color, INT32 height)
|
void HWR_DrawConsoleBack(UINT32 color, INT32 height)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
|
|
||||||
// setup some neat-o translucency effect
|
// setup some neat-o translucency effect
|
||||||
if (!height) //cool hack 0 height is full height
|
if (!height) //cool hack 0 height is full height
|
||||||
@@ -598,7 +588,7 @@ void HWR_drawAMline(const fline_t *fl, INT32 color)
|
|||||||
void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
float fx, fy, fw, fh, fwait = 0;
|
float fx, fy, fw, fh, fwait = 0;
|
||||||
RGBA_t *palette;
|
RGBA_t *palette;
|
||||||
|
|
||||||
@@ -702,7 +692,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
|||||||
void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32 options)
|
void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32 options)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
float fx, fy, fw, fh;
|
float fx, fy, fw, fh;
|
||||||
|
|
||||||
if (w < 0 || h < 0)
|
if (w < 0 || h < 0)
|
||||||
@@ -820,7 +810,7 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
|
|||||||
void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
|
void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
float fx, fy, fw, fh;
|
float fx, fy, fw, fh;
|
||||||
|
|
||||||
if (w < 0 || h < 0)
|
if (w < 0 || h < 0)
|
||||||
@@ -964,6 +954,20 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef USE_PNG
|
#ifndef USE_PNG
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
UINT8 id_field_length ; // 1
|
||||||
|
UINT8 color_map_type ; // 2
|
||||||
|
UINT8 image_type ; // 3
|
||||||
|
UINT8 dummy[5] ; // 4, 8
|
||||||
|
INT16 x_origin ; // 9, 10
|
||||||
|
INT16 y_origin ; //11, 12
|
||||||
|
INT16 width ; //13, 14
|
||||||
|
INT16 height ; //15, 16
|
||||||
|
UINT8 image_pix_size ; //17
|
||||||
|
UINT8 image_descriptor; //18
|
||||||
|
} ATTRPACK TGAHeader; // sizeof is 18
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// save screenshots with TGA format
|
// save screenshots with TGA format
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -32,8 +32,12 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value);
|
|||||||
void GL_SetTransform(FTransform *stransform);
|
void GL_SetTransform(FTransform *stransform);
|
||||||
void GL_SetBlend(FBITFIELD PolyFlags);
|
void GL_SetBlend(FBITFIELD PolyFlags);
|
||||||
void GL_SetPalette(RGBA_t *palette);
|
void GL_SetPalette(RGBA_t *palette);
|
||||||
|
|
||||||
void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor);
|
void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor);
|
||||||
|
|
||||||
|
void GL_EnableStencilTest(void);
|
||||||
|
void GL_DisableStencilTest(void);
|
||||||
|
|
||||||
void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
|
void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
|
||||||
void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray);
|
void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray);
|
||||||
void GL_Draw2DLine(F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
|
void GL_Draw2DLine(F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
|
||||||
@@ -63,7 +67,7 @@ void GL_FlushScreenTextures(void);
|
|||||||
void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
|
void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
|
||||||
void GL_DoScreenWipe(int wipeStart, int wipeEnd);
|
void GL_DoScreenWipe(int wipeStart, int wipeEnd);
|
||||||
void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
|
void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
|
||||||
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader);
|
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height);
|
||||||
|
|
||||||
void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);
|
void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);
|
||||||
|
|
||||||
@@ -72,6 +76,7 @@ void GL_LoadShader(int slot, char *code, hwdshaderstage_t stage);
|
|||||||
boolean GL_CompileShader(int slot);
|
boolean GL_CompileShader(int slot);
|
||||||
void GL_SetShader(int slot);
|
void GL_SetShader(int slot);
|
||||||
void GL_UnSetShader(void);
|
void GL_UnSetShader(void);
|
||||||
|
void GL_EnableShader(void);
|
||||||
|
|
||||||
void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value);
|
void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value);
|
||||||
|
|
||||||
@@ -80,6 +85,9 @@ UINT32 GL_CreateLightTable(RGBA_t *hw_lighttable);
|
|||||||
void GL_ClearLightTables(void);
|
void GL_ClearLightTables(void);
|
||||||
void GL_SetScreenPalette(RGBA_t *palette);
|
void GL_SetScreenPalette(RGBA_t *palette);
|
||||||
|
|
||||||
|
void GL_Draw2DModel(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex,
|
||||||
|
FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ typedef struct gl_vissprite_s
|
|||||||
float gz, gzt;
|
float gz, gzt;
|
||||||
float tz;
|
float tz;
|
||||||
float scale;
|
float scale;
|
||||||
float spritexscale, spriteyscale;
|
//float spritexscale, spriteyscale;
|
||||||
float spritexoffset, spriteyoffset;
|
//float spritexoffset, spriteyoffset;
|
||||||
patch_t *gpatch;
|
patch_t *gpatch;
|
||||||
boolean flip;
|
boolean flip;
|
||||||
UINT8 translucency; //alpha level 0-255
|
UINT8 translucency; //alpha level 0-255
|
||||||
@@ -54,7 +54,7 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32
|
|||||||
// --------
|
// --------
|
||||||
extern extrasubsector_t *extrasubsectors;
|
extern extrasubsector_t *extrasubsectors;
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
extern size_t addsubsector;
|
extern size_t num_extra_subsector;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void HWR_FreeExtraSubsectors(void);
|
void HWR_FreeExtraSubsectors(void);
|
||||||
|
|||||||
+1004
-882
File diff suppressed because it is too large.
Load diff
Loaded 100 of 260 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user