X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapblock.h;h=75e146665390c279cfea2d81c07edee7881b5032;hb=abceeee92f99b84ebb79968269835a4f509bfb90;hp=18b679cfc9fcee0bc426f26094de2fe1abea5482;hpb=5fc791ac9a15ea6f234ca2d23041c83679255746;p=dragonfireclient.git diff --git a/src/mapblock.h b/src/mapblock.h index 18b679cfc..75e146665 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -38,6 +38,8 @@ with this program; if not, write to the Free Software Foundation, Inc., class Map; class NodeMetadataList; +class ITextureSource; +class IGameDef; #define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff @@ -407,7 +409,7 @@ class MapBlock /*: public NodeContainer*/ NOTE: Prefer generating the mesh separately and then using replaceMesh(). */ - void updateMesh(u32 daynight_ratio); + void updateMesh(u32 daynight_ratio, ITextureSource *tsrc); #endif // Replace the mesh with a new one void replaceMesh(scene::SMesh *mesh_new); @@ -537,7 +539,7 @@ class MapBlock /*: public NodeContainer*/ // These don't write or read version by itself void serialize(std::ostream &os, u8 version); - void deSerialize(std::istream &is, u8 version); + void deSerialize(std::istream &is, u8 version, IGameDef *gamedef); // Used after the basic ones when writing on disk (serverside) void serializeDiskExtra(std::ostream &os, u8 version); void deSerializeDiskExtra(std::istream &is, u8 version);