• R/O
  • SSH

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).


Commit MetaInfo

Révisiond85c64ff2914f68c61c4ec18708fc2494f396132 (tree)
l'heure2015-08-03 04:43:36
AuteurBenjamin Berkels <torr.samaho@quan...>
CommiterBenjamin Berkels

Message de Log

Merged with G1.9pre-459-g3e318e4

Change Summary

Modification

diff -r 3f692a003efe -r d85c64ff2914 gdtoa/gdtoa.h
--- a/gdtoa/gdtoa.h Sun Aug 02 21:28:50 2015 +0200
+++ b/gdtoa/gdtoa.h Sun Aug 02 21:43:36 2015 +0200
@@ -142,8 +142,8 @@
142142 extern char* gdtoa ANSI((FPI *fpi, int be, ULong *bits, int *kindp,
143143 int mode, int ndigits, int *decpt, char **rve));
144144 extern void freedtoa ANSI((char*));
145-extern float strtof ANSI((CONST char *, char **));
146-extern double strtod ANSI((CONST char *, char **));
145+//extern float strtof ANSI((CONST char *, char **));
146+//extern double strtod ANSI((CONST char *, char **));
147147 extern int strtodg ANSI((CONST char*, char**, FPI*, Long*, ULong*));
148148
149149 extern char* g_ddfmt ANSI((char*, double*, int, size_t));
diff -r 3f692a003efe -r d85c64ff2914 gdtoa/gdtoa.vcproj
--- a/gdtoa/gdtoa.vcproj Sun Aug 02 21:28:50 2015 +0200
+++ b/gdtoa/gdtoa.vcproj Sun Aug 02 21:43:36 2015 +0200
@@ -293,50 +293,434 @@
293293 <File
294294 RelativePath=".\g__fmt.c"
295295 >
296+ <FileConfiguration
297+ Name="Debug|Win32"
298+ ExcludedFromBuild="true"
299+ >
300+ <Tool
301+ Name="VCCLCompilerTool"
302+ />
303+ </FileConfiguration>
304+ <FileConfiguration
305+ Name="Debug|x64"
306+ ExcludedFromBuild="true"
307+ >
308+ <Tool
309+ Name="VCCLCompilerTool"
310+ />
311+ </FileConfiguration>
312+ <FileConfiguration
313+ Name="Release|Win32"
314+ ExcludedFromBuild="true"
315+ >
316+ <Tool
317+ Name="VCCLCompilerTool"
318+ />
319+ </FileConfiguration>
320+ <FileConfiguration
321+ Name="Release|x64"
322+ ExcludedFromBuild="true"
323+ >
324+ <Tool
325+ Name="VCCLCompilerTool"
326+ />
327+ </FileConfiguration>
296328 </File>
297329 <File
298330 RelativePath=".\g_ddfmt.c"
299331 >
332+ <FileConfiguration
333+ Name="Debug|Win32"
334+ ExcludedFromBuild="true"
335+ >
336+ <Tool
337+ Name="VCCLCompilerTool"
338+ />
339+ </FileConfiguration>
340+ <FileConfiguration
341+ Name="Debug|x64"
342+ ExcludedFromBuild="true"
343+ >
344+ <Tool
345+ Name="VCCLCompilerTool"
346+ />
347+ </FileConfiguration>
348+ <FileConfiguration
349+ Name="Release|Win32"
350+ ExcludedFromBuild="true"
351+ >
352+ <Tool
353+ Name="VCCLCompilerTool"
354+ />
355+ </FileConfiguration>
356+ <FileConfiguration
357+ Name="Release|x64"
358+ ExcludedFromBuild="true"
359+ >
360+ <Tool
361+ Name="VCCLCompilerTool"
362+ />
363+ </FileConfiguration>
300364 </File>
301365 <File
302366 RelativePath=".\g_dfmt.c"
303367 >
368+ <FileConfiguration
369+ Name="Debug|Win32"
370+ ExcludedFromBuild="true"
371+ >
372+ <Tool
373+ Name="VCCLCompilerTool"
374+ />
375+ </FileConfiguration>
376+ <FileConfiguration
377+ Name="Debug|x64"
378+ ExcludedFromBuild="true"
379+ >
380+ <Tool
381+ Name="VCCLCompilerTool"
382+ />
383+ </FileConfiguration>
384+ <FileConfiguration
385+ Name="Release|Win32"
386+ ExcludedFromBuild="true"
387+ >
388+ <Tool
389+ Name="VCCLCompilerTool"
390+ />
391+ </FileConfiguration>
392+ <FileConfiguration
393+ Name="Release|x64"
394+ ExcludedFromBuild="true"
395+ >
396+ <Tool
397+ Name="VCCLCompilerTool"
398+ />
399+ </FileConfiguration>
304400 </File>
305401 <File
306402 RelativePath=".\g_ffmt.c"
307403 >
404+ <FileConfiguration
405+ Name="Debug|Win32"
406+ ExcludedFromBuild="true"
407+ >
408+ <Tool
409+ Name="VCCLCompilerTool"
410+ />
411+ </FileConfiguration>
412+ <FileConfiguration
413+ Name="Debug|x64"
414+ ExcludedFromBuild="true"
415+ >
416+ <Tool
417+ Name="VCCLCompilerTool"
418+ />
419+ </FileConfiguration>
420+ <FileConfiguration
421+ Name="Release|Win32"
422+ ExcludedFromBuild="true"
423+ >
424+ <Tool
425+ Name="VCCLCompilerTool"
426+ />
427+ </FileConfiguration>
428+ <FileConfiguration
429+ Name="Release|x64"
430+ ExcludedFromBuild="true"
431+ >
432+ <Tool
433+ Name="VCCLCompilerTool"
434+ />
435+ </FileConfiguration>
308436 </File>
309437 <File
310438 RelativePath=".\g_Qfmt.c"
311439 >
440+ <FileConfiguration
441+ Name="Debug|Win32"
442+ ExcludedFromBuild="true"
443+ >
444+ <Tool
445+ Name="VCCLCompilerTool"
446+ />
447+ </FileConfiguration>
448+ <FileConfiguration
449+ Name="Debug|x64"
450+ ExcludedFromBuild="true"
451+ >
452+ <Tool
453+ Name="VCCLCompilerTool"
454+ />
455+ </FileConfiguration>
456+ <FileConfiguration
457+ Name="Release|Win32"
458+ ExcludedFromBuild="true"
459+ >
460+ <Tool
461+ Name="VCCLCompilerTool"
462+ />
463+ </FileConfiguration>
464+ <FileConfiguration
465+ Name="Release|x64"
466+ ExcludedFromBuild="true"
467+ >
468+ <Tool
469+ Name="VCCLCompilerTool"
470+ />
471+ </FileConfiguration>
312472 </File>
313473 <File
314474 RelativePath=".\g_xfmt.c"
315475 >
476+ <FileConfiguration
477+ Name="Debug|Win32"
478+ ExcludedFromBuild="true"
479+ >
480+ <Tool
481+ Name="VCCLCompilerTool"
482+ />
483+ </FileConfiguration>
484+ <FileConfiguration
485+ Name="Debug|x64"
486+ ExcludedFromBuild="true"
487+ >
488+ <Tool
489+ Name="VCCLCompilerTool"
490+ />
491+ </FileConfiguration>
492+ <FileConfiguration
493+ Name="Release|Win32"
494+ ExcludedFromBuild="true"
495+ >
496+ <Tool
497+ Name="VCCLCompilerTool"
498+ />
499+ </FileConfiguration>
500+ <FileConfiguration
501+ Name="Release|x64"
502+ ExcludedFromBuild="true"
503+ >
504+ <Tool
505+ Name="VCCLCompilerTool"
506+ />
507+ </FileConfiguration>
316508 </File>
317509 <File
318510 RelativePath=".\g_xLfmt.c"
319511 >
512+ <FileConfiguration
513+ Name="Debug|Win32"
514+ ExcludedFromBuild="true"
515+ >
516+ <Tool
517+ Name="VCCLCompilerTool"
518+ />
519+ </FileConfiguration>
520+ <FileConfiguration
521+ Name="Debug|x64"
522+ ExcludedFromBuild="true"
523+ >
524+ <Tool
525+ Name="VCCLCompilerTool"
526+ />
527+ </FileConfiguration>
528+ <FileConfiguration
529+ Name="Release|Win32"
530+ ExcludedFromBuild="true"
531+ >
532+ <Tool
533+ Name="VCCLCompilerTool"
534+ />
535+ </FileConfiguration>
536+ <FileConfiguration
537+ Name="Release|x64"
538+ ExcludedFromBuild="true"
539+ >
540+ <Tool
541+ Name="VCCLCompilerTool"
542+ />
543+ </FileConfiguration>
320544 </File>
321545 <File
322546 RelativePath=".\gdtoa.c"
323547 >
548+ <FileConfiguration
549+ Name="Debug|Win32"
550+ ExcludedFromBuild="true"
551+ >
552+ <Tool
553+ Name="VCCLCompilerTool"
554+ />
555+ </FileConfiguration>
556+ <FileConfiguration
557+ Name="Debug|x64"
558+ ExcludedFromBuild="true"
559+ >
560+ <Tool
561+ Name="VCCLCompilerTool"
562+ />
563+ </FileConfiguration>
564+ <FileConfiguration
565+ Name="Release|Win32"
566+ ExcludedFromBuild="true"
567+ >
568+ <Tool
569+ Name="VCCLCompilerTool"
570+ />
571+ </FileConfiguration>
572+ <FileConfiguration
573+ Name="Release|x64"
574+ ExcludedFromBuild="true"
575+ >
576+ <Tool
577+ Name="VCCLCompilerTool"
578+ />
579+ </FileConfiguration>
324580 </File>
325581 <File
326582 RelativePath=".\gethex.c"
327583 >
584+ <FileConfiguration
585+ Name="Debug|Win32"
586+ ExcludedFromBuild="true"
587+ >
588+ <Tool
589+ Name="VCCLCompilerTool"
590+ />
591+ </FileConfiguration>
592+ <FileConfiguration
593+ Name="Debug|x64"
594+ ExcludedFromBuild="true"
595+ >
596+ <Tool
597+ Name="VCCLCompilerTool"
598+ />
599+ </FileConfiguration>
600+ <FileConfiguration
601+ Name="Release|Win32"
602+ ExcludedFromBuild="true"
603+ >
604+ <Tool
605+ Name="VCCLCompilerTool"
606+ />
607+ </FileConfiguration>
608+ <FileConfiguration
609+ Name="Release|x64"
610+ ExcludedFromBuild="true"
611+ >
612+ <Tool
613+ Name="VCCLCompilerTool"
614+ />
615+ </FileConfiguration>
328616 </File>
329617 <File
330618 RelativePath=".\gmisc.c"
331619 >
620+ <FileConfiguration
621+ Name="Debug|Win32"
622+ ExcludedFromBuild="true"
623+ >
624+ <Tool
625+ Name="VCCLCompilerTool"
626+ />
627+ </FileConfiguration>
628+ <FileConfiguration
629+ Name="Debug|x64"
630+ ExcludedFromBuild="true"
631+ >
632+ <Tool
633+ Name="VCCLCompilerTool"
634+ />
635+ </FileConfiguration>
636+ <FileConfiguration
637+ Name="Release|Win32"
638+ ExcludedFromBuild="true"
639+ >
640+ <Tool
641+ Name="VCCLCompilerTool"
642+ />
643+ </FileConfiguration>
644+ <FileConfiguration
645+ Name="Release|x64"
646+ ExcludedFromBuild="true"
647+ >
648+ <Tool
649+ Name="VCCLCompilerTool"
650+ />
651+ </FileConfiguration>
332652 </File>
333653 <File
334654 RelativePath=".\hd_init.c"
335655 >
656+ <FileConfiguration
657+ Name="Debug|Win32"
658+ ExcludedFromBuild="true"
659+ >
660+ <Tool
661+ Name="VCCLCompilerTool"
662+ />
663+ </FileConfiguration>
664+ <FileConfiguration
665+ Name="Debug|x64"
666+ ExcludedFromBuild="true"
667+ >
668+ <Tool
669+ Name="VCCLCompilerTool"
670+ />
671+ </FileConfiguration>
672+ <FileConfiguration
673+ Name="Release|Win32"
674+ ExcludedFromBuild="true"
675+ >
676+ <Tool
677+ Name="VCCLCompilerTool"
678+ />
679+ </FileConfiguration>
680+ <FileConfiguration
681+ Name="Release|x64"
682+ ExcludedFromBuild="true"
683+ >
684+ <Tool
685+ Name="VCCLCompilerTool"
686+ />
687+ </FileConfiguration>
336688 </File>
337689 <File
338690 RelativePath=".\hexnan.c"
339691 >
692+ <FileConfiguration
693+ Name="Debug|Win32"
694+ ExcludedFromBuild="true"
695+ >
696+ <Tool
697+ Name="VCCLCompilerTool"
698+ />
699+ </FileConfiguration>
700+ <FileConfiguration
701+ Name="Debug|x64"
702+ ExcludedFromBuild="true"
703+ >
704+ <Tool
705+ Name="VCCLCompilerTool"
706+ />
707+ </FileConfiguration>
708+ <FileConfiguration
709+ Name="Release|Win32"
710+ ExcludedFromBuild="true"
711+ >
712+ <Tool
713+ Name="VCCLCompilerTool"
714+ />
715+ </FileConfiguration>
716+ <FileConfiguration
717+ Name="Release|x64"
718+ ExcludedFromBuild="true"
719+ >
720+ <Tool
721+ Name="VCCLCompilerTool"
722+ />
723+ </FileConfiguration>
340724 </File>
341725 <File
342726 RelativePath=".\misc.c"
@@ -345,18 +729,146 @@
345729 <File
346730 RelativePath=".\smisc.c"
347731 >
732+ <FileConfiguration
733+ Name="Debug|Win32"
734+ ExcludedFromBuild="true"
735+ >
736+ <Tool
737+ Name="VCCLCompilerTool"
738+ />
739+ </FileConfiguration>
740+ <FileConfiguration
741+ Name="Debug|x64"
742+ ExcludedFromBuild="true"
743+ >
744+ <Tool
745+ Name="VCCLCompilerTool"
746+ />
747+ </FileConfiguration>
748+ <FileConfiguration
749+ Name="Release|Win32"
750+ ExcludedFromBuild="true"
751+ >
752+ <Tool
753+ Name="VCCLCompilerTool"
754+ />
755+ </FileConfiguration>
756+ <FileConfiguration
757+ Name="Release|x64"
758+ ExcludedFromBuild="true"
759+ >
760+ <Tool
761+ Name="VCCLCompilerTool"
762+ />
763+ </FileConfiguration>
348764 </File>
349765 <File
350766 RelativePath=".\strtod.c"
351767 >
768+ <FileConfiguration
769+ Name="Debug|Win32"
770+ ExcludedFromBuild="true"
771+ >
772+ <Tool
773+ Name="VCCLCompilerTool"
774+ />
775+ </FileConfiguration>
776+ <FileConfiguration
777+ Name="Debug|x64"
778+ ExcludedFromBuild="true"
779+ >
780+ <Tool
781+ Name="VCCLCompilerTool"
782+ />
783+ </FileConfiguration>
784+ <FileConfiguration
785+ Name="Release|Win32"
786+ ExcludedFromBuild="true"
787+ >
788+ <Tool
789+ Name="VCCLCompilerTool"
790+ />
791+ </FileConfiguration>
792+ <FileConfiguration
793+ Name="Release|x64"
794+ ExcludedFromBuild="true"
795+ >
796+ <Tool
797+ Name="VCCLCompilerTool"
798+ />
799+ </FileConfiguration>
352800 </File>
353801 <File
354802 RelativePath=".\strtodg.c"
355803 >
804+ <FileConfiguration
805+ Name="Debug|Win32"
806+ ExcludedFromBuild="true"
807+ >
808+ <Tool
809+ Name="VCCLCompilerTool"
810+ />
811+ </FileConfiguration>
812+ <FileConfiguration
813+ Name="Debug|x64"
814+ ExcludedFromBuild="true"
815+ >
816+ <Tool
817+ Name="VCCLCompilerTool"
818+ />
819+ </FileConfiguration>
820+ <FileConfiguration
821+ Name="Release|Win32"
822+ ExcludedFromBuild="true"
823+ >
824+ <Tool
825+ Name="VCCLCompilerTool"
826+ />
827+ </FileConfiguration>
828+ <FileConfiguration
829+ Name="Release|x64"
830+ ExcludedFromBuild="true"
831+ >
832+ <Tool
833+ Name="VCCLCompilerTool"
834+ />
835+ </FileConfiguration>
356836 </File>
357837 <File
358838 RelativePath=".\strtodI.c"
359839 >
840+ <FileConfiguration
841+ Name="Debug|Win32"
842+ ExcludedFromBuild="true"
843+ >
844+ <Tool
845+ Name="VCCLCompilerTool"
846+ />
847+ </FileConfiguration>
848+ <FileConfiguration
849+ Name="Debug|x64"
850+ ExcludedFromBuild="true"
851+ >
852+ <Tool
853+ Name="VCCLCompilerTool"
854+ />
855+ </FileConfiguration>
856+ <FileConfiguration
857+ Name="Release|Win32"
858+ ExcludedFromBuild="true"
859+ >
860+ <Tool
861+ Name="VCCLCompilerTool"
862+ />
863+ </FileConfiguration>
864+ <FileConfiguration
865+ Name="Release|x64"
866+ ExcludedFromBuild="true"
867+ >
868+ <Tool
869+ Name="VCCLCompilerTool"
870+ />
871+ </FileConfiguration>
360872 </File>
361873 <File
362874 RelativePath=".\strtodnrp.c"
@@ -397,90 +909,794 @@
397909 <File
398910 RelativePath=".\strtof.c"
399911 >
912+ <FileConfiguration
913+ Name="Debug|Win32"
914+ ExcludedFromBuild="true"
915+ >
916+ <Tool
917+ Name="VCCLCompilerTool"
918+ />
919+ </FileConfiguration>
920+ <FileConfiguration
921+ Name="Debug|x64"
922+ ExcludedFromBuild="true"
923+ >
924+ <Tool
925+ Name="VCCLCompilerTool"
926+ />
927+ </FileConfiguration>
928+ <FileConfiguration
929+ Name="Release|Win32"
930+ ExcludedFromBuild="true"
931+ >
932+ <Tool
933+ Name="VCCLCompilerTool"
934+ />
935+ </FileConfiguration>
936+ <FileConfiguration
937+ Name="Release|x64"
938+ ExcludedFromBuild="true"
939+ >
940+ <Tool
941+ Name="VCCLCompilerTool"
942+ />
943+ </FileConfiguration>
400944 </File>
401945 <File
402946 RelativePath=".\strtoId.c"
403947 >
948+ <FileConfiguration
949+ Name="Debug|Win32"
950+ ExcludedFromBuild="true"
951+ >
952+ <Tool
953+ Name="VCCLCompilerTool"
954+ />
955+ </FileConfiguration>
956+ <FileConfiguration
957+ Name="Debug|x64"
958+ ExcludedFromBuild="true"
959+ >
960+ <Tool
961+ Name="VCCLCompilerTool"
962+ />
963+ </FileConfiguration>
964+ <FileConfiguration
965+ Name="Release|Win32"
966+ ExcludedFromBuild="true"
967+ >
968+ <Tool
969+ Name="VCCLCompilerTool"
970+ />
971+ </FileConfiguration>
972+ <FileConfiguration
973+ Name="Release|x64"
974+ ExcludedFromBuild="true"
975+ >
976+ <Tool
977+ Name="VCCLCompilerTool"
978+ />
979+ </FileConfiguration>
404980 </File>
405981 <File
406982 RelativePath=".\strtoIdd.c"
407983 >
984+ <FileConfiguration
985+ Name="Debug|Win32"
986+ ExcludedFromBuild="true"
987+ >
988+ <Tool
989+ Name="VCCLCompilerTool"
990+ />
991+ </FileConfiguration>
992+ <FileConfiguration
993+ Name="Debug|x64"
994+ ExcludedFromBuild="true"
995+ >
996+ <Tool
997+ Name="VCCLCompilerTool"
998+ />
999+ </FileConfiguration>
1000+ <FileConfiguration
1001+ Name="Release|Win32"
1002+ ExcludedFromBuild="true"
1003+ >
1004+ <Tool
1005+ Name="VCCLCompilerTool"
1006+ />
1007+ </FileConfiguration>
1008+ <FileConfiguration
1009+ Name="Release|x64"
1010+ ExcludedFromBuild="true"
1011+ >
1012+ <Tool
1013+ Name="VCCLCompilerTool"
1014+ />
1015+ </FileConfiguration>
4081016 </File>
4091017 <File
4101018 RelativePath=".\strtoIf.c"
4111019 >
1020+ <FileConfiguration
1021+ Name="Debug|Win32"
1022+ ExcludedFromBuild="true"
1023+ >
1024+ <Tool
1025+ Name="VCCLCompilerTool"
1026+ />
1027+ </FileConfiguration>
1028+ <FileConfiguration
1029+ Name="Debug|x64"
1030+ ExcludedFromBuild="true"
1031+ >
1032+ <Tool
1033+ Name="VCCLCompilerTool"
1034+ />
1035+ </FileConfiguration>
1036+ <FileConfiguration
1037+ Name="Release|Win32"
1038+ ExcludedFromBuild="true"
1039+ >
1040+ <Tool
1041+ Name="VCCLCompilerTool"
1042+ />
1043+ </FileConfiguration>
1044+ <FileConfiguration
1045+ Name="Release|x64"
1046+ ExcludedFromBuild="true"
1047+ >
1048+ <Tool
1049+ Name="VCCLCompilerTool"
1050+ />
1051+ </FileConfiguration>
4121052 </File>
4131053 <File
4141054 RelativePath=".\strtoIg.c"
4151055 >
1056+ <FileConfiguration
1057+ Name="Debug|Win32"
1058+ ExcludedFromBuild="true"
1059+ >
1060+ <Tool
1061+ Name="VCCLCompilerTool"
1062+ />
1063+ </FileConfiguration>
1064+ <FileConfiguration
1065+ Name="Debug|x64"
1066+ ExcludedFromBuild="true"
1067+ >
1068+ <Tool
1069+ Name="VCCLCompilerTool"
1070+ />
1071+ </FileConfiguration>
1072+ <FileConfiguration
1073+ Name="Release|Win32"
1074+ ExcludedFromBuild="true"
1075+ >
1076+ <Tool
1077+ Name="VCCLCompilerTool"
1078+ />
1079+ </FileConfiguration>
1080+ <FileConfiguration
1081+ Name="Release|x64"
1082+ ExcludedFromBuild="true"
1083+ >
1084+ <Tool
1085+ Name="VCCLCompilerTool"
1086+ />
1087+ </FileConfiguration>
4161088 </File>
4171089 <File
4181090 RelativePath=".\strtoIQ.c"
4191091 >
1092+ <FileConfiguration
1093+ Name="Debug|Win32"
1094+ ExcludedFromBuild="true"
1095+ >
1096+ <Tool
1097+ Name="VCCLCompilerTool"
1098+ />
1099+ </FileConfiguration>
1100+ <FileConfiguration
1101+ Name="Debug|x64"
1102+ ExcludedFromBuild="true"
1103+ >
1104+ <Tool
1105+ Name="VCCLCompilerTool"
1106+ />
1107+ </FileConfiguration>
1108+ <FileConfiguration
1109+ Name="Release|Win32"
1110+ ExcludedFromBuild="true"
1111+ >
1112+ <Tool
1113+ Name="VCCLCompilerTool"
1114+ />
1115+ </FileConfiguration>
1116+ <FileConfiguration
1117+ Name="Release|x64"
1118+ ExcludedFromBuild="true"
1119+ >
1120+ <Tool
1121+ Name="VCCLCompilerTool"
1122+ />
1123+ </FileConfiguration>
4201124 </File>
4211125 <File
4221126 RelativePath=".\strtoIx.c"
4231127 >
1128+ <FileConfiguration
1129+ Name="Debug|Win32"
1130+ ExcludedFromBuild="true"
1131+ >
1132+ <Tool
1133+ Name="VCCLCompilerTool"
1134+ />
1135+ </FileConfiguration>
1136+ <FileConfiguration
1137+ Name="Debug|x64"
1138+ ExcludedFromBuild="true"
1139+ >
1140+ <Tool
1141+ Name="VCCLCompilerTool"
1142+ />
1143+ </FileConfiguration>
1144+ <FileConfiguration
1145+ Name="Release|Win32"
1146+ ExcludedFromBuild="true"
1147+ >
1148+ <Tool
1149+ Name="VCCLCompilerTool"
1150+ />
1151+ </FileConfiguration>
1152+ <FileConfiguration
1153+ Name="Release|x64"
1154+ ExcludedFromBuild="true"
1155+ >
1156+ <Tool
1157+ Name="VCCLCompilerTool"
1158+ />
1159+ </FileConfiguration>
4241160 </File>
4251161 <File
4261162 RelativePath=".\strtoIxL.c"
4271163 >
1164+ <FileConfiguration
1165+ Name="Debug|Win32"
1166+ ExcludedFromBuild="true"
1167+ >
1168+ <Tool
1169+ Name="VCCLCompilerTool"
1170+ />
1171+ </FileConfiguration>
1172+ <FileConfiguration
1173+ Name="Debug|x64"
1174+ ExcludedFromBuild="true"
1175+ >
1176+ <Tool
1177+ Name="VCCLCompilerTool"
1178+ />
1179+ </FileConfiguration>
1180+ <FileConfiguration
1181+ Name="Release|Win32"
1182+ ExcludedFromBuild="true"
1183+ >
1184+ <Tool
1185+ Name="VCCLCompilerTool"
1186+ />
1187+ </FileConfiguration>
1188+ <FileConfiguration
1189+ Name="Release|x64"
1190+ ExcludedFromBuild="true"
1191+ >
1192+ <Tool
1193+ Name="VCCLCompilerTool"
1194+ />
1195+ </FileConfiguration>
4281196 </File>
4291197 <File
4301198 RelativePath=".\strtopd.c"
4311199 >
1200+ <FileConfiguration
1201+ Name="Debug|Win32"
1202+ ExcludedFromBuild="true"
1203+ >
1204+ <Tool
1205+ Name="VCCLCompilerTool"
1206+ />
1207+ </FileConfiguration>
1208+ <FileConfiguration
1209+ Name="Debug|x64"
1210+ ExcludedFromBuild="true"
1211+ >
1212+ <Tool
1213+ Name="VCCLCompilerTool"
1214+ />
1215+ </FileConfiguration>
1216+ <FileConfiguration
1217+ Name="Release|Win32"
1218+ ExcludedFromBuild="true"
1219+ >
1220+ <Tool
1221+ Name="VCCLCompilerTool"
1222+ />
1223+ </FileConfiguration>
1224+ <FileConfiguration
1225+ Name="Release|x64"
1226+ ExcludedFromBuild="true"
1227+ >
1228+ <Tool
1229+ Name="VCCLCompilerTool"
1230+ />
1231+ </FileConfiguration>
4321232 </File>
4331233 <File
4341234 RelativePath=".\strtopdd.c"
4351235 >
1236+ <FileConfiguration
1237+ Name="Debug|Win32"
1238+ ExcludedFromBuild="true"
1239+ >
1240+ <Tool
1241+ Name="VCCLCompilerTool"
1242+ />
1243+ </FileConfiguration>
1244+ <FileConfiguration
1245+ Name="Debug|x64"
1246+ ExcludedFromBuild="true"
1247+ >
1248+ <Tool
1249+ Name="VCCLCompilerTool"
1250+ />
1251+ </FileConfiguration>
1252+ <FileConfiguration
1253+ Name="Release|Win32"
1254+ ExcludedFromBuild="true"
1255+ >
1256+ <Tool
1257+ Name="VCCLCompilerTool"
1258+ />
1259+ </FileConfiguration>
1260+ <FileConfiguration
1261+ Name="Release|x64"
1262+ ExcludedFromBuild="true"
1263+ >
1264+ <Tool
1265+ Name="VCCLCompilerTool"
1266+ />
1267+ </FileConfiguration>
4361268 </File>
4371269 <File
4381270 RelativePath=".\strtopf.c"
4391271 >
1272+ <FileConfiguration
1273+ Name="Debug|Win32"
1274+ ExcludedFromBuild="true"
1275+ >
1276+ <Tool
1277+ Name="VCCLCompilerTool"
1278+ />
1279+ </FileConfiguration>
1280+ <FileConfiguration
1281+ Name="Debug|x64"
1282+ ExcludedFromBuild="true"
1283+ >
1284+ <Tool
1285+ Name="VCCLCompilerTool"
1286+ />
1287+ </FileConfiguration>
1288+ <FileConfiguration
1289+ Name="Release|Win32"
1290+ ExcludedFromBuild="true"
1291+ >
1292+ <Tool
1293+ Name="VCCLCompilerTool"
1294+ />
1295+ </FileConfiguration>
1296+ <FileConfiguration
1297+ Name="Release|x64"
1298+ ExcludedFromBuild="true"
1299+ >
1300+ <Tool
1301+ Name="VCCLCompilerTool"
1302+ />
1303+ </FileConfiguration>
4401304 </File>
4411305 <File
4421306 RelativePath=".\strtopQ.c"
4431307 >
1308+ <FileConfiguration
1309+ Name="Debug|Win32"
1310+ ExcludedFromBuild="true"
1311+ >
1312+ <Tool
1313+ Name="VCCLCompilerTool"
1314+ />
1315+ </FileConfiguration>
1316+ <FileConfiguration
1317+ Name="Debug|x64"
1318+ ExcludedFromBuild="true"
1319+ >
1320+ <Tool
1321+ Name="VCCLCompilerTool"
1322+ />
1323+ </FileConfiguration>
1324+ <FileConfiguration
1325+ Name="Release|Win32"
1326+ ExcludedFromBuild="true"
1327+ >
1328+ <Tool
1329+ Name="VCCLCompilerTool"
1330+ />
1331+ </FileConfiguration>
1332+ <FileConfiguration
1333+ Name="Release|x64"
1334+ ExcludedFromBuild="true"
1335+ >
1336+ <Tool
1337+ Name="VCCLCompilerTool"
1338+ />
1339+ </FileConfiguration>
4441340 </File>
4451341 <File
4461342 RelativePath=".\strtopx.c"
4471343 >
1344+ <FileConfiguration
1345+ Name="Debug|Win32"
1346+ ExcludedFromBuild="true"
1347+ >
1348+ <Tool
1349+ Name="VCCLCompilerTool"
1350+ />
1351+ </FileConfiguration>
1352+ <FileConfiguration
1353+ Name="Debug|x64"
1354+ ExcludedFromBuild="true"
1355+ >
1356+ <Tool
1357+ Name="VCCLCompilerTool"
1358+ />
1359+ </FileConfiguration>
1360+ <FileConfiguration
1361+ Name="Release|Win32"
1362+ ExcludedFromBuild="true"
1363+ >
1364+ <Tool
1365+ Name="VCCLCompilerTool"
1366+ />
1367+ </FileConfiguration>
1368+ <FileConfiguration
1369+ Name="Release|x64"
1370+ ExcludedFromBuild="true"
1371+ >
1372+ <Tool
1373+ Name="VCCLCompilerTool"
1374+ />
1375+ </FileConfiguration>
4481376 </File>
4491377 <File
4501378 RelativePath=".\strtopxL.c"
4511379 >
1380+ <FileConfiguration
1381+ Name="Debug|Win32"
1382+ ExcludedFromBuild="true"
1383+ >
1384+ <Tool
1385+ Name="VCCLCompilerTool"
1386+ />
1387+ </FileConfiguration>
1388+ <FileConfiguration
1389+ Name="Debug|x64"
1390+ ExcludedFromBuild="true"
1391+ >
1392+ <Tool
1393+ Name="VCCLCompilerTool"
1394+ />
1395+ </FileConfiguration>
1396+ <FileConfiguration
1397+ Name="Release|Win32"
1398+ ExcludedFromBuild="true"
1399+ >
1400+ <Tool
1401+ Name="VCCLCompilerTool"
1402+ />
1403+ </FileConfiguration>
1404+ <FileConfiguration
1405+ Name="Release|x64"
1406+ ExcludedFromBuild="true"
1407+ >
1408+ <Tool
1409+ Name="VCCLCompilerTool"
1410+ />
1411+ </FileConfiguration>
4521412 </File>
4531413 <File
4541414 RelativePath=".\strtord.c"
4551415 >
1416+ <FileConfiguration
1417+ Name="Debug|Win32"
1418+ ExcludedFromBuild="true"
1419+ >
1420+ <Tool
1421+ Name="VCCLCompilerTool"
1422+ />
1423+ </FileConfiguration>
1424+ <FileConfiguration
1425+ Name="Debug|x64"
1426+ ExcludedFromBuild="true"
1427+ >
1428+ <Tool
1429+ Name="VCCLCompilerTool"
1430+ />
1431+ </FileConfiguration>
1432+ <FileConfiguration
1433+ Name="Release|Win32"
1434+ ExcludedFromBuild="true"
1435+ >
1436+ <Tool
1437+ Name="VCCLCompilerTool"
1438+ />
1439+ </FileConfiguration>
1440+ <FileConfiguration
1441+ Name="Release|x64"
1442+ ExcludedFromBuild="true"
1443+ >
1444+ <Tool
1445+ Name="VCCLCompilerTool"
1446+ />
1447+ </FileConfiguration>
4561448 </File>
4571449 <File
4581450 RelativePath=".\strtordd.c"
4591451 >
1452+ <FileConfiguration
1453+ Name="Debug|Win32"
1454+ ExcludedFromBuild="true"
1455+ >
1456+ <Tool
1457+ Name="VCCLCompilerTool"
1458+ />
1459+ </FileConfiguration>
1460+ <FileConfiguration
1461+ Name="Debug|x64"
1462+ ExcludedFromBuild="true"
1463+ >
1464+ <Tool
1465+ Name="VCCLCompilerTool"
1466+ />
1467+ </FileConfiguration>
1468+ <FileConfiguration
1469+ Name="Release|Win32"
1470+ ExcludedFromBuild="true"
1471+ >
1472+ <Tool
1473+ Name="VCCLCompilerTool"
1474+ />
1475+ </FileConfiguration>
1476+ <FileConfiguration
1477+ Name="Release|x64"
1478+ ExcludedFromBuild="true"
1479+ >
1480+ <Tool
1481+ Name="VCCLCompilerTool"
1482+ />
1483+ </FileConfiguration>
4601484 </File>
4611485 <File
4621486 RelativePath=".\strtorf.c"
4631487 >
1488+ <FileConfiguration
1489+ Name="Debug|Win32"
1490+ ExcludedFromBuild="true"
1491+ >
1492+ <Tool
1493+ Name="VCCLCompilerTool"
1494+ />
1495+ </FileConfiguration>
1496+ <FileConfiguration
1497+ Name="Debug|x64"
1498+ ExcludedFromBuild="true"
1499+ >
1500+ <Tool
1501+ Name="VCCLCompilerTool"
1502+ />
1503+ </FileConfiguration>
1504+ <FileConfiguration
1505+ Name="Release|Win32"
1506+ ExcludedFromBuild="true"
1507+ >
1508+ <Tool
1509+ Name="VCCLCompilerTool"
1510+ />
1511+ </FileConfiguration>
1512+ <FileConfiguration
1513+ Name="Release|x64"
1514+ ExcludedFromBuild="true"
1515+ >
1516+ <Tool
1517+ Name="VCCLCompilerTool"
1518+ />
1519+ </FileConfiguration>
4641520 </File>
4651521 <File
4661522 RelativePath=".\strtorQ.c"
4671523 >
1524+ <FileConfiguration
1525+ Name="Debug|Win32"
1526+ ExcludedFromBuild="true"
1527+ >
1528+ <Tool
1529+ Name="VCCLCompilerTool"
1530+ />
1531+ </FileConfiguration>
1532+ <FileConfiguration
1533+ Name="Debug|x64"
1534+ ExcludedFromBuild="true"
1535+ >
1536+ <Tool
1537+ Name="VCCLCompilerTool"
1538+ />
1539+ </FileConfiguration>
1540+ <FileConfiguration
1541+ Name="Release|Win32"
1542+ ExcludedFromBuild="true"
1543+ >
1544+ <Tool
1545+ Name="VCCLCompilerTool"
1546+ />
1547+ </FileConfiguration>
1548+ <FileConfiguration
1549+ Name="Release|x64"
1550+ ExcludedFromBuild="true"
1551+ >
1552+ <Tool
1553+ Name="VCCLCompilerTool"
1554+ />
1555+ </FileConfiguration>
4681556 </File>
4691557 <File
4701558 RelativePath=".\strtorx.c"
4711559 >
1560+ <FileConfiguration
1561+ Name="Debug|Win32"
1562+ ExcludedFromBuild="true"
1563+ >
1564+ <Tool
1565+ Name="VCCLCompilerTool"
1566+ />
1567+ </FileConfiguration>
1568+ <FileConfiguration
1569+ Name="Debug|x64"
1570+ ExcludedFromBuild="true"
1571+ >
1572+ <Tool
1573+ Name="VCCLCompilerTool"
1574+ />
1575+ </FileConfiguration>
1576+ <FileConfiguration
1577+ Name="Release|Win32"
1578+ ExcludedFromBuild="true"
1579+ >
1580+ <Tool
1581+ Name="VCCLCompilerTool"
1582+ />
1583+ </FileConfiguration>
1584+ <FileConfiguration
1585+ Name="Release|x64"
1586+ ExcludedFromBuild="true"
1587+ >
1588+ <Tool
1589+ Name="VCCLCompilerTool"
1590+ />
1591+ </FileConfiguration>
4721592 </File>
4731593 <File
4741594 RelativePath=".\strtorxL.c"
4751595 >
1596+ <FileConfiguration
1597+ Name="Debug|Win32"
1598+ ExcludedFromBuild="true"
1599+ >
1600+ <Tool
1601+ Name="VCCLCompilerTool"
1602+ />
1603+ </FileConfiguration>
1604+ <FileConfiguration
1605+ Name="Debug|x64"
1606+ ExcludedFromBuild="true"
1607+ >
1608+ <Tool
1609+ Name="VCCLCompilerTool"
1610+ />
1611+ </FileConfiguration>
1612+ <FileConfiguration
1613+ Name="Release|Win32"
1614+ ExcludedFromBuild="true"
1615+ >
1616+ <Tool
1617+ Name="VCCLCompilerTool"
1618+ />
1619+ </FileConfiguration>
1620+ <FileConfiguration
1621+ Name="Release|x64"
1622+ ExcludedFromBuild="true"
1623+ >
1624+ <Tool
1625+ Name="VCCLCompilerTool"
1626+ />
1627+ </FileConfiguration>
4761628 </File>
4771629 <File
4781630 RelativePath=".\sum.c"
4791631 >
1632+ <FileConfiguration
1633+ Name="Debug|Win32"
1634+ ExcludedFromBuild="true"
1635+ >
1636+ <Tool
1637+ Name="VCCLCompilerTool"
1638+ />
1639+ </FileConfiguration>
1640+ <FileConfiguration
1641+ Name="Debug|x64"
1642+ ExcludedFromBuild="true"
1643+ >
1644+ <Tool
1645+ Name="VCCLCompilerTool"
1646+ />
1647+ </FileConfiguration>
1648+ <FileConfiguration
1649+ Name="Release|Win32"
1650+ ExcludedFromBuild="true"
1651+ >
1652+ <Tool
1653+ Name="VCCLCompilerTool"
1654+ />
1655+ </FileConfiguration>
1656+ <FileConfiguration
1657+ Name="Release|x64"
1658+ ExcludedFromBuild="true"
1659+ >
1660+ <Tool
1661+ Name="VCCLCompilerTool"
1662+ />
1663+ </FileConfiguration>
4801664 </File>
4811665 <File
4821666 RelativePath=".\ulp.c"
4831667 >
1668+ <FileConfiguration
1669+ Name="Debug|Win32"
1670+ ExcludedFromBuild="true"
1671+ >
1672+ <Tool
1673+ Name="VCCLCompilerTool"
1674+ />
1675+ </FileConfiguration>
1676+ <FileConfiguration
1677+ Name="Debug|x64"
1678+ ExcludedFromBuild="true"
1679+ >
1680+ <Tool
1681+ Name="VCCLCompilerTool"
1682+ />
1683+ </FileConfiguration>
1684+ <FileConfiguration
1685+ Name="Release|Win32"
1686+ ExcludedFromBuild="true"
1687+ >
1688+ <Tool
1689+ Name="VCCLCompilerTool"
1690+ />
1691+ </FileConfiguration>
1692+ <FileConfiguration
1693+ Name="Release|x64"
1694+ ExcludedFromBuild="true"
1695+ >
1696+ <Tool
1697+ Name="VCCLCompilerTool"
1698+ />
1699+ </FileConfiguration>
4841700 </File>
4851701 </Filter>
4861702 <Filter
diff -r 3f692a003efe -r d85c64ff2914 gdtoa/gdtoaimp.h
--- a/gdtoa/gdtoaimp.h Sun Aug 02 21:28:50 2015 +0200
+++ b/gdtoa/gdtoaimp.h Sun Aug 02 21:43:36 2015 +0200
@@ -630,7 +630,7 @@
630630 extern Bigint *set_ones ANSI((Bigint*, int));
631631 extern char *strcp ANSI((char*, const char*));
632632 extern int strtoIg ANSI((CONST char*, char**, FPI*, Long*, Bigint**, int*));
633- extern double strtod ANSI((const char *s00, char **se));
633+// extern double strtod ANSI((const char *s00, char **se));
634634 extern Bigint *sum ANSI((Bigint*, Bigint*));
635635 extern int trailz ANSI((Bigint*));
636636 extern double ulp ANSI((U*));
diff -r 3f692a003efe -r d85c64ff2914 src/c_console.cpp
--- a/src/c_console.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/c_console.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -42,6 +42,7 @@
4242
4343 #include "version.h"
4444 #include "g_game.h"
45+#include "c_bind.h"
4546 #include "c_console.h"
4647 #include "c_cvars.h"
4748 #include "c_dispatch.h"
@@ -1946,6 +1947,12 @@
19461947 break;
19471948
19481949 case '`':
1950+ // Check to see if we have ` bound to the console before accepting
1951+ // it as a way to close the console.
1952+ if (Bindings.GetBinding(KEY_GRAVE).CompareNoCase("toggleconsole"))
1953+ {
1954+ break;
1955+ }
19491956 case GK_ESCAPE:
19501957 // Close console and clear command line. But if we're in the
19511958 // fullscreen console mode, there's nothing to fall back on
diff -r 3f692a003efe -r d85c64ff2914 src/d_main.cpp
--- a/src/d_main.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/d_main.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -2204,19 +2204,23 @@
22042204 // Try looking for the wad in the same directory as the .wad
22052205 // before looking for it in the current directory.
22062206
2207+ FString checkpath;
22072208 if (lastSlash != NULL)
22082209 {
2209- FString checkpath(fn, (lastSlash - fn) + 1);
2210+ checkpath = FString(fn, (lastSlash - fn) + 1);
22102211 checkpath += sc.String;
2211-
2212- if (!FileExists (checkpath))
2213- {
2214- pos += D_AddFile(pwads, sc.String, true, pos);
2215- }
2216- else
2217- {
2218- pos += D_AddFile(pwads, checkpath, true, pos);
2219- }
2212+ }
2213+ else
2214+ {
2215+ checkpath = sc.String;
2216+ }
2217+ if (!FileExists(checkpath))
2218+ {
2219+ pos += D_AddFile(pwads, sc.String, true, pos);
2220+ }
2221+ else
2222+ {
2223+ pos += D_AddFile(pwads, checkpath, true, pos);
22202224 }
22212225 }
22222226 while (sc.CheckToken(','));
diff -r 3f692a003efe -r d85c64ff2914 src/d_netinfo.cpp
--- a/src/d_netinfo.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/d_netinfo.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -1410,7 +1410,7 @@
14101410 val.String = CleanseString(value.LockBuffer());
14111411 (*cvar_ptr)->SetGenericRep(val, CVAR_String);
14121412 value.UnlockBuffer();
1413- if (keyname == NAME_Name && update && oldname != value)
1413+ if (keyname == NAME_Name && update && oldname.Compare (value))
14141414 {
14151415 // [BB] Added "\\c-"
14161416 Printf("%s \\c-is now known as %s\n", oldname.GetChars(), value.GetChars());
diff -r 3f692a003efe -r d85c64ff2914 src/doomdef.h
--- a/src/doomdef.h Sun Aug 02 21:28:50 2015 +0200
+++ b/src/doomdef.h Sun Aug 02 21:43:36 2015 +0200
@@ -137,6 +137,7 @@
137137 #define KEY_F10 0x44 // DIK_F10
138138 #define KEY_F11 0x57 // DIK_F11
139139 #define KEY_F12 0x58 // DIK_F12
140+#define KEY_GRAVE 0x29 // DIK_GRAVE
140141
141142 #define KEY_BACKSPACE 0x0e // DIK_BACK
142143
diff -r 3f692a003efe -r d85c64ff2914 src/g_strife/a_entityboss.cpp
--- a/src/g_strife/a_entityboss.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/g_strife/a_entityboss.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -103,7 +103,7 @@
103103
104104 fixed_t SpawnX = spot->x;
105105 fixed_t SpawnY = spot->y;
106- fixed_t SpawnZ = spot->z + self->tracer? 70*FRACUNIT : 0;
106+ fixed_t SpawnZ = spot->z + (self->tracer? 70*FRACUNIT : 0);
107107
108108 an = self->angle >> ANGLETOFINESHIFT;
109109 second = Spawn("EntitySecond", SpawnX + FixedMul (secondRadius, finecosine[an]),
diff -r 3f692a003efe -r d85c64ff2914 src/menu/playermenu.cpp
--- a/src/menu/playermenu.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/menu/playermenu.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -1030,7 +1030,10 @@
10301030 // item specific handling comes here
10311031
10321032 case NAME_Playerbox:
1033- PlayerNameChanged(li);
1033+ if (mkey == MKEY_Input)
1034+ {
1035+ PlayerNameChanged(li);
1036+ }
10341037 break;
10351038
10361039 case NAME_Team:
diff -r 3f692a003efe -r d85c64ff2914 src/p_acs.cpp
--- a/src/p_acs.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/p_acs.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -4752,6 +4752,8 @@
47524752 ACSF_CheckFont,
47534753 ACSF_DropItem,
47544754 ACSF_CheckFlag,
4755+ ACSF_SetLineActivation,
4756+ ACSF_GetLineActivation,
47554757
47564758 // [BB] Skulltag functions
47574759 ACSF_ResetMap = 100,
@@ -5826,6 +5828,26 @@
58265828 break;
58275829 }
58285830
5831+ case ACSF_SetLineActivation:
5832+ if (argCount >= 2)
5833+ {
5834+ int line = -1;
5835+
5836+ while ((line = P_FindLineFromID(args[0], line)) >= 0)
5837+ {
5838+ lines[line].activation = args[1];
5839+ }
5840+ }
5841+ break;
5842+
5843+ case ACSF_GetLineActivation:
5844+ if (argCount > 0)
5845+ {
5846+ int line = P_FindLineFromID(args[0], -1);
5847+ return line >= 0 ? lines[line].activation : 0;
5848+ }
5849+ break;
5850+
58295851 // [BL] Skulltag function
58305852 case ACSF_AnnouncerSound:
58315853 if (args[1] == 0)
diff -r 3f692a003efe -r d85c64ff2914 src/p_conversation.cpp
--- a/src/p_conversation.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/p_conversation.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -655,7 +655,14 @@
655655 item->Amount -= amount;
656656 if (item->Amount <= 0)
657657 {
658- item->Destroy ();
658+ if (item->ItemFlags & IF_KEEPDEPLETED)
659+ {
660+ item->Amount = 0;
661+ }
662+ else
663+ {
664+ item->Destroy ();
665+ }
659666 }
660667 }
661668 }
diff -r 3f692a003efe -r d85c64ff2914 src/p_mobj.cpp
--- a/src/p_mobj.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/p_mobj.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -6051,6 +6051,12 @@
60516051 if (defaults->SpawnState == NULL ||
60526052 sprites[defaults->SpawnState->sprite].numframes == 0)
60536053 {
6054+ // We don't load mods for shareware games so we'll just ignore
6055+ // missing actors. Heretic needs this since the shareware includes
6056+ // the retail weapons in Deathmatch.
6057+ if (gameinfo.flags & GI_SHAREWARE)
6058+ return NULL;
6059+
60546060 Printf ("%s at (%i, %i) has no frames\n",
60556061 i->TypeName.GetChars(), mthing->x>>FRACBITS, mthing->y>>FRACBITS);
60566062 i = PClass::FindClass("Unknown");
@@ -6728,7 +6734,7 @@
67286734 }
67296735 }
67306736 planez = rover->bottom.plane->ZatPoint(x, y);
6731- if (planez < z) return false;
6737+ if (planez < z && !(planez < thing->floorz)) return false;
67326738 }
67336739 #endif
67346740 hsec = sec->GetHeightSec();
diff -r 3f692a003efe -r d85c64ff2914 src/r_plane.cpp
--- a/src/r_plane.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/r_plane.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -613,8 +613,7 @@
613613 // same visplane, then only the floor sky will be drawn.
614614 plane.c = height.c;
615615 plane.ic = height.ic;
616- isskybox = skybox != NULL && !skybox->bInSkybox &&
617- (skybox->bAlways || picnum == skyflatnum);
616+ isskybox = skybox != NULL && !skybox->bInSkybox;
618617 }
619618 else if (skybox != NULL && skybox->bAlways && !skybox->bInSkybox)
620619 {
diff -r 3f692a003efe -r d85c64ff2914 src/sdl/i_joystick.cpp
--- a/src/sdl/i_joystick.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/sdl/i_joystick.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -1,8 +1,12 @@
11 #include <SDL_joystick.h>
22
33 #include "doomdef.h"
4+#include "templates.h"
45 #include "m_joy.h"
56
7+// Very small deadzone so that floating point magic doesn't happen
8+#define MIN_DEADZONE 0.000001f
9+
610 class SDLInputJoystick: public IJoystickConfig
711 {
812 public:
@@ -65,7 +69,7 @@
6569
6670 void SetAxisDeadZone(int axis, float zone)
6771 {
68- Axes[axis].DeadZone = zone;
72+ Axes[axis].DeadZone = clamp(zone, MIN_DEADZONE, 1.f);
6973 }
7074 void SetAxisMap(int axis, EJoyAxis gameaxis)
7175 {
@@ -83,7 +87,7 @@
8387 }
8488 bool IsAxisDeadZoneDefault(int axis)
8589 {
86- return Axes[axis].DeadZone == 0.0f;
90+ return Axes[axis].DeadZone <= MIN_DEADZONE;
8791 }
8892 bool IsAxisMapDefault(int axis)
8993 {
@@ -105,7 +109,7 @@
105109 info.Name.Format("Axis %d", i+1);
106110 else
107111 info.Name.Format("Hat %d (%c)", (i-NumAxes)/2 + 1, (i-NumAxes)%2 == 0 ? 'x' : 'y');
108- info.DeadZone = 0.0f;
112+ info.DeadZone = MIN_DEADZONE;
109113 info.Multiplier = 1.0f;
110114 info.Value = 0.0;
111115 info.ButtonValue = 0;
@@ -141,7 +145,7 @@
141145 {
142146 buttonstate = 0;
143147
144- Axes[i].Value = SDL_JoystickGetAxis(Device, i)/32768.0;
148+ Axes[i].Value = SDL_JoystickGetAxis(Device, i)/32767.0;
145149 Axes[i].Value = Joy_RemoveDeadZone(Axes[i].Value, Axes[i].DeadZone, &buttonstate);
146150
147151 // Map button to axis
diff -r 3f692a003efe -r d85c64ff2914 src/sound/fmodsound.cpp
--- a/src/sound/fmodsound.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/sound/fmodsound.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -66,7 +66,7 @@
6666 #include "cmdlib.h"
6767 #include "s_sound.h"
6868
69-#if FMOD_VERSION > 0x42899 && FMOD_VERSION < 0x43800
69+#if FMOD_VERSION > 0x42899 && FMOD_VERSION < 0x43600
7070 #error You are trying to compile with an unsupported version of FMOD.
7171 #endif
7272
@@ -865,7 +865,7 @@
865865 result = Sys->setDriver(driver);
866866 }
867867 result = Sys->getDriver(&driver);
868-#if FMOD_VERSION >= 0x43700
868+#if FMOD_VERSION >= 0x43600
869869 // We were built with an FMOD that only returns the control panel frequency
870870 result = Sys->getDriverCaps(driver, &Driver_Caps, &Driver_MinFrequency, &speakermode);
871871 Driver_MaxFrequency = Driver_MinFrequency;
@@ -1055,7 +1055,7 @@
10551055 }
10561056
10571057 // Create DSP units for underwater effect
1058-#if FMOD_VERSION < 0x43701
1058+#if FMOD_VERSION < 0x43600
10591059 result = Sys->createDSPByType(FMOD_DSP_TYPE_LOWPASS, &WaterLP);
10601060 if (result != FMOD_OK)
10611061 {
@@ -1118,7 +1118,7 @@
11181118 WaterLP->setActive(false);
11191119 WaterLP->setParameter(FMOD_DSP_LOWPASS_CUTOFF, snd_waterlp);
11201120 WaterLP->setParameter(FMOD_DSP_LOWPASS_RESONANCE, 2);
1121-#if FMOD_VERSION < 0x43701
1121+#if FMOD_VERSION < 0x43600
11221122 if (WaterReverb != NULL)
11231123 {
11241124 FMOD::DSPConnection *dry;
diff -r 3f692a003efe -r d85c64ff2914 src/thingdef/thingdef_codeptr.cpp
--- a/src/thingdef/thingdef_codeptr.cpp Sun Aug 02 21:28:50 2015 +0200
+++ b/src/thingdef/thingdef_codeptr.cpp Sun Aug 02 21:43:36 2015 +0200
@@ -2838,7 +2838,8 @@
28382838 ACTION_PARAM_STRING(text, 0);
28392839
28402840 if (text[0] == '$') text = GStrings(text+1);
2841- Printf("%s\n", text);
2841+ FString formatted = strbin1(text);
2842+ Printf("%s\n", formatted.GetChars());
28422843 ACTION_SET_RESULT(false); // Prints should never set the result for inventory state chains!
28432844 }
28442845
diff -r 3f692a003efe -r d85c64ff2914 wadsrc/static/mapinfo/hereticsw.txt
--- a/wadsrc/static/mapinfo/hereticsw.txt Sun Aug 02 21:28:50 2015 +0200
+++ b/wadsrc/static/mapinfo/hereticsw.txt Sun Aug 02 21:43:36 2015 +0200
@@ -4,5 +4,6 @@
44 {
55 finalepage = "ORDER"
66 infopage = "ORDER", "HELP1", "HELP2", "CREDIT"
7+ borderflat = "FLOOR04"
78 }
89