Merge branch 'master' into miami

# Conflicts: # src/control/Darkel.cpp # src/core/main.cpp
2020-08-15 15:13:46 +03:00
parent 07038ce88e 72088a000b
commit 9956b27767
10 changed files with 96 additions and 7 deletions
--- a/src/skel/platform.h
+++ b/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);