Mercurial > mm7

diff mm7_data.h @ 2125:ba3de1337989

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
house animations working round renamed to round_to_int
author zipi
date Thu, 26 Dec 2013 22:46:49 +0000
parents 68fbaf45ef66
children 49de109bbab5
line wrap: on
line diff
--- a/mm7_data.h	Fri Dec 27 01:28:48 2013 +0600
+++ b/mm7_data.h	Thu Dec 26 22:46:49 2013 +0000
@@ -1352,7 +1352,7 @@
 int __fastcall MakeColorMaskFromBitDepth(int a1);
 void __fastcall fill_pixels_fast(unsigned int a1, unsigned __int16 *pPixels, unsigned int uNumPixels);
 int __fastcall GetDiceResult(unsigned int uNumDice, unsigned int uDiceSides); // idb
-inline int round(float x) { return (int)floor(x + 0.5f); }
+inline int round_to_int(float x) { return (int)floor(x + 0.5f); }
 inline void __fastcall memset32(void *ptr, unsigned __int32 value, int count)
 {
   unsigned __int32* p = (unsigned __int32 *)ptr;