diff --git a/src/fragglescript/t_load.cpp b/src/fragglescript/t_load.cpp
index 2d1e49fa51..850d61769e 100644
--- a/src/fragglescript/t_load.cpp
+++ b/src/fragglescript/t_load.cpp
@@ -316,7 +316,7 @@ bool FScriptLoader::ParseInfo(MapData * map)
}
- delete lump;
+ delete[] lump;
return HasScripts;
}
diff --git a/src/p_glnodes.cpp b/src/p_glnodes.cpp
index 8f623486d6..26bd4b1dff 100644
--- a/src/p_glnodes.cpp
+++ b/src/p_glnodes.cpp
@@ -1234,7 +1234,7 @@ static bool CheckCachedNodes(MapData *map)
BYTE md5[16];
BYTE md5map[16];
DWORD numlin;
- DWORD *verts;
+ DWORD *verts = NULL;
FString path = CreateCacheName(map, false);
FILE *f = fopen(path, "rb");
@@ -1298,6 +1298,10 @@ static bool CheckCachedNodes(MapData *map)
return true;
errorout:
+ if (verts != NULL)
+ {
+ delete[] verts;
+ }
fclose(f);
return false;
}
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 3ddd2e259a..340b6df63d 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -3098,7 +3098,6 @@ static void P_GroupLines (bool buildmap)
// set the soundorg to the middle of the bounding box
sector->soundorg[0] = bbox.Right()/2 + bbox.Left()/2;
sector->soundorg[1] = bbox.Top()/2 + bbox.Bottom()/2;
- sector->soundorg[2] = sector->floorplane.ZatPoint (sector->soundorg[0], sector->soundorg[1]);
}
delete[] linesDoneInEachSector;
times[3].Unclock();
diff --git a/src/po_man.cpp b/src/po_man.cpp
index b270218101..856ff93415 100644
--- a/src/po_man.cpp
+++ b/src/po_man.cpp
@@ -445,7 +445,7 @@ bool EV_RotatePoly (line_t *line, int polyNum, int speed, int byteAngle,
Printf ("EV_RotatePoly: Invalid polyobj num: %d\n", polyNum);
break;
}
- if (poly && poly->specialdata && !overRide)
+ if (poly->specialdata && !overRide)
{ // mirroring poly is already in motion
break;
}
@@ -555,8 +555,8 @@ bool EV_MovePoly (line_t *line, int polyNum, int speed, angle_t angle,
while ( (mirror = poly->GetMirror()) )
{
poly = PO_GetPolyobj(mirror);
- if (poly && poly->specialdata && !overRide)
- { // mirroring poly is already in motion
+ if (poly == NULL || (poly->specialdata != NULL && !overRide))
+ { // mirroring poly does not exist or is already in motion
break;
}
pe = new DMovePoly (mirror);
@@ -655,8 +655,8 @@ bool EV_MovePolyTo(line_t *line, int polyNum, int speed, fixed_t targx, fixed_t
while ( (mirror = poly->GetMirror()) )
{
poly = PO_GetPolyobj(mirror);
- if (poly && poly->specialdata && !overRide)
- { // mirroring poly is already in motion
+ if (poly == NULL || (poly->specialdata != NULL && !overRide))
+ { // mirroring poly does not exist or is already in motion
break;
}
// reverse the direction
@@ -841,8 +841,8 @@ bool EV_OpenPolyDoor (line_t *line, int polyNum, int speed, angle_t angle,
while ( (mirror = poly->GetMirror()) )
{
poly = PO_GetPolyobj (mirror);
- if (poly && poly->specialdata)
- { // mirroring poly is already in motion
+ if (poly == NULL || poly->specialdata != NULL)
+ { // mirroring poly does not exist or is already in motion
break;
}
pd = new DPolyDoor (mirror, type);
diff --git a/zdoom.vcproj b/zdoom.vcproj
index dff0e6cb22..4601991fa3 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
@@ -1848,6 +1840,14 @@
Outputs="$(IntDir)/$(InputName).obj"
/>
+
+
+
@@ -2037,6 +2037,14 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
+
+
+
@@ -2047,14 +2055,6 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
-
-
-
+
+
+
@@ -2477,14 +2485,6 @@
AdditionalIncludeDirectories="src\win32;$(NoInherit)"
/>
-
-
-
@@ -2783,7 +2783,7 @@
/>
+
+
+
-
-
-