Mercurial > mm7
diff mm7_1.cpp @ 1572:19f1735fca80
Слияние
author | Ritor1 |
---|---|
date | Sun, 08 Sep 2013 17:07:58 +0600 |
parents | e668660457dc |
children | 75fafd8ced59 |
line wrap: on
line diff
--- a/mm7_1.cpp Sun Sep 08 17:07:47 2013 +0600 +++ b/mm7_1.cpp Sun Sep 08 17:07:58 2013 +0600 @@ -9,7 +9,6 @@ */ //#include <defs.h> -#include <assert.h> #include "Texture.h" #include "mm7_data.h" @@ -49,12 +48,12 @@ //----- (004A1780) mm6_chinese--------------------------------------------- -int fixpoint_div(int a1, int a2) +__int64 fixpoint_div(int a1, int a2) { return ((__int64)a1 << 16) / a2; } -int fixpoint_mul(int a1, int a2) +__int64 fixpoint_mul(int a1, int a2) { return (((__int64)a1 << 16) * a2) >> 16; } @@ -63,11 +62,18 @@ //----- (0042EBBE) -------------------------------------------------------- //----- (004453C0) mm6----------------------------------------------------- //----- (004A1760) mm6_chinese--------------------------------------------- -int fixpoint_sub0(int a1, int a2) +__int64 fixpoint_sub0(int a1, int a2) { return ((__int64)a1 * (__int64)a2) >> 16; } +__int64 fixpoint_dot(int x1, int x2, int y1, int y2, int z1, int z2) +{ + return fixpoint_sub0(x1, x2) + + fixpoint_sub0(y1, y2) + + fixpoint_sub0(z1, z2); +} + //----- (0041D20D) -------------------------------------------------------- void __fastcall sub_41D20D_buff_remaining_time_string( int ecx0, struct GUIWindow *edx0, __int64 a3, struct GUIFont *a2 ) { @@ -400,7 +406,7 @@ v4 = 225; v6 = 255; } - else assert(false); + else Error("Invalid alignment type: %u", align); uGameUIFontMain = v3; uGameUIFontShadow = TargetColor(v5, v4, v6);