Skip to content
Snippets Groups Projects
Commit b4ab284d authored by James R.'s avatar James R.
Browse files

Merge branch 'fixed2float-funcs' into 'master'

Turn FIXED_TO_FLOAT into a function

See merge request STJr/SRB2!869
parents b6f1155a befae492
No related branches found
No related tags found
No related merge requests found
...@@ -38,8 +38,20 @@ typedef INT32 fixed_t; ...@@ -38,8 +38,20 @@ typedef INT32 fixed_t;
/*! /*!
\brief convert fixed_t into floating number \brief convert fixed_t into floating number
*/ */
#define FIXED_TO_FLOAT(x) (((float)(x)) / ((float)FRACUNIT))
#define FLOAT_TO_FIXED(f) (fixed_t)((f) * ((float)FRACUNIT)) FUNCMATH FUNCINLINE static ATTRINLINE float FixedToFloat(fixed_t x)
{
return x / (float)FRACUNIT;
}
FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FloatToFixed(float f)
{
return (fixed_t)(f * FRACUNIT);
}
// for backwards compat
#define FIXED_TO_FLOAT(x) FixedToFloat(x) // (((float)(x)) / ((float)FRACUNIT))
#define FLOAT_TO_FIXED(f) FloatToFixed(f) // (fixed_t)((f) * ((float)FRACUNIT))
#if defined (__WATCOMC__) && FRACBITS == 16 #if defined (__WATCOMC__) && FRACBITS == 16
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment