LegacyConsole/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-23 09:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: unglob std::{min, max}, manual stuff

Browse Source
This commit is contained in:
Tropical
2026-03-06 20:47:11 -06:00
parent 967ffbb2a6
commit 04ff82ba70
54 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.World/IO/Streams/ByteArrayInputStream.cpp
View File

@@ -10,7 +10,7 @@
//offset - the offset in the buffer of the first byte to read.
//length - the maximum number of bytes to read from the buffer.
ByteArrayInputStream::ByteArrayInputStream(byteArray buf, unsigned int offset, unsigned int length)
: pos( offset ), count( min( offset+length, buf.length ) ), mark( offset )
: pos( offset ), count( std::min( offset+length, buf.length ) ), mark( offset )
{
this->buf = buf;
}
@@ -77,7 +77,7 @@ int ByteArrayInputStream::read(byteArray b, unsigned int offset, unsigned int le
if( pos == count )
return -1;
int k = min( length, count-pos );
int k = std::min( length, count-pos );
XMemCpy( &b[offset], &buf[pos], k );
//std::copy( buf->data+pos, buf->data+pos+k, b->data + offset ); // Or this instead?