From 67e1c7fef4a56dbdec52d20a76b8829e7bd5bc2c Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 31 Dec 2013 23:25:38 +0000 Subject: [PATCH] Require integral types to newdemo_read --- similar/main/newdemo.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/similar/main/newdemo.cpp b/similar/main/newdemo.cpp index 47b3adaed..9af89bff2 100644 --- a/similar/main/newdemo.cpp +++ b/similar/main/newdemo.cpp @@ -278,16 +278,22 @@ static void my_extract_shortpos(object *objp, shortpos *spp) objp->mtype.phys_info.velocity.z = (spp->velz << VEL_PRECISION); } -static int newdemo_read( void *buffer, int elsize, int nelem ) +static int _newdemo_read( void *buffer, int elsize, int nelem ) { int num_read; - num_read = PHYSFS_read(infile, buffer, elsize, nelem); + num_read = (PHYSFS_read)(infile, buffer, elsize, nelem); if (num_read < nelem || PHYSFS_eof(infile)) nd_playback_v_bad_read = -1; return num_read; } +template +static typename tt::enable_if::value, int>::type newdemo_read( T *buffer, int elsize, int nelem ) +{ + return _newdemo_read(buffer, elsize, nelem); +} + int newdemo_find_object( int signature ) { for (unsigned i=0; i<=Highest_object_index; i++) {