Merge branch 'master' into miami

# Conflicts:
#	src/control/Darkel.cpp
#	src/core/main.cpp

src/skel/glfw/glfw.cpp

@@ -185,6 +185,22 @@ psCameraShowRaster(RwCamera *camera)
 	return;
 }
 
+/*
+ *****************************************************************************
+ */
+RwImage *
+psGrabScreen(RwCamera *pCamera)
+{
+#ifndef LIBRW
+	RwRaster *pRaster = RwCameraGetRaster(pCamera);
+	if (RwImage *pImage = RwImageCreate(pRaster->width, pRaster->height, 32)) {
+		RwImageAllocatePixels(pImage);
+		RwImageSetFromRaster(pImage, pRaster);
+		return pImage;
+	}
+#endif
+	return nil;
+}
 
 /*
  *****************************************************************************

src/skel/platform.h

@@ -22,6 +22,7 @@ extern void   psTerminate(void);
 
 extern void psCameraShowRaster(RwCamera *camera);
 extern RwBool psCameraBeginUpdate(RwCamera *camera);
+extern RwImage *psGrabScreen(RwCamera *camera);
 
 extern void psMouseSetPos(RwV2d *pos);
 

src/skel/skeleton.cpp

@@ -50,6 +50,15 @@ RsCameraBeginUpdate(RwCamera * camera)
 	return psCameraBeginUpdate(camera);
 }
 
+/*
+ *****************************************************************************
+ */
+RwImage*
+RsGrabScreen(RwCamera *camera)
+{
+	return psGrabScreen(camera);
+}
+
 /*
  *****************************************************************************
  */

src/skel/skeleton.h

@@ -274,6 +274,9 @@ RsCameraBeginUpdate(RwCamera *camera);
 //extern void                     
 //RsMouseSetVisibility(RwBool visible);
 
+extern RwImage*
+RsGrabScreen(RwCamera *camera);
+
 extern void                     
 RsMouseSetPos(RwV2d *pos);
 

src/skel/win/win.cpp

@@ -242,6 +242,23 @@ psCameraShowRaster(RwCamera *camera)
 }
 
 
+/*
+ *****************************************************************************
+ */
+RwImage *
+psGrabScreen(RwCamera *pCamera)
+{
+#ifndef LIBRW
+	RwRaster *pRaster = RwCameraGetRaster(pCamera);
+	if (RwImage *pImage = RwImageCreate(pRaster->width, pRaster->height, 32)) {
+		RwImageAllocatePixels(pImage);
+		RwImageSetFromRaster(pImage, pRaster);
+		return pImage;
+	}
+#endif
+	return nil;
+}
+
 /*
  *****************************************************************************
  */