a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 13:10:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/miami' into lcs

Browse source 
# Conflicts:
#	vendor/librw
This commit is contained in:
Sergeanur 2021-01-21 16:03:27 +02:00
parent cc94419a72 f0097ff733
commit ed74182cc2
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modelinfo/ModelIndices.h
View file

@ -35,7 +35,7 @@
X("veg_treea1", MI_TREE3) \ X("veg_treea1", MI_TREE3) \
X("veg_treeb1", MI_TREE6) \ X("veg_treeb1", MI_TREE6) \
X("veg_treea3", MI_TREE8) \ 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_cab01", MODELID_CRANE_2) \
X("doc_crane_cab02", MODELID_CRANE_3) \ X("doc_crane_cab02", MODELID_CRANE_3) \
X("doc_crane_cab03", MODELID_CRANE_4) \ X("doc_crane_cab03", MODELID_CRANE_4) \

4
src/skel/glfw/glfw.cpp
View file

@ -216,6 +216,10 @@ psGrabScreen(RwCamera *pCamera)
RwImageSetFromRaster(pImage, pRaster); RwImageSetFromRaster(pImage, pRaster);
return pImage; return pImage;
} }
#else
rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
if(image)
return image;
#endif #endif
return nil; return nil;
} }

4
src/skel/win/win.cpp
View file

@ -257,6 +257,10 @@ psGrabScreen(RwCamera *pCamera)
RwImageSetFromRaster(pImage, pRaster); RwImageSetFromRaster(pImage, pRaster);
return pImage; return pImage;
} }
#else
rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
if(image)
return image;
#endif #endif
return nil; return nil;
} }

2
vendor/librw vendored

@ -1 +1 @@
Subproject commit 78d540fce0ca090b07377cee40d73eadfb7a699d Subproject commit 9260bddc66f70eb51adf0749fa835fed1562c178