* changed SoundStream.onStart to onSeek

* made network package compilable in D2
+ Vector2.max function to return the bigger member

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1354 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
trass3r 2010-01-13 17:42:05 +00:00
parent 40f13c7302
commit bf539551b9
9 changed files with 53 additions and 44 deletions

View file

@ -130,7 +130,9 @@ class Packet : DSFMLObject
byte[] getData()
{
if (canRead)
return sfPacket_GetData(m_ptr)[0..getDataSize];
return sfPacket_GetData(m_ptr)[0..getDataSize()];
else
return null;
}
@ -253,20 +255,18 @@ private:
}
void internalGet(ref string data)
{
scope string temp = new char[sfPacket_GetDataSize(m_ptr)];
scope char[] temp = new char[sfPacket_GetDataSize(m_ptr)];
sfPacket_ReadString(m_ptr, temp.ptr);
size_t l = fromStringz(temp.ptr).length;
data = new char[l];
data[] = temp[0 .. l];
data = cast(string) temp[0 .. l];
}
void internalGet(ref wstring data)
{
scope wstring temp = new wchar[sfPacket_GetDataSize(m_ptr)];
scope wchar[] temp = new wchar[sfPacket_GetDataSize(m_ptr)];
sfPacket_ReadWideString(m_ptr, temp.ptr);
size_t l = fromStringz(temp.ptr).length;
data = new wchar[l];
data[] = temp[0 .. l];
data = cast(wstring) temp[0 .. l];
}
void internalSet(bool data)
@ -345,8 +345,8 @@ private:
typedef void function(void*, uint) pf_sfPacket_WriteUint32;
typedef void function(void*, float) pf_sfPacket_WriteFloat;
typedef void function(void*, double) pf_sfPacket_WriteDouble;
typedef void function(void*, char*) pf_sfPacket_WriteString;
typedef void function(void*, wchar*) pf_sfPacket_WriteWideString;
typedef void function(void*, cchar*) pf_sfPacket_WriteString;
typedef void function(void*, cwchar*) pf_sfPacket_WriteWideString;
static pf_sfPacket_Create sfPacket_Create;
static pf_sfPacket_Destroy sfPacket_Destroy;