mm7: mm7_3.cpp comparison

comparison mm7_3.cpp @ 1461:845907a747d3

Merge

author	Gloval
date	Wed, 21 Aug 2013 20:59:16 +0400
parents	2ca62c9e7b3c
children	c987b5ed09af

comparison

equal deleted inserted replaced

-:ff2118028c71
+:845907a747d3
 #include "Lights.h"
 #include "MM7.h"
 //----- (0046E44E) --------------------------------------------------------
-int __thiscall _46E44E_collide_against_faces_and_portals(unsigned int b1)
+int  _46E44E_collide_against_faces_and_portals(unsigned int b1)
 {
 BLVSector *pSector; // edi@1
 signed int v2; // ebx@1
 BLVFace *pFace; // esi@2
 __int16 pNextSector; // si@10
 while ( (signed int)v15 < (signed int)uNumSpriteObjects );
 }
 }
 //----- (0046EF01) --------------------------------------------------------
-int __thiscall _46EF01_collision_chech_player(int a1)
+int  _46EF01_collision_chech_player(int a1)
 {
 int v1; // edx@1
 int result; // eax@1
 int v3; // ebx@7
 int v4; // esi@7
 }
 return result;
 }
 //----- (0046F04E) --------------------------------------------------------
-signed int __cdecl _46F04E_collide_against_portals()
+int _46F04E_collide_against_portals()
 {
 BLVSector *v0; // ecx@1
 unsigned int v1; // eax@1
 int v2; // eax@2
 BLVFace *v3; // eax@3
 }
 return result;
 }
 //----- (004706C6) --------------------------------------------------------
-void __cdecl UpdateActors_ODM()
+void  UpdateActors_ODM()
 {
 Actor *v0; // esi@2
 AIState uAIState; // ax@2
 //unsigned int v2; // ecx@6
 int v3; // ebx@6
 *v19 = 0;
 return 1;
 }
 //----- (00475665) --------------------------------------------------------
-signed int __thiscall sub_475665(BLVFace *_this, int a2, __int16 a3)
+int sub_475665(BLVFace *_this, int a2, __int16 a3)
 {
 unsigned int v3; // eax@1
 Vec3_short_ *v4; // edx@3
 signed int v5; // eax@4
 int v6; // esi@4
 			&& (double)(signed int)pViewport->uViewportBR_Y > a1->field_B4[i*4+21] )
 			v16 = 1;
 }
 }
 return v16;
-}
-//----- (004783FA) --------------------------------------------------------
-void __cdecl sub_4783FA_construct_global_73D150()
-{
-char *v0; // eax@1
-signed int v1; // ecx@1
-v0 = (char *)&array_73D150[0].flt_2C;
-v1 = 20;
-do
-{
-*(float *)v0 = 0.0;
-v0 += 48;
---v1;
-}
-while ( v1 );
 }
 //----- (0047840D) --------------------------------------------------------
 char Render::DrawBuildingsD3D()
 {
 v7 = 248;
 return (-1 - v7) << 24;
 }
 //----- (0047C4FC) --------------------------------------------------------
-signed int __fastcall GetActorTintColor(int max_dimm, int min_dimm, float distance, int a4, RenderBillboard *a5)
+int __fastcall GetActorTintColor(int max_dimm, int min_dimm, float distance, int a4, RenderBillboard *a5)
 {
 //int v5; // esi@1
 signed int v6; // edx@1
 //signed int result; // eax@2
 int v8; // eax@3
 return 64 - (sWorldPosZ >> 9); // sar is in original exe, resulting -880 / 512 = -1
 //                               and -880 sar 9 = -2
 }
 //----- (0047F469) --------------------------------------------------------
-int __stdcall GridCellToWorldPosX(int a1)
+int GridCellToWorldPosX(int a1)
 {
 return (a1 - 64) << 9;
 }
 //----- (0047F476) --------------------------------------------------------
-int __stdcall GridCellToWorldPosZ(int a1)
+int GridCellToWorldPosZ(int a1)
 {
 return (64 - a1) << 9;
 }
 array_77EC08[i].field_32 = 0;
 }
 }
 //----- (00481ED9) --------------------------------------------------------
-void __cdecl sub_481ED9_MessWithOutdoorCamera()
+void  sub_481ED9_MessWithOutdoorCamera()
 {
 stru_8019C8._48616B(65536, 0, 0, 0, 65536, 0);
 pOutdoorCamera->uNumPolygons = 0;
 pOutdoorCamera->uNumEdges = 0;
 pOutdoorCamera->uNumSpans = 0;
 }
 else
 return y_x1z1;
 }
-//----- (00482A90) --------------------------------------------------------
-signed int __cdecl const_1_0()
-{
-return 1;
-}
 //----- (00485F53) --------------------------------------------------------
