summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-21 21:19:12 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-21 21:19:12 +0100
commitc8e715c33bb588dff96ae3477d6a42653c7cc14c (patch)
treedf6305e17d6d6e490c45514b3143aef3d46093f3
parentMerge branch 'lcs-dev' into lcs (diff)
parentMerge remote-tracking branch 'origin/miami' into lcs (diff)
downloadre3-c8e715c33bb588dff96ae3477d6a42653c7cc14c.tar
re3-c8e715c33bb588dff96ae3477d6a42653c7cc14c.tar.gz
re3-c8e715c33bb588dff96ae3477d6a42653c7cc14c.tar.bz2
re3-c8e715c33bb588dff96ae3477d6a42653c7cc14c.tar.lz
re3-c8e715c33bb588dff96ae3477d6a42653c7cc14c.tar.xz
re3-c8e715c33bb588dff96ae3477d6a42653c7cc14c.tar.zst
re3-c8e715c33bb588dff96ae3477d6a42653c7cc14c.zip
-rw-r--r--src/modelinfo/ModelIndices.h2
-rw-r--r--src/skel/glfw/glfw.cpp4
-rw-r--r--src/skel/win/win.cpp4
m---------vendor/librw0
4 files changed, 9 insertions, 1 deletions
diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index b155d293..476a2273 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -35,7 +35,7 @@
X("veg_treea1", MI_TREE3) \
X("veg_treeb1", MI_TREE6) \
X("veg_treea3", MI_TREE8) \
- X("doc_crane_cab", MODELID_CRANE_1) \
+ X("doc_crane_cab0", MODELID_CRANE_1) \
X("doc_crane_cab01", MODELID_CRANE_2) \
X("doc_crane_cab02", MODELID_CRANE_3) \
X("doc_crane_cab03", MODELID_CRANE_4) \
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 78d540fce0ca090b07377cee40d73eadfb7a699
+Subproject 9260bddc66f70eb51adf0749fa835fed1562c17