Added room objects to store placed objects in rooms
This commit is contained in:
1 parent
e5406ed0ce
commit
0cbde44138
6 files changed
+148
-36
No files matched your search
@@ -322,6 +322,20 @@ QDataStream &operator>>(QDataStream &ds, Object &object)
|
||||
return ds;
|
||||
}
|
||||
|
||||
QDataStream &operator<<(QDataStream &ds, const Room::Object &object)
|
||||
{
|
||||
ds << object.objectName
|
||||
<< object.pos;
|
||||
return ds;
|
||||
}
|
||||
|
||||
QDataStream &operator>>(QDataStream &ds, Room::Object &object)
|
||||
{
|
||||
ds >> object.objectName
|
||||
>> object.pos;
|
||||
return ds;
|
||||
}
|
||||
|
||||
QDataStream &operator<<(QDataStream &ds, const Room &room)
|
||||
{
|
||||
ds << room.name
|
||||
@@ -334,7 +348,8 @@ QDataStream &operator<<(QDataStream &ds, const Room &room)
|
||||
<< room.snapX
|
||||
<< room.snapY
|
||||
<< room.gridEnabled
|
||||
<< room.isometricGrid;
|
||||
<< room.isometricGrid
|
||||
<< room.objects;
|
||||
return ds;
|
||||
}
|
||||
|
||||
@@ -350,7 +365,8 @@ QDataStream &operator>>(QDataStream &ds, Room &room)
|
||||
>> room.snapX
|
||||
>> room.snapY
|
||||
>> room.gridEnabled
|
||||
>> room.isometricGrid;
|
||||
>> room.isometricGrid
|
||||
>> room.objects;
|
||||
return ds;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user