-void __thiscall sr_485F53(Vec2_int_ *v)
+void  sr_485F53(Vec2_int_ *v)
 {
 ++v->y;
 if ( v->y > 1000 )
 v->y = 0;
 }
 }
 }
 }
 //----- (00443F95) --------------------------------------------------------
-void __cdecl OnMapLeave()
+void  OnMapLeave()
 {
 _evt_raw *test_event;
 if ( uLevelEVT_NumEvents > 0 )
 {
 for (uint i = 0; i < uLevelEVT_NumEvents; ++i)
 if (uLevelStrFileSize)
 LoadLevel_InitializeLevelStr();
 }
 //----- (00444564) --------------------------------------------------------
-const char *__cdecl sub_444564()
+const char * sub_444564()
 {
 double v0; // st7@3
 int v1; // ebx@3
 int v2; // edi@3
 int v3; // eax@3
 pGUIWindow2->CreateButton(407, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 4, '4', "", 0);
 }
 }
 //----- (004452BB) --------------------------------------------------------
-void __cdecl sub_4452BB()
+void  sub_4452BB()
 {
 pGUIWindow2->Release();
 pGUIWindow2 = 0;
 activeLevelDecoration = _591094_decoration;
 EventProcessor(dword_5C3418, 0, 1, dword_5C341C);
 }
 }
 }
 //----- (00448B45) --------------------------------------------------------
-void __thiscall GameUI_StatusBar_UpdateTimedString(unsigned int bForceHide)
+void  GameUI_StatusBar_UpdateTimedString(unsigned int bForceHide)
 {
 if ( bForceHide || GameUI_Footer_TimeLeft && GetTickCount() >= GameUI_Footer_TimeLeft )
 GameUI_Footer_TimeLeft = 0;
 }
 if ( !GameUI_Footer_TimeLeft )
 ShowStatusBarString(pGlobalTXT_LocalizationStrings[521], 2u);// Nothing here
 }
 //----- (0044C28B) --------------------------------------------------------
-signed int __cdecl const_2()
+int const_2()
 {
 return 2;
 }
 //----- (0044C28F) --------------------------------------------------------
-bool __cdecl sub_44C28F_open_nwc_dungeon()
+bool TeleportToNWCDungeon()
 {
-bool result; // eax@1
+if (!_stricmp("nwc.blv", pCurrentMapName.data()))
+return false;
-result = _stricmp("nwc.blv", pCurrentMapName.data());
-if ( result )
+_5B65A8_npcdata_uflags_or_other = 0;
-{
+_5B65AC_npcdata_fame_or_other = 0;
-_5B65A8_npcdata_uflags_or_other = 0;
+_5B65B0_npcdata_rep_or_other = 0;
-_5B65AC_npcdata_fame_or_other = 0;
+_5B65B4_npcdata_loword_house_or_other = 0;
-_5B65B0_npcdata_rep_or_other = 0;
+_5B65B8_npcdata_hiword_house_or_other = 0;
-_5B65B4_npcdata_loword_house_or_other = 0;
+dword_5B65BC = 0;
-_5B65B8_npcdata_hiword_house_or_other = 0;
+dword_5B65C0 = 0;
-dword_5B65BC = 0;
-dword_5B65C0 = 0;
+pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
-pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
+sub_44987B("nwc.blv", MapStartPoint_Party);
-sub_44987B("nwc.blv", MapStartPoint_Party);
+pCurrentScreen = SCREEN_GAME;
-pCurrentScreen = SCREEN_GAME;
+return true;
-result = 1;
-}
-return result;
 }
 //----- (0044C2F4) --------------------------------------------------------
 bool LevelDecoration::IsInteractive()
 {
 v14 = v13 + 6.7553994e15;
 this->z = LODWORD(v14);
 }
 //----- (00401000) --------------------------------------------------------
-void __stdcall mm7__vector_constructor(void *a1, int objSize, int numObjs, int (__thiscall *constructor)(int))
+void mm7__vector_constructor(void *a1, int objSize, int numObjs, int ( *constructor)(int))
 {
 void *v4; // esi@2
 int v5; // edi@2
 if ( numObjs - 1 >= 0 )
 --v5;
 }
 while ( v5 );
 }
 }
-// 4F75D8: using guessed type int ai_arrays_size;
-// 4F75D8: using guessed type int ai_arrays_size;
 //----- (0040261D) --------------------------------------------------------
 int stru298::Add(__int16 uID, __int16 a3, __int16 x, __int16 y, __int16 z, char a7, char a8)
 {
 int result; // eax@1

Mercurial > mm7

comparison mm7_3.cpp @ 1461:845907a747d3