Skip to content

Commit

Permalink
Wrapped ZAPD Stuff into USE_ZAPD
Browse files Browse the repository at this point in the history
  • Loading branch information
KiritoDv authored and briaguya-ai committed Apr 6, 2024
1 parent e40c19e commit 2e0933b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/utils/binarytools/BinaryReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ double LUS::BinaryReader::ReadDouble() {
return result;
}

#ifdef USE_ZAPD

ZAPDUtils::Vec3f LUS::BinaryReader::ReadVec3f() {
return ZAPDUtils::Vec3f();
}
Expand All @@ -183,6 +185,8 @@ Color3b LUS::BinaryReader::ReadColor3b() {
return Color3b();
}

#endif

std::string LUS::BinaryReader::ReadString() {
std::string res;
int numChars = ReadInt32();
Expand Down
4 changes: 4 additions & 0 deletions src/utils/binarytools/BinaryReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
#include <memory>
#include <vector>
#include "endianness.h"
#ifdef USE_ZAPD
#include "Vec2f.h"
#include "Vec3f.h"
#include "Vec3s.h"
#include "Color3b.h"
#endif
#include "Stream.h"

class BinaryReader;
Expand Down Expand Up @@ -40,11 +42,13 @@ class BinaryReader {
uint64_t ReadUInt64();
float ReadFloat();
double ReadDouble();
#ifdef USE_ZAPD
ZAPDUtils::Vec3f ReadVec3f();
ZAPDUtils::Vec3s ReadVec3s();
ZAPDUtils::Vec3s ReadVec3b();
ZAPDUtils::Vec2f ReadVec2f();
Color3b ReadColor3b();
#endif
std::string ReadString();
std::string ReadCString();

Expand Down

0 comments on commit 2e0933b

Please sign in to comment.