Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-25 15:42:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

object ids are u16, not s16 (#12848)

Browse Source
This commit is contained in:
fluxionary 2022-10-13 05:46:48 -07:00 committed by GitHub
parent f7ae70c3d9
commit 6b6f886bcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/pointedthing.cpp
View File

@ -36,7 +36,7 @@ PointedThing::PointedThing(const v3s16 &under, const v3s16 &above,
distanceSq(distSq) distanceSq(distSq)
{} {}
PointedThing::PointedThing(s16 id, const v3f &point, const v3s16 &normal, PointedThing::PointedThing(u16 id, const v3f &point, const v3s16 &normal,
f32 distSq) : f32 distSq) :
type(POINTEDTHING_OBJECT), type(POINTEDTHING_OBJECT),
object_id(id), object_id(id),
@ -81,7 +81,7 @@ void PointedThing::serialize(std::ostream &os) const
writeV3S16(os, node_abovesurface); writeV3S16(os, node_abovesurface);
break; break;
case POINTEDTHING_OBJECT: case POINTEDTHING_OBJECT:
writeS16(os, object_id); writeU16(os, object_id);
break; break;
} }
} }
@ -100,7 +100,7 @@ void PointedThing::deSerialize(std::istream &is)
node_abovesurface = readV3S16(is); node_abovesurface = readV3S16(is);
break; break;
case POINTEDTHING_OBJECT: case POINTEDTHING_OBJECT:
object_id = readS16(is); object_id = readU16(is);
break; break;
default: default:
throw SerializationError("unsupported PointedThingType"); throw SerializationError("unsupported PointedThingType");

4
src/util/pointedthing.h
View File

@ -61,7 +61,7 @@ struct PointedThing
* Only valid if type is POINTEDTHING_OBJECT. * Only valid if type is POINTEDTHING_OBJECT.
* The ID of the object the ray hit. * The ID of the object the ray hit.
*/ */
s16 object_id = -1; u16 object_id = 0;
/*! /*!
* Only valid if type isn't POINTEDTHING_NONE. * Only valid if type isn't POINTEDTHING_NONE.
* First intersection point of the ray and the nodebox in irrlicht * First intersection point of the ray and the nodebox in irrlicht
@ -93,7 +93,7 @@ struct PointedThing
const v3s16 &real_under, const v3f &point, const v3s16 &normal, const v3s16 &real_under, const v3f &point, const v3s16 &normal,
u16 box_id, f32 distSq); u16 box_id, f32 distSq);
//! Constructor for POINTEDTHING_OBJECT //! Constructor for POINTEDTHING_OBJECT
PointedThing(s16 id, const v3f &point, const v3s16 &normal, f32 distSq); PointedThing(u16 id, const v3f &point, const v3s16 &normal, f32 distSq);
std::string dump() const; std::string dump() const;
void serialize(std::ostream &os) const; void serialize(std::ostream &os) const;
void deSerialize(std::istream &is); void deSerialize(std::istream &is);