minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Fix write and read S32 vectors

mutilcraft-mt53
BlockMen 2014-04-12 17:39:51 +02:00
parent 7cdbb805d9
commit e149d1ad9a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/serialize.h
View File

@ -166,14 +166,14 @@ inline v2s16 readV2S16(const u8 *data)
inline void writeV2S32(u8 *data, v2s32 p) inline void writeV2S32(u8 *data, v2s32 p)
{ {
writeS32(&data[0], p.X); writeS32(&data[0], p.X);
writeS32(&data[2], p.Y); writeS32(&data[4], p.Y);
} }
inline v2s32 readV2S32(const u8 *data) inline v2s32 readV2S32(const u8 *data)
{ {
v2s32 p; v2s32 p;
p.X = readS32(&data[0]); p.X = readS32(&data[0]);
p.Y = readS32(&data[2]); p.Y = readS32(&data[4]);
return p; return p;
} }
@ -346,6 +346,19 @@ inline v2s16 readV2S16(std::istream &is)
return readV2S16((u8*)buf); return readV2S16((u8*)buf);
} }
inline void writeV2S32(std::ostream &os, v2s32 p)
{
char buf[8] = {0};
writeV2S32((u8*)buf, p);
os.write(buf, 8);
}
inline v2s32 readV2S32(std::istream &is)
{
char buf[8] = {0};
is.read(buf, 8);
return readV2S32((u8*)buf);
}
inline void writeV3S16(std::ostream &os, v3s16 p) inline void writeV3S16(std::ostream &os, v3s16 p)
{ {
char buf[6] = {0}; char buf[6] = {0};