Mercurial > mm7
comparison Arcomage.cpp @ 1461:845907a747d3
Merge
author | Gloval |
---|---|
date | Wed, 21 Aug 2013 20:59:16 +0400 |
parents | ff2118028c71 934074e7fcc1 |
children | 3c33f3e44f71 |
comparison
equal
deleted
inserted
replaced
1460:ff2118028c71 | 1461:845907a747d3 |
---|---|
56 int am_40D2B4(POINT* a1, int a2); // weak | 56 int am_40D2B4(POINT* a1, int a2); // weak |
57 int ApplyDamageToBuildings(int player_num, int damage); // weak | 57 int ApplyDamageToBuildings(int player_num, int damage); // weak |
58 void GameResultsApply(); | 58 void GameResultsApply(); |
59 | 59 |
60 void pPrimaryWindow_draws_text(int a1, const char *pText, POINT *pXY); | 60 void pPrimaryWindow_draws_text(int a1, const char *pText, POINT *pXY); |
61 void __thiscall am_BeginScene(unsigned __int16 *pPcxPixels, int a2, int a3); // idb | 61 void am_BeginScene(unsigned __int16 *pPcxPixels, int a2, int a3); // idb |
62 void __fastcall Blt_Chroma(RECT *pSrcXYZW, POINT *pTargetXY, int a3, int a4); | 62 void __fastcall Blt_Chroma(RECT *pSrcXYZW, POINT *pTargetXY, int a3, int a4); |
63 void Blt_Copy(RECT *pSrcRect, POINT *pTargetXY, int a3); | 63 void Blt_Copy(RECT *pSrcRect, POINT *pTargetXY, int a3); |
64 void __cdecl am_EndScene(); | 64 void am_EndScene(); |
65 void DrawRect(RECT *pXYZW, unsigned __int16 uColor, char bSolidFill); | 65 void DrawRect(RECT *pXYZW, unsigned __int16 uColor, char bSolidFill); |
66 void SetPixel2sq( POINT *pTargetXY, unsigned __int16 uColor ); | 66 void SetPixel2sq( POINT *pTargetXY, unsigned __int16 uColor ); |
67 void SetPixel(POINT *pTargetXY, unsigned __int16 uColor); | 67 void SetPixel(POINT *pTargetXY, unsigned __int16 uColor); |
68 int rand_interval(int min, int max); // idb | 68 int rand_interval(int min, int max); // idb |
69 void __fastcall intToString(int val, char *pOut); | 69 void __fastcall intToString(int val, char *pOut); |
1270 pArcomageGame->GameOver = 1; | 1270 pArcomageGame->GameOver = 1; |
1271 } | 1271 } |
1272 GameResultsApply(); | 1272 GameResultsApply(); |
1273 if ( byte_4FAA2C ) | 1273 if ( byte_4FAA2C ) |
1274 { | 1274 { |
1275 // v2 = retzero_sub_40DFA7((int)dword_4FAA28); | |
1276 // v1 = 1000; | |
1277 // dword_4FAA70 = v2 / 1000; | |
1278 dword_4FAA70 = 0; | 1275 dword_4FAA70 = 0; |
1279 } | 1276 } |
1280 else | 1277 else |
1281 { | 1278 { |
1282 dword_4FAA70 = -1; | 1279 dword_4FAA70 = -1; |