TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move PHYSFSX_writeMatrix to gamesave.cpp

Browse source
This commit is contained in:
Kp 2014-10-26 22:56:50 +00:00
parent 44bd07d031
commit bf57d03930
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/include/physfsx.h
View file

@ -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) \
{ \

10
similar/main/gamesave.cpp
View file

@ -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);