Mercurial > mm7
comparison mm7_2.cpp @ 1640:afc1c3514dd5
Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
author | Nomad |
---|---|
date | Tue, 17 Sep 2013 17:40:59 +0200 |
parents | ccde94f02b75 |
children | 7182930263b3 |
comparison
equal
deleted
inserted
replaced
1639:b60ddd777d50 | 1640:afc1c3514dd5 |
---|---|
2890 PlayLevelMusic(); | 2890 PlayLevelMusic(); |
2891 } | 2891 } |
2892 // 6BE35C: using guessed type int uLevel_StartingPointType; | 2892 // 6BE35C: using guessed type int uLevel_StartingPointType; |
2893 | 2893 |
2894 //----- (00461103) -------------------------------------------------------- | 2894 //----- (00461103) -------------------------------------------------------- |
2895 void _461103_load_level_sub() | 2895 void _461103_load_level_sub() |
2896 { | 2896 { |
2897 //GUIProgressBar *v0; // ebx@1 | 2897 //GUIProgressBar *v0; // ebx@1 |
2898 //signed int v1; // ebp@1 | 2898 //signed int v1; // ebp@1 |
2899 //char *v2; // esi@2 | 2899 //char *v2; // esi@2 |
2900 __int16 v3; // cx@3 | 2900 __int16 v3; // cx@3 |
3048 uNumLevelDecorations = 0; | 3048 uNumLevelDecorations = 0; |
3049 init_event_triggers(); | 3049 init_event_triggers(); |
3050 | 3050 |
3051 pGameLoadingUI_ProgressBar->Progress(); | 3051 pGameLoadingUI_ProgressBar->Progress(); |
3052 | 3052 |
3053 pODMRenderParams->vPartyPos.x = 0; | 3053 pGame->pIndoorCameraD3D->vPartyPos.x = 0; |
3054 pODMRenderParams->vPartyPos.y = 0; | 3054 pGame->pIndoorCameraD3D->vPartyPos.y = 0; |
3055 pODMRenderParams->vPartyPos.z = 100; | 3055 pGame->pIndoorCameraD3D->vPartyPos.z = 100; |
3056 pODMRenderParams->rotation_y = 0; | 3056 pGame->pIndoorCameraD3D->sRotationX = 0; |
3057 pODMRenderParams->rotation_x = 0; | 3057 pGame->pIndoorCameraD3D->sRotationY = 0; |
3058 viewparams->bRedrawGameUI = true; | 3058 viewparams->bRedrawGameUI = true; |
3059 uLevel_StartingPointType = MapStartPoint_Party; | 3059 uLevel_StartingPointType = MapStartPoint_Party; |
3060 pSprites_LOD->_461397(); | 3060 pSprites_LOD->_461397(); |
3061 pPaletteManager->LockTestAll(); | 3061 pPaletteManager->LockTestAll(); |
3062 if ( pParty->pPickedItem.uItemID != 0 ) | 3062 if ( pParty->pPickedItem.uItemID != 0 ) |
5034 assert(sizeof(PlayerBuffAnim) == 0x10); | 5034 assert(sizeof(PlayerBuffAnim) == 0x10); |
5035 assert(sizeof(ProjectileAnim) == 0x1C); | 5035 assert(sizeof(ProjectileAnim) == 0x1C); |
5036 assert(sizeof(stru6) == 0x5F8); | 5036 assert(sizeof(stru6) == 0x5F8); |
5037 assert(sizeof(IndoorCameraD3D_Vec3) == 0x10); | 5037 assert(sizeof(IndoorCameraD3D_Vec3) == 0x10); |
5038 assert(sizeof(IndoorCameraD3D_Vec4) == 0x18); //should be 14 (10 vec3 + 4 vdtor) but 18 coz of his +4 from own vdtor, but it is odd since vdtor already present from vec3 | 5038 assert(sizeof(IndoorCameraD3D_Vec4) == 0x18); //should be 14 (10 vec3 + 4 vdtor) but 18 coz of his +4 from own vdtor, but it is odd since vdtor already present from vec3 |
5039 assert(sizeof(IndoorCameraD3D) == 0x1A1384); | 5039 //assert(sizeof(IndoorCameraD3D) == 0x1A1384); |
5040 assert(sizeof(StationaryLight) == 0xC); | 5040 assert(sizeof(StationaryLight) == 0xC); |
5041 assert(sizeof(LightsStack_StationaryLight_) == 0x12C8); | 5041 assert(sizeof(LightsStack_StationaryLight_) == 0x12C8); |
5042 assert(sizeof(MobileLight) == 0x12); | 5042 assert(sizeof(MobileLight) == 0x12); |
5043 assert(sizeof(LightsStack_MobileLight_) == 0x1C28); | 5043 assert(sizeof(LightsStack_MobileLight_) == 0x1C28); |
5044 assert(sizeof(Game) == 0xE78); | 5044 assert(sizeof(Game) == 0xE78); |