diff --git a/src/p_slopes.c b/src/p_slopes.c
index f8a2752c2..6393ca4b5 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -90,7 +90,7 @@ static void P_ReconfigureVertexSlope(pslope_t *slope)
// Get angles
slope->xydirection = R_PointToAngle2(0, 0, slope->d.x, slope->d.y)+ANGLE_180;
- slope->zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta))-1;
+ slope->zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta));
}
}
diff --git a/src/r_bsp.h b/src/r_bsp.h
index 97b8c2e8c..e871b5dde 100644
--- a/src/r_bsp.h
+++ b/src/r_bsp.h
@@ -33,8 +33,6 @@ extern drawseg_t *drawsegs;
extern drawseg_t *ds_p;
extern INT32 doorclosed;
-typedef void (*drawfunc_t)(INT32 start, INT32 stop);
-
// BSP?
void R_ClearClipSegs(void);
void R_PortalClearClipSegs(INT32 start, INT32 end);
diff --git a/src/r_plane.h b/src/r_plane.h
index 64b339d04..8730bcefd 100644
--- a/src/r_plane.h
+++ b/src/r_plane.h
@@ -73,7 +73,6 @@ extern visplane_t *ceilingplane;
// Visplane related.
extern INT16 *lastopening, *openings;
extern size_t maxopenings;
-typedef void (*planefunction_t)(INT32 top, INT32 bottom);
extern INT16 floorclip[MAXVIDWIDTH], ceilingclip[MAXVIDWIDTH];
extern fixed_t frontscale[MAXVIDWIDTH], yslopetab[MAXVIDHEIGHT*4];
diff --git a/src/r_segs.c b/src/r_segs.c
index 9faee429b..11b4c8aef 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -2480,7 +2480,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ds_p->maskedtexturecol = ds_p->thicksidecol;
#ifdef ESLOPE
- maskedtextureheight = &(ds_p->maskedtextureheight[0]); // ????
+ maskedtextureheight = ds_p->maskedtextureheight; // note to red, this == &(ds_p->maskedtextureheight[0])
// Set midtexture starting height
if (linedef->flags & ML_EFFECT2) { // Ignore slopes when texturing
diff --git a/src/sdl/SRB2SDL.props b/src/sdl/SRB2SDL_common.props
similarity index 100%
rename from src/sdl/SRB2SDL.props
rename to src/sdl/SRB2SDL_common.props
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj
index 5d564969b..452b47ed1 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj
+++ b/src/sdl/Srb2SDL-vc10.vcxproj
@@ -5,14 +5,14 @@
Debug
Win32
-
- Debug
- x64
-
Release
Win32
+
+ Debug
+ x64
+
Release
x64
@@ -24,30 +24,25 @@
Win32Proj
Srb2SDL
8.1
- Srb2SDL
+ Srb2Win
-
- Application
- false
+
v140
- true
- Application
- false
- v140
+ true
-
- Application
- false
- v140
+
+ false
true
- Application
- false
- v140
+ true
+
+
+ false
+ true
@@ -59,7 +54,7 @@
-
+
@@ -82,19 +77,6 @@
<_ProjectFileVersion>10.0.30319.1
-
-
- NativeMinimumRules.ruleset
-
-
- NativeMinimumRules.ruleset
- false
-
-
- NativeMinimumRules.ruleset
-
-
- NativeMinimumRules.ruleset
false
@@ -240,18 +222,9 @@
Document
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
+ nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
+ Compiling %(Filename).nas with NASM...
+ $(IntDir)%(Filename).obj;%(Outputs)
true
true
@@ -259,18 +232,9 @@
Document
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
+ nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
+ Compiling %(Filename).nas with NASM...
+ $(IntDir)%(Filename).obj;%(Outputs)
true
true
@@ -278,18 +242,9 @@
Document
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
+ nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
+ Compiling %(Filename).nas with NASM...
+ $(IntDir)%(Filename).obj;%(Outputs)
true
true
@@ -352,10 +307,7 @@
- true
- true
- true
- true
+ true
@@ -404,16 +356,10 @@
- true
- true
- true
- true
+ true
- true
- true
- true
- true
+ true
@@ -428,28 +374,16 @@
- true
- true
- true
- true
+ true
- true
- true
- true
- true
+ true
- true
- true
- true
- true
+ true
- true
- true
- true
- true
+ true
@@ -460,10 +394,7 @@
- true
- true
- true
- true
+ true
diff --git a/src/win32/Srb2win-vc10.vcxproj b/src/win32/Srb2win-vc10.vcxproj
index efa977381..c57c305a4 100644
--- a/src/win32/Srb2win-vc10.vcxproj
+++ b/src/win32/Srb2win-vc10.vcxproj
@@ -19,30 +19,28 @@
+ Srb2DD
{0F554F1D-ED49-4D65-A9A7-F63C57F277BE}
Win32Proj
Srb2win
8.1
- Srb2DD
+
+ v140
+
true
- v140
false
- v140
true
true
- v140
- Application
false
- v140
true
@@ -79,38 +77,10 @@
-
- NativeMinimumRules.ruleset
+
+ <_ProjectFileVersion>10.0.30319.1
false
-
- NativeMinimumRules.ruleset
- false
-
-
- NativeMinimumRules.ruleset
- false
-
-
- NativeMinimumRules.ruleset
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -407,54 +377,27 @@
Document
+ nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
+ Compiling %(Filename).nas with NASM...
+ $(IntDir)%(Filename).obj;%(Outputs)
true
true
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
Document
+ nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
+ Compiling %(Filename).nas with NASM...
+ $(IntDir)%(Filename).obj;%(Outputs)
true
true
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
Document
+ nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
+ Compiling %(Filename).nas with NASM...
+ $(IntDir)%(Filename).obj;%(Outputs)
true
true
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- Compiling %(Filename).nas with NASM...
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)
- $(IntDir)%(Filename).obj;%(Outputs)