Mercurial > mm7
diff mm7_5.cpp @ 784:b3e08a496778
Merge
author | Nomad |
---|---|
date | Sun, 24 Mar 2013 21:15:01 +0200 |
parents | b27dd658ea77 c47efaf23642 |
children | 41b4e9769863 |
line wrap: on
line diff
--- a/mm7_5.cpp Sun Mar 24 21:14:28 2013 +0200 +++ b/mm7_5.cpp Sun Mar 24 21:15:01 2013 +0200 @@ -1,7 +1,6 @@ #include <assert.h> #include "mm7.h" - #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h" @@ -45,24 +44,8 @@ #include "texts.h" #include "Log.h" #include "UIHouses.h" - #include "mm7_data.h" - - - - - - - - - - - - - - - //----- (004304E7) -------------------------------------------------------- void __cdecl GameUI_MsgProc() { @@ -3480,7 +3463,6 @@ pStru277->_427E01_cast_spell(); } - //----- (004356FF) -------------------------------------------------------- void __cdecl back_to_game() { @@ -3493,6 +3475,7 @@ pEventTimer->Resume(); viewparams->bRedrawGameUI = 1; } + //----- (00435748) -------------------------------------------------------- void __cdecl GUI_MainMenuMessageProc() { @@ -4014,15 +3997,6 @@ v1->z = v2 * v1->z; } - - - - - - - - - //----- (004385B5) -------------------------------------------------------- void stru11::CheckCPU() { @@ -4415,8 +4389,6 @@ memcpy((char *)&v17->cpuid_80000002_registers2[0] + 1, v18, 0x30u);*/ } - - //----- (00438BDF) -------------------------------------------------------- bool MonsterStats::BelongsToSupertype(unsigned int uMonsterInfoID, enum MONSTER_SUPERTYPE eSupertype) { @@ -4500,7 +4472,6 @@ return result; } - //----- (00438F8F) -------------------------------------------------------- void __cdecl area_of_effect__damage_evaluate() { @@ -5201,7 +5172,6 @@ } // 4D864C: using guessed type char byte_4D864C; - //----- (00439FCB) -------------------------------------------------------- void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int a2, Vec3_int_ *pPos, unsigned int a4) { @@ -5708,7 +5678,6 @@ } } - //----- (0043A97E) -------------------------------------------------------- void __fastcall sub_43A97E(unsigned int uLayingItemID, signed int a2) { @@ -5799,9 +5768,6 @@ *z *= 65536 / (v5 | 1); } - - - //----- (0043AE12) -------------------------------------------------------- double __fastcall sub_43AE12(signed int a1) { @@ -6051,8 +6017,6 @@ } } - - //----- (0043C91D) -------------------------------------------------------- int __fastcall _43C91D_FormItemTextureFilename(char *a1, signed int a2, int a3, int a4) { @@ -6256,8 +6220,6 @@ return result; } - - //----- (0043ED6F) -------------------------------------------------------- bool _43ED6F_check_party_races(bool a1) { @@ -6529,7 +6491,6 @@ return result; } - //----- (0043F333) -------------------------------------------------------- void BspRenderer::MakeVisibleSectorList() { @@ -6557,7 +6518,6 @@ } } - //----- (0043F515) -------------------------------------------------------- void FindBillboardsLightLevels_BLV() { @@ -9346,7 +9306,6 @@ return !v114 || !v113; } - //----- (00408768) -------------------------------------------------------- void InitializeActors() { @@ -9435,7 +9394,6 @@ return result; } - //----- (00408A27) -------------------------------------------------------- unsigned int __thiscall SearchAliveActors(unsigned int *pTotalActors) { @@ -9577,7 +9535,6 @@ return v5; } - //----- (00409BE8) -------------------------------------------------------- void __cdecl sub_409BE8() { @@ -9622,12 +9579,6 @@ // 505888: using guessed type int amuint_505888; // 50588C: using guessed type int amuint_50588C; - - - - - - //----- (0040D75D) -------------------------------------------------------- char __fastcall pPrimaryWindow_draws_text(int a1, const char *pText, int *pXY) { @@ -9647,8 +9598,6 @@ 0); } - - //----- (0040DB27) -------------------------------------------------------- void __fastcall DrawRect(Vec4_int_ *pXYZW, unsigned __int16 uColor, char bSolidFill) { @@ -9675,9 +9624,6 @@ pRenderer->EndScene(); } - - - //----- (0040DDB1) -------------------------------------------------------- int __fastcall rand_interval(int a, int b) { @@ -9722,7 +9668,6 @@ pRenderer->Present(); } - //----- (0040DFA7) -------------------------------------------------------- int __stdcall retzero_sub_40DFA7(int a1) { @@ -9935,12 +9880,6 @@ return result; } - - - - - - //----- (0040F82D) -------------------------------------------------------- void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue) { @@ -10037,7 +9976,6 @@ } } - //----- (0040F92A) -------------------------------------------------------- void __fastcall sub_40F92A(int *pZBuffer, Texture *a2, int a3) {