• R/O
  • SSH

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

This is a fork of Zandronum for Mac Os (M1 and Intel)


Commit MetaInfo

Revision6c83187561a51979a9683071685522c92e5ed1c8 (tree)
Time2006-09-02 07:09:03
AuthorRandy Heit <rheit@zdoo...>
CommiterRandy Heit

Log Message

- Version bump to 2.1.5.
- Fixed: P_LoadSegs() checked for invalid vertices too late.

SVN r320 (trunk)

Change Summary

Incremental Difference

diff -r 5c4f98fec005 -r 6c83187561a5 docs/rh-log.txt
--- a/docs/rh-log.txt Fri Sep 01 01:52:50 2006 +0000
+++ b/docs/rh-log.txt Fri Sep 01 22:09:03 2006 +0000
@@ -1,3 +1,7 @@
1+September 1, 2006
2+- Version bump to 2.1.5.
3+- Fixed: P_LoadSegs() checked for invalid vertices too late.
4+
15 August 31, 2006
26 - Changed: Starting a new game or reloading an old one reset the chasecam.
37 - Removed the r: ACS print cast. You can do it yourself with s: and an array.
diff -r 5c4f98fec005 -r 6c83187561a5 src/p_setup.cpp
--- a/src/p_setup.cpp Fri Sep 01 01:52:50 2006 +0000
+++ b/src/p_setup.cpp Fri Sep 01 22:09:03 2006 +0000
@@ -816,8 +816,16 @@
816816 int side, linedef;
817817 line_t *ldef;
818818
819- li->v1 = &vertexes[LittleShort(ml->v1)];
820- li->v2 = &vertexes[LittleShort(ml->v2)];
819+ vnum1 = LittleShort(ml->v1);
820+ vnum2 = LittleShort(ml->v2);
821+
822+ if (vnum1 >= numvertexes || vnum2 >= numvertexes)
823+ {
824+ throw i * 4;
825+ }
826+
827+ li->v1 = &vertexes[vnum1];
828+ li->v2 = &vertexes[vnum2];
821829 li->PartnerSeg = NULL;
822830
823831 segangle = (WORD)LittleShort(ml->angle);
@@ -856,14 +864,6 @@
856864 dis = 0;
857865 delta_angle = (abs(ptp_angle-(segangle<<16))>>ANGLETOFINESHIFT)*360/FINEANGLES;
858866
859- vnum1 = li->v1 - vertexes;
860- vnum2 = li->v2 - vertexes;
861-
862- if (vnum1 >= numvertexes || vnum2 >= numvertexes)
863- {
864- throw i * 4;
865- }
866-
867867 if (delta_angle != 0)
868868 {
869869 segangle >>= (ANGLETOFINESHIFT-16);
diff -r 5c4f98fec005 -r 6c83187561a5 src/version.h
--- a/src/version.h Fri Sep 01 01:52:50 2006 +0000
+++ b/src/version.h Fri Sep 01 22:09:03 2006 +0000
@@ -40,13 +40,13 @@
4040
4141 /** Lots of different version numbers **/
4242
43-#define DOTVERSIONSTR_NOREV "2.1.4"
43+#define DOTVERSIONSTR_NOREV "2.1.5"
4444
4545 // The version string the user actually sees.
4646 #define DOTVERSIONSTR DOTVERSIONSTR_NOREV " (r" SVN_REVISION_STRING ")"
4747
4848 // The version as seen in the Windows resource
49-#define RC_FILEVERSION 2,1,4,SVN_REVISION_NUMBER
49+#define RC_FILEVERSION 2,1,5,SVN_REVISION_NUMBER
5050 #define RC_PRODUCTVERSION 2,1,0,0
5151 #define RC_FILEVERSION2 DOTVERSIONSTR
5252 #define RC_PRODUCTVERSION2 "2.1"
@@ -89,7 +89,7 @@
8989 #endif
9090
9191 // MINSAVEVER is the minimum level snapshot version that can be loaded.
92-#define MINSAVEVER 235 // Used by 2.1.2
92+#define MINSAVEVER 235 // Used by 2.1.5
9393
9494 // The maximum length of one save game description for the menus.
9595 #define SAVESTRINGSIZE 24