summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-21 10:21:42 +0100
committeraap <aap@papnet.eu>2021-01-21 10:21:47 +0100
commit24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe (patch)
treed478453f07c2879f614491b2a8a051c2deb8f68e
parentGet rid of bitfields in CPool (diff)
downloadre3-24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe.tar
re3-24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe.tar.gz
re3-24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe.tar.bz2
re3-24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe.tar.lz
re3-24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe.tar.xz
re3-24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe.tar.zst
re3-24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe.zip
-rw-r--r--src/skel/glfw/glfw.cpp4
-rw-r--r--src/skel/win/win.cpp4
m---------vendor/librw0
3 files changed, 8 insertions, 0 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index f039819c..9b2a768e 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -216,6 +216,10 @@ psGrabScreen(RwCamera *pCamera)
RwImageSetFromRaster(pImage, pRaster);
return pImage;
}
+#else
+ rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
+ if(image)
+ return image;
#endif
return nil;
}
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 1fd959f2..a5f721c8 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -257,6 +257,10 @@ psGrabScreen(RwCamera *pCamera)
RwImageSetFromRaster(pImage, pRaster);
return pImage;
}
+#else
+ rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
+ if(image)
+ return image;
#endif
return nil;
}
diff --git a/vendor/librw b/vendor/librw
-Subproject 61b288a9fe72ae4073c0ac5fd2a5815ed510c8c
+Subproject 9260bddc66f70eb51adf0749fa835fed1562c17