diff --git a/common/include/physfsx.h b/common/include/physfsx.h index 1f96e3a29..0955521fd 100644 --- a/common/include/physfsx.h +++ b/common/include/physfsx.h @@ -361,16 +361,6 @@ static inline int PHYSFSX_writeAngleVec(PHYSFS_file *file, vms_angvec *v) return 1; } -static inline int PHYSFSX_writeMatrix(PHYSFS_file *file, vms_matrix *m) -{ - if (PHYSFSX_writeVector(file, m->rvec) < 1 || - PHYSFSX_writeVector(file, m->uvec) < 1 || - PHYSFSX_writeVector(file, m->fvec) < 1) - return 0; - - return 1; -} - #define define_read_helper(T,N,F) \ static inline T N(const char *func, const unsigned line, PHYSFS_file *file) \ { \ diff --git a/similar/main/gamesave.cpp b/similar/main/gamesave.cpp index c660b47fa..ebfb39c83 100644 --- a/similar/main/gamesave.cpp +++ b/similar/main/gamesave.cpp @@ -593,6 +593,14 @@ static void read_object(object *obj,PHYSFS_file *f,int version) } #ifdef EDITOR +static int PHYSFSX_writeMatrix(PHYSFS_file *file, const vms_matrix &m) +{ + if (PHYSFSX_writeVector(file, m.rvec) < 1 || + PHYSFSX_writeVector(file, m.uvec) < 1 || + PHYSFSX_writeVector(file, m.fvec) < 1) + return 0; + return 1; +} //writes one object to the given file static void write_object(object *obj, short version, PHYSFS_file *f) @@ -611,7 +619,7 @@ static void write_object(object *obj, short version, PHYSFS_file *f) PHYSFS_writeSLE16(f, obj->segnum); PHYSFSX_writeVector(f, obj->pos); - PHYSFSX_writeMatrix(f, &obj->orient); + PHYSFSX_writeMatrix(f, obj->orient); PHYSFSX_writeFix(f, obj->size); PHYSFSX_writeFix(f, obj->shields);