mirror of
https://github.com/halpz/re3.git
synced 2025-05-12 00:36:37 +03:00
Fixed merge errors
This commit is contained in:
parent
08b053a568
commit
fa132bb773
4 changed files with 4 additions and 4 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue