ref: e20874a9aa4a5d25ae6608536a56d549b82b3dc9
parent: 2bc56af7010e7f40d94dd664b51d86cfd4bd5fc8
author: James Haley <[email protected]>
date: Sat Feb 9 13:18:26 EST 2013
* 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
--- a/msvc/.gitignore
+++ b/msvc/.gitignore
@@ -3,3 +3,5 @@
*.suo
*.user
savegames
+strfsav*
+*.pcx
--- a/msvc/libtextscreen.vcproj
+++ b/msvc/libtextscreen.vcproj
@@ -215,6 +215,10 @@
>
</File>
<File
+ RelativePath="..\textscreen\txt_utf8.c"
+ >
+ </File>
+ <File
RelativePath="..\textscreen\txt_widget.c"
>
</File>
@@ -273,6 +277,10 @@
>
</File>
<File
+ RelativePath="..\textscreen\txt_largefont.h"
+ >
+ </File>
+ <File
RelativePath="..\textscreen\txt_main.h"
>
</File>
@@ -298,6 +306,10 @@
</File>
<File
RelativePath="..\textscreen\txt_table.h"
+ >
+ </File>
+ <File
+ RelativePath="..\textscreen\txt_utf8.h"
>
</File>
<File
--- a/msvc/strife.vcproj
+++ b/msvc/strife.vcproj
@@ -193,6 +193,10 @@
Name="Header Files"
>
<File
+ RelativePath="..\src\aes_prng.h"
+ >
+ </File>
+ <File
RelativePath="..\src\d_event.h"
>
</File>
@@ -305,10 +309,6 @@
>
</File>
<File
- RelativePath="..\src\md5.h"
- >
- </File>
- <File
RelativePath="..\src\memio.h"
>
</File>
@@ -369,6 +369,10 @@
>
</File>
<File
+ RelativePath="..\src\sha1.h"
+ >
+ </File>
+ <File
RelativePath="..\src\tables.h"
>
</File>
@@ -621,6 +625,10 @@
Name="Source Files"
>
<File
+ RelativePath="..\src\aes_prng.c"
+ >
+ </File>
+ <File
RelativePath="..\src\d_event.c"
>
</File>
@@ -741,10 +749,6 @@
>
</File>
<File
- RelativePath="..\src\md5.c"
- >
- </File>
- <File
RelativePath="..\src\memio.c"
>
</File>
@@ -798,6 +802,10 @@
</File>
<File
RelativePath="..\src\net_structrw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\sha1.c"
>
</File>
<File
--- a/src/strife/p_ceilng.c
+++ b/src/strife/p_ceilng.c
@@ -169,6 +169,7 @@
// * 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 @@
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: