Mercurial > mm7

comparison Chest.cpp @ 855:cb0b3badc7f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 31 Mar 2013 16:44:01 +0600
parents ceef50611567
children 0d96349d8c87
comparison
equal deleted inserted replaced
854:06fc66ceecd6 855:cb0b3badc7f7
18 #include "GUIWindow.h" 18 #include "GUIWindow.h"
19 #include "Time.h" 19 #include "Time.h"
20 #include "Overlays.h" 20 #include "Overlays.h"
21 21
22 #include "mm7_data.h" 22 #include "mm7_data.h"
23 23 #include "MM7.h"
24 24
25 25
26 26
27 size_t uNumChests; // idb 27 size_t uNumChests; // idb
28 struct ChestList *pChestList; 28 struct ChestList *pChestList;
107 v29 = 811; 107 v29 = 811;
108 v30 = 812; 108 v30 = 812;
109 v31 = 813; 109 v31 = 813;
110 v32 = 814; 110 v32 = 814;
111 v5 = rand() % 4; 111 v5 = rand() % 4;
112 v6 = EvtTargetObj >> 3; 112 v6 = PID_ID(EvtTargetObj);
113 v35 = v5; 113 v35 = v5;
114 if ( (EvtTargetObj & 7) == OBJECT_Decoration) 114 if ( PID_TYPE(EvtTargetObj) == OBJECT_Decoration)
115 { 115 {
116 v16 = v6; 116 v16 = v6;
117 v14 = pLevelDecorations[v6].vPosition.x; 117 v14 = pLevelDecorations[v6].vPosition.x;
118 v38 = pLevelDecorations[v6].vPosition.y; 118 v38 = pLevelDecorations[v6].vPosition.y;
119 v17 = pDecorationList->pDecorations[pLevelDecorations[v6].uDecorationDescID].uDecorationHeight; 119 v17 = pDecorationList->pDecorations[pLevelDecorations[v6].uDecorationDescID].uDecorationHeight;
120 v15 = pLevelDecorations[v16].vPosition.z + (((signed int)v17 - HIDWORD(v17)) >> 1); 120 v15 = pLevelDecorations[v16].vPosition.z + (((signed int)v17 - HIDWORD(v17)) >> 1);
121 } 121 }
122 else 122 else
123 { 123 {
124 if ( (EvtTargetObj & 7) != OBJECT_BModel) 124 if ( PID_TYPE(EvtTargetObj) != OBJECT_BModel)
125 goto LABEL_12; 125 goto LABEL_12;
126 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor) 126 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
127 { 127 {
128 v7 = &pOutdoor->pBModels[EvtTargetObj >> 9].pFaces[(EvtTargetObj >> 3) & 0x3F]; 128 v7 = &pOutdoor->pBModels[EvtTargetObj >> 9].pFaces[(EvtTargetObj >> 3) & 0x3F];
129 v8 = v7->pBoundingBox.y1; 129 v8 = v7->pBoundingBox.y1;