diff --git a/source/core/intvec.h b/source/core/intvec.h
index 7c89c389f..8bf4fc0b0 100644
--- a/source/core/intvec.h
+++ b/source/core/intvec.h
@@ -18,8 +18,10 @@ struct vec2_t
     vec2_t operator-(const vec2_t& other) const { return { x - other.x, y - other.y }; }
     vec2_t& operator+=(const vec2_t& other) { x += other.x; y += other.y; return *this; };
     vec2_t& operator-=(const vec2_t& other) { x -= other.x; y -= other.y; return *this; };
+	vec2_t& operator/= (int other) { x /= other; y /= other; return *this; }
     bool operator == (const vec2_t& other) const { return x == other.x && y == other.y; };
 };
+inline vec2_t operator/ (const vec2_t& vec, int other) { return { vec.x / other, vec.y / other }; }
 
 struct vec3_t
 {
diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp
index 74ee0b510..18b0d9490 100644
--- a/source/games/duke/src/player_d.cpp
+++ b/source/games/duke/src/player_d.cpp
@@ -288,7 +288,7 @@ static void shootknee(DDukeActor* actor, int p, int sx, int sy, int sz, int sa)
 						if (hitz >= (wal->nextSector()->floorz))
 							wal =wal->nextWall();
 
-				if (/*hitwall >= 0 &&*/ wal->picnum != ACCESSSWITCH && wal->picnum != ACCESSSWITCH2)
+				if (wal->picnum != ACCESSSWITCH && wal->picnum != ACCESSSWITCH2)
 				{
 					fi.checkhitwall(knee, wallnum(wal), hitx, hity, hitz, KNEE);
 					if (p >= 0) fi.checkhitswitch(p, wallnum(wal), nullptr);
diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp
index 28d9e05bf..d4712a8ff 100644
--- a/source/games/duke/src/spawn.cpp
+++ b/source/games/duke/src/spawn.cpp
@@ -1093,7 +1093,7 @@ void spawneffector(DDukeActor* actor)
 
 void lotsofglass(DDukeActor *actor, int wallnum, int n)
 {
-	int j, xv, yv, z, x1, y1, a;
+	int j, z, a;
 	int sect;
 	auto sp = actor->s;
 
@@ -1109,24 +1109,19 @@ void lotsofglass(DDukeActor *actor, int wallnum, int n)
 		return;
 	}
 
-	j = n + 1;
+	auto wal = &wall[wallnum];
+	int x1 = wal->x;
+	int y1 = wal->y;
+	auto delta = wal->delta() / (n + 1);
 
-	x1 = wall[wallnum].x;
-	y1 = wall[wallnum].y;
+	x1 -= Sgn(delta.y);
+	y1 += Sgn(delta.x);
 
-	xv = wall[wall[wallnum].point2].x - x1;
-	yv = wall[wall[wallnum].point2].y - y1;
-
-	x1 -= Sgn(yv);
-	y1 += Sgn(xv);
-
-	xv /= j;
-	yv /= j;
 
 	for (j = n; j > 0; j--)
 	{
-		x1 += xv;
-		y1 += yv;
+		x1 += delta.x;
+		y1 += delta.y;
 
 		updatesector(x1, y1, &sect);
 		if (sect >= 0)
@@ -1167,24 +1162,20 @@ void spriteglass(DDukeActor* actor, int n)
 
 void ceilingglass(DDukeActor* actor, int sectnum, int n)
 {
-	int j, xv, yv, z, x1, y1;
-	int a, s, startwall, endwall;
+	int j, z;
+	int a;
 
-	startwall = sector[sectnum].wallptr;
-	endwall = startwall + sector[sectnum].wallnum;
-
-	for (s = startwall; s < (endwall - 1); s++)
+	for (auto& wal : wallsofsector(sectnum))
 	{
-		x1 = wall[s].x;
-		y1 = wall[s].y;
+		int x1 = wal.x;
+		int y1 = wal.y;
 
-		xv = (wall[s + 1].x - x1) / (n + 1);
-		yv = (wall[s + 1].y - y1) / (n + 1);
+		auto delta = wal.delta() / (n + 1);
 
 		for (j = n; j > 0; j--)
 		{
-			x1 += xv;
-			y1 += yv;
+			x1 += delta.x;
+			y1 += delta.y;
 			a = krand() & 2047;
 			z = sector[sectnum].ceilingz + ((krand() & 15) << 8);
 			EGS(sectnum, x1, y1, z, TILE_GLASSPIECES + (j % 3), -32, 36, 36, a, (krand() & 31), 0, actor, 5);
@@ -1200,7 +1191,7 @@ void ceilingglass(DDukeActor* actor, int sectnum, int n)
 
 void lotsofcolourglass(DDukeActor* actor, int wallnum, int n)
 {
-	int j, xv, yv, z, x1, y1;
+	int j, z;
 	int sect = -1;
 	int a;;
 	auto sp = actor->s;
@@ -1215,18 +1206,18 @@ void lotsofcolourglass(DDukeActor* actor, int wallnum, int n)
 		}
 		return;
 	}
+	
+	auto& wal = wall[wallnum];
 
-	j = n + 1;
-	x1 = wall[wallnum].x;
-	y1 = wall[wallnum].y;
+	int x1 = wal.x;
+	int y1 = wal.y;
 
-	xv = (wall[wall[wallnum].point2].x - wall[wallnum].x) / j;
-	yv = (wall[wall[wallnum].point2].y - wall[wallnum].y) / j;
+	auto delta = wal.delta() / (n + 1);
 
 	for (j = n; j > 0; j--)
 	{
-		x1 += xv;
-		y1 += yv;
+		x1 += delta.x;
+		y1 += delta.y;
 
 		updatesector(x1, y1, &sect);
 		z = sector[sect].floorz - (krand() & (abs(sector[sect].ceilingz - sector[sect].floorz)));