commit e20874a9aa4a5d25ae6608536a56d549b82b3dc9
Author: James Haley <haleyjd@hotmail.com>
AuthorDate: Sat Feb 9 18:18:26 2013 +0000
Commit: James Haley <haleyjd@hotmail.com>
CommitDate: Sat Feb 9 18:18:26 2013 +0000
* Update MSVC project file
* Add /msvc/strfsav* and *.pcx to ignore list
* Fix for Strife crushAndRaise, silentCrushAndRaise types identified by
Gez and verified with the disassembly - these types do not inflict
crushing damage in Strife.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2558
---
msvc/.gitignore | 2 ++
msvc/libtextscreen.vcproj | 12 ++++++++++++
msvc/strife.vcproj | 24 ++++++++++++++++--------
src/strife/p_ceilng.c | 6 +++++-
4 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/msvc/.gitignore b/msvc/.gitignore
index ae21ee43..47e8226e 100644
--- a/msvc/.gitignore
+++ b/msvc/.gitignore
@@ -3,3 +3,5 @@
*.suo
*.user
savegames
+strfsav*
+*.pcx
diff --git a/msvc/libtextscreen.vcproj b/msvc/libtextscreen.vcproj
index fc68d46a..3489cd77 100644
--- a/msvc/libtextscreen.vcproj
+++ b/msvc/libtextscreen.vcproj
@@ -214,6 +214,10 @@
RelativePath="..\textscreen\txt_table.c"
>
</File>
+ <File
+ RelativePath="..\textscreen\txt_utf8.c"
+ >
+ </File>
<File
RelativePath="..\textscreen\txt_widget.c"
>
@@ -272,6 +276,10 @@
RelativePath="..\textscreen\txt_label.h"
>
</File>
+ <File
+ RelativePath="..\textscreen\txt_largefont.h"
+ >
+ </File>
<File
RelativePath="..\textscreen\txt_main.h"
>
@@ -300,6 +308,10 @@
RelativePath="..\textscreen\txt_table.h"
>
</File>
+ <File
+ RelativePath="..\textscreen\txt_utf8.h"
+ >
+ </File>
<File
RelativePath="..\textscreen\txt_widget.h"
>
diff --git a/msvc/strife.vcproj b/msvc/strife.vcproj
index df74ab9d..34f7a143 100644
--- a/msvc/strife.vcproj
+++ b/msvc/strife.vcproj
@@ -192,6 +192,10 @@
<Filter
Name="Header Files"
>
+ <File
+ RelativePath="..\src\aes_prng.h"
+ >
+ </File>
<File
RelativePath="..\src\d_event.h"
>
@@ -304,10 +308,6 @@
RelativePath="..\src\m_misc.h"
>
</File>
- <File
- RelativePath="..\src\md5.h"
- >
- </File>
<File
RelativePath="..\src\memio.h"
>
@@ -368,6 +368,10 @@
RelativePath="..\src\net_structrw.h"
>
</File>
+ <File
+ RelativePath="..\src\sha1.h"
+ >
+ </File>
<File
RelativePath="..\src\tables.h"
>
@@ -620,6 +624,10 @@
<Filter
Name="Source Files"
>
+ <File
+ RelativePath="..\src\aes_prng.c"
+ >
+ </File>
<File
RelativePath="..\src\d_event.c"
>
@@ -740,10 +748,6 @@
RelativePath="..\src\m_misc.c"
>
</File>
- <File
- RelativePath="..\src\md5.c"
- >
- </File>
<File
RelativePath="..\src\memio.c"
>
@@ -800,6 +804,10 @@
RelativePath="..\src\net_structrw.c"
>
</File>
+ <File
+ RelativePath="..\src\sha1.c"
+ >
+ </File>
<File
RelativePath="..\src\tables.c"
>
diff --git a/src/strife/p_ceilng.c b/src/strife/p_ceilng.c
index ec07eeaf..fce4dce2 100644
--- a/src/strife/p_ceilng.c
+++ b/src/strife/p_ceilng.c
@@ -169,6 +169,7 @@ void T_MoveCeiling (ceiling_t* ceiling)
// * Fast crushers were made 2x as fast.
// * lowerAndCrush was apparently "fixed" to actually crush, and was also
// altered to lower all the way to the floor rather than remain 8 above.
+// * silentCrushAndRaise and crushAndRaise no longer crush.
int
EV_DoCeiling
( line_t* line,
@@ -231,7 +232,10 @@ EV_DoCeiling
case silentCrushAndRaise:
case crushAndRaise:
- ceiling->crush = true;
+ // [STRIFE] haleyjd 20130209: Turns out these types do NOT crush
+ // in Strife... yeah, that makes a lot of sense. Thanks to Gez for
+ // having detected this difference.
+ //ceiling->crush = true;
ceiling->topheight = sec->ceilingheight;
case lowerToFloor: