Mercurial > mm7
comparison Indoor.cpp @ 1458:934074e7fcc1
ModalWindow
__thiscall and __cdecl removed
Some random renames & refactors
author | Nomad |
---|---|
date | Wed, 21 Aug 2013 14:26:36 +0200 |
parents | b67a3e0d6fc3 |
children | 7ef4b64f6329 |
comparison
equal
deleted
inserted
replaced
1457:9dc33590f93e | 1458:934074e7fcc1 |
---|---|
2737 | 2737 |
2738 | 2738 |
2739 | 2739 |
2740 | 2740 |
2741 //----- (0046F228) -------------------------------------------------------- | 2741 //----- (0046F228) -------------------------------------------------------- |
2742 void __cdecl BLV_UpdateDoors() | 2742 void BLV_UpdateDoors() |
2743 { | 2743 { |
2744 //int v0; // ebx@1 | 2744 //int v0; // ebx@1 |
2745 //int v1; // edi@1 | 2745 //int v1; // edi@1 |
2746 //BLVDoor *v2; // esi@3 | 2746 //BLVDoor *v2; // esi@3 |
2747 //unsigned __int16 v3; // ax@3 | 2747 //unsigned __int16 v3; // ax@3 |
3160 } | 3160 } |
3161 } | 3161 } |
3162 // 6BE13C: using guessed type int dword_6BE13C_uCurrentlyLoadedLocationID; | 3162 // 6BE13C: using guessed type int dword_6BE13C_uCurrentlyLoadedLocationID; |
3163 | 3163 |
3164 //----- (0046F90C) -------------------------------------------------------- | 3164 //----- (0046F90C) -------------------------------------------------------- |
3165 void __cdecl UpdateActors_BLV() | 3165 void UpdateActors_BLV() |
3166 { | 3166 { |
3167 Actor *v0; // esi@2 | 3167 Actor *v0; // esi@2 |
3168 unsigned __int16 v1; // ax@2 | 3168 unsigned __int16 v1; // ax@2 |
3169 int v2; // edi@6 | 3169 int v2; // edi@6 |
3170 int v3; // eax@6 | 3170 int v3; // eax@6 |
3635 | 3635 |
3636 | 3636 |
3637 | 3637 |
3638 | 3638 |
3639 //----- (00460A78) -------------------------------------------------------- | 3639 //----- (00460A78) -------------------------------------------------------- |
3640 void __thiscall PrepareToLoadBLV(unsigned int bLoading) | 3640 void PrepareToLoadBLV(unsigned int bLoading) |
3641 { | 3641 { |
3642 unsigned int v1; // ebx@1 | 3642 unsigned int v1; // ebx@1 |
3643 unsigned int v2; // eax@8 | 3643 unsigned int v2; // eax@8 |
3644 MapInfo *v3; // edi@9 | 3644 MapInfo *v3; // edi@9 |
3645 int v4; // eax@11 | 3645 int v4; // eax@11 |
4239 } | 4239 } |
4240 | 4240 |
4241 return result; | 4241 return result; |
4242 } | 4242 } |
4243 //----- (004016FA) -------------------------------------------------------- | 4243 //----- (004016FA) -------------------------------------------------------- |
4244 int __cdecl MakeActorAIList_BLV() | 4244 int MakeActorAIList_BLV() |
4245 { | 4245 { |
4246 Actor *v0; // esi@2 | 4246 Actor *v0; // esi@2 |
4247 int v1; // eax@4 | 4247 int v1; // eax@4 |
4248 int v2; // ebx@4 | 4248 int v2; // ebx@4 |
4249 unsigned int v3; // ecx@4 | 4249 unsigned int v3; // ecx@4 |
5439 int v_4a; // [sp+8Ch] [bp+10h]@65 | 5439 int v_4a; // [sp+8Ch] [bp+10h]@65 |
5440 int v_4b; // [sp+8Ch] [bp+10h]@136 | 5440 int v_4b; // [sp+8Ch] [bp+10h]@136 |
5441 int v_4c; // [sp+8Ch] [bp+10h]@141 | 5441 int v_4c; // [sp+8Ch] [bp+10h]@141 |
5442 int v_8; // [sp+90h] [bp+14h]@53 | 5442 int v_8; // [sp+90h] [bp+14h]@53 |
5443 | 5443 |
5444 __debugbreak(); | |
5445 | |
5444 a4 = __PAIR__(z, x); | 5446 a4 = __PAIR__(z, x); |
5445 v4 = stru_5C6E00->Atan2(v.x - x, v.y - z); | 5447 v4 = stru_5C6E00->Atan2(v.x - x, v.y - z); |
5446 v114 = 0; | 5448 v114 = 0; |
5447 v97.z = y; | 5449 v97.z = y; |
5448 v113 = 0; | 5450 v113 = 0; |
6207 break; | 6209 break; |
6208 } | 6210 } |
6209 return 0; | 6211 return 0; |
6210 } | 6212 } |
6211 //----- (0046BDF1) -------------------------------------------------------- | 6213 //----- (0046BDF1) -------------------------------------------------------- |
6212 void __cdecl BLV_UpdateUserInputAndOther() | 6214 void BLV_UpdateUserInputAndOther() |
6213 { | 6215 { |
6214 UpdateObjects(); | 6216 UpdateObjects(); |
6215 BLV_ProcessPartyActions(); | 6217 BLV_ProcessPartyActions(); |
6216 UpdateActors_BLV(); | 6218 UpdateActors_BLV(); |
6217 BLV_UpdateDoors(); | 6219 BLV_UpdateDoors(); |