diff options
| -rw-r--r-- | msvc/.gitignore | 2 | ||||
| -rw-r--r-- | msvc/libtextscreen.vcproj | 12 | ||||
| -rw-r--r-- | msvc/strife.vcproj | 24 | ||||
| -rw-r--r-- | 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 @@ -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>
@@ -301,6 +309,10 @@ >
</File>
<File
+ RelativePath="..\textscreen\txt_utf8.h"
+ >
+ </File>
+ <File
RelativePath="..\textscreen\txt_widget.h"
>
</File>
diff --git a/msvc/strife.vcproj b/msvc/strife.vcproj index df74ab9d..34f7a143 100644 --- 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>
@@ -801,6 +805,10 @@ >
</File>
<File
+ RelativePath="..\src\sha1.c"
+ >
+ </File>
+ <File
RelativePath="..\src\tables.c"
>
</File>
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: |