Fixed merge errors

2019-06-26 23:47:23 +03:00
parent 08b053a568
commit fa132bb773
4 changed files with 4 additions and 4 deletions
--- a/src/Streaming.cpp
+++ b/src/Streaming.cpp
@ -1585,7 +1585,6 @@ CStreaming::UpdateMemoryUsed(void)
 }

 WRAPPER void CStreaming::LoadScene(CVector *pos) { EAXJMP(0x40A6D0); }
-WRAPPER void CStreaming::LoadAllRequestedModels(bool) { EAXJMP(0x40A440); }

 bool
 CStreamingInfo::GetCdPosnAndSize(uint32 &posn, uint32 &size)