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

Only use newdemo_write on integral types

Browse source
This commit is contained in:
Kp 2013-12-31 22:52:00 +00:00
parent 888f44336f
commit a7d87134db
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
similar/main/newdemo.cpp
View file

@ -87,6 +87,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "editor/editor.h"
#endif
#include "dxxsconf.h"
#include "compiler-type_traits.h"
#define ND_EVENT_EOF 0 // EOF
#define ND_EVENT_START_DEMO 1 // Followed by 16 character, NULL terminated filename of .SAV file to use
#define ND_EVENT_START_FRAME 2 // Followed by integer frame number, then a fix FrameTime
@ -295,7 +298,7 @@ int newdemo_find_object( int signature )
return -1;
}
static int newdemo_write(const void *buffer, int elsize, int nelem )
static int _newdemo_write(const void *buffer, int elsize, int nelem )
{
int num_written, total_size;
@ -303,7 +306,7 @@ static int newdemo_write(const void *buffer, int elsize, int nelem )
nd_record_v_framebytes_written += total_size;
Newdemo_num_written += total_size;
Assert(outfile != NULL);
num_written = PHYSFS_write(outfile, buffer, elsize, nelem);
num_written = (PHYSFS_write)(outfile, buffer, elsize, nelem);
if (num_written == nelem && !nd_record_v_no_space)
return num_written;
@ -313,6 +316,12 @@ static int newdemo_write(const void *buffer, int elsize, int nelem )
return -1;
}
template <typename T>
static typename tt::enable_if<tt::is_integral<T>::value, int>::type newdemo_write(const T *buffer, int elsize, int nelem )
{
return _newdemo_write(buffer, elsize, nelem);
}
/*
* The next bunch of files taken from Matt's gamesave.c. We have to modify
* these since the demo must save more information about objects that