evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some server-side collision calls not including object collision

Browse Source
This commit is contained in:
Kae 2024-03-25 11:20:11 +11:00
parent dd3c40adb7
commit 9aaaf874e9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/game/StarWorldTiles.cpp
View File

@ -32,6 +32,10 @@ ServerTile::ServerTile(ServerTile const& serverTile) : WorldTile() {
*this = serverTile; *this = serverTile;
} }
bool ServerTile::isColliding(CollisionSet const& collisionSet) const {
return Star::isColliding(getCollision(), collisionSet);
}
ServerTile& ServerTile::operator=(ServerTile const& serverTile) { ServerTile& ServerTile::operator=(ServerTile const& serverTile) {
WorldTile::operator=(serverTile); WorldTile::operator=(serverTile);

2
source/game/StarWorldTiles.hpp
View File

@ -63,6 +63,8 @@ struct ServerTile : public WorldTile {
ServerTile(ServerTile const& serverTile); ServerTile(ServerTile const& serverTile);
ServerTile& operator=(ServerTile const& serverTile); ServerTile& operator=(ServerTile const& serverTile);
bool isColliding(CollisionSet const& collisionSet) const;
void write(DataStream& ds) const; void write(DataStream& ds) const;
void read(DataStream& ds, VersionNumber serializationVersion); void read(DataStream& ds, VersionNumber serializationVersion);