diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index 55d58e0e..45762a64 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -487,7 +487,6 @@ int mapclass::finalat(int x, int y)
 	{
 		return contents[x + vmult[y]];
 	}
-	return 0;
 }
 
 int mapclass::maptiletoenemycol(int t)
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index c791af4e..2a1ebe0b 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -661,7 +661,6 @@ int editorclass::getenemycol(int t)
         return 6;
         break;
     }
-    return 0;
 }
 
 int editorclass::getwarpbackground(int rx, int ry)
@@ -939,7 +938,6 @@ int editorclass::getenemyframe(int t)
         return 78;
         break;
     }
-    return 78;
 }
 
 
@@ -1334,7 +1332,6 @@ int editorclass::edgetile( int x, int y )
         return 0;
         break;
     }
-    return 0;
 }
 
 int editorclass::outsideedgetile( int x, int y )
@@ -1352,7 +1349,6 @@ int editorclass::outsideedgetile( int x, int y )
         return 2;
         break;
     }
-    return 2;
 }
 
 
@@ -1404,7 +1400,6 @@ int editorclass::backedgetile( int x, int y )
         return 0;
         break;
     }
-    return 0;
 }
 
 int editorclass::labspikedir( int x, int y, int t )