Merge branch 'master' into master

2019-06-12 20:18:24 +03:00
parent ec0b8b5730 292fd5ad24
commit cb5ec27747
3 changed files with 245 additions and 3 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -53,8 +53,7 @@
 #else
 #define DEFAULT_ASPECTRATIO (4.0f/3.0f)
 #endif
-
-WRAPPER void CameraSize(RwCamera *camera, void *rect, float viewWindow, float aspectRatio) { EAXJMP(0x527170); }
+													   

 uint8 work_buff[55000];

@ -679,7 +678,9 @@ AppEventHandler(RsEvent event, void *param)

 		case rsCAMERASIZE:
 		{
-			CameraSize(Scene.camera, param, DEFAULT_VIEWWINDOW, DEFAULT_ASPECTRATIO);
+											
+			CameraSize(Scene.camera, (RwRect *)param,
+				DEFAULT_VIEWWINDOW, DEFAULT_ASPECTRATIO);
 			
 			return rsEVENTPROCESSED;
 		}