annotate mm7_3.cpp @ 2203:4bfee77e900d

DoInteractionWithTopmostZObject cleaned
author Ritor1
date Tue, 04 Feb 2014 17:29:04 +0600
parents d9caf2b3d8d5
children 23e7c7299ea8
rev   line source
1323
bfde0563ecdc removed weather.h from indoor.h
Grumpy7
parents: 1306
diff changeset
1 #include "Weather.h"
1262
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1254
diff changeset
2 #include "Texture.h"
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1254
diff changeset
3 #include "mm7_data.h"
1016
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 999
diff changeset
4 #include "Sprites.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 999
diff changeset
5 #include "BSPModel.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 999
diff changeset
6 #include "LightmapBuilder.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 999
diff changeset
7 #include "DecalBuilder.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 999
diff changeset
8 #include "ParticleEngine.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 999
diff changeset
9 #include "Mouse.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 999
diff changeset
10 #include "Keyboard.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 999
diff changeset
11 #include "stru6.h"
1263
73269755dd89 arcomage renaming&cleaning
Gloval
parents: 1254
diff changeset
12 #include "FactionTable.h"
0
Ritor1
parents:
diff changeset
13 #include "MapInfo.h"
Ritor1
parents:
diff changeset
14 #include "Game.h"
Ritor1
parents:
diff changeset
15 #include "GUIWindow.h"
Ritor1
parents:
diff changeset
16 #include "GUIFont.h"
Ritor1
parents:
diff changeset
17 #include "GUIProgressBar.h"
Ritor1
parents:
diff changeset
18 #include "Party.h"
Ritor1
parents:
diff changeset
19 #include "AudioPlayer.h"
Ritor1
parents:
diff changeset
20 #include "Outdoor.h"
1277
1803172dffd9 header stuff
Grumpy7
parents: 1264
diff changeset
21 #include "Outdoor_stuff.h"
0
Ritor1
parents:
diff changeset
22 #include "Overlays.h"
Ritor1
parents:
diff changeset
23 #include "LOD.h"
Ritor1
parents:
diff changeset
24 #include "Actor.h"
Ritor1
parents:
diff changeset
25 #include "Events.h"
Ritor1
parents:
diff changeset
26 #include "Viewport.h"
2037
7a9477135943 Renamed Math.h -> OurMath.h (file resolution was sometimes ambiguous)
Nomad
parents: 2030
diff changeset
27 #include "OurMath.h"
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
28 #include "SpriteObject.h"
0
Ritor1
parents:
diff changeset
29 #include "ObjectList.h"
Ritor1
parents:
diff changeset
30 #include "PaletteManager.h"
Ritor1
parents:
diff changeset
31 #include "DecorationList.h"
Ritor1
parents:
diff changeset
32 #include "stru123.h"
2044
28cb79ae2f6f Time.h rename
Ritor1
parents: 2043
diff changeset
33 #include "Timer.h"
0
Ritor1
parents:
diff changeset
34 #include "IconFrameTable.h"
Ritor1
parents:
diff changeset
35 #include "TurnEngine.h"
Ritor1
parents:
diff changeset
36 #include "Events2D.h"
Ritor1
parents:
diff changeset
37 #include "stru176.h"
Ritor1
parents:
diff changeset
38 #include "stru298.h"
189
038a4d09406f new texts file, fix text rendender error
Gloval
parents: 185
diff changeset
39 #include "texts.h"
0
Ritor1
parents:
diff changeset
40 #include "Log.h"
1262
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1254
diff changeset
41 #include "Lights.h"
1828
35c1e4ff6ba7 party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents: 1813
diff changeset
42 #include "Level/Decoration.h"
828
0f56abdcce94 Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents: 824
diff changeset
43
0f56abdcce94 Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents: 824
diff changeset
44 #include "MM7.h"
0
Ritor1
parents:
diff changeset
45
Ritor1
parents:
diff changeset
46 //----- (0046E44E) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1445
diff changeset
47 int _46E44E_collide_against_faces_and_portals(unsigned int b1)
0
Ritor1
parents:
diff changeset
48 {
717
Ritor1
parents: 688
diff changeset
49 BLVSector *pSector; // edi@1
0
Ritor1
parents:
diff changeset
50 signed int v2; // ebx@1
717
Ritor1
parents: 688
diff changeset
51 BLVFace *pFace; // esi@2
Ritor1
parents: 688
diff changeset
52 __int16 pNextSector; // si@10
Ritor1
parents: 688
diff changeset
53 int pArrayNum; // ecx@12
0
Ritor1
parents:
diff changeset
54 unsigned __int8 v6; // sf@12
Ritor1
parents:
diff changeset
55 unsigned __int8 v7; // of@12
Ritor1
parents:
diff changeset
56 int result; // eax@14
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
57 //int v10; // ecx@15
717
Ritor1
parents: 688
diff changeset
58 int pFloor; // eax@16
0
Ritor1
parents:
diff changeset
59 int v15; // eax@24
Ritor1
parents:
diff changeset
60 int v16; // edx@25
Ritor1
parents:
diff changeset
61 int v17; // eax@29
Ritor1
parents:
diff changeset
62 unsigned int v18; // eax@33
Ritor1
parents:
diff changeset
63 int v21; // eax@35
Ritor1
parents:
diff changeset
64 int v22; // ecx@36
Ritor1
parents:
diff changeset
65 int v23; // eax@40
Ritor1
parents:
diff changeset
66 unsigned int v24; // eax@44
Ritor1
parents:
diff changeset
67 int a3; // [sp+10h] [bp-48h]@28
Ritor1
parents:
diff changeset
68 int v26; // [sp+14h] [bp-44h]@15
Ritor1
parents:
diff changeset
69 int i; // [sp+18h] [bp-40h]@1
Ritor1
parents:
diff changeset
70 int a10; // [sp+1Ch] [bp-3Ch]@1
Ritor1
parents:
diff changeset
71 int v29; // [sp+20h] [bp-38h]@14
Ritor1
parents:
diff changeset
72 int v32; // [sp+2Ch] [bp-2Ch]@15
717
Ritor1
parents: 688
diff changeset
73 int pSectorsArray[10]; // [sp+30h] [bp-28h]@1
Ritor1
parents: 688
diff changeset
74
Ritor1
parents: 688
diff changeset
75 pSector = &pIndoor->pSectors[stru_721530.uSectorID];
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
76 i = 1;
0
Ritor1
parents:
diff changeset
77 a10 = b1;
717
Ritor1
parents: 688
diff changeset
78 pSectorsArray[0] = stru_721530.uSectorID;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
79 for ( v2 = 0; v2 < pSector->uNumPortals; ++v2 )
717
Ritor1
parents: 688
diff changeset
80 {
Ritor1
parents: 688
diff changeset
81 pFace = &pIndoor->pFaces[pSector->pPortals[v2]];
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
82 if ( stru_721530.sMaxX <= pFace->pBounding.x2 && stru_721530.sMinX >= pFace->pBounding.x1
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
83 && stru_721530.sMaxY <= pFace->pBounding.y2 && stru_721530.sMinY >= pFace->pBounding.y1
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
84 && stru_721530.sMaxZ <= pFace->pBounding.z2 && stru_721530.sMinZ >= pFace->pBounding.z1
717
Ritor1
parents: 688
diff changeset
85 && abs((pFace->pFacePlane_old.dist
Ritor1
parents: 688
diff changeset
86 + stru_721530.normal.x * pFace->pFacePlane_old.vNormal.x
Ritor1
parents: 688
diff changeset
87 + stru_721530.normal.y * pFace->pFacePlane_old.vNormal.y
Ritor1
parents: 688
diff changeset
88 + stru_721530.normal.z * pFace->pFacePlane_old.vNormal.z) >> 16) <= stru_721530.field_6C + 16 )
Ritor1
parents: 688
diff changeset
89 {
Ritor1
parents: 688
diff changeset
90 pNextSector = pFace->uSectorID == stru_721530.uSectorID ? pFace->uBackSectorID : pFace->uSectorID;//FrontSectorID
Ritor1
parents: 688
diff changeset
91 pArrayNum = i++;
Ritor1
parents: 688
diff changeset
92 v7 = i < 10;
0
Ritor1
parents:
diff changeset
93 v6 = i - 10 < 0;
717
Ritor1
parents: 688
diff changeset
94 pSectorsArray[pArrayNum] = pNextSector;
0
Ritor1
parents:
diff changeset
95 if ( !(v6 ^ v7) )
Ritor1
parents:
diff changeset
96 break;
Ritor1
parents:
diff changeset
97 }
Ritor1
parents:
diff changeset
98 }
Ritor1
parents:
diff changeset
99 result = 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
100 for ( v29 = 0; v29 < i; v29++ )
0
Ritor1
parents:
diff changeset
101 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
102 pSector = &pIndoor->pSectors[pSectorsArray[v29]];
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
103 v32 = pSector->uNumFloors + pSector->uNumWalls + pSector->uNumCeilings;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
104 for ( v26 = 0; v26 < v32; v26++ )
0
Ritor1
parents:
diff changeset
105 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
106 pFloor = pSector->pFloors[v26];
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
107 pFace = &pIndoor->pFaces[pSector->pFloors[v26]];
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
108 if ( !pFace->Portal()
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
109 && stru_721530.sMaxX <= pFace->pBounding.x2 && stru_721530.sMinX >= pFace->pBounding.x1
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
110 && stru_721530.sMaxY <= pFace->pBounding.y2 && stru_721530.sMinY >= pFace->pBounding.y1
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
111 && stru_721530.sMaxZ <= pFace->pBounding.z2 && stru_721530.sMinZ >= pFace->pBounding.z1
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
112 && pFloor != stru_721530.field_84 )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
113 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
114 v15 = ( pFace->pFacePlane_old.dist + stru_721530.normal.x * pFace->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
115 + stru_721530.normal.y * pFace->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
116 + stru_721530.normal.z * pFace->pFacePlane_old.vNormal.z ) >> 16;
0
Ritor1
parents:
diff changeset
117 if ( v15 > 0 )
Ritor1
parents:
diff changeset
118 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
119 v16 = ( pFace->pFacePlane_old.dist + stru_721530.normal2.x * pFace->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
120 + stru_721530.normal2.y * pFace->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
121 + stru_721530.normal2.z * pFace->pFacePlane_old.vNormal.z ) >> 16;
0
Ritor1
parents:
diff changeset
122 if ( v15 <= stru_721530.prolly_normal_d || v16 <= stru_721530.prolly_normal_d )
Ritor1
parents:
diff changeset
123 {
Ritor1
parents:
diff changeset
124 if ( v16 <= v15 )
Ritor1
parents:
diff changeset
125 {
Ritor1
parents:
diff changeset
126 a3 = stru_721530.field_6C;
717
Ritor1
parents: 688
diff changeset
127 if ( sub_47531C(stru_721530.prolly_normal_d, &a3, stru_721530.normal.x, stru_721530.normal.y, stru_721530.normal.z,
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
128 stru_721530.direction.x, stru_721530.direction.y, stru_721530.direction.z, pFace, a10) )
0
Ritor1
parents:
diff changeset
129 {
Ritor1
parents:
diff changeset
130 v17 = a3;
Ritor1
parents:
diff changeset
131 }
Ritor1
parents:
diff changeset
132 else
Ritor1
parents:
diff changeset
133 {
Ritor1
parents:
diff changeset
134 a3 = stru_721530.field_6C + stru_721530.prolly_normal_d;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
135 if ( !sub_475D85(&stru_721530.normal, &stru_721530.direction, &a3, pFace) )
0
Ritor1
parents:
diff changeset
136 goto LABEL_34;
Ritor1
parents:
diff changeset
137 v17 = a3 - stru_721530.prolly_normal_d;
Ritor1
parents:
diff changeset
138 a3 -= stru_721530.prolly_normal_d;
Ritor1
parents:
diff changeset
139 }
Ritor1
parents:
diff changeset
140 if ( v17 < stru_721530.field_7C )
Ritor1
parents:
diff changeset
141 {
Ritor1
parents:
diff changeset
142 stru_721530.field_7C = v17;
717
Ritor1
parents: 688
diff changeset
143 v18 = 8 * pSector->pFloors[v26];
0
Ritor1
parents:
diff changeset
144 LOBYTE(v18) = v18 | 6;
Ritor1
parents:
diff changeset
145 stru_721530.uFaceID = v18;
Ritor1
parents:
diff changeset
146 }
Ritor1
parents:
diff changeset
147 }
Ritor1
parents:
diff changeset
148 }
Ritor1
parents:
diff changeset
149 }
Ritor1
parents:
diff changeset
150 LABEL_34:
Ritor1
parents:
diff changeset
151 if ( !(stru_721530.field_0 & 1)
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
152 || (v21 = ( pFace->pFacePlane_old.dist + stru_721530.position.x * pFace->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
153 + stru_721530.position.y * pFace->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
154 + stru_721530.position.z * pFace->pFacePlane_old.vNormal.z) >> 16, v21 <= 0)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
155 || (v22 = ( pFace->pFacePlane_old.dist + stru_721530.field_4C * pFace->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
156 + stru_721530.field_50 * pFace->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
157 + stru_721530.field_54 * pFace->pFacePlane_old.vNormal.z) >> 16, v21 > stru_721530.prolly_normal_d)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
158 && v22 > stru_721530.prolly_normal_d || v22 > v21 )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
159 continue;
0
Ritor1
parents:
diff changeset
160 a3 = stru_721530.field_6C;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
161 if ( sub_47531C(stru_721530.field_8_radius, &a3, stru_721530.position.x, stru_721530.position.y, stru_721530.position.z,
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
162 stru_721530.direction.x, stru_721530.direction.y, stru_721530.direction.z, pFace, a10) )
0
Ritor1
parents:
diff changeset
163 {
Ritor1
parents:
diff changeset
164 v23 = a3;
Ritor1
parents:
diff changeset
165 goto LABEL_43;
Ritor1
parents:
diff changeset
166 }
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
167 a3 = stru_721530.field_6C + stru_721530.field_8_radius;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
168 if ( sub_475D85(&stru_721530.position, &stru_721530.direction, &a3, pFace) )
0
Ritor1
parents:
diff changeset
169 {
Ritor1
parents:
diff changeset
170 v23 = a3 - stru_721530.prolly_normal_d;
Ritor1
parents:
diff changeset
171 a3 -= stru_721530.prolly_normal_d;
Ritor1
parents:
diff changeset
172 LABEL_43:
Ritor1
parents:
diff changeset
173 if ( v23 < stru_721530.field_7C )
Ritor1
parents:
diff changeset
174 {
Ritor1
parents:
diff changeset
175 stru_721530.field_7C = v23;
717
Ritor1
parents: 688
diff changeset
176 v24 = 8 * pSector->pFloors[v26];
0
Ritor1
parents:
diff changeset
177 LOBYTE(v24) = v24 | 6;
Ritor1
parents:
diff changeset
178 stru_721530.uFaceID = v24;
Ritor1
parents:
diff changeset
179 }
Ritor1
parents:
diff changeset
180 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
181 }
0
Ritor1
parents:
diff changeset
182 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
183 result = v29 + 1;
0
Ritor1
parents:
diff changeset
184 }
Ritor1
parents:
diff changeset
185 return result;
Ritor1
parents:
diff changeset
186 }
Ritor1
parents:
diff changeset
187 // 46E44E: using guessed type int var_28[10];
Ritor1
parents:
diff changeset
188
Ritor1
parents:
diff changeset
189 //----- (0046E889) --------------------------------------------------------
Ritor1
parents:
diff changeset
190 int __fastcall _46E889_collide_against_bmodels(unsigned int ecx0)
Ritor1
parents:
diff changeset
191 {
Ritor1
parents:
diff changeset
192 int result; // eax@1
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
193 //int v3; // ebx@9
0
Ritor1
parents:
diff changeset
194 int v8; // eax@19
Ritor1
parents:
diff changeset
195 int v9; // ecx@20
Ritor1
parents:
diff changeset
196 int v10; // eax@24
Ritor1
parents:
diff changeset
197 unsigned int v14; // eax@28
Ritor1
parents:
diff changeset
198 int v15; // eax@30
Ritor1
parents:
diff changeset
199 int v16; // ecx@31
Ritor1
parents:
diff changeset
200 unsigned int v17; // eax@36
Ritor1
parents:
diff changeset
201 int v21; // eax@42
Ritor1
parents:
diff changeset
202 unsigned int v22; // eax@43
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
203 //int a11; // [sp+70h] [bp-18h]@1
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
204 //int a10; // [sp+80h] [bp-8h]@1
0
Ritor1
parents:
diff changeset
205 int a2; // [sp+84h] [bp-4h]@23
Ritor1
parents:
diff changeset
206
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
207 //a11 = ecx0;
0
Ritor1
parents:
diff changeset
208
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
209 BLVFace face; // [sp+Ch] [bp-7Ch]@1
0
Ritor1
parents:
diff changeset
210
Ritor1
parents:
diff changeset
211 result = 0;
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
212 for ( uint i = 0; i < (signed int)pOutdoor->uNumBModels; ++i )
0
Ritor1
parents:
diff changeset
213 {
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
214 if ( stru_721530.sMaxX <= pOutdoor->pBModels[i].sMaxX && stru_721530.sMinX >= pOutdoor->pBModels[i].sMinX
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
215 && stru_721530.sMaxY <= pOutdoor->pBModels[i].sMaxY && stru_721530.sMinY >= pOutdoor->pBModels[i].sMinY
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
216 && stru_721530.sMaxZ <= pOutdoor->pBModels[i].sMaxZ && stru_721530.sMinZ >= pOutdoor->pBModels[i].sMinZ )
0
Ritor1
parents:
diff changeset
217 {
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
218 for ( uint j = 0; j < pOutdoor->pBModels[i].uNumFaces; ++j )
0
Ritor1
parents:
diff changeset
219 {
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
220 if ( stru_721530.sMaxX <= pOutdoor->pBModels[i].pFaces[j].pBoundingBox.x2 && stru_721530.sMinX >= pOutdoor->pBModels[i].pFaces[j].pBoundingBox.x1
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
221 && stru_721530.sMaxY <= pOutdoor->pBModels[i].pFaces[j].pBoundingBox.y2 && stru_721530.sMinY >= pOutdoor->pBModels[i].pFaces[j].pBoundingBox.y1
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
222 && stru_721530.sMaxZ <= pOutdoor->pBModels[i].pFaces[j].pBoundingBox.z2 && stru_721530.sMinZ >= pOutdoor->pBModels[i].pFaces[j].pBoundingBox.z1 )
0
Ritor1
parents:
diff changeset
223 {
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
224 face.pFacePlane_old.vNormal.x = pOutdoor->pBModels[i].pFaces[j].pFacePlane.vNormal.x;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
225 face.pFacePlane_old.vNormal.y = pOutdoor->pBModels[i].pFaces[j].pFacePlane.vNormal.y;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
226 face.pFacePlane_old.vNormal.z = pOutdoor->pBModels[i].pFaces[j].pFacePlane.vNormal.z;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
227
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
228 face.pFacePlane_old.dist = pOutdoor->pBModels[i].pFaces[j].pFacePlane.dist; //incorrect
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
229
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
230 face.uAttributes = pOutdoor->pBModels[i].pFaces[j].uAttributes;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
231
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
232 face.pBounding.x1 = pOutdoor->pBModels[i].pFaces[j].pBoundingBox.x1;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
233 face.pBounding.y1 = pOutdoor->pBModels[i].pFaces[j].pBoundingBox.y1;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
234 face.pBounding.z1 = pOutdoor->pBModels[i].pFaces[j].pBoundingBox.z1;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
235
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
236 face.pBounding.x2 = pOutdoor->pBModels[i].pFaces[j].pBoundingBox.x2;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
237 face.pBounding.y2 = pOutdoor->pBModels[i].pFaces[j].pBoundingBox.y2;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
238 face.pBounding.z2 = pOutdoor->pBModels[i].pFaces[j].pBoundingBox.z2;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
239
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
240 face.zCalc1 = pOutdoor->pBModels[i].pFaces[j].zCalc1;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
241 face.zCalc2 = pOutdoor->pBModels[i].pFaces[j].zCalc2;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
242 face.zCalc3 = pOutdoor->pBModels[i].pFaces[j].zCalc3;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
243
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
244 face.pXInterceptDisplacements = pOutdoor->pBModels[i].pFaces[j].pXInterceptDisplacements;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
245 face.pYInterceptDisplacements = pOutdoor->pBModels[i].pFaces[j].pYInterceptDisplacements;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
246 face.pZInterceptDisplacements = pOutdoor->pBModels[i].pFaces[j].pZInterceptDisplacements;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
247
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
248 face.uPolygonType = (PolygonType)pOutdoor->pBModels[i].pFaces[j].uPolygonType;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
249
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
250 face.uNumVertices = pOutdoor->pBModels[i].pFaces[j].uNumVertices;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
251
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
252 face.uBitmapID = pOutdoor->pBModels[i].pFaces[j].uTextureID;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
253
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
254 face.pVertexIDs = pOutdoor->pBModels[i].pFaces[j].pVertexIDs;
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
255
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
256 if ( !face.Ethereal() && !face.Portal() )
0
Ritor1
parents:
diff changeset
257 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
258 v8 = (face.pFacePlane_old.dist + face.pFacePlane_old.vNormal.x * stru_721530.normal.x
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
259 + face.pFacePlane_old.vNormal.y * stru_721530.normal.y
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
260 + face.pFacePlane_old.vNormal.z * stru_721530.normal.z ) >> 16;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
261 if ( v8 > 0 )
0
Ritor1
parents:
diff changeset
262 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
263 v9 = (face.pFacePlane_old.dist + face.pFacePlane_old.vNormal.x * stru_721530.normal2.x
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
264 + face.pFacePlane_old.vNormal.y * stru_721530.normal2.y
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
265 + face.pFacePlane_old.vNormal.z * stru_721530.normal2.z) >> 16;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
266 if ( v8 <= stru_721530.prolly_normal_d || v9 <= stru_721530.prolly_normal_d )
0
Ritor1
parents:
diff changeset
267 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
268 if ( v9 <= v8 )
0
Ritor1
parents:
diff changeset
269 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
270 a2 = stru_721530.field_6C;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
271 if ( sub_4754BF(stru_721530.prolly_normal_d, &a2, stru_721530.normal.x, stru_721530.normal.y, stru_721530.normal.z,
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
272 stru_721530.direction.x, stru_721530.direction.y, stru_721530.direction.z, &face, i, ecx0) )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
273 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
274 v10 = a2;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
275 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
276 else
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
277 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
278 a2 = stru_721530.prolly_normal_d + stru_721530.field_6C;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
279 if ( !sub_475F30( &a2, &face, stru_721530.normal.x, stru_721530.normal.y, stru_721530.normal.z,
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
280 stru_721530.direction.x, stru_721530.direction.y, stru_721530.direction.z, i) )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
281 goto LABEL_29;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
282 v10 = a2 - stru_721530.prolly_normal_d;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
283 a2 -= stru_721530.prolly_normal_d;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
284 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
285 if ( v10 < stru_721530.field_7C )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
286 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
287 stru_721530.field_7C = v10;
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
288 v14 = 8 * (j | (i << 6));
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
289 LOBYTE(v14) = v14 | 6;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
290 stru_721530.uFaceID = v14;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
291 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
292 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
293 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
294 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
295 LABEL_29:
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
296 if ( stru_721530.field_0 & 1 )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
297 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
298 v15 = (face.pFacePlane_old.dist + face.pFacePlane_old.vNormal.x * stru_721530.position.x
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
299 + face.pFacePlane_old.vNormal.y * stru_721530.position.y
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
300 + face.pFacePlane_old.vNormal.z * stru_721530.position.z) >> 16;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
301 if ( v15 > 0 )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
302 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
303 v16 = (face.pFacePlane_old.dist + face.pFacePlane_old.vNormal.x * stru_721530.field_4C
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
304 + face.pFacePlane_old.vNormal.y * stru_721530.field_50
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
305 + face.pFacePlane_old.vNormal.z * stru_721530.field_54) >> 16;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
306 if ( v15 <= stru_721530.prolly_normal_d || v16 <= stru_721530.prolly_normal_d )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
307 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
308 if ( v16 <= v15 )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
309 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
310 a2 = stru_721530.field_6C;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
311 if ( sub_4754BF(stru_721530.field_8_radius, &a2, stru_721530.position.x, stru_721530.position.y, stru_721530.position.z,
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
312 stru_721530.direction.x, stru_721530.direction.y, stru_721530.direction.z, &face, i, ecx0) )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
313 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
314 if ( a2 < stru_721530.field_7C )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
315 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
316 stru_721530.field_7C = a2;
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
317 v17 = 8 * (j | (i << 6));
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
318 LOBYTE(v17) = v17 | 6;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
319 stru_721530.uFaceID = v17;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
320 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
321 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
322 else
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
323 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
324 a2 = stru_721530.field_6C + stru_721530.field_8_radius;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
325 if ( sub_475F30(&a2, &face, stru_721530.position.x, stru_721530.position.y, stru_721530.position.z,
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
326 stru_721530.direction.x, stru_721530.direction.y, stru_721530.direction.z, i) )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
327 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
328 v21 = a2 - stru_721530.prolly_normal_d;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
329 a2 -= stru_721530.prolly_normal_d;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
330 if ( a2 < stru_721530.field_7C )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
331 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
332 stru_721530.field_7C = v21;
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
333 v22 = 8 * (j | (i << 6));
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
334 LOBYTE(v22) = v22 | 6;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
335 stru_721530.uFaceID = v22;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
336 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
337 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
338 }
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
339 }
0
Ritor1
parents:
diff changeset
340 }
Ritor1
parents:
diff changeset
341 }
Ritor1
parents:
diff changeset
342 }
Ritor1
parents:
diff changeset
343 }
Ritor1
parents:
diff changeset
344 }
Ritor1
parents:
diff changeset
345 }
Ritor1
parents:
diff changeset
346 }
2148
af349bd395ff ODM_ProcessPartyActions continue
Ritor1
parents: 2144
diff changeset
347 result = i;
0
Ritor1
parents:
diff changeset
348 }
Ritor1
parents:
diff changeset
349 return result;
Ritor1
parents:
diff changeset
350 }
Ritor1
parents:
diff changeset
351
Ritor1
parents:
diff changeset
352 //----- (0046ED1B) --------------------------------------------------------
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
353 int collide_against_floor(int x, int y, int z, unsigned int *pSectorID, unsigned int *pFaceID)
0
Ritor1
parents:
diff changeset
354 {
Ritor1
parents:
diff changeset
355 uint uFaceID = -1;
723
256211e8243a ODM_GetFloorLevel & BLV_GetFloorLevel
Ritor1
parents: 722
diff changeset
356 int floor_level = BLV_GetFloorLevel(x, y, z, *pSectorID, &uFaceID);
0
Ritor1
parents:
diff changeset
357
Ritor1
parents:
diff changeset
358 if (floor_level != -30000 && floor_level <= z + 50)
Ritor1
parents:
diff changeset
359 {
Ritor1
parents:
diff changeset
360 *pFaceID = uFaceID;
Ritor1
parents:
diff changeset
361 return floor_level;
Ritor1
parents:
diff changeset
362 }
Ritor1
parents:
diff changeset
363
Ritor1
parents:
diff changeset
364 uint uSectorID = pIndoor->GetSector(x, y, z);
Ritor1
parents:
diff changeset
365 *pSectorID = uSectorID;
Ritor1
parents:
diff changeset
366
723
256211e8243a ODM_GetFloorLevel & BLV_GetFloorLevel
Ritor1
parents: 722
diff changeset
367 floor_level = BLV_GetFloorLevel(x, y, z, uSectorID, &uFaceID);
0
Ritor1
parents:
diff changeset
368 if (uSectorID && floor_level != -30000)
Ritor1
parents:
diff changeset
369 *pFaceID = uFaceID;
Ritor1
parents:
diff changeset
370 else return -30000;
Ritor1
parents:
diff changeset
371 return floor_level;
Ritor1
parents:
diff changeset
372 }
Ritor1
parents:
diff changeset
373
Ritor1
parents:
diff changeset
374 //----- (0046ED8A) --------------------------------------------------------
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
375 void __fastcall _46ED8A_collide_against_sprite_objects(unsigned int _this)
0
Ritor1
parents:
diff changeset
376 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
377 ObjectDesc *object; // edx@4
0
Ritor1
parents:
diff changeset
378 int v10; // ecx@12
Ritor1
parents:
diff changeset
379 int v11; // esi@13
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
380
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
381 for ( uint i = 0; i < uNumSpriteObjects; ++i )
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
382 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
383 if ( pSpriteObjects[i].uObjectDescID )
0
Ritor1
parents:
diff changeset
384 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
385 object = &pObjectList->pObjects[pSpriteObjects[i].uObjectDescID];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
386 if ( !(object->uFlags & OBJECT_DESC_NO_COLLISION) )
0
Ritor1
parents:
diff changeset
387 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
388 if ( stru_721530.sMaxX <= pSpriteObjects[i].vPosition.x + object->uRadius && stru_721530.sMinX >= pSpriteObjects[i].vPosition.x - object->uRadius
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
389 && stru_721530.sMaxY <= pSpriteObjects[i].vPosition.y + object->uRadius && stru_721530.sMinY >= pSpriteObjects[i].vPosition.y - object->uRadius
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
390 && stru_721530.sMaxZ <= pSpriteObjects[i].vPosition.z + object->uHeight && stru_721530.sMinZ >= pSpriteObjects[i].vPosition.z )
0
Ritor1
parents:
diff changeset
391 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
392 if ( abs(((pSpriteObjects[i].vPosition.x - stru_721530.normal.x) * stru_721530.direction.y
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
393 - (pSpriteObjects[i].vPosition.y - stru_721530.normal.y) * stru_721530.direction.x) >> 16)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
394 <= object->uHeight + stru_721530.prolly_normal_d )
0
Ritor1
parents:
diff changeset
395 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
396 v10 = ((pSpriteObjects[i].vPosition.x - stru_721530.normal.x) * stru_721530.direction.x
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
397 + (pSpriteObjects[i].vPosition.y - stru_721530.normal.y) * stru_721530.direction.y) >> 16;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
398 if ( v10 > 0 )
0
Ritor1
parents:
diff changeset
399 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
400 v11 = stru_721530.normal.z + ((unsigned __int64)(stru_721530.direction.z * (signed __int64)v10) >> 16);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
401 if ( v11 >= pSpriteObjects[i].vPosition.z - stru_721530.prolly_normal_d )
0
Ritor1
parents:
diff changeset
402 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
403 if ( v11 <= object->uHeight + stru_721530.prolly_normal_d + pSpriteObjects[i].vPosition.z )
0
Ritor1
parents:
diff changeset
404 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
405 if ( v10 < stru_721530.field_7C )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
406 sub_46DEF2(_this, i);
0
Ritor1
parents:
diff changeset
407 }
Ritor1
parents:
diff changeset
408 }
Ritor1
parents:
diff changeset
409 }
Ritor1
parents:
diff changeset
410 }
Ritor1
parents:
diff changeset
411 }
Ritor1
parents:
diff changeset
412 }
Ritor1
parents:
diff changeset
413 }
Ritor1
parents:
diff changeset
414 }
Ritor1
parents:
diff changeset
415 }
Ritor1
parents:
diff changeset
416
Ritor1
parents:
diff changeset
417 //----- (0046EF01) --------------------------------------------------------
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
418 int _46EF01_collision_chech_player(int a1)
0
Ritor1
parents:
diff changeset
419 {
Ritor1
parents:
diff changeset
420 int result; // eax@1
Ritor1
parents:
diff changeset
421 int v3; // ebx@7
Ritor1
parents:
diff changeset
422 int v4; // esi@7
Ritor1
parents:
diff changeset
423 int v5; // edi@8
Ritor1
parents:
diff changeset
424 int v6; // ecx@9
Ritor1
parents:
diff changeset
425 int v7; // edi@12
Ritor1
parents:
diff changeset
426 int v10; // [sp+14h] [bp-8h]@7
Ritor1
parents:
diff changeset
427 int v11; // [sp+18h] [bp-4h]@7
Ritor1
parents:
diff changeset
428
Ritor1
parents:
diff changeset
429 result = pParty->vPosition.x;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
430 //v9 = pParty->uPartyHeight;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
431 if ( stru_721530.sMaxX <= pParty->vPosition.x + (2 * pParty->field_14_radius) && stru_721530.sMinX >= pParty->vPosition.x - (2 * pParty->field_14_radius)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
432 && stru_721530.sMaxY <= pParty->vPosition.y + (2 * pParty->field_14_radius) && stru_721530.sMinY >= pParty->vPosition.y - (2 * pParty->field_14_radius)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
433 && stru_721530.sMaxZ <= pParty->vPosition.z + pParty->uPartyHeight && stru_721530.sMinZ >= pParty->vPosition.z )
0
Ritor1
parents:
diff changeset
434 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
435 v3 = stru_721530.prolly_normal_d + (2 * pParty->field_14_radius);
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
436 v11 = pParty->vPosition.x - stru_721530.normal.x;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
437 v4 = ((pParty->vPosition.x - stru_721530.normal.x) * stru_721530.direction.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
438 - (pParty->vPosition.y - stru_721530.normal.y) * stru_721530.direction.x) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
439 v10 = pParty->vPosition.y - stru_721530.normal.y;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
440 result = abs(((pParty->vPosition.x - stru_721530.normal.x) * stru_721530.direction.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
441 - (pParty->vPosition.y - stru_721530.normal.y) * stru_721530.direction.x) >> 16);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
442 if ( result <= stru_721530.prolly_normal_d + (2 * pParty->field_14_radius) )
0
Ritor1
parents:
diff changeset
443 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
444 result = v10 * stru_721530.direction.y;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
445 v5 = (v10 * stru_721530.direction.y + v11 * stru_721530.direction.x) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
446 if ( v5 > 0 )
0
Ritor1
parents:
diff changeset
447 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
448 v6 = ((unsigned __int64)(stru_721530.direction.z * (signed __int64)v5) >> 16) + stru_721530.normal.z;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
449 result = pParty->vPosition.z;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
450 if ( v6 >= pParty->vPosition.z )
0
Ritor1
parents:
diff changeset
451 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
452 result = pParty->uPartyHeight + pParty->vPosition.z;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
453 if ( v6 <= (signed int)(pParty->uPartyHeight + pParty->vPosition.z) || a1 )
0
Ritor1
parents:
diff changeset
454 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
455 result = integer_sqrt(v3 * v3 - v4 * v4);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
456 v7 = v5 - integer_sqrt(v3 * v3 - v4 * v4);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
457 if ( v7 < 0 )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
458 v7 = 0;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
459 if ( v7 < stru_721530.field_7C )
0
Ritor1
parents:
diff changeset
460 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
461 stru_721530.field_7C = v7;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
462 stru_721530.uFaceID = 4;
0
Ritor1
parents:
diff changeset
463 }
Ritor1
parents:
diff changeset
464 }
Ritor1
parents:
diff changeset
465 }
Ritor1
parents:
diff changeset
466 }
Ritor1
parents:
diff changeset
467 }
Ritor1
parents:
diff changeset
468 }
Ritor1
parents:
diff changeset
469 return result;
Ritor1
parents:
diff changeset
470 }
Ritor1
parents:
diff changeset
471
Ritor1
parents:
diff changeset
472 //----- (0046F04E) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
473 int _46F04E_collide_against_portals()
0
Ritor1
parents:
diff changeset
474 {
Ritor1
parents:
diff changeset
475 unsigned int v1; // eax@1
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
476 BLVFace *face; // eax@3
0
Ritor1
parents:
diff changeset
477 int v4; // ecx@9
Ritor1
parents:
diff changeset
478 int v5; // edx@9
Ritor1
parents:
diff changeset
479 signed int result; // eax@21
Ritor1
parents:
diff changeset
480 unsigned int v10; // [sp+8h] [bp-Ch]@1
Ritor1
parents:
diff changeset
481 int a3; // [sp+Ch] [bp-8h]@13
Ritor1
parents:
diff changeset
482 int v12; // [sp+10h] [bp-4h]@15
Ritor1
parents:
diff changeset
483
Ritor1
parents:
diff changeset
484 v1 = 0xFFFFFFu;
Ritor1
parents:
diff changeset
485 v10 = 0xFFFFFFu;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
486 for ( uint i = 0; i < pIndoor->pSectors[stru_721530.uSectorID].uNumPortals; ++i )
0
Ritor1
parents:
diff changeset
487 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
488 if ( pIndoor->pSectors[stru_721530.uSectorID].pPortals[i] != stru_721530.field_80 )
0
Ritor1
parents:
diff changeset
489 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
490 face = &pIndoor->pFaces[pIndoor->pSectors[stru_721530.uSectorID].pPortals[i]];
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
491 if ( stru_721530.sMaxX <= face->pBounding.x2 && stru_721530.sMinX >= face->pBounding.x1
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
492 && stru_721530.sMaxY <= face->pBounding.y2 && stru_721530.sMinY >= face->pBounding.y1
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
493 && stru_721530.sMaxZ <= face->pBounding.z2 && stru_721530.sMinZ >= face->pBounding.z1 )
0
Ritor1
parents:
diff changeset
494 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
495 v4 = (stru_721530.normal.x * face->pFacePlane_old.vNormal.x + face->pFacePlane_old.dist
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
496 + stru_721530.normal.y * face->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
497 + stru_721530.normal.z * face->pFacePlane_old.vNormal.z) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
498 v5 = (stru_721530.normal2.z * face->pFacePlane_old.vNormal.z + face->pFacePlane_old.dist
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
499 + stru_721530.normal2.x * face->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
500 + stru_721530.normal2.y * face->pFacePlane_old.vNormal.y) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
501 if ( (v4 < stru_721530.prolly_normal_d || v5 < stru_721530.prolly_normal_d)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
502 && (v4 > -stru_721530.prolly_normal_d || v5 > -stru_721530.prolly_normal_d)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
503 && (a3 = stru_721530.field_6C, sub_475D85(&stru_721530.normal, &stru_721530.direction, &a3, face))
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
504 && a3 < (signed int)v10 )
0
Ritor1
parents:
diff changeset
505 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
506 v10 = a3;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
507 v12 = pIndoor->pSectors[stru_721530.uSectorID].pPortals[i];
0
Ritor1
parents:
diff changeset
508 }
Ritor1
parents:
diff changeset
509 }
Ritor1
parents:
diff changeset
510 }
Ritor1
parents:
diff changeset
511 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
512 v1 = v10;
0
Ritor1
parents:
diff changeset
513 if ( stru_721530.field_7C >= (signed int)v1 && (signed int)v1 <= stru_721530.field_6C )
Ritor1
parents:
diff changeset
514 {
Ritor1
parents:
diff changeset
515 stru_721530.field_80 = v12;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
516 if ( pIndoor->pFaces[v12].uSectorID == stru_721530.uSectorID )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
517 stru_721530.uSectorID = pIndoor->pFaces[v12].uBackSectorID;
0
Ritor1
parents:
diff changeset
518 else
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
519 stru_721530.uSectorID = pIndoor->pFaces[v12].uSectorID;
0
Ritor1
parents:
diff changeset
520 stru_721530.field_7C = 268435455;
Ritor1
parents:
diff changeset
521 result = 0;
Ritor1
parents:
diff changeset
522 }
Ritor1
parents:
diff changeset
523 else
Ritor1
parents:
diff changeset
524 {
Ritor1
parents:
diff changeset
525 result = 1;
Ritor1
parents:
diff changeset
526 }
Ritor1
parents:
diff changeset
527 return result;
Ritor1
parents:
diff changeset
528 }
Ritor1
parents:
diff changeset
529
Ritor1
parents:
diff changeset
530 //----- (0047050A) --------------------------------------------------------
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
531 int stru141_actor_collision_object::_47050A(int dt)
0
Ritor1
parents:
diff changeset
532 {
Ritor1
parents:
diff changeset
533 int v7; // eax@1
Ritor1
parents:
diff changeset
534 signed int result; // eax@4
Ritor1
parents:
diff changeset
535 int v17; // eax@5
Ritor1
parents:
diff changeset
536 int v18; // eax@7
Ritor1
parents:
diff changeset
537 int v21; // eax@9
Ritor1
parents:
diff changeset
538 int v22; // eax@11
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
539
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
540 int speed = 1 | integer_sqrt(this->velocity.z * this->velocity.z + this->velocity.y * this->velocity.y + this->velocity.x * this->velocity.x);
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
541
1799
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
542 this->direction.x = 65536 / speed * this->velocity.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
543 this->direction.y = 65536 / speed * this->velocity.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
544 this->direction.z = 65536 / speed * this->velocity.z;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
545
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
546 this->speed = speed;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
547 this->inv_speed = 65536 / speed;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
548
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
549 if (dt)
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
550 v7 = dt;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
551 else
0
Ritor1
parents:
diff changeset
552 v7 = pEventTimer->dt_in_some_format;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
553
1799
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
554 //v8 = fixpoint_mul(v7, speed) - this->field_70; // speed * dt - something
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
555 this->field_6C = fixpoint_mul(v7, speed) - this->field_70;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
556 if ( this->field_6C > 0 )
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
557 {
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
558 //v10 = fixpoint_mul(v8, this->direction.x) + this->normal.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
559 this->field_4C = fixpoint_mul(this->field_6C, this->direction.x) + this->normal.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
560 this->normal2.x = fixpoint_mul(this->field_6C, this->direction.x) + this->normal.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
561 //v11 = fixpoint_mul(this->field_6C, this->direction.y) + this->normal.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
562 this->field_50 = fixpoint_mul(this->field_6C, this->direction.y) + this->normal.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
563 this->normal2.y = fixpoint_mul(this->field_6C, this->direction.y) + this->normal.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
564 this->normal2.z = fixpoint_mul(this->field_6C, this->direction.z) + this->normal.z;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
565 //v12 = this->position.z;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
566 //v13 = this->normal.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
567 //v14 = this->normal2.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
568 //v15 = this->prolly_normal_d;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
569 //v16 = this->position.z + fixpoint_mul(this->field_6C, this->direction.z);
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
570 //v28 = this->position.z + fixpoint_mul(this->field_6C, this->direction.z);
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
571 this->field_54 = this->position.z + fixpoint_mul(this->field_6C, this->direction.z);
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
572 v17 = this->normal.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
573 if ( v17 >= this->normal2.x )
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
574 v17 = this->normal2.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
575 this->sMaxX = v17 - this->prolly_normal_d;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
576 v18 = this->prolly_normal_d + this->normal.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
577 if ( this->normal.x <= this->normal2.x )
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
578 v18 = this->prolly_normal_d + this->normal2.x;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
579 //v19 = this->normal.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
580 //v20 = this->normal2.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
581 this->sMinX = v18;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
582 v21 = this->normal.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
583 if ( v21 >= this->normal2.y )
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
584 v21 = this->normal2.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
585 this->sMaxY = v21 - this->prolly_normal_d;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
586 v22 = this->prolly_normal_d + this->normal.y;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
587 if ( this->normal.y <= this->normal2.y )
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
588 v22 = this->normal2.y + this->prolly_normal_d;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
589 //v23 = this->normal2.z;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
590 this->sMinY = v22;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
591 //v24 = this->normal.z;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
592 if ( this->normal.z >= this->normal2.z )
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
593 this->sMaxZ = this->normal2.z - this->prolly_normal_d;
0
Ritor1
parents:
diff changeset
594 else
1799
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
595 this->sMaxZ = this->normal.z - this->prolly_normal_d;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
596 //this->sMaxZ = v25;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
597 //v26 = this->field_8_radius;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
598 if ( this->position.z <= this->position.z + fixpoint_mul(this->field_6C, this->direction.z) )
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
599 this->sMinZ = (this->position.z + fixpoint_mul(this->field_6C, this->direction.z)) + this->field_8_radius;
0
Ritor1
parents:
diff changeset
600 else
1799
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
601 this->sMinZ = this->position.z + this->field_8_radius;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
602 this->uFaceID = 0;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
603 this->field_80 = -1;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
604 this->field_88 = -1;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
605 //this->sMinZ = v27;
dfafcd39c67b GetSpellColor, DrawSkyD3D()(continue)
Ritor1
parents: 1787
diff changeset
606 this->field_7C = 0xFFFFFFu;
0
Ritor1
parents:
diff changeset
607 result = 0;
Ritor1
parents:
diff changeset
608 }
Ritor1
parents:
diff changeset
609 else
Ritor1
parents:
diff changeset
610 {
Ritor1
parents:
diff changeset
611 result = 1;
Ritor1
parents:
diff changeset
612 }
Ritor1
parents:
diff changeset
613 return result;
Ritor1
parents:
diff changeset
614 }
Ritor1
parents:
diff changeset
615
Ritor1
parents:
diff changeset
616 //----- (004706C6) --------------------------------------------------------
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
617 void UpdateActors_ODM()
0
Ritor1
parents:
diff changeset
618 {
Ritor1
parents:
diff changeset
619 int v3; // ebx@6
Ritor1
parents:
diff changeset
620 int v5; // eax@10
Ritor1
parents:
diff changeset
621 int v6; // ecx@10
Ritor1
parents:
diff changeset
622 signed int v8; // ebx@17
Ritor1
parents:
diff changeset
623 unsigned __int8 v10; // sf@17
Ritor1
parents:
diff changeset
624 unsigned __int16 v11; // ax@21
Ritor1
parents:
diff changeset
625 __int16 v20; // ax@42
Ritor1
parents:
diff changeset
626 int v25; // eax@45
Ritor1
parents:
diff changeset
627 signed int v26; // ecx@50
Ritor1
parents:
diff changeset
628 int v28; // eax@54
Ritor1
parents:
diff changeset
629 signed int v29; // ebx@57
Ritor1
parents:
diff changeset
630 signed int v30; // eax@57
Ritor1
parents:
diff changeset
631 int v31; // edi@57
Ritor1
parents:
diff changeset
632 signed int i; // ebx@57
Ritor1
parents:
diff changeset
633 unsigned int v33; // ecx@58
Ritor1
parents:
diff changeset
634 int v35; // edi@64
Ritor1
parents:
diff changeset
635 int v36; // eax@64
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 846
diff changeset
636 unsigned int v39; // edi@71
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
637 ODMFace *face; // edi@75
0
Ritor1
parents:
diff changeset
638 int v46; // ecx@82
Ritor1
parents:
diff changeset
639 signed int v47; // ebx@85
Ritor1
parents:
diff changeset
640 int v48; // edi@85
Ritor1
parents:
diff changeset
641 int v55; // eax@107
Ritor1
parents:
diff changeset
642 unsigned int v56; // edi@107
Ritor1
parents:
diff changeset
643 int v57; // ST10_4@107
Ritor1
parents:
diff changeset
644 unsigned int v58; // edi@107
Ritor1
parents:
diff changeset
645 unsigned int v59; // ebx@107
Ritor1
parents:
diff changeset
646 signed int v60; // eax@107
Ritor1
parents:
diff changeset
647 int v61; // eax@124
Ritor1
parents:
diff changeset
648 Vec3_int_ v62; // [sp+Ch] [bp-44h]@42
153
86a2637ba125 UpdateActors
Ritor1
parents: 152
diff changeset
649 int v63; // [sp+18h] [bp-38h]@64
0
Ritor1
parents:
diff changeset
650 int v64; // [sp+1Ch] [bp-34h]@64
Ritor1
parents:
diff changeset
651 bool v67; // [sp+28h] [bp-28h]@10
Ritor1
parents:
diff changeset
652 unsigned int v69; // [sp+30h] [bp-20h]@6
Ritor1
parents:
diff changeset
653 unsigned int v70; // [sp+34h] [bp-1Ch]@10
Ritor1
parents:
diff changeset
654 int v71; // [sp+38h] [bp-18h]@62
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
655 int uIsAboveFloor; // [sp+3Ch] [bp-14h]@10
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
656 int v72b;
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
657 int uIsFlying; // [sp+44h] [bp-Ch]@8
0
Ritor1
parents:
diff changeset
658 unsigned int v75; // [sp+48h] [bp-8h]@1
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
659 int uIsOnWater; // [sp+4Ch] [bp-4h]@10
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
660
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
661 for (v75 = 0; v75 < uNumActors; ++v75)
0
Ritor1
parents:
diff changeset
662 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
663 if ( pActors[v75].uAIState == Removed || pActors[v75].uAIState == Disabled || pActors[v75].uAIState == Summoned
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
664 || !pActors[v75].uMovementSpeed )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
665 continue;
0
Ritor1
parents:
diff changeset
666 v3 = 0;
Ritor1
parents:
diff changeset
667 v69 = 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
668 if ( MonsterStats::BelongsToSupertype(pActors[v75].pMonsterInfo.uID, MONSTER_SUPERTYPE_WATER_ELEMENTAL) )
0
Ritor1
parents:
diff changeset
669 v3 = 1;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
670 pActors[v75].uSectorID = 0;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
671 uIsFlying = pActors[v75].pMonsterInfo.uFlying;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
672 if ( !pActors[v75].CanAct() )
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
673 uIsFlying = 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
674 v70 = IsTerrainSlopeTooHigh(pActors[v75].vPosition.x, pActors[v75].vPosition.y);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
675 v5 = ODM_GetFloorLevel(pActors[v75].vPosition.x, pActors[v75].vPosition.y, pActors[v75].vPosition.z,
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
676 pActors[v75].uActorHeight, &uIsOnWater, (int *)&v69, v3);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
677 v6 = pActors[v75].vPosition.z;
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
678 uIsAboveFloor = 0;
0
Ritor1
parents:
diff changeset
679 v67 = v69 == 0;
Ritor1
parents:
diff changeset
680 if ( v6 > v5 + 1 )
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
681 uIsAboveFloor = 1;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
682 if ( pActors[v75].uAIState == Dead && uIsOnWater && !uIsAboveFloor )
0
Ritor1
parents:
diff changeset
683 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
684 pActors[v75].uAIState = Removed;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
685 continue;
0
Ritor1
parents:
diff changeset
686 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
687 if ( pActors[v75].uCurrentActionAnimation == ANIM_Walking )
0
Ritor1
parents:
diff changeset
688 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
689 v8 = pActors[v75].uMovementSpeed;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
690 if ( (signed __int64)pActors[v75].pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
0
Ritor1
parents:
diff changeset
691 {
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
692 v8 = (signed __int64)((double)v8 * 0.5);
0
Ritor1
parents:
diff changeset
693 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
694 if ( pActors[v75].uAIState == Fleeing || pActors[v75].uAIState == Pursuing )
0
Ritor1
parents:
diff changeset
695 {
Ritor1
parents:
diff changeset
696 v8 *= 2;
Ritor1
parents:
diff changeset
697 }
1340
22cb507446a4 turnengine refactoring continue
Gloval
parents: 1339
diff changeset
698 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 1 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
699 v8 *= flt_6BE3AC_debug_recmod1_x_1_6;
0
Ritor1
parents:
diff changeset
700 if ( v8 > 1000 )
Ritor1
parents:
diff changeset
701 v8 = 1000;
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
702
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
703 pActors[v75].vVelocity.x = fixpoint_mul(stru_5C6E00->Cos(pActors[v75].uYawAngle), v8);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
704 pActors[v75].vVelocity.y = fixpoint_mul(stru_5C6E00->Sin(pActors[v75].uYawAngle), v8);
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
705 if ( uIsFlying )
0
Ritor1
parents:
diff changeset
706 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
707 pActors[v75].vVelocity.z = fixpoint_mul(stru_5C6E00->Sin(pActors[v75].uPitchAngle), v8);
0
Ritor1
parents:
diff changeset
708 }
846
39503542470c UpdateActors_ODM cleaning 2
zipi
parents: 845
diff changeset
709 //v7 = v68;
0
Ritor1
parents:
diff changeset
710 }
Ritor1
parents:
diff changeset
711 else
Ritor1
parents:
diff changeset
712 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
713 pActors[v75].vVelocity.x = fixpoint_mul(55000, pActors[v75].vVelocity.x);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
714 pActors[v75].vVelocity.y = fixpoint_mul(55000, pActors[v75].vVelocity.y);
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
715 if ( uIsFlying )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
716 pActors[v75].vVelocity.z = fixpoint_mul(55000, pActors[v75].vVelocity.z);
0
Ritor1
parents:
diff changeset
717 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
718 if ( pActors[v75].vPosition.z < v5 )
0
Ritor1
parents:
diff changeset
719 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
720 pActors[v75].vPosition.z = v5;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
721 pActors[v75].vVelocity.z = uIsFlying != 0 ? 0x14 : 0;
0
Ritor1
parents:
diff changeset
722 }
846
39503542470c UpdateActors_ODM cleaning 2
zipi
parents: 845
diff changeset
723 //v17 = 0;
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
724 if ( !uIsAboveFloor || uIsFlying )
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
725 {
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
726 if ( v70 && !uIsAboveFloor && v67 )
0
Ritor1
parents:
diff changeset
727 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
728 pActors[v75].vPosition.z = v5;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
729 ODM_GetTerrainNormalAt(pActors[v75].vPosition.x, pActors[v75].vPosition.y, &v62);
0
Ritor1
parents:
diff changeset
730 v20 = GetGravityStrength();
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
731 //v21 = v62.y;
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
732 //v22 = v62.z;
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
733 //v23 = v62.y * v0->vVelocity.y;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
734 pActors[v75].vVelocity.z += -8 * LOWORD(pEventTimer->uTimeElapsed) * v20;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
735 int v73 = abs(v62.x * pActors[v75].vVelocity.x + v62.z * pActors[v75].vVelocity.z + v62.y * pActors[v75].vVelocity.y) >> 16;
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
736 //v72b = v21;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
737 pActors[v75].vVelocity.x += fixpoint_mul(v73, v62.x);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
738 pActors[v75].vVelocity.y += fixpoint_mul(v73, v62.y);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
739 pActors[v75].vVelocity.z += fixpoint_mul(v73, v62.z);
846
39503542470c UpdateActors_ODM cleaning 2
zipi
parents: 845
diff changeset
740 //v17 = 0;
0
Ritor1
parents:
diff changeset
741 }
Ritor1
parents:
diff changeset
742 }
Ritor1
parents:
diff changeset
743 else
Ritor1
parents:
diff changeset
744 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
745 pActors[v75].vVelocity.z -= LOWORD(pEventTimer->uTimeElapsed) * GetGravityStrength();
0
Ritor1
parents:
diff changeset
746 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
747 if ( pParty->armageddon_timer != 0 && pActors[v75].CanAct() )
0
Ritor1
parents:
diff changeset
748 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
749 pActors[v75].vVelocity.x += rand() % 100 - 50;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
750 pActors[v75].vVelocity.y += rand() % 100 - 50;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
751 pActors[v75].vVelocity.z += rand() % 100 - 20;
0
Ritor1
parents:
diff changeset
752 v25 = rand();
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
753 pActors[v75].uAIState = Stunned;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
754 pActors[v75].uYawAngle += v25 % 32 - 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
755 pActors[v75].UpdateAnimation();
0
Ritor1
parents:
diff changeset
756 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
757 if ( pActors[v75].vVelocity.x * pActors[v75].vVelocity.x + pActors[v75].vVelocity.y * pActors[v75].vVelocity.y < 400 && v70 == 0 )
846
39503542470c UpdateActors_ODM cleaning 2
zipi
parents: 845
diff changeset
758 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
759 pActors[v75].vVelocity.y = 0;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
760 pActors[v75].vVelocity.x = 0;
0
Ritor1
parents:
diff changeset
761 }
Ritor1
parents:
diff changeset
762 stru_721530.field_0 = 1;
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
763 if ( !uIsFlying )
0
Ritor1
parents:
diff changeset
764 v26 = 40;
Ritor1
parents:
diff changeset
765 else
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
766 v26 = pActors[v75].uActorRadius;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
767
0
Ritor1
parents:
diff changeset
768 stru_721530.field_84 = -1;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
769 stru_721530.field_8_radius = v26;
0
Ritor1
parents:
diff changeset
770 stru_721530.prolly_normal_d = v26;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
771 stru_721530.height = pActors[v75].uActorHeight;
846
39503542470c UpdateActors_ODM cleaning 2
zipi
parents: 845
diff changeset
772 stru_721530.field_70 = 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
773
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
774 for ( v69 = 0; v69 < 100; ++v69 )
0
Ritor1
parents:
diff changeset
775 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
776 stru_721530.position.x = pActors[v75].vPosition.x;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
777 stru_721530.normal.x = stru_721530.position.x;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
778 stru_721530.position.y = pActors[v75].vPosition.y;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
779 stru_721530.normal.y = stru_721530.position.y;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
780 v28 = pActors[v75].vPosition.z;
0
Ritor1
parents:
diff changeset
781 stru_721530.normal.z = v28 + v26 + 1;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
782 stru_721530.position.z = v28 - v26 + stru_721530.height - 1;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
783 if ( stru_721530.position.z < stru_721530.normal.z )
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
784 stru_721530.position.z = v28 + v26 + 1;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
785 stru_721530.velocity.x = pActors[v75].vVelocity.x;
0
Ritor1
parents:
diff changeset
786 stru_721530.uSectorID = 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
787 stru_721530.velocity.y = pActors[v75].vVelocity.y;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
788 stru_721530.velocity.z = pActors[v75].vVelocity.z;
0
Ritor1
parents:
diff changeset
789 if ( stru_721530._47050A(0) )
Ritor1
parents:
diff changeset
790 break;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
791 _46E889_collide_against_bmodels(1);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
792 v29 = WorldPosToGridCellZ(pActors[v75].vPosition.y);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
793 v30 = WorldPosToGridCellX(pActors[v75].vPosition.x);
0
Ritor1
parents:
diff changeset
794 _46E26D_collide_against_sprites(v30, v29);
Ritor1
parents:
diff changeset
795 _46EF01_collision_chech_player(0);
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
796 _46ED8A_collide_against_sprite_objects(PID(OBJECT_Actor,v75));
0
Ritor1
parents:
diff changeset
797 v31 = 0;
Ritor1
parents:
diff changeset
798 for ( i = 0; v31 < ai_arrays_size; ++v31 )
Ritor1
parents:
diff changeset
799 {
390
35a62d1948d4 More sound fixes
Nomad
parents: 377
diff changeset
800 v33 = ai_near_actors_ids[v31];
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1861
diff changeset
801 if ( v33 != v75 && Actor::_46DF1A_collide_against_actor(v33, 40) )
0
Ritor1
parents:
diff changeset
802 ++i;
Ritor1
parents:
diff changeset
803 }
Ritor1
parents:
diff changeset
804 v71 = i > 1;
Ritor1
parents:
diff changeset
805 if ( stru_721530.field_7C < stru_721530.field_6C )
1643
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
806 v70 = fixpoint_mul(stru_721530.field_7C, stru_721530.direction.z);
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
807 //v34 = 0;
0
Ritor1
parents:
diff changeset
808 v35 = stru_721530.normal2.z - stru_721530.prolly_normal_d - 1;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
809 v36 = ODM_GetFloorLevel(stru_721530.normal2.x, stru_721530.normal2.y,
0
Ritor1
parents:
diff changeset
810 stru_721530.normal2.z - stru_721530.prolly_normal_d - 1,
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
811 pActors[v75].uActorHeight, (int *)&v63, &v64, 0);
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
812 if ( uIsOnWater )
0
Ritor1
parents:
diff changeset
813 {
Ritor1
parents:
diff changeset
814 if ( v35 < v36 + 60 )
Ritor1
parents:
diff changeset
815 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
816 if ( pActors[v75].uAIState == Dead || pActors[v75].uAIState == Dying || pActors[v75].uAIState == Removed
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
817 || pActors[v75].uAIState == Disabled )
0
Ritor1
parents:
diff changeset
818 {
Ritor1
parents:
diff changeset
819 if ( v64 )
Ritor1
parents:
diff changeset
820 v61 = v36 + 30;
Ritor1
parents:
diff changeset
821 else
846
39503542470c UpdateActors_ODM cleaning 2
zipi
parents: 845
diff changeset
822 v61 = v5 + 60;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
823 sub_42F960_create_object(pActors[v75].vPosition.x, pActors[v75].vPosition.y, v61);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
824 pActors[v75].uAIState = Removed;
0
Ritor1
parents:
diff changeset
825 return;
Ritor1
parents:
diff changeset
826 }
Ritor1
parents:
diff changeset
827 }
Ritor1
parents:
diff changeset
828 }
Ritor1
parents:
diff changeset
829 if ( stru_721530.field_7C >= stru_721530.field_6C )
Ritor1
parents:
diff changeset
830 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
831 pActors[v75].vPosition.x = LOWORD(stru_721530.normal2.x);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
832 pActors[v75].vPosition.y = LOWORD(stru_721530.normal2.y);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
833 pActors[v75].vPosition.z = LOWORD(stru_721530.normal2.z) - LOWORD(stru_721530.prolly_normal_d) - 1;
0
Ritor1
parents:
diff changeset
834 break;
Ritor1
parents:
diff changeset
835 }
1643
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
836 //v72b = fixpoint_mul(stru_721530.field_7C, stru_721530.field_58.x);
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
837 pActors[v75].vPosition.x += fixpoint_mul(stru_721530.field_7C, stru_721530.direction.x);
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
838 //v72b = (unsigned __int64)(stru_721530.field_7C * (signed __int64)stru_721530.field_58.y) >> 16;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
839 pActors[v75].vPosition.y += fixpoint_mul(stru_721530.field_7C, stru_721530.direction.y);
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
840 //v72b = (unsigned __int64)(stru_721530.field_7C * (signed __int64)stru_721530.field_58.z) >> 16;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
841 pActors[v75].vPosition.z += fixpoint_mul(stru_721530.field_7C, stru_721530.direction.z);
0
Ritor1
parents:
diff changeset
842 stru_721530.field_70 += stru_721530.field_7C;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
843 v39 = PID_ID(stru_721530.uFaceID);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
844 switch ( PID_TYPE(stru_721530.uFaceID) )
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
845 {
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
846 case OBJECT_Actor:
1340
22cb507446a4 turnengine refactoring continue
Gloval
parents: 1339
diff changeset
847 if ( pTurnEngine->turn_stage != 2 && pTurnEngine->turn_stage != 3 || pParty->bTurnBasedModeOn != 1 )
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
848 {
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
849 //if(pParty->bTurnBasedModeOn == 1)
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
850 //v34 = 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
851 if ( pActors[v75].pMonsterInfo.uHostilityType )
0
Ritor1
parents:
diff changeset
852 {
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
853 if ( v71 == 0 )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
854 Actor::AI_Flee(v75, stru_721530.uFaceID, 0, (AIDirection *)0);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
855 else
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
856 Actor::AI_StandOrBored(v75, 4, 0, (AIDirection *)0);
0
Ritor1
parents:
diff changeset
857 }
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
858 else if ( v71 )
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
859 Actor::AI_StandOrBored(v75, 4, 0, (AIDirection *)0);
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
860 else if ( pActors[v39].pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
861 Actor::AI_Flee(v75, stru_721530.uFaceID, 0, (AIDirection *)0);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
862 else
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
863 Actor::AI_FaceObject(v75, stru_721530.uFaceID, 0, (AIDirection *)0);
0
Ritor1
parents:
diff changeset
864 }
Ritor1
parents:
diff changeset
865 break;
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
866 case OBJECT_Player:
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
867 if ( !pActors[v75].GetActorsRelation(0) )
0
Ritor1
parents:
diff changeset
868 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
869 Actor::AI_FaceObject(v75, stru_721530.uFaceID, 0, (AIDirection *)0);
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
870 break;
0
Ritor1
parents:
diff changeset
871 }
1167
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
872 //v52 = HIDWORD(pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime) == 0;
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
873 //v53 = SHIDWORD(pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime) < 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
874 pActors[v75].vVelocity.y = 0;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
875 pActors[v75].vVelocity.x = 0;
1167
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
876 //if ( !v53 && (!(v53 | v52) || LODWORD(pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime) > 0) )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
877 if ( (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime < 0)
1167
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
878 pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].Reset();
0
Ritor1
parents:
diff changeset
879 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
880 break;
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
881 case OBJECT_Decoration:
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
882 v47 = integer_sqrt(pActors[v75].vVelocity.x * pActors[v75].vVelocity.x + pActors[v75].vVelocity.y * pActors[v75].vVelocity.y);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
883 v48 = stru_5C6E00->Atan2( pActors[v75].vPosition.x - pLevelDecorations[v39].vPosition.x,
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
884 pActors[v75].vPosition.y - pLevelDecorations[v39].vPosition.y);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
885 //v49 = v48;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
886 pActors[v75].vVelocity.x = fixpoint_mul(stru_5C6E00->Cos(v48), v47);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
887 pActors[v75].vVelocity.y = fixpoint_mul(stru_5C6E00->Sin(v48), v47);
0
Ritor1
parents:
diff changeset
888 break;
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
889 case OBJECT_BModel:
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
890 face = &pOutdoor->pBModels[stru_721530.uFaceID >> 9].pFaces[v39 & 0x3F];
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
891 if ( !face->Ethereal() )
0
Ritor1
parents:
diff changeset
892 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
893 if ( face->uPolygonType == 3 )
0
Ritor1
parents:
diff changeset
894 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
895 pActors[v75].vVelocity.z = 0;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
896 pActors[v75].vPosition.z = LOWORD(pOutdoor->pBModels[stru_721530.uFaceID >> 9].pVertices.pVertices[face->pVertexIDs[0]].z) + 1;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
897 if ( pActors[v75].vVelocity.x * pActors[v75].vVelocity.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
898 + pActors[v75].vVelocity.y * pActors[v75].vVelocity.y < 400 )
0
Ritor1
parents:
diff changeset
899 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
900 pActors[v75].vVelocity.y = 0;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
901 pActors[v75].vVelocity.x = 0;
0
Ritor1
parents:
diff changeset
902 }
Ritor1
parents:
diff changeset
903 }
Ritor1
parents:
diff changeset
904 else
Ritor1
parents:
diff changeset
905 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
906 v72b = abs(face->pFacePlane.vNormal.y * pActors[v75].vVelocity.y + face->pFacePlane.vNormal.z * pActors[v75].vVelocity.z
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
907 + face->pFacePlane.vNormal.x * pActors[v75].vVelocity.x) >> 16;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
908 if ( (stru_721530.speed >> 3) > v72b )
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
909 v72b = stru_721530.speed >> 3;
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
910
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
911 pActors[v75].vVelocity.x += fixpoint_mul(v72b, face->pFacePlane.vNormal.x);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
912 pActors[v75].vVelocity.y += fixpoint_mul(v72b, face->pFacePlane.vNormal.y);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
913 pActors[v75].vVelocity.z += fixpoint_mul(v72b, face->pFacePlane.vNormal.z);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
914 if ( face->uPolygonType != 4 )
0
Ritor1
parents:
diff changeset
915 {
Ritor1
parents:
diff changeset
916 v46 = stru_721530.prolly_normal_d
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
917 - ((face->pFacePlane.dist
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
918 + face->pFacePlane.vNormal.x * pActors[v75].vPosition.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
919 + face->pFacePlane.vNormal.y * pActors[v75].vPosition.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
920 + face->pFacePlane.vNormal.z * pActors[v75].vPosition.z) >> 16);
0
Ritor1
parents:
diff changeset
921 if ( v46 > 0 )
Ritor1
parents:
diff changeset
922 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
923 pActors[v75].vPosition.x += (unsigned int)(v46 * face->pFacePlane.vNormal.x) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
924 pActors[v75].vPosition.y += (unsigned int)(v46 * face->pFacePlane.vNormal.y) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
925 pActors[v75].vPosition.z += (unsigned int)(v46 * face->pFacePlane.vNormal.z) >> 16;
0
Ritor1
parents:
diff changeset
926 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
927 pActors[v75].uYawAngle = stru_5C6E00->Atan2(pActors[v75].vVelocity.x, pActors[v75].vVelocity.y);
0
Ritor1
parents:
diff changeset
928 }
Ritor1
parents:
diff changeset
929 }
Ritor1
parents:
diff changeset
930 }
Ritor1
parents:
diff changeset
931 break;
Ritor1
parents:
diff changeset
932 }
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
933
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
934 pActors[v75].vVelocity.x = fixpoint_mul(58500, pActors[v75].vVelocity.x);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
935 pActors[v75].vVelocity.y = fixpoint_mul(58500, pActors[v75].vVelocity.y);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
936 pActors[v75].vVelocity.z = fixpoint_mul(58500, pActors[v75].vVelocity.z);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
937
0
Ritor1
parents:
diff changeset
938 v26 = stru_721530.prolly_normal_d;
Ritor1
parents:
diff changeset
939 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
940
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
941 v58 = ((unsigned int)~pOutdoor->ActuallyGetSomeOtherTileInfo(WorldPosToGridCellX(pActors[v75].vPosition.x), WorldPosToGridCellZ(pActors[v75].vPosition.y) - 1) >> 1) & 1;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
942 v59 = ((unsigned int)~pOutdoor->ActuallyGetSomeOtherTileInfo(WorldPosToGridCellX(pActors[v75].vPosition.x), WorldPosToGridCellZ(pActors[v75].vPosition.y) - 1) >> 1) & 1;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
943 if ( WorldPosToGridCellX(pActors[v75].vPosition.x) == WorldPosToGridCellX(pActors[v75].vPosition.x)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
944 && WorldPosToGridCellZ(pActors[v75].vPosition.y) == WorldPosToGridCellZ(pActors[v75].vPosition.y)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
945 && v58 || v67 != 0 )
0
Ritor1
parents:
diff changeset
946 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
947 if ( MonsterStats::BelongsToSupertype(pActors[v75].pMonsterInfo.uID, MONSTER_SUPERTYPE_WATER_ELEMENTAL) )
0
Ritor1
parents:
diff changeset
948 {
Ritor1
parents:
diff changeset
949 v58 = v58 == 0;
Ritor1
parents:
diff changeset
950 v59 = v59 == 0;
Ritor1
parents:
diff changeset
951 }
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
952 if ( !uIsFlying && v58 && !v59 )
0
Ritor1
parents:
diff changeset
953 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
954 pActors[v75].vPosition.x = pActors[v75].vPosition.x;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
955 pActors[v75].vPosition.y = pActors[v75].vPosition.y;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
956 if ( pActors[v75].CanAct() )
0
Ritor1
parents:
diff changeset
957 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
958 pActors[v75].uYawAngle -= 32;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
959 pActors[v75].uCurrentActionTime = 0;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
960 pActors[v75].uCurrentActionLength = 128;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
961 pActors[v75].uAIState = Fleeing;
0
Ritor1
parents:
diff changeset
962 }
Ritor1
parents:
diff changeset
963 }
Ritor1
parents:
diff changeset
964 }
845
8f135b689262 UpdateActors_ODM cleaning
zipi
parents: 844
diff changeset
965 }
0
Ritor1
parents:
diff changeset
966 }
Ritor1
parents:
diff changeset
967
Ritor1
parents:
diff changeset
968 //----- (0047253E) --------------------------------------------------------
Ritor1
parents:
diff changeset
969 void UpdateObjects()
Ritor1
parents:
diff changeset
970 {
Ritor1
parents:
diff changeset
971 unsigned int v0; // ebx@0
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
972 ObjectDesc *object; // eax@5
0
Ritor1
parents:
diff changeset
973 int v5; // ecx@6
Ritor1
parents:
diff changeset
974 __int16 v6; // cx@7
Ritor1
parents:
diff changeset
975 signed int v7; // eax@9
Ritor1
parents:
diff changeset
976 signed int v11; // eax@17
Ritor1
parents:
diff changeset
977 int v12; // edi@27
Ritor1
parents:
diff changeset
978 int v13; // eax@27
Ritor1
parents:
diff changeset
979 int v14; // ebx@27
Ritor1
parents:
diff changeset
980 unsigned int v15; // ecx@27
Ritor1
parents:
diff changeset
981 unsigned int v16; // edx@30
Ritor1
parents:
diff changeset
982 unsigned int v17; // edx@32
Ritor1
parents:
diff changeset
983 int v18; // [sp+4h] [bp-10h]@27
Ritor1
parents:
diff changeset
984 int v19; // [sp+8h] [bp-Ch]@27
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
985
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
986 for (uint i = 0; i < uNumSpriteObjects; ++i)
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
987 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
988 if (pSpriteObjects[i].uAttributes & OBJECT_40)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
989 pSpriteObjects[i].uAttributes &= ~OBJECT_40;
0
Ritor1
parents:
diff changeset
990 else
Ritor1
parents:
diff changeset
991 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
992 object = &pObjectList->pObjects[pSpriteObjects[i].uObjectDescID];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
993 if (pSpriteObjects[i].AttachedToActor())
430
58b71c1af7d8 Objects are drawn (items, spells sfx)
Nomad
parents: 424
diff changeset
994 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
995 v5 = PID_ID(pSpriteObjects[i].spell_target_pid);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
996 pSpriteObjects[i].vPosition.x = pActors[v5].vPosition.x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
997 pSpriteObjects[i].vPosition.y = pActors[v5].vPosition.y;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
998 pSpriteObjects[i].vPosition.z = pActors[v5].vPosition.z + pActors[v5].uActorHeight;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
999 if ( !pSpriteObjects[i].uObjectDescID )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1000 continue;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1001 pSpriteObjects[i].uSpriteFrameID += pEventTimer->uTimeElapsed;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1002 if ( !(object->uFlags & OBJECT_DESC_TEMPORARY))
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1003 continue;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1004 if ( pSpriteObjects[i].uSpriteFrameID >= 0 )
0
Ritor1
parents:
diff changeset
1005 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1006 v7 = object->uLifetime;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1007 if (pSpriteObjects[i].uAttributes & ITEM_BROKEN)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1008 v7 = pSpriteObjects[i].field_20;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1009 if ( pSpriteObjects[i].uSpriteFrameID < v7 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1010 continue;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1011 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1012 SpriteObject::OnInteraction(i);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1013 continue;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1014 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1015 if ( pSpriteObjects[i].uObjectDescID )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1016 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1017 pSpriteObjects[i].uSpriteFrameID += pEventTimer->uTimeElapsed;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1018 if ( object->uFlags & OBJECT_DESC_TEMPORARY )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1019 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1020 if ( pSpriteObjects[i].uSpriteFrameID < 0 )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1021 {
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1022 SpriteObject::OnInteraction(i);
1083
ddf53a2d0bf5 pointer cleaning
zipi
parents: 1080
diff changeset
1023 continue;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1024 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1025 v11 = object->uLifetime;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1026 if (pSpriteObjects[i].uAttributes & ITEM_BROKEN)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1027 v11 = pSpriteObjects[i].field_20;
0
Ritor1
parents:
diff changeset
1028 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1029 if ( !(object->uFlags & OBJECT_DESC_TEMPORARY) || pSpriteObjects[i].uSpriteFrameID < v11 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1030 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1031 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1032 SpriteObject::UpdateObject_fn0_BLV(i);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1033 else
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1034 SpriteObject::UpdateObject_fn0_ODM(i);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1035 if ( pParty->bTurnBasedModeOn != 1 || !(pSpriteObjects[i].uSectorID & 4) )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1036 continue;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1037 v12 = abs(pParty->vPosition.x - pSpriteObjects[i].vPosition.x);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1038 v18 = abs(pParty->vPosition.y - pSpriteObjects[i].vPosition.y);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1039 v19 = abs(pParty->vPosition.z - pSpriteObjects[i].vPosition.z);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1040 v13 = v12;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1041 v14 = v18;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1042 v15 = v19;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1043 if ( v12 < v18 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1044 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1045 v13 = v18;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1046 v14 = v12;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1047 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1048 if ( v13 < v19 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1049 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1050 v16 = v13;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1051 v13 = v19;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1052 v15 = v16;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1053 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1054 if ( v14 < (signed int)v15 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1055 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1056 v17 = v15;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1057 v15 = v14;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1058 v14 = v17;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1059 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1060 v0 = (unsigned int)(11 * v14) >> 5;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1061 if ( (signed int)(v0 + (v15 >> 2) + v13) <= 5120 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1062 continue;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1063 SpriteObject::OnInteraction(i);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1064 continue;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1065 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1066 if ( !(object->uFlags & OBJECT_DESC_INTERACTABLE) )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1067 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1068 SpriteObject::OnInteraction(i);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1069 continue;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1070 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1071 _46BFFA_check_object_intercept(i, PID(OBJECT_Item,i));
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1072 }
0
Ritor1
parents:
diff changeset
1073 }
Ritor1
parents:
diff changeset
1074 }
Ritor1
parents:
diff changeset
1075 }
Ritor1
parents:
diff changeset
1076
Ritor1
parents:
diff changeset
1077 //----- (0047272C) --------------------------------------------------------
831
9c3f28b31b4a Party actions in blv
Nomad
parents: 829
diff changeset
1078 int collide_against_floor_approximate(int x, int y, int z, unsigned int *pSectorID, unsigned int *pFaceID)
0
Ritor1
parents:
diff changeset
1079 {
Ritor1
parents:
diff changeset
1080 int result; // eax@1
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1081
0
Ritor1
parents:
diff changeset
1082 *pSectorID = pIndoor->GetSector(x - 2, y, z + 40);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1083 result = collide_against_floor(x - 2, y, z + 40, pSectorID, pFaceID);
0
Ritor1
parents:
diff changeset
1084 if ( result == -30000 || !*pSectorID )
Ritor1
parents:
diff changeset
1085 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1086 *pSectorID = pIndoor->GetSector(x + 2, y, z + 40);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1087 result = collide_against_floor(x + 2, y, z + 40, pSectorID, pFaceID);
0
Ritor1
parents:
diff changeset
1088 if ( result == -30000 || !*pSectorID )
Ritor1
parents:
diff changeset
1089 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1090 *pSectorID = pIndoor->GetSector(x, y - 2, z + 40);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1091 result = collide_against_floor(x, y - 2, z + 40, pSectorID, pFaceID);
0
Ritor1
parents:
diff changeset
1092 if ( result == -30000 || !*pSectorID )
Ritor1
parents:
diff changeset
1093 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1094 *pSectorID = pIndoor->GetSector(x, y + 2, z + 40);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1095 result = collide_against_floor(x, y + 2, z + 40, pSectorID, pFaceID);
0
Ritor1
parents:
diff changeset
1096 if ( result == -30000 || !*pSectorID )
Ritor1
parents:
diff changeset
1097 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1098 *pSectorID = pIndoor->GetSector(x, y, z + 140);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1099 result = collide_against_floor(x, y, z + 140, pSectorID, pFaceID);
0
Ritor1
parents:
diff changeset
1100 }
Ritor1
parents:
diff changeset
1101 }
Ritor1
parents:
diff changeset
1102 }
Ritor1
parents:
diff changeset
1103 }
Ritor1
parents:
diff changeset
1104 return result;
Ritor1
parents:
diff changeset
1105 }
Ritor1
parents:
diff changeset
1106
Ritor1
parents:
diff changeset
1107 //----- (0047531C) --------------------------------------------------------
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1108 bool sub_47531C(int a1, int *a2, int pos_x, int pos_y, int pos_z, int dir_x, int dir_y, int dir_z, BLVFace *face, int a10)
0
Ritor1
parents:
diff changeset
1109 {
Ritor1
parents:
diff changeset
1110 int v11; // ST1C_4@3
Ritor1
parents:
diff changeset
1111 int v12; // edi@3
Ritor1
parents:
diff changeset
1112 int v13; // esi@3
Ritor1
parents:
diff changeset
1113 int v14; // edi@4
Ritor1
parents:
diff changeset
1114 signed __int64 v15; // qtt@6
Ritor1
parents:
diff changeset
1115 __int16 v16; // si@7
Ritor1
parents:
diff changeset
1116 int a7a; // [sp+30h] [bp+18h]@7
Ritor1
parents:
diff changeset
1117 int a9b; // [sp+38h] [bp+20h]@3
Ritor1
parents:
diff changeset
1118 int a9a; // [sp+38h] [bp+20h]@3
Ritor1
parents:
diff changeset
1119 int a10b; // [sp+3Ch] [bp+24h]@3
Ritor1
parents:
diff changeset
1120 signed int a10a; // [sp+3Ch] [bp+24h]@4
Ritor1
parents:
diff changeset
1121 int a10c; // [sp+3Ch] [bp+24h]@5
Ritor1
parents:
diff changeset
1122
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1123 if ( a10 && face->Ethereal() )
0
Ritor1
parents:
diff changeset
1124 return 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1125 v11 = (unsigned __int64)(dir_x * (signed __int64)face->pFacePlane_old.vNormal.x) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1126 a10b = (unsigned __int64)(dir_y * (signed __int64)face->pFacePlane_old.vNormal.y) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1127 a9b = (unsigned __int64)(dir_z * (signed __int64)face->pFacePlane_old.vNormal.z) >> 16;
0
Ritor1
parents:
diff changeset
1128 v12 = v11 + a9b + a10b;
Ritor1
parents:
diff changeset
1129 a9a = v11 + a9b + a10b;
Ritor1
parents:
diff changeset
1130 v13 = (a1 << 16)
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1131 - pos_x * face->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1132 - pos_y * face->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1133 - pos_z * face->pFacePlane_old.vNormal.z
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1134 - face->pFacePlane_old.dist;
0
Ritor1
parents:
diff changeset
1135 if ( abs((a1 << 16)
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1136 - pos_x * face->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1137 - pos_y * face->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1138 - pos_z * face->pFacePlane_old.vNormal.z - face->pFacePlane_old.dist) >= a1 << 16 )
0
Ritor1
parents:
diff changeset
1139 {
Ritor1
parents:
diff changeset
1140 a10c = abs(v13) >> 14;
Ritor1
parents:
diff changeset
1141 if ( a10c > abs(v12) )
Ritor1
parents:
diff changeset
1142 return 0;
Ritor1
parents:
diff changeset
1143 LODWORD(v15) = v13 << 16;
Ritor1
parents:
diff changeset
1144 HIDWORD(v15) = v13 >> 16;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1145 v14 = a1;
0
Ritor1
parents:
diff changeset
1146 a10a = v15 / a9a;
Ritor1
parents:
diff changeset
1147 }
Ritor1
parents:
diff changeset
1148 else
Ritor1
parents:
diff changeset
1149 {
Ritor1
parents:
diff changeset
1150 a10a = 0;
Ritor1
parents:
diff changeset
1151 v14 = abs(v13) >> 16;
Ritor1
parents:
diff changeset
1152 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1153 v16 = pos_y + ((unsigned int)((unsigned __int64)(a10a * (signed __int64)dir_y) >> 16) >> 16);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1154 LOWORD(a7a) = (short)pos_x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1155 + ((unsigned int)((unsigned __int64)(a10a * (signed __int64)dir_x) >> 16) >> 16)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1156 - ((unsigned int)(v14 * face->pFacePlane_old.vNormal.x) >> 16);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1157 HIWORD(a7a) = v16 - ((unsigned int)(v14 * face->pFacePlane_old.vNormal.y) >> 16);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1158 if ( !sub_475665(face, a7a, (short)pos_z + ((unsigned int)((unsigned __int64)(a10a * (signed __int64)dir_z) >> 16) >> 16)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1159 - ((unsigned int)(v14 * face->pFacePlane_old.vNormal.z) >> 16)) )
0
Ritor1
parents:
diff changeset
1160 return 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1161 *a2 = a10a >> 16;
0
Ritor1
parents:
diff changeset
1162 if ( a10a >> 16 < 0 )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1163 *a2 = 0;
0
Ritor1
parents:
diff changeset
1164 return 1;
Ritor1
parents:
diff changeset
1165 }
Ritor1
parents:
diff changeset
1166
Ritor1
parents:
diff changeset
1167 //----- (004754BF) --------------------------------------------------------
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1168 bool sub_4754BF(int a1, int *a2, int X, int Y, int Z, int dir_x, int dir_y, int dir_z, BLVFace *face, int a10, int a11)
0
Ritor1
parents:
diff changeset
1169 {
Ritor1
parents:
diff changeset
1170 int v12; // ST1C_4@3
Ritor1
parents:
diff changeset
1171 int v13; // edi@3
Ritor1
parents:
diff changeset
1172 int v14; // esi@3
Ritor1
parents:
diff changeset
1173 int v15; // edi@4
Ritor1
parents:
diff changeset
1174 signed __int64 v16; // qtt@6
Ritor1
parents:
diff changeset
1175 __int16 v17; // si@7
Ritor1
parents:
diff changeset
1176 int a7a; // [sp+30h] [bp+18h]@7
Ritor1
parents:
diff changeset
1177 int a1b; // [sp+38h] [bp+20h]@3
Ritor1
parents:
diff changeset
1178 int a1a; // [sp+38h] [bp+20h]@3
Ritor1
parents:
diff changeset
1179 int a11b; // [sp+40h] [bp+28h]@3
Ritor1
parents:
diff changeset
1180 signed int a11a; // [sp+40h] [bp+28h]@4
Ritor1
parents:
diff changeset
1181 int a11c; // [sp+40h] [bp+28h]@5
Ritor1
parents:
diff changeset
1182
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1183 if ( a11 && face->Ethereal() )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1184 return false;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1185 v12 = (unsigned __int64)(dir_x * (signed __int64)face->pFacePlane_old.vNormal.x) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1186 a11b = (unsigned __int64)(dir_y * (signed __int64)face->pFacePlane_old.vNormal.y) >> 16;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1187 a1b = (unsigned __int64)(dir_z * (signed __int64)face->pFacePlane_old.vNormal.z) >> 16;
0
Ritor1
parents:
diff changeset
1188 v13 = v12 + a1b + a11b;
Ritor1
parents:
diff changeset
1189 a1a = v12 + a1b + a11b;
Ritor1
parents:
diff changeset
1190 v14 = (a1 << 16)
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1191 - X * face->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1192 - Y * face->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1193 - Z * face->pFacePlane_old.vNormal.z
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1194 - face->pFacePlane_old.dist;
0
Ritor1
parents:
diff changeset
1195 if ( abs((a1 << 16)
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1196 - X * face->pFacePlane_old.vNormal.x
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1197 - Y * face->pFacePlane_old.vNormal.y
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1198 - Z * face->pFacePlane_old.vNormal.z - face->pFacePlane_old.dist) >= a1 << 16 )
0
Ritor1
parents:
diff changeset
1199 {
Ritor1
parents:
diff changeset
1200 a11c = abs(v14) >> 14;
Ritor1
parents:
diff changeset
1201 if ( a11c > abs(v13) )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1202 return false;
0
Ritor1
parents:
diff changeset
1203 LODWORD(v16) = v14 << 16;
Ritor1
parents:
diff changeset
1204 HIDWORD(v16) = v14 >> 16;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1205 v15 = a1;
0
Ritor1
parents:
diff changeset
1206 a11a = v16 / a1a;
Ritor1
parents:
diff changeset
1207 }
Ritor1
parents:
diff changeset
1208 else
Ritor1
parents:
diff changeset
1209 {
Ritor1
parents:
diff changeset
1210 a11a = 0;
Ritor1
parents:
diff changeset
1211 v15 = abs(v14) >> 16;
Ritor1
parents:
diff changeset
1212 }
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1213 v17 = Y + ((unsigned int)((unsigned __int64)(a11a * (signed __int64)dir_y) >> 16) >> 16);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1214 LOWORD(a7a) = (short)X
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1215 + ((unsigned int)((unsigned __int64)(a11a * (signed __int64)dir_x) >> 16) >> 16)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1216 - ((unsigned int)(v15 * face->pFacePlane_old.vNormal.x) >> 16);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1217 HIWORD(a7a) = v17 - ((unsigned int)(v15 * face->pFacePlane_old.vNormal.y) >> 16);
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1218 if ( !sub_4759C9(face, a10, a7a, (short)Z + ((unsigned int)((unsigned __int64)(a11a * (signed __int64)dir_z) >> 16) >> 16)
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1219 - ((unsigned int)(v15 * face->pFacePlane_old.vNormal.z) >> 16)) )
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1220 return false;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1221 *a2 = a11a >> 16;
0
Ritor1
parents:
diff changeset
1222 if ( a11a >> 16 < 0 )
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1223 *a2 = 0;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1224 return true;
0
Ritor1
parents:
diff changeset
1225 }
Ritor1
parents:
diff changeset
1226
Ritor1
parents:
diff changeset
1227 //----- (00475665) --------------------------------------------------------
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1228 int sub_475665(BLVFace *face, int a2, __int16 a3)
0
Ritor1
parents:
diff changeset
1229 {
Ritor1
parents:
diff changeset
1230 bool v16; // edi@14
Ritor1
parents:
diff changeset
1231 signed int v20; // ebx@18
Ritor1
parents:
diff changeset
1232 int v21; // edi@20
Ritor1
parents:
diff changeset
1233 signed int v22; // ST14_4@22
Ritor1
parents:
diff changeset
1234 signed __int64 v23; // qtt@22
Ritor1
parents:
diff changeset
1235 signed int result; // eax@25
Ritor1
parents:
diff changeset
1236 int v25; // [sp+14h] [bp-10h]@14
Ritor1
parents:
diff changeset
1237 int v26; // [sp+1Ch] [bp-8h]@2
Ritor1
parents:
diff changeset
1238 signed int v27; // [sp+20h] [bp-4h]@2
Ritor1
parents:
diff changeset
1239 signed int v28; // [sp+30h] [bp+Ch]@2
Ritor1
parents:
diff changeset
1240 signed int v29; // [sp+30h] [bp+Ch]@7
Ritor1
parents:
diff changeset
1241 signed int v30; // [sp+30h] [bp+Ch]@11
Ritor1
parents:
diff changeset
1242 signed int v31; // [sp+30h] [bp+Ch]@14
Ritor1
parents:
diff changeset
1243
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1244 if ( face->uAttributes & FACE_XY_PLANE )
0
Ritor1
parents:
diff changeset
1245 {
Ritor1
parents:
diff changeset
1246 v26 = (signed __int16)a2;
Ritor1
parents:
diff changeset
1247 v27 = SHIWORD(a2);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1248 if ( face->uNumVertices )
0
Ritor1
parents:
diff changeset
1249 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1250 for ( v28 = 0; v28 < face->uNumVertices; v28++ )
0
Ritor1
parents:
diff changeset
1251 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1252 word_720C10_intercepts_xs[2 * v28] = face->pXInterceptDisplacements[v28] + pIndoor->pVertices[face->pVertexIDs[v28]].x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1253 word_720B40_intercepts_zs[2 * v28] = face->pYInterceptDisplacements[v28] + pIndoor->pVertices[face->pVertexIDs[v28]].y;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1254 word_720C10_intercepts_xs[2 * v28 + 1] = face->pXInterceptDisplacements[v28 + 1] + pIndoor->pVertices[face->pVertexIDs[v28 + 1]].x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1255 word_720B40_intercepts_zs[2 * v28 + 1] = face->pYInterceptDisplacements[v28 + 1] + pIndoor->pVertices[face->pVertexIDs[v28 + 1]].y;
0
Ritor1
parents:
diff changeset
1256 }
Ritor1
parents:
diff changeset
1257 }
Ritor1
parents:
diff changeset
1258 }
Ritor1
parents:
diff changeset
1259 else
Ritor1
parents:
diff changeset
1260 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1261 if ( face->uAttributes & FACE_XZ_PLANE )
0
Ritor1
parents:
diff changeset
1262 {
Ritor1
parents:
diff changeset
1263 v26 = (signed __int16)a2;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1264 v27 = a3;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1265 if ( face->uNumVertices )
0
Ritor1
parents:
diff changeset
1266 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1267 for ( v29 = 0; v29 < face->uNumVertices; v29++ )
0
Ritor1
parents:
diff changeset
1268 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1269 word_720C10_intercepts_xs[2 * v29] = face->pXInterceptDisplacements[v29] + pIndoor->pVertices[face->pVertexIDs[v29]].x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1270 word_720B40_intercepts_zs[2 * v29] = face->pZInterceptDisplacements[v29] + pIndoor->pVertices[face->pVertexIDs[v29]].z;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1271 word_720C10_intercepts_xs[2 * v29 + 1] = face->pXInterceptDisplacements[v29 + 1] + pIndoor->pVertices[face->pVertexIDs[v29 + 1]].x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1272 word_720B40_intercepts_zs[2 * v29 + 1] = face->pZInterceptDisplacements[v29 + 1] + pIndoor->pVertices[face->pVertexIDs[v29 + 1]].z;
0
Ritor1
parents:
diff changeset
1273 }
Ritor1
parents:
diff changeset
1274 }
Ritor1
parents:
diff changeset
1275 }
Ritor1
parents:
diff changeset
1276 else
Ritor1
parents:
diff changeset
1277 {
Ritor1
parents:
diff changeset
1278 v26 = SHIWORD(a2);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1279 v27 = a3;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1280 if ( face->uNumVertices )
0
Ritor1
parents:
diff changeset
1281 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1282 for ( v30 = 0; v30 < face->uNumVertices; v30++ )
0
Ritor1
parents:
diff changeset
1283 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1284 word_720C10_intercepts_xs[2 * v30] = face->pYInterceptDisplacements[v30] + pIndoor->pVertices[face->pVertexIDs[v30]].y;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1285 word_720B40_intercepts_zs[2 * v30] = face->pZInterceptDisplacements[v30] + pIndoor->pVertices[face->pVertexIDs[v30]].z;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1286 word_720C10_intercepts_xs[2 * v30 + 1] = face->pYInterceptDisplacements[v30 + 1] + pIndoor->pVertices[face->pVertexIDs[v30 + 1]].y;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1287 word_720B40_intercepts_zs[2 * v30 + 1] = face->pZInterceptDisplacements[v30 + 1] + pIndoor->pVertices[face->pVertexIDs[v30 + 1]].z;
0
Ritor1
parents:
diff changeset
1288 }
Ritor1
parents:
diff changeset
1289 }
Ritor1
parents:
diff changeset
1290 }
Ritor1
parents:
diff changeset
1291 }
Ritor1
parents:
diff changeset
1292 v31 = 0;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1293 word_720C10_intercepts_xs[2 * face->uNumVertices] = word_720C10_intercepts_xs[0];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1294 word_720B40_intercepts_zs[2 * face->uNumVertices] = word_720B40_intercepts_zs[0];
0
Ritor1
parents:
diff changeset
1295 v16 = word_720B40_intercepts_zs[0] >= v27;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1296 if ( 2 * face->uNumVertices <= 0 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1297 return 0;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1298 for ( v25 = 0; v25 < 2 * face->uNumVertices; ++v25 )
0
Ritor1
parents:
diff changeset
1299 {
Ritor1
parents:
diff changeset
1300 if ( v31 >= 2 )
Ritor1
parents:
diff changeset
1301 break;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1302 if ( v16 ^ (word_720B40_intercepts_zs[v25 + 1] >= v27) )
0
Ritor1
parents:
diff changeset
1303 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1304 if ( word_720C10_intercepts_xs[v25 + 1] >= v26 )
0
Ritor1
parents:
diff changeset
1305 v20 = 0;
Ritor1
parents:
diff changeset
1306 else
Ritor1
parents:
diff changeset
1307 v20 = 2;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1308 v21 = v20 | (word_720C10_intercepts_xs[v25] < v26);
0
Ritor1
parents:
diff changeset
1309 if ( v21 != 3 )
Ritor1
parents:
diff changeset
1310 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1311 v22 = word_720C10_intercepts_xs[v25 + 1] - word_720C10_intercepts_xs[v25];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1312 LODWORD(v23) = v22 << 16;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1313 HIDWORD(v23) = v22 >> 16;
0
Ritor1
parents:
diff changeset
1314 if ( !v21
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1315 || (word_720C10_intercepts_xs[v25] + ((signed int)(((unsigned __int64)(v23
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1316 / (word_720B40_intercepts_zs[v25 + 1] - word_720B40_intercepts_zs[v25])
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1317 * ((v27 - (signed int)word_720B40_intercepts_zs[v25]) << 16)) >> 16)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1318 + 32768) >> 16) >= v26) )
0
Ritor1
parents:
diff changeset
1319 ++v31;
Ritor1
parents:
diff changeset
1320 }
Ritor1
parents:
diff changeset
1321 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1322 v16 = word_720B40_intercepts_zs[v25 + 1] >= v27;
0
Ritor1
parents:
diff changeset
1323 }
Ritor1
parents:
diff changeset
1324 result = 1;
Ritor1
parents:
diff changeset
1325 if ( v31 != 1 )
Ritor1
parents:
diff changeset
1326 result = 0;
Ritor1
parents:
diff changeset
1327 return result;
Ritor1
parents:
diff changeset
1328 }
Ritor1
parents:
diff changeset
1329
Ritor1
parents:
diff changeset
1330 //----- (004759C9) --------------------------------------------------------
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1331 bool __fastcall sub_4759C9(BLVFace *face, int a2, int a3, __int16 a4)
0
Ritor1
parents:
diff changeset
1332 {
Ritor1
parents:
diff changeset
1333 bool v12; // edi@14
Ritor1
parents:
diff changeset
1334 signed int v16; // ebx@18
Ritor1
parents:
diff changeset
1335 int v17; // edi@20
Ritor1
parents:
diff changeset
1336 signed int v18; // ST14_4@22
Ritor1
parents:
diff changeset
1337 signed __int64 v19; // qtt@22
Ritor1
parents:
diff changeset
1338 bool result; // eax@25
Ritor1
parents:
diff changeset
1339 int v21; // [sp+14h] [bp-10h]@14
Ritor1
parents:
diff changeset
1340 signed int v22; // [sp+18h] [bp-Ch]@1
Ritor1
parents:
diff changeset
1341 int v23; // [sp+1Ch] [bp-8h]@2
Ritor1
parents:
diff changeset
1342 signed int v24; // [sp+20h] [bp-4h]@2
Ritor1
parents:
diff changeset
1343 signed int a4d; // [sp+30h] [bp+Ch]@14
Ritor1
parents:
diff changeset
1344
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1345 if ( face->uAttributes & FACE_XY_PLANE )
0
Ritor1
parents:
diff changeset
1346 {
Ritor1
parents:
diff changeset
1347 v23 = (signed __int16)a3;
Ritor1
parents:
diff changeset
1348 v24 = SHIWORD(a3);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1349 if ( face->uNumVertices )
0
Ritor1
parents:
diff changeset
1350 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1351 for ( v22 = 0; v22 < face->uNumVertices; ++v22 )
0
Ritor1
parents:
diff changeset
1352 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1353 word_720A70_intercepts_xs_plus_xs[2 * v22] = face->pXInterceptDisplacements[v22] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22]].x);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1354 word_7209A0_intercepts_ys_plus_ys[2 * v22] = face->pYInterceptDisplacements[v22] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22]].y);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1355 word_720A70_intercepts_xs_plus_xs[2 * v22 + 1] = face->pXInterceptDisplacements[v22 + 1] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22 + 1]].x);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1356 word_7209A0_intercepts_ys_plus_ys[2 * v22 + 1] = face->pYInterceptDisplacements[v22 + 1] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22 + 1]].y);
0
Ritor1
parents:
diff changeset
1357 }
Ritor1
parents:
diff changeset
1358 }
Ritor1
parents:
diff changeset
1359 }
Ritor1
parents:
diff changeset
1360 else
Ritor1
parents:
diff changeset
1361 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1362 if ( face->uAttributes & FACE_XZ_PLANE )
0
Ritor1
parents:
diff changeset
1363 {
Ritor1
parents:
diff changeset
1364 v23 = (signed __int16)a3;
Ritor1
parents:
diff changeset
1365 v24 = a4;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1366 if ( face->uNumVertices )
0
Ritor1
parents:
diff changeset
1367 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1368 for ( v22 = 0; v22 < face->uNumVertices; ++v22 )
0
Ritor1
parents:
diff changeset
1369 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1370 word_720A70_intercepts_xs_plus_xs[2 * v22] = face->pXInterceptDisplacements[v22] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22]].x);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1371 word_7209A0_intercepts_ys_plus_ys[2 * v22] = face->pZInterceptDisplacements[v22] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22]].z);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1372 word_720A70_intercepts_xs_plus_xs[2 * v22 + 1] = face->pXInterceptDisplacements[v22 + 1] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22 + 1]].x);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1373 word_7209A0_intercepts_ys_plus_ys[2 * v22 + 1] = face->pZInterceptDisplacements[v22 + 1] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22 + 1]].z);
0
Ritor1
parents:
diff changeset
1374 }
Ritor1
parents:
diff changeset
1375 }
Ritor1
parents:
diff changeset
1376 }
Ritor1
parents:
diff changeset
1377 else
Ritor1
parents:
diff changeset
1378 {
Ritor1
parents:
diff changeset
1379 v23 = SHIWORD(a3);
Ritor1
parents:
diff changeset
1380 v24 = a4;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1381 if ( face->uNumVertices )
0
Ritor1
parents:
diff changeset
1382 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1383 for ( v22 = 0; v22 < face->uNumVertices; ++v22 )
0
Ritor1
parents:
diff changeset
1384 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1385 word_720A70_intercepts_xs_plus_xs[2 * v22] = face->pYInterceptDisplacements[v22] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22]].y);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1386 word_7209A0_intercepts_ys_plus_ys[2 * v22] = face->pZInterceptDisplacements[v22] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22]].z);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1387 word_720A70_intercepts_xs_plus_xs[2 * v22 + 1] = face->pYInterceptDisplacements[v22 + 1] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22 + 1]].y);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1388 word_7209A0_intercepts_ys_plus_ys[2 * v22 + 1] = face->pZInterceptDisplacements[v22 + 1] + LOWORD(pOutdoor->pBModels[a2].pVertices.pVertices[face->pVertexIDs[v22 + 1]].z);
0
Ritor1
parents:
diff changeset
1389 }
Ritor1
parents:
diff changeset
1390 }
Ritor1
parents:
diff changeset
1391 }
Ritor1
parents:
diff changeset
1392 }
Ritor1
parents:
diff changeset
1393 a4d = 0;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1394 word_720A70_intercepts_xs_plus_xs[2 * face->uNumVertices] = word_720A70_intercepts_xs_plus_xs[0];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1395 word_7209A0_intercepts_ys_plus_ys[2 * face->uNumVertices] = word_7209A0_intercepts_ys_plus_ys[0];
0
Ritor1
parents:
diff changeset
1396 v12 = word_7209A0_intercepts_ys_plus_ys[0] >= v24;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1397 if ( 2 * face->uNumVertices <= 0 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1398 return 0;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1399 for ( v21 = 0; v21 < 2 * face->uNumVertices; ++v21 )
0
Ritor1
parents:
diff changeset
1400 {
Ritor1
parents:
diff changeset
1401 if ( a4d >= 2 )
Ritor1
parents:
diff changeset
1402 break;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1403 if ( v12 ^ (word_7209A0_intercepts_ys_plus_ys[v21 + 1] >= v24) )
0
Ritor1
parents:
diff changeset
1404 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1405 if ( word_720A70_intercepts_xs_plus_xs[v21 + 1] >= v23 )
0
Ritor1
parents:
diff changeset
1406 v16 = 0;
Ritor1
parents:
diff changeset
1407 else
Ritor1
parents:
diff changeset
1408 v16 = 2;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1409 v17 = v16 | (word_720A70_intercepts_xs_plus_xs[v21] < v23);
0
Ritor1
parents:
diff changeset
1410 if ( v17 != 3 )
Ritor1
parents:
diff changeset
1411 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1412 v18 = word_720A70_intercepts_xs_plus_xs[v21 + 1] - word_720A70_intercepts_xs_plus_xs[v21];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1413 LODWORD(v19) = v18 << 16;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1414 HIDWORD(v19) = v18 >> 16;
0
Ritor1
parents:
diff changeset
1415 if ( !v17
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1416 || (word_720A70_intercepts_xs_plus_xs[v21] + ((signed int)(((unsigned __int64)(v19
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1417 / (word_7209A0_intercepts_ys_plus_ys[v21 + 1] - word_7209A0_intercepts_ys_plus_ys[v21])
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1418 * ((v24 - (signed int)word_7209A0_intercepts_ys_plus_ys[v21]) << 16)) >> 16)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1419 + 32768) >> 16) >= v23) )
0
Ritor1
parents:
diff changeset
1420 ++a4d;
Ritor1
parents:
diff changeset
1421 }
Ritor1
parents:
diff changeset
1422 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1423 v12 = word_7209A0_intercepts_ys_plus_ys[v21 + 1] >= v24;
0
Ritor1
parents:
diff changeset
1424 }
Ritor1
parents:
diff changeset
1425 result = 1;
Ritor1
parents:
diff changeset
1426 if ( a4d != 1 )
Ritor1
parents:
diff changeset
1427 result = 0;
Ritor1
parents:
diff changeset
1428 return result;
Ritor1
parents:
diff changeset
1429 }
Ritor1
parents:
diff changeset
1430
Ritor1
parents:
diff changeset
1431 //----- (00475D85) --------------------------------------------------------
Ritor1
parents:
diff changeset
1432 bool __fastcall sub_475D85(Vec3_int_ *a1, Vec3_int_ *a2, int *a3, BLVFace *a4)
Ritor1
parents:
diff changeset
1433 {
Ritor1
parents:
diff changeset
1434 BLVFace *v4; // ebx@1
Ritor1
parents:
diff changeset
1435 int v5; // ST24_4@2
Ritor1
parents:
diff changeset
1436 int v6; // ST28_4@2
Ritor1
parents:
diff changeset
1437 int v7; // edi@2
Ritor1
parents:
diff changeset
1438 int v8; // eax@5
Ritor1
parents:
diff changeset
1439 signed int v9; // esi@5
Ritor1
parents:
diff changeset
1440 signed __int64 v10; // qtt@10
Ritor1
parents:
diff changeset
1441 Vec3_int_ *v11; // esi@11
Ritor1
parents:
diff changeset
1442 int v12; // ST14_4@11
Ritor1
parents:
diff changeset
1443 Vec3_int_ *v14; // [sp+Ch] [bp-18h]@1
Ritor1
parents:
diff changeset
1444 Vec3_int_ *v15; // [sp+14h] [bp-10h]@1
Ritor1
parents:
diff changeset
1445 int v16; // [sp+18h] [bp-Ch]@2
Ritor1
parents:
diff changeset
1446 int v17; // [sp+20h] [bp-4h]@10
Ritor1
parents:
diff changeset
1447 int a4b; // [sp+30h] [bp+Ch]@2
Ritor1
parents:
diff changeset
1448 int a4c; // [sp+30h] [bp+Ch]@9
Ritor1
parents:
diff changeset
1449 signed int a4a; // [sp+30h] [bp+Ch]@10
Ritor1
parents:
diff changeset
1450
Ritor1
parents:
diff changeset
1451 v4 = a4;
Ritor1
parents:
diff changeset
1452 v15 = a2;
Ritor1
parents:
diff changeset
1453 v14 = a1;
Ritor1
parents:
diff changeset
1454 if ( BYTE3(a4->uAttributes) & 0x20
Ritor1
parents:
diff changeset
1455 || (v5 = (unsigned __int64)(a2->x * (signed __int64)a4->pFacePlane_old.vNormal.x) >> 16,
Ritor1
parents:
diff changeset
1456 a4b = (unsigned __int64)(a2->y * (signed __int64)a4->pFacePlane_old.vNormal.y) >> 16,
Ritor1
parents:
diff changeset
1457 v6 = (unsigned __int64)(a2->z * (signed __int64)v4->pFacePlane_old.vNormal.z) >> 16,
Ritor1
parents:
diff changeset
1458 v7 = v5 + v6 + a4b,
Ritor1
parents:
diff changeset
1459 (v16 = v5 + v6 + a4b) == 0)
676
ecfb1b3c9a39 BLV: when standing right on the portal (orange wall) everything looks fine
Nomad
parents: 675
diff changeset
1460 || v7 > 0 && !v4->Portal())
0
Ritor1
parents:
diff changeset
1461 return 0;
Ritor1
parents:
diff changeset
1462 v8 = v4->pFacePlane_old.vNormal.z * a1->z;
Ritor1
parents:
diff changeset
1463 v9 = -(v4->pFacePlane_old.dist + v8 + a1->y * v4->pFacePlane_old.vNormal.y + a1->x * v4->pFacePlane_old.vNormal.x);
Ritor1
parents:
diff changeset
1464 if ( v7 <= 0 )
Ritor1
parents:
diff changeset
1465 {
Ritor1
parents:
diff changeset
1466 if ( v4->pFacePlane_old.dist + v8 + a1->y * v4->pFacePlane_old.vNormal.y + a1->x * v4->pFacePlane_old.vNormal.x < 0 )
Ritor1
parents:
diff changeset
1467 return 0;
Ritor1
parents:
diff changeset
1468 }
Ritor1
parents:
diff changeset
1469 else
Ritor1
parents:
diff changeset
1470 {
Ritor1
parents:
diff changeset
1471 if ( v9 < 0 )
Ritor1
parents:
diff changeset
1472 return 0;
Ritor1
parents:
diff changeset
1473 }
Ritor1
parents:
diff changeset
1474 a4c = abs(-(v4->pFacePlane_old.dist + v8 + a1->y * v4->pFacePlane_old.vNormal.y + a1->x * v4->pFacePlane_old.vNormal.x)) >> 14;
Ritor1
parents:
diff changeset
1475 if ( a4c > abs(v7)
Ritor1
parents:
diff changeset
1476 || (LODWORD(v10) = v9 << 16, HIDWORD(v10) = v9 >> 16, a4a = v10 / v16, v17 = v10 / v16, v17 > *a3 << 16)
Ritor1
parents:
diff changeset
1477 || (v11 = v14,
Ritor1
parents:
diff changeset
1478 LOWORD(v12) = LOWORD(v14->x)
Ritor1
parents:
diff changeset
1479 + (((unsigned int)((unsigned __int64)(v17 * (signed __int64)v15->x) >> 16) + 32768) >> 16),
Ritor1
parents:
diff changeset
1480 HIWORD(v12) = LOWORD(v11->y)
Ritor1
parents:
diff changeset
1481 + (((unsigned int)((unsigned __int64)(v17 * (signed __int64)v15->y) >> 16) + 32768) >> 16),
Ritor1
parents:
diff changeset
1482 !sub_475665(
Ritor1
parents:
diff changeset
1483 v4,
Ritor1
parents:
diff changeset
1484 v12,
Ritor1
parents:
diff changeset
1485 LOWORD(v11->z) + (((unsigned int)((unsigned __int64)(v17 * (signed __int64)v15->z) >> 16) + 32768) >> 16))) )
Ritor1
parents:
diff changeset
1486 return 0;
Ritor1
parents:
diff changeset
1487 *a3 = a4a >> 16;
Ritor1
parents:
diff changeset
1488 return 1;
Ritor1
parents:
diff changeset
1489 }
Ritor1
parents:
diff changeset
1490
Ritor1
parents:
diff changeset
1491 //----- (00475F30) --------------------------------------------------------
Ritor1
parents:
diff changeset
1492 bool __fastcall sub_475F30(int *a1, BLVFace *a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)
Ritor1
parents:
diff changeset
1493 {
Ritor1
parents:
diff changeset
1494 int v10; // ST20_4@2
Ritor1
parents:
diff changeset
1495 int v11; // ST28_4@2
Ritor1
parents:
diff changeset
1496 int v12; // ST24_4@2
Ritor1
parents:
diff changeset
1497 char v13; // zf@2
Ritor1
parents:
diff changeset
1498 int v14; // edi@2
Ritor1
parents:
diff changeset
1499 signed int v16; // esi@5
Ritor1
parents:
diff changeset
1500 int v17; // ST20_4@9
Ritor1
parents:
diff changeset
1501 signed __int64 v18; // qtt@10
Ritor1
parents:
diff changeset
1502 int v19; // ST14_4@11
Ritor1
parents:
diff changeset
1503 int v22; // [sp+1Ch] [bp-8h]@2
Ritor1
parents:
diff changeset
1504 int v23; // [sp+1Ch] [bp-8h]@10
Ritor1
parents:
diff changeset
1505 signed int v24; // [sp+20h] [bp-4h]@10
Ritor1
parents:
diff changeset
1506
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1507 if ( a2->Ethereal()
0
Ritor1
parents:
diff changeset
1508 || (v10 = (unsigned __int64)(a6 * (signed __int64)a2->pFacePlane_old.vNormal.x) >> 16,
Ritor1
parents:
diff changeset
1509 v11 = (unsigned __int64)(a7 * (signed __int64)a2->pFacePlane_old.vNormal.y) >> 16,
Ritor1
parents:
diff changeset
1510 v12 = (unsigned __int64)(a8 * (signed __int64)a2->pFacePlane_old.vNormal.z) >> 16,
Ritor1
parents:
diff changeset
1511 v13 = v10 + v12 + v11 == 0,
Ritor1
parents:
diff changeset
1512 v14 = v10 + v12 + v11,
Ritor1
parents:
diff changeset
1513 v22 = v10 + v12 + v11,
Ritor1
parents:
diff changeset
1514 v13)
676
ecfb1b3c9a39 BLV: when standing right on the portal (orange wall) everything looks fine
Nomad
parents: 675
diff changeset
1515 || v14 > 0 && !a2->Portal())
0
Ritor1
parents:
diff changeset
1516 return 0;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1517 v16 = -(a2->pFacePlane_old.dist + a4 * a2->pFacePlane_old.vNormal.y + a3 * a2->pFacePlane_old.vNormal.x + a5 * a2->pFacePlane_old.vNormal.z);
0
Ritor1
parents:
diff changeset
1518 if ( v14 <= 0 )
Ritor1
parents:
diff changeset
1519 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1520 if ( a2->pFacePlane_old.dist + a4 * a2->pFacePlane_old.vNormal.y + a3 * a2->pFacePlane_old.vNormal.x + a5 * a2->pFacePlane_old.vNormal.z < 0 )
0
Ritor1
parents:
diff changeset
1521 return 0;
Ritor1
parents:
diff changeset
1522 }
Ritor1
parents:
diff changeset
1523 else
Ritor1
parents:
diff changeset
1524 {
Ritor1
parents:
diff changeset
1525 if ( v16 < 0 )
Ritor1
parents:
diff changeset
1526 return 0;
Ritor1
parents:
diff changeset
1527 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1528 v17 = abs(-(a2->pFacePlane_old.dist + a4 * a2->pFacePlane_old.vNormal.y + a3 * a2->pFacePlane_old.vNormal.x + a5 * a2->pFacePlane_old.vNormal.z)) >> 14;
0
Ritor1
parents:
diff changeset
1529 if ( v17 > abs(v14)
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1530 || (LODWORD(v18) = v16 << 16, HIDWORD(v18) = v16 >> 16, v24 = v18 / v22, v23 = v18 / v22, v23 > *a1 << 16)
0
Ritor1
parents:
diff changeset
1531 || (LOWORD(v19) = a3 + (((unsigned int)((unsigned __int64)(v23 * (signed __int64)a6) >> 16) + 32768) >> 16),
Ritor1
parents:
diff changeset
1532 HIWORD(v19) = a4 + (((unsigned int)((unsigned __int64)(v23 * (signed __int64)a7) >> 16) + 32768) >> 16),
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1533 !sub_4759C9(a2, a9, v19,
0
Ritor1
parents:
diff changeset
1534 a5 + (((unsigned int)((unsigned __int64)(v23 * (signed __int64)a8) >> 16) + 32768) >> 16))) )
Ritor1
parents:
diff changeset
1535 return 0;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
1536 *a1 = v24 >> 16;
0
Ritor1
parents:
diff changeset
1537 return 1;
Ritor1
parents:
diff changeset
1538 }
Ritor1
parents:
diff changeset
1539
Ritor1
parents:
diff changeset
1540 //----- (004760D5) --------------------------------------------------------
Ritor1
parents:
diff changeset
1541 PartyAction ActionQueue::Next()
Ritor1
parents:
diff changeset
1542 {
Ritor1
parents:
diff changeset
1543 if (!uNumActions)
Ritor1
parents:
diff changeset
1544 return PARTY_INVALID;
Ritor1
parents:
diff changeset
1545
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
1546 PartyAction result = pActions[0];
0
Ritor1
parents:
diff changeset
1547 for (unsigned int i = 0; i < uNumActions - 1; ++i)
Ritor1
parents:
diff changeset
1548 pActions[i] = pActions[i + 1];
Ritor1
parents:
diff changeset
1549 --uNumActions;
Ritor1
parents:
diff changeset
1550
Ritor1
parents:
diff changeset
1551 return result;
Ritor1
parents:
diff changeset
1552 }
Ritor1
parents:
diff changeset
1553
Ritor1
parents:
diff changeset
1554 //----- (004775ED) --------------------------------------------------------
Ritor1
parents:
diff changeset
1555 int stru6_stru1_indoor_sw_billboard::_4775ED(float a2)
Ritor1
parents:
diff changeset
1556 {
Ritor1
parents:
diff changeset
1557 char *v2; // edi@1
Ritor1
parents:
diff changeset
1558 int v3; // eax@1
Ritor1
parents:
diff changeset
1559 char *v4; // edx@2
Ritor1
parents:
diff changeset
1560 char *v5; // esi@3
Ritor1
parents:
diff changeset
1561 double v6; // st7@6
Ritor1
parents:
diff changeset
1562 signed __int64 v7; // ST84_8@6
Ritor1
parents:
diff changeset
1563 double v8; // ST0C_8@6
Ritor1
parents:
diff changeset
1564 int v9; // esi@6
Ritor1
parents:
diff changeset
1565 double v10; // ST44_8@6
Ritor1
parents:
diff changeset
1566 int v11; // ecx@6
Ritor1
parents:
diff changeset
1567 double v12; // ST34_8@6
Ritor1
parents:
diff changeset
1568 int v13; // ecx@6
Ritor1
parents:
diff changeset
1569 double v14; // ST14_8@6
Ritor1
parents:
diff changeset
1570 double v15; // st7@8
Ritor1
parents:
diff changeset
1571 unsigned int v16; // ecx@8
Ritor1
parents:
diff changeset
1572 signed __int64 v17; // ST64_8@8
Ritor1
parents:
diff changeset
1573 double v18; // ST24_8@8
Ritor1
parents:
diff changeset
1574 int v19; // edi@8
Ritor1
parents:
diff changeset
1575 double v20; // ST3C_8@8
Ritor1
parents:
diff changeset
1576 int v21; // ecx@8
Ritor1
parents:
diff changeset
1577 double v22; // ST2C_8@8
Ritor1
parents:
diff changeset
1578 int v23; // ST9C_4@8
Ritor1
parents:
diff changeset
1579 double v24; // ST1C_8@8
Ritor1
parents:
diff changeset
1580 int *v25; // edi@8
Ritor1
parents:
diff changeset
1581 int v26; // esi@8
Ritor1
parents:
diff changeset
1582 int *v27; // edi@10
Ritor1
parents:
diff changeset
1583 int v28; // esi@10
Ritor1
parents:
diff changeset
1584 int result; // eax@12
Ritor1
parents:
diff changeset
1585 __int64 v30; // [sp+A8h] [bp-30h]@8
Ritor1
parents:
diff changeset
1586 float v31; // [sp+B0h] [bp-28h]@6
Ritor1
parents:
diff changeset
1587 float v32; // [sp+B4h] [bp-24h]@6
Ritor1
parents:
diff changeset
1588 int v33; // [sp+B8h] [bp-20h]@6
Ritor1
parents:
diff changeset
1589 int v34; // [sp+BCh] [bp-1Ch]@2
Ritor1
parents:
diff changeset
1590 stru6_stru1_indoor_sw_billboard *v35; // [sp+C0h] [bp-18h]@1
Ritor1
parents:
diff changeset
1591 float v36; // [sp+C4h] [bp-14h]@6
Ritor1
parents:
diff changeset
1592 int v37; // [sp+C8h] [bp-10h]@6
Ritor1
parents:
diff changeset
1593 int v38; // [sp+CCh] [bp-Ch]@1
Ritor1
parents:
diff changeset
1594 float v39; // [sp+D0h] [bp-8h]@6
Ritor1
parents:
diff changeset
1595 int *v40; // [sp+D4h] [bp-4h]@2
Ritor1
parents:
diff changeset
1596
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
1597 __debugbreak();//íóæíî ïî÷èñòèòü, ñðàáàòûâàåò ïðè ïðèìåíåíèè çàêëà Òî÷å÷íûé âçðûâ è ïðè ñòðåëüáå èç æåçëà
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1598 v2 = (char *)&this->field_64[4 * this->uNumVertices];
0
Ritor1
parents:
diff changeset
1599 v38 = 0;
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1600 *(int *)v2 = this->field_64[0];
0
Ritor1
parents:
diff changeset
1601 v2 += 4;
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1602 *(int *)v2 = this->field_64[1];
0
Ritor1
parents:
diff changeset
1603 v2 += 4;
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1604 *(int *)v2 = this->field_64[2];
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1605 *((int *)v2 + 1) = this->field_64[3];
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1606 v3 = this->uNumVertices;
0
Ritor1
parents:
diff changeset
1607 v35 = this;
Ritor1
parents:
diff changeset
1608 if ( v3 > 0 )
Ritor1
parents:
diff changeset
1609 {
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1610 v40 = &this->field_64[20];
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1611 v4 = (char *)&this->field_64[3] + 3;
0
Ritor1
parents:
diff changeset
1612 v34 = v3;
Ritor1
parents:
diff changeset
1613 while ( 1 )
Ritor1
parents:
diff changeset
1614 {
Ritor1
parents:
diff changeset
1615 v5 = v4 - 15;
Ritor1
parents:
diff changeset
1616 if ( *(float *)(v4 - 15) <= (double)a2 && *(float *)(v4 + 1) <= (double)a2 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1617 {
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1618 v4 += 16;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1619 --v34;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1620 if ( !v34 )
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1621 return this->uNumVertices = v38;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1622 continue;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1623 }
0
Ritor1
parents:
diff changeset
1624 if ( *(float *)v5 <= (double)a2 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1625 {
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1626 v6 = (a2 - *(float *)v5) / (*(float *)(v4 + 1) - *(float *)v5);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1627 v7 = (unsigned __int8)v4[16] - (unsigned int)(unsigned __int8)*v4;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1628 v36 = v6;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1629 v31 = (*(float *)(v4 + 5) - *(float *)(v4 - 11)) * v6 + *(float *)(v4 - 11);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1630 v32 = (*(float *)(v4 + 9) - *(float *)(v4 - 7)) * v6 + *(float *)(v4 - 7);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1631 *(float *)&v37 = (double)v7 * v6;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1632 v8 = *(float *)&v37 + 6.7553994e15;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1633 v9 = (unsigned __int8)*v4;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1634 *(float *)&v37 = (double)((unsigned __int8)v4[15] - (unsigned int)(unsigned __int8)*(v4 - 1)) * v36;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1635 v10 = *(float *)&v37 + 6.7553994e15;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1636 v11 = (unsigned __int8)*(v4 - 2);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1637 v37 = LODWORD(v10) + (unsigned __int8)*(v4 - 1);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1638 v39 = (double)((unsigned int)(unsigned __int8)v4[14] - v11) * v36;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1639 v12 = v39 + 6.7553994e15;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1640 v13 = LODWORD(v12) + (unsigned __int8)*(v4 - 2);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1641 v39 = (double)((*(int *)(v4 + 13) & 0xFF) - (*(int *)(v4 - 3) & 0xFFu)) * v36;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1642 v14 = v39 + 6.7553994e15;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1643 v33 = (LODWORD(v14) + (*(int *)(v4 - 3) & 0xFF)) | ((v13 | ((v37 | ((LODWORD(v8) + v9) << 8)) << 8)) << 8);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1644 //this = v35;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1645 v5 = (char *)&v30 + 4;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1646 }
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1647 else if ( *(float *)(v4 + 1) <= (double)a2 )
0
Ritor1
parents:
diff changeset
1648 {
Ritor1
parents:
diff changeset
1649 v15 = (a2 - *(float *)v5) / (*(float *)(v4 + 1) - *(float *)v5);
Ritor1
parents:
diff changeset
1650 v16 = (unsigned __int8)*v4;
Ritor1
parents:
diff changeset
1651 HIDWORD(v30) = LODWORD(a2);
Ritor1
parents:
diff changeset
1652 v17 = (unsigned __int8)v4[16] - v16;
Ritor1
parents:
diff changeset
1653 v36 = v15;
Ritor1
parents:
diff changeset
1654 v31 = (*(float *)(v4 + 5) - *(float *)(v4 - 11)) * v15 + *(float *)(v4 - 11);
Ritor1
parents:
diff changeset
1655 v32 = (*(float *)(v4 + 9) - *(float *)(v4 - 7)) * v15 + *(float *)(v4 - 7);
Ritor1
parents:
diff changeset
1656 v39 = (double)v17 * v15;
Ritor1
parents:
diff changeset
1657 v18 = v39 + 6.7553994e15;
Ritor1
parents:
diff changeset
1658 v19 = (unsigned __int8)*v4;
Ritor1
parents:
diff changeset
1659 v39 = (double)((unsigned __int8)v4[15] - (unsigned int)(unsigned __int8)*(v4 - 1)) * v36;
Ritor1
parents:
diff changeset
1660 v20 = v39 + 6.7553994e15;
Ritor1
parents:
diff changeset
1661 v21 = (unsigned __int8)*(v4 - 2);
Ritor1
parents:
diff changeset
1662 v37 = LODWORD(v20) + (unsigned __int8)*(v4 - 1);
Ritor1
parents:
diff changeset
1663 v39 = (double)((unsigned int)(unsigned __int8)v4[14] - v21) * v36;
Ritor1
parents:
diff changeset
1664 v22 = v39 + 6.7553994e15;
Ritor1
parents:
diff changeset
1665 v23 = LODWORD(v22) + (unsigned __int8)*(v4 - 2);
Ritor1
parents:
diff changeset
1666 v39 = (double)((*(int *)(v4 + 13) & 0xFF) - (*(int *)(v4 - 3) & 0xFFu)) * v36;
Ritor1
parents:
diff changeset
1667 v24 = v39 + 6.7553994e15;
Ritor1
parents:
diff changeset
1668 v33 = (LODWORD(v24) + (*(int *)(v4 - 3) & 0xFF)) | ((v23 | ((v37 | ((LODWORD(v18) + v19) << 8)) << 8)) << 8);
Ritor1
parents:
diff changeset
1669 v25 = v40;
Ritor1
parents:
diff changeset
1670 *v40 = *(int *)v5;
Ritor1
parents:
diff changeset
1671 v26 = (int)(v5 + 4);
Ritor1
parents:
diff changeset
1672 ++v25;
Ritor1
parents:
diff changeset
1673 *v25 = *(int *)v26;
Ritor1
parents:
diff changeset
1674 v26 += 4;
Ritor1
parents:
diff changeset
1675 ++v25;
Ritor1
parents:
diff changeset
1676 ++v38;
Ritor1
parents:
diff changeset
1677 v40 += 4;
Ritor1
parents:
diff changeset
1678 *v25 = *(int *)v26;
Ritor1
parents:
diff changeset
1679 v25[1] = *(int *)(v26 + 4);
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1680 v5 = (char *)&v30 + 4;
0
Ritor1
parents:
diff changeset
1681 }
Ritor1
parents:
diff changeset
1682 v27 = v40;
Ritor1
parents:
diff changeset
1683 ++v38;
Ritor1
parents:
diff changeset
1684 *v40 = *(int *)v5;
Ritor1
parents:
diff changeset
1685 v28 = (int)(v5 + 4);
Ritor1
parents:
diff changeset
1686 ++v27;
Ritor1
parents:
diff changeset
1687 *v27 = *(int *)v28;
Ritor1
parents:
diff changeset
1688 v28 += 4;
Ritor1
parents:
diff changeset
1689 ++v27;
Ritor1
parents:
diff changeset
1690 v40 += 4;
Ritor1
parents:
diff changeset
1691 *v27 = *(int *)v28;
Ritor1
parents:
diff changeset
1692 v27[1] = *(int *)(v28 + 4);
Ritor1
parents:
diff changeset
1693 v4 += 16;
Ritor1
parents:
diff changeset
1694 --v34;
Ritor1
parents:
diff changeset
1695 if ( !v34 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1696 return this->uNumVertices = v38;
0
Ritor1
parents:
diff changeset
1697 }
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1698 }
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1699 return this->uNumVertices = v38;
0
Ritor1
parents:
diff changeset
1700 }
Ritor1
parents:
diff changeset
1701
Ritor1
parents:
diff changeset
1702 //----- (00477927) --------------------------------------------------------
Ritor1
parents:
diff changeset
1703 int stru6_stru1_indoor_sw_billboard::_477927(float a2)
Ritor1
parents:
diff changeset
1704 {
Ritor1
parents:
diff changeset
1705 char *v2; // edi@1
Ritor1
parents:
diff changeset
1706 int v3; // eax@1
Ritor1
parents:
diff changeset
1707 char *v4; // edx@2
Ritor1
parents:
diff changeset
1708 char *v5; // esi@3
Ritor1
parents:
diff changeset
1709 double v6; // st7@6
Ritor1
parents:
diff changeset
1710 signed __int64 v7; // ST84_8@6
Ritor1
parents:
diff changeset
1711 double v8; // ST0C_8@6
Ritor1
parents:
diff changeset
1712 int v9; // esi@6
Ritor1
parents:
diff changeset
1713 double v10; // ST44_8@6
Ritor1
parents:
diff changeset
1714 int v11; // ecx@6
Ritor1
parents:
diff changeset
1715 double v12; // ST34_8@6
Ritor1
parents:
diff changeset
1716 int v13; // ecx@6
Ritor1
parents:
diff changeset
1717 double v14; // ST14_8@6
Ritor1
parents:
diff changeset
1718 double v15; // st7@8
Ritor1
parents:
diff changeset
1719 unsigned int v16; // ecx@8
Ritor1
parents:
diff changeset
1720 signed __int64 v17; // ST64_8@8
Ritor1
parents:
diff changeset
1721 double v18; // ST24_8@8
Ritor1
parents:
diff changeset
1722 int v19; // edi@8
Ritor1
parents:
diff changeset
1723 double v20; // ST3C_8@8
Ritor1
parents:
diff changeset
1724 int v21; // ecx@8
Ritor1
parents:
diff changeset
1725 double v22; // ST2C_8@8
Ritor1
parents:
diff changeset
1726 int v23; // ST9C_4@8
Ritor1
parents:
diff changeset
1727 double v24; // ST1C_8@8
Ritor1
parents:
diff changeset
1728 int *v25; // edi@8
Ritor1
parents:
diff changeset
1729 int v26; // esi@8
Ritor1
parents:
diff changeset
1730 int *v27; // edi@10
Ritor1
parents:
diff changeset
1731 int v28; // esi@10
Ritor1
parents:
diff changeset
1732 int result; // eax@12
Ritor1
parents:
diff changeset
1733 __int64 v30; // [sp+A8h] [bp-30h]@8
Ritor1
parents:
diff changeset
1734 float v31; // [sp+B0h] [bp-28h]@6
Ritor1
parents:
diff changeset
1735 float v32; // [sp+B4h] [bp-24h]@6
Ritor1
parents:
diff changeset
1736 int v33; // [sp+B8h] [bp-20h]@6
Ritor1
parents:
diff changeset
1737 int v34; // [sp+BCh] [bp-1Ch]@2
Ritor1
parents:
diff changeset
1738 stru6_stru1_indoor_sw_billboard *v35; // [sp+C0h] [bp-18h]@1
Ritor1
parents:
diff changeset
1739 float v36; // [sp+C4h] [bp-14h]@6
Ritor1
parents:
diff changeset
1740 int v37; // [sp+C8h] [bp-10h]@6
Ritor1
parents:
diff changeset
1741 int v38; // [sp+CCh] [bp-Ch]@1
Ritor1
parents:
diff changeset
1742 float v39; // [sp+D0h] [bp-8h]@6
Ritor1
parents:
diff changeset
1743 int *v40; // [sp+D4h] [bp-4h]@2
Ritor1
parents:
diff changeset
1744
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
1745 __debugbreak();//íóæíî ïî÷èñòèòü
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1746 v2 = (char *)&this->field_64[4 * this->uNumVertices];
0
Ritor1
parents:
diff changeset
1747 v38 = 0;
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1748 *(int *)v2 = this->field_64[0];
0
Ritor1
parents:
diff changeset
1749 v2 += 4;
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1750 *(int *)v2 = this->field_64[1];
0
Ritor1
parents:
diff changeset
1751 v2 += 4;
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1752 *(int *)v2 = this->field_64[2];
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1753 *((int *)v2 + 1) = this->field_64[3];
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1754 v3 = this->uNumVertices;
0
Ritor1
parents:
diff changeset
1755 v35 = this;
Ritor1
parents:
diff changeset
1756 if ( v3 > 0 )
Ritor1
parents:
diff changeset
1757 {
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1758 v40 = &this->field_64[20];
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1759 v4 = (char *)&this->field_64[3] + 3;
0
Ritor1
parents:
diff changeset
1760 v34 = v3;
Ritor1
parents:
diff changeset
1761 while ( 1 )
Ritor1
parents:
diff changeset
1762 {
Ritor1
parents:
diff changeset
1763 v5 = v4 - 15;
Ritor1
parents:
diff changeset
1764 if ( *(float *)(v4 - 15) >= (double)a2 && *(float *)(v4 + 1) >= (double)a2 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1765 {
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1766 v4 += 16;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1767 --v34;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1768 if ( !v34 )
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1769 return this->uNumVertices = v38;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1770 continue;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1771 }
0
Ritor1
parents:
diff changeset
1772 if ( *(float *)v5 >= (double)a2 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1773 {
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1774 v6 = (a2 - *(float *)v5) / (*(float *)(v4 + 1) - *(float *)v5);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1775 v7 = (unsigned __int8)v4[16] - (unsigned int)(unsigned __int8)*v4;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1776 v36 = v6;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1777 v31 = (*(float *)(v4 + 5) - *(float *)(v4 - 11)) * v6 + *(float *)(v4 - 11);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1778 v32 = (*(float *)(v4 + 9) - *(float *)(v4 - 7)) * v6 + *(float *)(v4 - 7);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1779 *(float *)&v37 = (double)v7 * v6;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1780 v8 = *(float *)&v37 + 6.7553994e15;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1781 v9 = (unsigned __int8)*v4;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1782 *(float *)&v37 = (double)((unsigned __int8)v4[15] - (unsigned int)(unsigned __int8)*(v4 - 1)) * v36;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1783 v10 = *(float *)&v37 + 6.7553994e15;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1784 v11 = (unsigned __int8)*(v4 - 2);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1785 v37 = LODWORD(v10) + (unsigned __int8)*(v4 - 1);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1786 v39 = (double)((unsigned int)(unsigned __int8)v4[14] - v11) * v36;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1787 v12 = v39 + 6.7553994e15;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1788 v13 = LODWORD(v12) + (unsigned __int8)*(v4 - 2);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1789 v39 = (double)((*(int *)(v4 + 13) & 0xFF) - (*(int *)(v4 - 3) & 0xFFu)) * v36;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1790 v14 = v39 + 6.7553994e15;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1791 v33 = (LODWORD(v14) + (*(int *)(v4 - 3) & 0xFF)) | ((v13 | ((v37 | ((LODWORD(v8) + v9) << 8)) << 8)) << 8);
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1792 //this = v35;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1793 v5 = (char *)&v30 + 4;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1794 }
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1795 else if ( *(float *)(v4 + 1) >= (double)a2 )
0
Ritor1
parents:
diff changeset
1796 {
Ritor1
parents:
diff changeset
1797 v15 = (a2 - *(float *)v5) / (*(float *)(v4 + 1) - *(float *)v5);
Ritor1
parents:
diff changeset
1798 v16 = (unsigned __int8)*v4;
Ritor1
parents:
diff changeset
1799 HIDWORD(v30) = LODWORD(a2);
Ritor1
parents:
diff changeset
1800 v17 = (unsigned __int8)v4[16] - v16;
Ritor1
parents:
diff changeset
1801 v36 = v15;
Ritor1
parents:
diff changeset
1802 v31 = (*(float *)(v4 + 5) - *(float *)(v4 - 11)) * v15 + *(float *)(v4 - 11);
Ritor1
parents:
diff changeset
1803 v32 = (*(float *)(v4 + 9) - *(float *)(v4 - 7)) * v15 + *(float *)(v4 - 7);
Ritor1
parents:
diff changeset
1804 v39 = (double)v17 * v15;
Ritor1
parents:
diff changeset
1805 v18 = v39 + 6.7553994e15;
Ritor1
parents:
diff changeset
1806 v19 = (unsigned __int8)*v4;
Ritor1
parents:
diff changeset
1807 v39 = (double)((unsigned __int8)v4[15] - (unsigned int)(unsigned __int8)*(v4 - 1)) * v36;
Ritor1
parents:
diff changeset
1808 v20 = v39 + 6.7553994e15;
Ritor1
parents:
diff changeset
1809 v21 = (unsigned __int8)*(v4 - 2);
Ritor1
parents:
diff changeset
1810 v37 = LODWORD(v20) + (unsigned __int8)*(v4 - 1);
Ritor1
parents:
diff changeset
1811 v39 = (double)((unsigned int)(unsigned __int8)v4[14] - v21) * v36;
Ritor1
parents:
diff changeset
1812 v22 = v39 + 6.7553994e15;
Ritor1
parents:
diff changeset
1813 v23 = LODWORD(v22) + (unsigned __int8)*(v4 - 2);
Ritor1
parents:
diff changeset
1814 v39 = (double)((*(int *)(v4 + 13) & 0xFF) - (*(int *)(v4 - 3) & 0xFFu)) * v36;
Ritor1
parents:
diff changeset
1815 v24 = v39 + 6.7553994e15;
Ritor1
parents:
diff changeset
1816 v33 = (LODWORD(v24) + (*(int *)(v4 - 3) & 0xFF)) | ((v23 | ((v37 | ((LODWORD(v18) + v19) << 8)) << 8)) << 8);
Ritor1
parents:
diff changeset
1817 v25 = v40;
Ritor1
parents:
diff changeset
1818 *v40 = *(int *)v5;
Ritor1
parents:
diff changeset
1819 v26 = (int)(v5 + 4);
Ritor1
parents:
diff changeset
1820 ++v25;
Ritor1
parents:
diff changeset
1821 *v25 = *(int *)v26;
Ritor1
parents:
diff changeset
1822 v26 += 4;
Ritor1
parents:
diff changeset
1823 ++v25;
Ritor1
parents:
diff changeset
1824 ++v38;
Ritor1
parents:
diff changeset
1825 v40 += 4;
Ritor1
parents:
diff changeset
1826 *v25 = *(int *)v26;
Ritor1
parents:
diff changeset
1827 v25[1] = *(int *)(v26 + 4);
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1828 v5 = (char *)&v30 + 4;
0
Ritor1
parents:
diff changeset
1829 }
Ritor1
parents:
diff changeset
1830 v27 = v40;
Ritor1
parents:
diff changeset
1831 ++v38;
Ritor1
parents:
diff changeset
1832 *v40 = *(int *)v5;
Ritor1
parents:
diff changeset
1833 v28 = (int)(v5 + 4);
Ritor1
parents:
diff changeset
1834 ++v27;
Ritor1
parents:
diff changeset
1835 *v27 = *(int *)v28;
Ritor1
parents:
diff changeset
1836 v28 += 4;
Ritor1
parents:
diff changeset
1837 ++v27;
Ritor1
parents:
diff changeset
1838 v40 += 4;
Ritor1
parents:
diff changeset
1839 *v27 = *(int *)v28;
Ritor1
parents:
diff changeset
1840 v27[1] = *(int *)(v28 + 4);
Ritor1
parents:
diff changeset
1841 v4 += 16;
Ritor1
parents:
diff changeset
1842 --v34;
Ritor1
parents:
diff changeset
1843 if ( !v34 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1844 return this->uNumVertices = v38;
0
Ritor1
parents:
diff changeset
1845 }
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
1846 }
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1847 return this->uNumVertices = v38;
0
Ritor1
parents:
diff changeset
1848 }
Ritor1
parents:
diff changeset
1849
Ritor1
parents:
diff changeset
1850 //----- (00477C61) --------------------------------------------------------
Ritor1
parents:
diff changeset
1851 int stru6_stru1_indoor_sw_billboard::sub_477C61()
Ritor1
parents:
diff changeset
1852 {
998
e4383e6dfbef ProcessInput
Ritor1
parents: 978
diff changeset
1853 //stru6_stru1_indoor_sw_billboard *v1; // ebx@1
0
Ritor1
parents:
diff changeset
1854 int v2; // ecx@2
Ritor1
parents:
diff changeset
1855 int v3; // eax@3
Ritor1
parents:
diff changeset
1856 double v4; // st7@4
Ritor1
parents:
diff changeset
1857 double v5; // st7@5
Ritor1
parents:
diff changeset
1858 double v6; // st6@5
Ritor1
parents:
diff changeset
1859 double v7; // st5@6
Ritor1
parents:
diff changeset
1860 float v8; // ST30_4@8
Ritor1
parents:
diff changeset
1861 float v9; // ST24_4@8
Ritor1
parents:
diff changeset
1862 double v10; // st7@8
Ritor1
parents:
diff changeset
1863 double v11; // st6@8
Ritor1
parents:
diff changeset
1864 double v12; // st5@8
Ritor1
parents:
diff changeset
1865 float v13; // ST24_4@13
Ritor1
parents:
diff changeset
1866 int v14; // esi@13
Ritor1
parents:
diff changeset
1867 char *v15; // esi@15
1638
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
1868 //signed int v16; // eax@16
0
Ritor1
parents:
diff changeset
1869 __int16 v17; // fps@16
Ritor1
parents:
diff changeset
1870 unsigned __int8 v18; // c2@16
Ritor1
parents:
diff changeset
1871 unsigned __int8 v19; // c3@16
Ritor1
parents:
diff changeset
1872 double v20; // st6@16
Ritor1
parents:
diff changeset
1873 float v21; // ST18_4@17
Ritor1
parents:
diff changeset
1874 float v22; // ST2C_4@17
Ritor1
parents:
diff changeset
1875 float v23; // ST34_4@17
Ritor1
parents:
diff changeset
1876 float v24; // ST24_4@17
Ritor1
parents:
diff changeset
1877 double v25; // st7@17
Ritor1
parents:
diff changeset
1878 double v26; // st6@17
Ritor1
parents:
diff changeset
1879 float v27; // ST34_4@18
Ritor1
parents:
diff changeset
1880 float v28; // ST30_4@18
Ritor1
parents:
diff changeset
1881 int v29; // eax@19
Ritor1
parents:
diff changeset
1882 signed int v31; // [sp+8h] [bp-28h]@15
Ritor1
parents:
diff changeset
1883 float v32; // [sp+Ch] [bp-24h]@16
Ritor1
parents:
diff changeset
1884 float v33; // [sp+14h] [bp-1Ch]@16
Ritor1
parents:
diff changeset
1885 float v34; // [sp+18h] [bp-18h]@16
Ritor1
parents:
diff changeset
1886 float v35; // [sp+1Ch] [bp-14h]@17
Ritor1
parents:
diff changeset
1887 float v36; // [sp+20h] [bp-10h]@4
Ritor1
parents:
diff changeset
1888 float v37; // [sp+24h] [bp-Ch]@4
Ritor1
parents:
diff changeset
1889 float v38; // [sp+24h] [bp-Ch]@16
Ritor1
parents:
diff changeset
1890 float v39; // [sp+28h] [bp-8h]@9
Ritor1
parents:
diff changeset
1891 float v40; // [sp+28h] [bp-8h]@16
Ritor1
parents:
diff changeset
1892 float v41; // [sp+2Ch] [bp-4h]@6
Ritor1
parents:
diff changeset
1893 float v42; // [sp+2Ch] [bp-4h]@9
Ritor1
parents:
diff changeset
1894
2198
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1895 //__debugbreak();//íóæíî ïî÷èñòèòü, ñðàáàòûâàåò ïðè ïðèìåíåíèè çàêëà Òî÷å÷íûé âçðûâ
0
Ritor1
parents:
diff changeset
1896 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
Ritor1
parents:
diff changeset
1897 {
2198
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1898
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1899 if ( this->uNumVertices > 0 )
998
e4383e6dfbef ProcessInput
Ritor1
parents: 978
diff changeset
1900 {
e4383e6dfbef ProcessInput
Ritor1
parents: 978
diff changeset
1901 v3 = (int)&this->field_14[1];
2198
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1902 //do
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1903 for ( v2 = 0; v2 < this->uNumVertices; ++v2 )
0
Ritor1
parents:
diff changeset
1904 {
Ritor1
parents:
diff changeset
1905 v4 = *(float *)(v3 - 4);
Ritor1
parents:
diff changeset
1906 LODWORD(v37) = *(int *)v3;
Ritor1
parents:
diff changeset
1907 LODWORD(v36) = *(int *)(v3 + 4);
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1908 if (pGame->pIndoorCameraD3D->sRotationX)
0
Ritor1
parents:
diff changeset
1909 {
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1910 v5 = v4 - (double)pGame->pIndoorCameraD3D->vPartyPos.x;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1911 v6 = v37 - (double)pGame->pIndoorCameraD3D->vPartyPos.y;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1912 //if ( pRenderer->pRenderD3D )
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1913 //{
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
1914 v41 = pGame->pIndoorCameraD3D->fRotationYSine * v6 + pGame->pIndoorCameraD3D->fRotationYCosine * v5;
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
1915 v7 = pGame->pIndoorCameraD3D->fRotationYSine * v5 - pGame->pIndoorCameraD3D->fRotationYCosine * v6;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1916 /*}
0
Ritor1
parents:
diff changeset
1917 else
Ritor1
parents:
diff changeset
1918 {
Ritor1
parents:
diff changeset
1919 v41 = pBLVRenderParams->fCosineY * v5 - pBLVRenderParams->fSineY * v6;
Ritor1
parents:
diff changeset
1920 v7 = pBLVRenderParams->fSineY * v5 + pBLVRenderParams->fCosineY * v6;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1921 }*/
0
Ritor1
parents:
diff changeset
1922 v8 = v7;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1923 v9 = v36 - (double)pGame->pIndoorCameraD3D->vPartyPos.z;
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
1924 v10 = pGame->pIndoorCameraD3D->fRotationXCosine * v41 - pGame->pIndoorCameraD3D->fRotationXSine * v9;
0
Ritor1
parents:
diff changeset
1925 v11 = v8;
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
1926 v12 = pGame->pIndoorCameraD3D->fRotationXCosine * v9 + pGame->pIndoorCameraD3D->fRotationXSine * v41;
0
Ritor1
parents:
diff changeset
1927 }
Ritor1
parents:
diff changeset
1928 else
Ritor1
parents:
diff changeset
1929 {
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1930 v42 = v4 - (double)pGame->pIndoorCameraD3D->vPartyPos.x;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1931 v39 = v37 - (double)pGame->pIndoorCameraD3D->vPartyPos.y;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1932 //if ( pRenderer->pRenderD3D )
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1933 //{
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
1934 v10 = pGame->pIndoorCameraD3D->fRotationYSine * v39 + pGame->pIndoorCameraD3D->fRotationYCosine * v42;
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
1935 v11 = pGame->pIndoorCameraD3D->fRotationYSine * v42 - pGame->pIndoorCameraD3D->fRotationYCosine * v39;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1936 /*}
0
Ritor1
parents:
diff changeset
1937 else
Ritor1
parents:
diff changeset
1938 {
Ritor1
parents:
diff changeset
1939 v10 = pBLVRenderParams->fCosineY * v42 - pBLVRenderParams->fSineY * v39;
Ritor1
parents:
diff changeset
1940 v11 = pBLVRenderParams->fSineY * v42 + pBLVRenderParams->fCosineY * v39;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1941 }*/
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1942 v12 = v36 - (double)pGame->pIndoorCameraD3D->vPartyPos.z;
0
Ritor1
parents:
diff changeset
1943 }
Ritor1
parents:
diff changeset
1944 v13 = v12;
2198
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1945 //++v2;
0
Ritor1
parents:
diff changeset
1946 *(int *)(v3 + 84) = LODWORD(v13);
Ritor1
parents:
diff changeset
1947 v14 = *(int *)(v3 + 8);
Ritor1
parents:
diff changeset
1948 *(float *)(v3 + 76) = v10;
Ritor1
parents:
diff changeset
1949 *(int *)(v3 + 88) = v14;
Ritor1
parents:
diff changeset
1950 *(float *)(v3 + 80) = v11;
Ritor1
parents:
diff changeset
1951 v3 += 16;
Ritor1
parents:
diff changeset
1952 }
2198
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1953 //while ( v2 < this->uNumVertices );
0
Ritor1
parents:
diff changeset
1954 }
Ritor1
parents:
diff changeset
1955 }
Ritor1
parents:
diff changeset
1956 else
Ritor1
parents:
diff changeset
1957 {
Ritor1
parents:
diff changeset
1958 v15 = (char *)&this->field_14[1];
2198
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1959 //do
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1960 for ( v31 = 3; v31; --v31 )
0
Ritor1
parents:
diff changeset
1961 {
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1962 v40 = (double)stru_5C6E00->Cos(pGame->pIndoorCameraD3D->sRotationX) * 0.0000152587890625;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1963 v32 = (double)stru_5C6E00->Sin(pGame->pIndoorCameraD3D->sRotationX) * 0.0000152587890625;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1964 v34 = (double)stru_5C6E00->Cos(pGame->pIndoorCameraD3D->sRotationY) * 0.0000152587890625;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1965 v33 = (double)stru_5C6E00->Sin(pGame->pIndoorCameraD3D->sRotationY) * 0.0000152587890625;
1638
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
1966 //v16 = stru_5C6E00->Sin(pODMRenderParams->rotation_y);
0
Ritor1
parents:
diff changeset
1967 LODWORD(v38) = *(int *)v15;
Ritor1
parents:
diff changeset
1968 //UNDEF(v17);
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1969 v20 = *((float *)v15 - 1) - (double)pGame->pIndoorCameraD3D->vPartyPos.x;
1090
8b59f13c9c3e a few spells fixed
zipi
parents: 1083
diff changeset
1970 //if ( v19 | v18 )
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1971 if (pGame->pIndoorCameraD3D->vPartyPos.x == 0)
0
Ritor1
parents:
diff changeset
1972 {
Ritor1
parents:
diff changeset
1973 v27 = v20;
Ritor1
parents:
diff changeset
1974 LODWORD(v35) = *((int *)v15 + 1);
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1975 v28 = v38 - (double)pGame->pIndoorCameraD3D->vPartyPos.y;
0
Ritor1
parents:
diff changeset
1976 v25 = v33 * v28 + v34 * v27;
Ritor1
parents:
diff changeset
1977 v26 = v34 * v28 - v33 * v27;
Ritor1
parents:
diff changeset
1978 }
Ritor1
parents:
diff changeset
1979 else
Ritor1
parents:
diff changeset
1980 {
Ritor1
parents:
diff changeset
1981 v21 = v20;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1982 v22 = v38 - (double)pGame->pIndoorCameraD3D->vPartyPos.y;
0
Ritor1
parents:
diff changeset
1983 v23 = v33 * v22 + v34 * v21;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
1984 v24 = *((float *)v15 + 1) - (double)pGame->pIndoorCameraD3D->vPartyPos.z;
0
Ritor1
parents:
diff changeset
1985 v25 = v32 * v24 + v40 * v23;
Ritor1
parents:
diff changeset
1986 v26 = v34 * v22 - v33 * v21;
Ritor1
parents:
diff changeset
1987 v35 = v40 * v24 - v32 * v23;
Ritor1
parents:
diff changeset
1988 }
Ritor1
parents:
diff changeset
1989 *((int *)v15 + 21) = LODWORD(v35);
Ritor1
parents:
diff changeset
1990 v29 = *((int *)v15 + 2);
Ritor1
parents:
diff changeset
1991 *((float *)v15 + 19) = v25;
Ritor1
parents:
diff changeset
1992 *((int *)v15 + 22) = v29;
Ritor1
parents:
diff changeset
1993 *((float *)v15 + 20) = v26;
Ritor1
parents:
diff changeset
1994 v15 += 16;
2198
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1995 //--v31;
0
Ritor1
parents:
diff changeset
1996 }
2198
d9caf2b3d8d5 draw FlyAction and WaterWalk icons
Ritor1
parents: 2196
diff changeset
1997 //while ( v31 );
0
Ritor1
parents:
diff changeset
1998 }
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1345
diff changeset
1999 this->uNumVertices = 3;
0
Ritor1
parents:
diff changeset
2000 return 1;
Ritor1
parents:
diff changeset
2001 }
Ritor1
parents:
diff changeset
2002
Ritor1
parents:
diff changeset
2003 //----- (00477F63) --------------------------------------------------------
Ritor1
parents:
diff changeset
2004 bool stru6_stru1_indoor_sw_billboard::sub_477F63()
Ritor1
parents:
diff changeset
2005 {
Ritor1
parents:
diff changeset
2006 signed int v1; // ebx@1
Ritor1
parents:
diff changeset
2007 double v3; // st7@2
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2008 //int v4; // edx@4
0
Ritor1
parents:
diff changeset
2009 char *v5; // ecx@5
Ritor1
parents:
diff changeset
2010 int v6; // edi@5
Ritor1
parents:
diff changeset
2011 float v7; // ST08_4@13
Ritor1
parents:
diff changeset
2012 signed int v9; // [sp+Ch] [bp-8h]@1
Ritor1
parents:
diff changeset
2013 float v10; // [sp+10h] [bp-4h]@2
Ritor1
parents:
diff changeset
2014
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2015 __debugbreak();// ïî÷èñòèòü
0
Ritor1
parents:
diff changeset
2016 v1 = 0;
Ritor1
parents:
diff changeset
2017 v9 = 0;
Ritor1
parents:
diff changeset
2018 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
Ritor1
parents:
diff changeset
2019 {
Ritor1
parents:
diff changeset
2020 v10 = 16192.0;
1641
466c5e15f524 Excess wrapper (IndoorLocation_drawstru) removed.
Nomad
parents: 1640
diff changeset
2021 v3 = (double)pBLVRenderParams->fov_rad_fixpoint * 0.000015258789;
0
Ritor1
parents:
diff changeset
2022 }
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2023 else if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor )
0
Ritor1
parents:
diff changeset
2024 {
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2025 v10 = (double)pODMRenderParams->shading_dist_mist;
0
Ritor1
parents:
diff changeset
2026 v3 = 8.0;
Ritor1
parents:
diff changeset
2027 }
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2028 else
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2029 __debugbreak();//Error
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2030 if ( this->uNumVertices <= 0 )
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2031 {
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2032 memcpy(&this->field_14[40], &this->field_14[20], 16 * this->uNumVertices);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2033 return this->uNumVertices != 0;
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2034 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2035 v5 = (char *)&this->field_14[20];
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2036 for ( v6 = 0; v6 < this->uNumVertices; v6++ )
0
Ritor1
parents:
diff changeset
2037 {
Ritor1
parents:
diff changeset
2038 if ( v3 >= *(float *)v5 || *(float *)v5 >= (double)v10 )
Ritor1
parents:
diff changeset
2039 {
Ritor1
parents:
diff changeset
2040 if ( v3 < *(float *)v5 )
Ritor1
parents:
diff changeset
2041 v9 = 1;
Ritor1
parents:
diff changeset
2042 else
Ritor1
parents:
diff changeset
2043 v1 = 1;
Ritor1
parents:
diff changeset
2044 }
Ritor1
parents:
diff changeset
2045 v5 += 16;
Ritor1
parents:
diff changeset
2046 }
Ritor1
parents:
diff changeset
2047 if ( !v1 )
Ritor1
parents:
diff changeset
2048 {
Ritor1
parents:
diff changeset
2049 if ( v9 )
Ritor1
parents:
diff changeset
2050 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2051 this->_477927(v10);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2052 return this->uNumVertices != 0;
0
Ritor1
parents:
diff changeset
2053 }
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
2054 memcpy(&this->field_14[40], &this->field_14[20], 16 * this->uNumVertices);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2055 return this->uNumVertices != 0;
0
Ritor1
parents:
diff changeset
2056 }
Ritor1
parents:
diff changeset
2057 v7 = v3;
Ritor1
parents:
diff changeset
2058 _4775ED(v7);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2059 return this->uNumVertices != 0;
0
Ritor1
parents:
diff changeset
2060 }
Ritor1
parents:
diff changeset
2061
Ritor1
parents:
diff changeset
2062 //----- (0047802A) --------------------------------------------------------
Ritor1
parents:
diff changeset
2063 int stru6_stru1_indoor_sw_billboard::sub_47802A()
Ritor1
parents:
diff changeset
2064 {
Ritor1
parents:
diff changeset
2065 double v6; // st7@4
Ritor1
parents:
diff changeset
2066 signed int v16; // [sp+38h] [bp-Ch]@1
Ritor1
parents:
diff changeset
2067 int a6; // [sp+3Ch] [bp-8h]@5
Ritor1
parents:
diff changeset
2068 int a5; // [sp+40h] [bp-4h]@5
Ritor1
parents:
diff changeset
2069
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2070 __debugbreak(); //íåîáõîäèìî ïðîâåðèòü this->field_B4[i*4+16]
0
Ritor1
parents:
diff changeset
2071 v16 = 0;
Ritor1
parents:
diff changeset
2072 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
Ritor1
parents:
diff changeset
2073 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2074 for(int i = 0; i < this->uNumVertices; i++)
1117
ad89d1905b48 * stru6_stru1_indoor_sw_billboard::sub_47802A() cleaned, fireball working
zipi
parents: 1113
diff changeset
2075 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2076 v6 = (double)pBLVRenderParams->fov_rad_fixpoint * 0.000015258789 / this->field_B4[i*4];
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2077 //if ( pRenderer->pRenderD3D )
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2078 {
2125
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
2079 pGame->pIndoorCameraD3D->Project(round_to_int(this->field_B4[i*4]), round_to_int(this->field_B4[i*4+1]), round_to_int(this->field_B4[i*4+2]),
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2080 &a5, &a6);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2081 this->field_B4[i*4+16] = (double)a5;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2082 this->field_B4[i*4+17] = (double)a6;
2125
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
2083 this->field_B4[i*4+18] = round_to_int(this->field_B4[i*4]);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2084 }
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2085 /*else
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2086 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2087 this->field_B4[i*4+16] = (double)pBLVRenderParams->uViewportCenterX - v6 * this->field_B4[i*4+1];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2088 this->field_B4[i*4+17] = (double)pBLVRenderParams->uViewportCenterY - v6 * this->field_B4[i*4+2];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2089 this->field_B4[i*4+18] = this->field_B4[i*4];
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2090 }*/
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2091 this->field_B4[i*4+19] = this->field_B4[i*4+3];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2092 if ( (double)(signed int)pViewport->uViewportTL_X <= this->field_B4[i*4+16] && (double)(signed int)pViewport->uViewportBR_X > this->field_B4[i*4+16]
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2093 && (double)(signed int)pViewport->uViewportTL_Y <= this->field_B4[i*4+17] && (double)(signed int)pViewport->uViewportBR_Y > this->field_B4[i*4+17] )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2094 v16 = 1;
1117
ad89d1905b48 * stru6_stru1_indoor_sw_billboard::sub_47802A() cleaned, fireball working
zipi
parents: 1113
diff changeset
2095 }
ad89d1905b48 * stru6_stru1_indoor_sw_billboard::sub_47802A() cleaned, fireball working
zipi
parents: 1113
diff changeset
2096 }
ad89d1905b48 * stru6_stru1_indoor_sw_billboard::sub_47802A() cleaned, fireball working
zipi
parents: 1113
diff changeset
2097 else
ad89d1905b48 * stru6_stru1_indoor_sw_billboard::sub_47802A() cleaned, fireball working
zipi
parents: 1113
diff changeset
2098 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2099 for(int i = 0; i < this->uNumVertices; i++)
1117
ad89d1905b48 * stru6_stru1_indoor_sw_billboard::sub_47802A() cleaned, fireball working
zipi
parents: 1113
diff changeset
2100 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2101 this->field_B4[i*4+20] = (double)pViewport->uScreenCenterX - (double)pODMRenderParams->int_fov_rad / this->field_B4[i*4] * this->field_B4[i*4+1];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2102 this->field_B4[i*4+21] = (double)pViewport->uScreenCenterY - (double)pODMRenderParams->int_fov_rad / this->field_B4[i*4] * this->field_B4[i*4+2];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2103 *((int *)&this->field_B4[i*4+22]) = (int)this->field_B4[i*4];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2104 *((int *)&this->field_B4[i*4+23]) = this->field_B4[i*4+3];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2105 if ( (double)(signed int)pViewport->uViewportTL_X <= this->field_B4[i*4+20] && (double)(signed int)pViewport->uViewportBR_X > this->field_B4[i*4+20]
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2106 && (double)(signed int)pViewport->uViewportTL_Y <= this->field_B4[i*4+21] && (double)(signed int)pViewport->uViewportBR_Y > this->field_B4[i*4+21] )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2107 v16 = 1;
0
Ritor1
parents:
diff changeset
2108 }
Ritor1
parents:
diff changeset
2109 }
Ritor1
parents:
diff changeset
2110 return v16;
Ritor1
parents:
diff changeset
2111 }
Ritor1
parents:
diff changeset
2112
Ritor1
parents:
diff changeset
2113 // 73C84C: using guessed type char static_RenderBuildingsD3D_byte_73C84C_init_flag;
Ritor1
parents:
diff changeset
2114
Ritor1
parents:
diff changeset
2115 //----- (00479089) --------------------------------------------------------
323
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2116 bool __fastcall IsBModelVisible(unsigned int uModelID, int *reachable)
0
Ritor1
parents:
diff changeset
2117 {
Ritor1
parents:
diff changeset
2118 int v3; // edi@1
Ritor1
parents:
diff changeset
2119 int v4; // ebx@1
Ritor1
parents:
diff changeset
2120 int v9; // eax@3
Ritor1
parents:
diff changeset
2121 signed int v11; // esi@6
Ritor1
parents:
diff changeset
2122 int v12; // esi@8
Ritor1
parents:
diff changeset
2123 bool result; // eax@9
Ritor1
parents:
diff changeset
2124 int v17; // [sp+1Ch] [bp-10h]@1
Ritor1
parents:
diff changeset
2125 int v19; // [sp+20h] [bp-Ch]@3
Ritor1
parents:
diff changeset
2126 int angle; // [sp+24h] [bp-8h]@1
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2127
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2128 angle = (signed int)(pODMRenderParams->uCameraFovInDegrees << 11) / 360 / 2;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2129 v3 = pOutdoor->pBModels[uModelID].vBoundingCenter.x - pGame->pIndoorCameraD3D->vPartyPos.x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2130 v4 = pOutdoor->pBModels[uModelID].vBoundingCenter.y - pGame->pIndoorCameraD3D->vPartyPos.y;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
2131 stru_5C6E00->Sin(pGame->pIndoorCameraD3D->sRotationX);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2132 v17 = v3 * stru_5C6E00->Cos(pGame->pIndoorCameraD3D->sRotationY) + v4 * stru_5C6E00->Sin(pGame->pIndoorCameraD3D->sRotationY);
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
2133 if (pGame->pIndoorCameraD3D->sRotationX)
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2134 v17 = (unsigned __int64)(v17 * (signed __int64)stru_5C6E00->Cos(pGame->pIndoorCameraD3D->sRotationX)) >> 16;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2135 v19 = v4 * stru_5C6E00->Cos(pGame->pIndoorCameraD3D->sRotationY) - v3 * stru_5C6E00->Sin(pGame->pIndoorCameraD3D->sRotationY);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2136 v9 = int_get_vector_length(abs(v3), abs(v4), 0);
323
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2137 //v10 = v14 * 188;
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2138 //v22 = v9;
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2139 *reachable = false;
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2140 if ( v9 < pOutdoor->pBModels[uModelID].sBoundingRadius + 256 )
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2141 *reachable = true;
0
Ritor1
parents:
diff changeset
2142 if ( v19 >= 0 )
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2143 v11 = ((unsigned __int64)(stru_5C6E00->Sin(angle) * (signed __int64)v17) >> 16) - ((unsigned __int64)(stru_5C6E00->Cos(angle) * (signed __int64)v19) >> 16);
323
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2144 else
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2145 v11 = ((unsigned __int64)(stru_5C6E00->Cos(angle) * (signed __int64)v19) >> 16) + ((unsigned __int64)(stru_5C6E00->Sin(angle) * (signed __int64)v17) >> 16);
0
Ritor1
parents:
diff changeset
2146 v12 = v11 >> 16;
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2147 if ( v9 <= pODMRenderParams->shading_dist_mist + 2048 )
0
Ritor1
parents:
diff changeset
2148 {
79
6ad816231528 structure fixes, death crash fix
zipi
parents: 75
diff changeset
2149 //if ( abs(v12) > *(int *)((char *)&pOutdoor->pBModels->sBoundingRadius + v10) + 512 )
323
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2150 if ( abs(v12) > pOutdoor->pBModels[uModelID].sBoundingRadius + 512 )
0
Ritor1
parents:
diff changeset
2151 {
Ritor1
parents:
diff changeset
2152 result = v12 < 0;
Ritor1
parents:
diff changeset
2153 LOBYTE(result) = v12 >= 0;
323
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2154 return result;
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2155 }
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2156 else
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2157 return true;
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2158 }
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
2159 return false;
0
Ritor1
parents:
diff changeset
2160 }
Ritor1
parents:
diff changeset
2161
Ritor1
parents:
diff changeset
2162 //----- (00479295) --------------------------------------------------------
1391
cc9a3a24d61d Moved stru11, stru12 and some SW Rendering stuff to the archives.
Nomad
parents: 1390
diff changeset
2163 int Polygon::_479295()
0
Ritor1
parents:
diff changeset
2164 {
Ritor1
parents:
diff changeset
2165 int v3; // ecx@4
Ritor1
parents:
diff changeset
2166 int v4; // eax@4
Ritor1
parents:
diff changeset
2167 int v5; // edx@4
Ritor1
parents:
diff changeset
2168 int v6; // ST14_4@5
Ritor1
parents:
diff changeset
2169 Vec3_int_ thisa; // [sp+Ch] [bp-10h]@8
Ritor1
parents:
diff changeset
2170 int v11; // [sp+18h] [bp-4h]@4
Ritor1
parents:
diff changeset
2171
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2172 if ( !this->pODMFace->pFacePlane.vNormal.z )
0
Ritor1
parents:
diff changeset
2173 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2174 v3 = this->pODMFace->pFacePlane.vNormal.x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2175 v4 = -this->pODMFace->pFacePlane.vNormal.y;
0
Ritor1
parents:
diff changeset
2176 v5 = 0;
Ritor1
parents:
diff changeset
2177 v11 = 65536;
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2178 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2179 else if ( (this->pODMFace->pFacePlane.vNormal.x || this->pODMFace->pFacePlane.vNormal.y)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2180 && abs(this->pODMFace->pFacePlane.vNormal.z) < 59082 )
0
Ritor1
parents:
diff changeset
2181 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2182 thisa.x = -this->pODMFace->pFacePlane.vNormal.y;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2183 thisa.y = this->pODMFace->pFacePlane.vNormal.x;
0
Ritor1
parents:
diff changeset
2184 thisa.z = 0;
Ritor1
parents:
diff changeset
2185 thisa.Normalize_float();
Ritor1
parents:
diff changeset
2186 v4 = thisa.x;
Ritor1
parents:
diff changeset
2187 v3 = thisa.y;
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2188 v5 = 0;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2189 v11 = 65536;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2190 }
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2191 else
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2192 {
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2193 v3 = 0;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2194 v4 = 65536;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2195 v11 = 0;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2196 v5 = -65536;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2197 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2198 sTextureDeltaU = this->pODMFace->sTextureDeltaU;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2199 sTextureDeltaV = this->pODMFace->sTextureDeltaV;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
2200 ptr_38->_48616B_frustum_odm(v4, v3, 0, 0, v5, v11);
0
Ritor1
parents:
diff changeset
2201 return 1;
Ritor1
parents:
diff changeset
2202 }
Ritor1
parents:
diff changeset
2203
Ritor1
parents:
diff changeset
2204
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2205 unsigned short *LoadTgaTexture(const wchar_t *filename, int *out_width = nullptr, int *out_height = nullptr)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2206 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2207 #pragma pack(push, 1)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2208 struct TGAHeader
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2209 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2210 unsigned char tgaSkip;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2211 unsigned char colourmaptype; // type of colour map 0=none, 1=has palette
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2212 unsigned char tgaType; // type of image 0=none,1=indexed,2=rgb,3=grey,+8=rle packed
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2213
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2214 short colourmapstart; // first colour map entry in palette
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2215 short colourmaplength; // number of colours in palette
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2216 char colourmapbits; // number of bits per palette entry 15,16,24,32
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2217
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2218 //unsigned char tgaDontCare2[9];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2219 short xstart; // image x origin
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2220 short ystart; // image y origin
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2221
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2222 unsigned short tgaWidth;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2223 unsigned short tgaHeight;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2224 unsigned char tgaBPP;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2225
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2226 char descriptor; // image descriptor bits: 00vhaaaa
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2227 // h horizontal flip
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2228 // v vertical flip
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2229 // a alpha bits
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2230 };
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2231 #pragma pack(pop)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2232
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2233 if (out_width)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2234 *out_width = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2235 if (out_height)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2236 *out_height = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2237
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2238 DWORD w;
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
2239 void* file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, 0, nullptr);
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2240 if (file == INVALID_HANDLE_VALUE)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2241 return nullptr;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2242
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2243 TGAHeader header;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2244 ReadFile(file, &header, sizeof(header), &w, nullptr);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2245 SetFilePointer(file, header.tgaSkip, nullptr, FILE_CURRENT);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2246
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2247 if (header.tgaBPP != 24 || header.tgaType != 2)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2248 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2249 CloseHandle(file);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2250 return nullptr;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2251 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2252
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2253 int imgSize = header.tgaWidth * header.tgaHeight * 3;
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
2254 unsigned char* pixels = new unsigned char[imgSize];
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2255 ReadFile(file, pixels, imgSize, &w, nullptr);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2256 CloseHandle(file);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2257
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2258 if (w != imgSize)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2259 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2260 delete [] pixels;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2261 return nullptr;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2262 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2263
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2264 if (out_width)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2265 *out_width = header.tgaWidth;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2266 if (out_height)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2267 *out_height = header.tgaHeight;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2268
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
2269 unsigned short* pixels_16bit = new unsigned short[imgSize / 3];
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2270 for (int i = 0; i < imgSize / 3; ++i)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2271 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2272 pixels_16bit[i] = (pixels[i * 3] / 8 & 0x1F) |
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2273 ((pixels[i * 3 + 1] / 4 & 0x3F) << 5) |
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2274 ((pixels[i * 3 + 2] / 8 & 0x1F) << 11);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2275 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2276 delete [] pixels;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2277 return pixels_16bit;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2278 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2279
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2280 unsigned short *skybox_xn, *skybox_xp,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2281 *skybox_yn, *skybox_yp,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2282 *skybox_zn, *skybox_zp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2283 int skybox_width, skybox_height;
781
d170f23f70d1 tidy, code moving
zipi
parents: 774
diff changeset
2284
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2285 IDirect3DTexture2 *skybox_texture;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2286 IDirectDrawSurface4 *skybox_surface;
781
d170f23f70d1 tidy, code moving
zipi
parents: 774
diff changeset
2287
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2288 bool Skybox_Initialize(const wchar_t *skybox_name)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2289 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2290 wchar_t xn_filename[1024], xp_filename[1024],
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2291 yn_filename[1024], yp_filename[1024],
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2292 zn_filename[1024], zp_filename[1024];
1165
29a8defbad9e temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents: 1160
diff changeset
2293 swprintf(xn_filename, wcslen(L"%s_xn.tga"), L"%s_xn.tga", skybox_name); swprintf(xp_filename, wcslen(L"%s_xp.tga"), L"%s_xp.tga", skybox_name);
29a8defbad9e temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents: 1160
diff changeset
2294 swprintf(yn_filename, wcslen(L"%s_yn.tga"), L"%s_yn.tga", skybox_name); swprintf(yp_filename, wcslen(L"%s_yp.tga"), L"%s_yp.tga", skybox_name);
29a8defbad9e temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents: 1160
diff changeset
2295 swprintf(zn_filename, wcslen(L"%s_zn.tga"), L"%s_zn.tga", skybox_name); swprintf(zp_filename, wcslen(L"%s_zp.tga"), L"%s_zp.tga", skybox_name);
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2296
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2297 int xn_width, xn_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2298 skybox_xn = LoadTgaTexture(xn_filename, &xn_width, &xn_height);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2299 if (!skybox_xn)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2300 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2301
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2302 int xp_width, xp_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2303 skybox_xp = LoadTgaTexture(xp_filename, &xp_width, &xp_height);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2304 if (!skybox_xp || xp_width != xn_width || xp_height != xn_height)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2305 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2306 delete [] skybox_xn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2307 if (skybox_xp) delete [] skybox_xp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2308 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2309 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2310
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2311 int yn_width, yn_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2312 skybox_yn = LoadTgaTexture(yn_filename, &yn_width, &yn_height);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2313 if (!skybox_yn || yn_width != xn_width || yn_height != xn_height)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2314 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2315 delete [] skybox_xn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2316 if (skybox_xp) delete [] skybox_xp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2317 if (skybox_yn) delete [] skybox_yn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2318 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2319 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2320
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2321 int yp_width, yp_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2322 skybox_yp = LoadTgaTexture(yp_filename, &yp_width, &yp_height);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2323 if (!skybox_yp || yp_width != xn_width || yp_height != xn_height)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2324 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2325 delete [] skybox_xn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2326 if (skybox_xp) delete [] skybox_xp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2327 if (skybox_yn) delete [] skybox_yn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2328 if (skybox_yp) delete [] skybox_yp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2329 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2330 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2331
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2332 int zn_width, zn_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2333 skybox_zn = LoadTgaTexture(zn_filename, &zn_width, &zn_height);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2334 if (!skybox_zn || zn_width != xn_width || zn_height != xn_height)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2335 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2336 delete [] skybox_xn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2337 if (skybox_xp) delete [] skybox_xp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2338 if (skybox_yn) delete [] skybox_yn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2339 if (skybox_yp) delete [] skybox_yp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2340 if (skybox_zn) delete [] skybox_zn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2341 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2342 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2343
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2344 int zp_width, zp_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2345 skybox_zp = LoadTgaTexture(zp_filename, &zp_width, &zp_height);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2346 if (!skybox_zp || zp_width != xn_width || zp_height != xn_height)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2347 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2348 delete [] skybox_xn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2349 if (skybox_xp) delete [] skybox_xp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2350 if (skybox_yn) delete [] skybox_yn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2351 if (skybox_yp) delete [] skybox_yp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2352 if (skybox_zn) delete [] skybox_zn;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2353 if (skybox_zp) delete [] skybox_zp;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2354 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2355 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2356
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2357 skybox_width = xn_width;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2358 skybox_height = xn_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2359
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2360 __debugbreak();
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2361 //if (!pRenderer->pRenderD3D->CreateTexture(skybox_width, skybox_height, &skybox_surface, &skybox_texture,
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2362 //false, false, pRenderer->uMinDeviceTextureDim))
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2363 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2364
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2365 return true;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2366 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2367
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2368 struct vector
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2369 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2370 float x, y, z;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2371 };
781
d170f23f70d1 tidy, code moving
zipi
parents: 774
diff changeset
2372
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2373 struct matrix
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2374 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2375 float m[4][4];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2376 };
781
d170f23f70d1 tidy, code moving
zipi
parents: 774
diff changeset
2377
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2378 void VectorNormalize(vector *v)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2379 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2380 float invmag = 1.0f / sqrtf(v->x * v->x + v->y * v->y + v->z * v->z);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2381 v->x *= invmag;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2382 v->y *= invmag;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2383 v->z *= invmag;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2384 }
781
d170f23f70d1 tidy, code moving
zipi
parents: 774
diff changeset
2385
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2386 void MatrixRotationAxis(matrix *pout, CONST vector *pv, float angle)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2387 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2388 memset(pout, 0, sizeof(matrix));
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2389 pout->m[3][0] = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2390 pout->m[3][1] = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2391 pout->m[3][2] = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2392 pout->m[3][3] = 1;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2393
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2394 vector v;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2395 v.x = pv->x; v.y = pv->y; v.z = pv->z;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2396 VectorNormalize(&v);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2397
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2398 pout->m[0][0] = (1.0f - cos(angle)) * v.x * v.x + cos(angle);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2399 pout->m[1][0] = (1.0f - cos(angle)) * v.x * v.y - sin(angle) * v.z;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2400 pout->m[2][0] = (1.0f - cos(angle)) * v.x * v.z + sin(angle) * v.y;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2401 pout->m[0][1] = (1.0f - cos(angle)) * v.y * v.x + sin(angle) * v.z;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2402 pout->m[1][1] = (1.0f - cos(angle)) * v.y * v.y + cos(angle);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2403 pout->m[2][1] = (1.0f - cos(angle)) * v.y * v.z - sin(angle) * v.x;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2404 pout->m[0][2] = (1.0f - cos(angle)) * v.z * v.x - sin(angle) * v.y;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2405 pout->m[1][2] = (1.0f - cos(angle)) * v.z * v.y + sin(angle) * v.x;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2406 pout->m[2][2] = (1.0f - cos(angle)) * v.z * v.z + cos(angle);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2407 }
781
d170f23f70d1 tidy, code moving
zipi
parents: 774
diff changeset
2408
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2409 void VectorTransform(const matrix *m, const vector *v, vector *out)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2410 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2411 out->x = m->m[0][0] * v->x + m->m[1][0] * v->y + m->m[2][0] * v->z + m->m[3][0];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2412 out->y = m->m[0][1] * v->x + m->m[1][1] * v->y + m->m[2][1] * v->z + m->m[3][1];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2413 out->z = m->m[0][2] * v->x + m->m[1][2] * v->y + m->m[2][2] * v->z + m->m[3][2];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2414 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2415
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2416 bool DrawSkyD3D_Skybox()
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2417 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2418 static bool initialized = false,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2419 initialization_failed = false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2420 if (initialization_failed)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2421 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2422
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2423 static int last_camera_rot_y,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2424 last_camera_rot_x;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2425 if (!initialized)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2426 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2427 if (!Skybox_Initialize(L"data/skybox/stars"))
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2428 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2429 initialization_failed = true;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2430 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2431 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2432 initialized = true;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2433
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2434 last_camera_rot_y = pParty->sRotationY + 1; // force update for the first run
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2435 last_camera_rot_x = pParty->sRotationX + 1;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2436 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2437
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2438 /*
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2439 r(y) =
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2440 cos y 0 sin y 0
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2441 0 1 0 0
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2442 -sin y 0 cos y 0
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2443 0 0 0 1
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2444
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2445 x cos y - z sin y
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2446 y
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2447 x sin y + z cos y
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2448 1
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2449
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2450
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2451
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2452 r(x) = // should be r(right) actually
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2453 1 0 0 0
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2454 0 cos x -sin x 0
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2455 0 sin x cos x 0
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2456 0 0 0 1
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2457
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2458
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2459 x
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2460 y cos x + z sin x
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2461 -y sin x + z cos x
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2462 1
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2463
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2464 */
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2465
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2466 if (last_camera_rot_y == pParty->sRotationY &&
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2467 last_camera_rot_x == pParty->sRotationX)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2468 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2469 draw:
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2470 struct RenderVertexD3D3 v[6];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2471
692
066e2b29b30f viewport.cpp added
Gloval
parents: 688
diff changeset
2472 v[0].pos.x = pViewport->uScreen_TL_X;
066e2b29b30f viewport.cpp added
Gloval
parents: 688
diff changeset
2473 v[0].pos.y = pViewport->uScreen_TL_Y;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2474 v[0].pos.z = 0.99989998;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2475 v[0].rhw = 1;
2006
30c2b575d25c signed fixes
zipi
parents: 2002
diff changeset
2476 v[0].diffuse = -1;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2477 v[0].specular = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2478 v[0].texcoord.x = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2479 v[0].texcoord.y = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2480
692
066e2b29b30f viewport.cpp added
Gloval
parents: 688
diff changeset
2481 v[1].pos.x = pViewport->uScreen_TL_X + pViewport->uScreenWidth;
066e2b29b30f viewport.cpp added
Gloval
parents: 688
diff changeset
2482 v[1].pos.y = pViewport->uScreen_TL_Y + pViewport->uScreenHeight;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2483 v[1].pos.z = 0.99989998;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2484 v[1].rhw = 1;
2006
30c2b575d25c signed fixes
zipi
parents: 2002
diff changeset
2485 v[1].diffuse = -1;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2486 v[1].specular = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2487 v[1].texcoord.x = (float)pViewport->uScreenWidth / skybox_width;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2488 v[1].texcoord.y = (float)pViewport->uScreenHeight / skybox_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2489
692
066e2b29b30f viewport.cpp added
Gloval
parents: 688
diff changeset
2490 v[2].pos.x = pViewport->uScreen_TL_X + pViewport->uScreenWidth;
066e2b29b30f viewport.cpp added
Gloval
parents: 688
diff changeset
2491 v[2].pos.y = pViewport->uScreen_TL_Y;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2492 v[2].pos.z = 0.99989998;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2493 v[2].rhw = 1;
2006
30c2b575d25c signed fixes
zipi
parents: 2002
diff changeset
2494 v[2].diffuse = -1;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2495 v[2].specular = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2496 v[2].texcoord.x = (float)pViewport->uScreenWidth / skybox_width;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2497 v[2].texcoord.y = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2498
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2499 memcpy(&v[3], &v[0], sizeof(*v));
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2500
692
066e2b29b30f viewport.cpp added
Gloval
parents: 688
diff changeset
2501 v[4].pos.x = pViewport->uScreen_TL_X;
066e2b29b30f viewport.cpp added
Gloval
parents: 688
diff changeset
2502 v[4].pos.y = pViewport->uScreen_TL_Y + pViewport->uScreenHeight;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2503 v[4].pos.z = 0.99989998;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2504 v[4].rhw = 1;
2006
30c2b575d25c signed fixes
zipi
parents: 2002
diff changeset
2505 v[4].diffuse = -1;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2506 v[4].specular = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2507 v[4].texcoord.x = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2508 v[4].texcoord.y = (float)pViewport->uScreenHeight / skybox_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2509
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2510 memcpy(&v[5], &v[1], sizeof(*v));
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2511
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
2512 __debugbreak();
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
2513 /*
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2514 pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_CULLMODE, D3DCULL_NONE);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2515 pRenderer->pRenderD3D->pDevice->SetTexture(0, skybox_texture);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2516 pRenderer->pRenderD3D->pDevice->DrawPrimitive(D3DPT_TRIANGLELIST, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1, v, 6, D3DDP_DONOTUPDATEEXTENTS | D3DDP_DONOTLIGHT);
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
2517 */
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2518 return true;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2519 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2520
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2521
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2522 DDSURFACEDESC2 desc;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2523 desc.dwSize = sizeof(desc);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2524 if (!pRenderer->LockSurface_DDraw4(skybox_surface, &desc, DDLOCK_WAIT | DDLOCK_WRITEONLY))
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2525 return false;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2526
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2527 last_camera_rot_y = pParty->sRotationY;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2528 last_camera_rot_x = pParty->sRotationX;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2529
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2530 float aspect = (float)pViewport->uScreenWidth / (float)pViewport->uScreenHeight;
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2531 float fov_x = 3.141592f * (pODMRenderParams->uCameraFovInDegrees + 0) / 360.0f;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2532 float fov_y = fov_x / aspect;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2533
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2534 float ray_dx = fov_x / (float)pViewport->uScreenWidth,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2535 ray_dy = fov_y / (float)pViewport->uScreenHeight;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2536 float party_angle_x = 2 * 3.141592653589 * pParty->sRotationX / 2048.0,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2537 party_angle_y = 2 * 3.141592653589 * pParty->sRotationY / 2048.0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2538 for (int y = 0; y < pViewport->uScreenHeight; ++y)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2539 for (int x = 0; x < pViewport->uScreenWidth; ++x)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2540 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2541 float angle_x = party_angle_x - (y - pViewport->uScreenHeight / 2) * ray_dy;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2542 float angle_y = party_angle_y - (x - pViewport->uScreenWidth / 2) * ray_dx;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2543
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2544 float _dir_x_ = 1,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2545 _dir_y_ = 0,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2546 _dir_z_ = 0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2547
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2548 float dir_x_ = _dir_x_ * cosf(angle_y);// - _dir_z_ * sinf(angle_y); // rotation around y
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2549 //float dir_y_ = _dir_y_;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2550 float dir_z_ = _dir_x_ * sinf(angle_y);// + _dir_z_ * cosf(angle_y);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2551
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2552 //float dir_x = dir_x_; // rotation around x
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2553 //float dir_y = /*dir_y_ * cosf(angle_x)*/ + dir_z_ * sinf(angle_x);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2554 //float dir_z = /*-dir_y_ * sinf(angle_x)*/ + dir_z_ * cosf(angle_x);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2555
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2556 vector right; // rotate around right actually to avoid space distortion
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2557 right.x = /*dir_y * 0*/ - dir_z_ * 1;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2558 right.y = /*dir_z_ * 0 - dir_x_ * */0;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2559 right.z = dir_x_ * 1/* - dir_y_ * 0*/;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2560 //VectorNormalize(&right);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2561
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2562 matrix rightMatrix;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2563 MatrixRotationAxis(&rightMatrix, &right, angle_x);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2564
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2565 vector v1, v2;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2566 v1.x = dir_x_; v1.y = 0; v1.z = dir_z_;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2567 VectorTransform(&rightMatrix, &v1, &v2);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2568
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2569 float dir_x = v2.x,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2570 dir_y = v2.y,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2571 dir_z = v2.z;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2572
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2573 float abs_dir_x = fabsf(dir_x),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2574 abs_dir_y = fabsf(dir_y),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2575 abs_dir_z = fabsf(dir_z);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2576
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2577 unsigned short color = (0x1F << 11) | (0x1F << 5) | (5); //default to orange
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2578 if (abs_dir_x >= abs_dir_y)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2579 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2580 if (abs_dir_x >= abs_dir_z)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2581 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2582 if (dir_x >= 0)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2583 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2584 float instersect_y = dir_y / (2.0f * dir_x); // plane equation for this side is x + 0.5 = 0
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2585 float instersect_z = dir_z / (2.0f * dir_x);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2586
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2587 float u = 1.0f - (instersect_z + 0.5f),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2588 v = 1.0f - (instersect_y + 0.5f);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2589
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2590 int tx = u * (skybox_width - 1),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2591 ty = v * (skybox_height - 1);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2592
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2593 color = skybox_xp[ty * skybox_width + tx];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2594 //color = ty * 0x1F / skybox_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2595 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2596 else
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2597 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2598 float instersect_y = dir_y / (2.0f * dir_x);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2599 float instersect_z = dir_z / (2.0f * dir_x);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2600
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2601 float u = 1.0f - (instersect_z + 0.5f),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2602 v = instersect_y + 0.5f;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2603
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2604 int tx = u * (skybox_width - 1),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2605 ty = v * (skybox_height - 1);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2606
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2607 color = skybox_xn[ty * skybox_width + tx];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2608 //color = tx * 0x1F / skybox_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2609 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2610 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2611 else if (dir_z >= 0)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2612 goto DIR_ZP;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2613 else
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2614 goto DIR_ZN;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2615 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2616 else if (abs_dir_y >= abs_dir_z)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2617 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2618 if (dir_y >= 0)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2619 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2620 float instersect_x = dir_x / (2.0f * dir_y);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2621 float instersect_z = dir_z / (2.0f * dir_y);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2622
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2623 float u = instersect_x + 0.5f,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2624 v = instersect_z + 0.5f;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2625
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2626 int tx = u * (skybox_width - 1),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2627 ty = v * (skybox_height - 1);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2628
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2629 color = skybox_yp[ty * skybox_width + tx];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2630 //color = tx * 0x1F / skybox_height;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2631 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2632 /*else should never be seen i guess
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2633 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2634 __debugbreak();
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2635 // -y
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2636 //Log::Warning(L"(%03u, %03u): -y", x, y);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2637 }*/
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2638 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2639 else if (dir_z >= 0)
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2640 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2641 DIR_ZP:
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2642 // +z
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2643 float instersect_x = dir_x / (2.0f * dir_z);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2644 float instersect_y = dir_y / (2.0f * dir_z);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2645 //float intersect_z = 0.5f;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2646
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2647 float u = instersect_x + 0.5f,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2648 v = -instersect_y + 0.5f;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2649
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2650 int tx = u * (skybox_width - 1),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2651 ty = v * (skybox_height - 1);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2652
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2653 color = skybox_zp[ty * skybox_width + tx];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2654 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2655 else
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2656 {
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2657 DIR_ZN:
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2658 // -z
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2659 float instersect_x = -dir_x / (2.0f * dir_z);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2660 float instersect_y = -dir_y / (2.0f * dir_z);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2661 //float intersect_z = -0.5f;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2662
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2663 float u = 1.0f - instersect_x - 0.5f,
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2664 v = -instersect_y + 0.5f;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2665
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2666 int tx = u * (skybox_width - 1),
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2667 ty = v * (skybox_height - 1);
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2668
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2669 color = skybox_zn[ty * skybox_width + tx];
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2670 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2671
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2672 //pRenderer->pTargetSurface[(pViewport->uScreenY + y) * pRenderer->uTargetSurfacePitch + pViewport->uScreenX + x] = color;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2673 ((unsigned __int16 *)((char *)desc.lpSurface + y * desc.lPitch))[x] = color;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2674 }
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2675
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2676 ErrD3D((skybox_surface)->Unlock(0));
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2677 goto draw;
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2678 }
0
Ritor1
parents:
diff changeset
2679 //----- (0047A384) --------------------------------------------------------
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2680 void ODM_LoadAndInitialize(const char *pLevelFilename, ODMRenderParams *thisa)
0
Ritor1
parents:
diff changeset
2681 {
Ritor1
parents:
diff changeset
2682 int v2; // ebx@3
Ritor1
parents:
diff changeset
2683 unsigned int v3; // eax@3
Ritor1
parents:
diff changeset
2684 MapInfo *v4; // edi@4
Ritor1
parents:
diff changeset
2685 //int v5; // eax@8
Ritor1
parents:
diff changeset
2686 //SpawnPointMM7 *v6; // edx@14
Ritor1
parents:
diff changeset
2687 size_t v7; // eax@19
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2688 //char *v8; // eax@19
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2689 //char *v9; // eax@21
0
Ritor1
parents:
diff changeset
2690 char Source[120]; // [sp+Ch] [bp-84h]@19
Ritor1
parents:
diff changeset
2691 const char *pFilename; // [sp+84h] [bp-Ch]@1
Ritor1
parents:
diff changeset
2692 //unsigned int v12; // [sp+88h] [bp-8h]@12
Ritor1
parents:
diff changeset
2693 //int v13; // [sp+8Ch] [bp-4h]@11
Ritor1
parents:
diff changeset
2694
Ritor1
parents:
diff changeset
2695 pFilename = pLevelFilename;
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1563
diff changeset
2696 //thisa->AllocSoftwareDrawBuffers();
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2697 pODMRenderParams->Initialize();
2128
0d0aa7c1ccdd Savegame_screenshot continue
Ritor1
parents: 2125
diff changeset
2698 pWeather->bRenderSnow = false;
0
Ritor1
parents:
diff changeset
2699 pRenderer->ClearZBuffer(0, 479);
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2700 thisa = (ODMRenderParams *)1;
0
Ritor1
parents:
diff changeset
2701 GetAlertStatus();
2182
e1e4a8a20b5f _46Ð6ÐС_GetActorsInViewport
Ritor1
parents: 2179
diff changeset
2702 if ( _A750D8_player_speech_timer )
e1e4a8a20b5f _46Ð6ÐС_GetActorsInViewport
Ritor1
parents: 2179
diff changeset
2703 _A750D8_player_speech_timer = 0;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1470
diff changeset
2704 v2 = pMapStats->GetMapInfo(pCurrentMapName);
0
Ritor1
parents:
diff changeset
2705 v3 = 0;
Ritor1
parents:
diff changeset
2706 if ( v2 )
Ritor1
parents:
diff changeset
2707 {
Ritor1
parents:
diff changeset
2708 v4 = &pMapStats->pInfos[v2];
Ritor1
parents:
diff changeset
2709 v3 = v4->uRespawnIntervalDays;
Ritor1
parents:
diff changeset
2710 }
Ritor1
parents:
diff changeset
2711 else
Ritor1
parents:
diff changeset
2712 {
Ritor1
parents:
diff changeset
2713 v4 = (MapInfo *)thisa;
Ritor1
parents:
diff changeset
2714 }
767
45615cacad31 Fog fixed
Nomad
parents: 755
diff changeset
2715 day_attrib &= ~DAY_ATTRIB_FOG;
0
Ritor1
parents:
diff changeset
2716 dword_6BE13C_uCurrentlyLoadedLocationID = v2;
Ritor1
parents:
diff changeset
2717 pOutdoor->Initialize(
Ritor1
parents:
diff changeset
2718 pFilename,
Ritor1
parents:
diff changeset
2719 (unsigned int)(signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 0x3C / 0x3C / 0x18 + 1,
Ritor1
parents:
diff changeset
2720 v3,
Ritor1
parents:
diff changeset
2721 (int)&thisa);
2061
b2a434d65344 GAME_SETTINGS_* defines introduced
Nomad
parents: 2044
diff changeset
2722 if ( !(dword_6BE364_game_settings_1 & GAME_SETTINGS_2000) )
0
Ritor1
parents:
diff changeset
2723 {
Ritor1
parents:
diff changeset
2724 InitializeActors();
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
2725 InitializeSpriteObjects();
0
Ritor1
parents:
diff changeset
2726 }
2061
b2a434d65344 GAME_SETTINGS_* defines introduced
Nomad
parents: 2044
diff changeset
2727 dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_2000;
0
Ritor1
parents:
diff changeset
2728 //v5 = 0;
Ritor1
parents:
diff changeset
2729 if ( !v2 )
Ritor1
parents:
diff changeset
2730 thisa = 0;
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2731 if ( thisa == (ODMRenderParams *)1 )
0
Ritor1
parents:
diff changeset
2732 {
Ritor1
parents:
diff changeset
2733 //v13 = 0;
Ritor1
parents:
diff changeset
2734 for (uint i = 0; i < pOutdoor->uNumSpawnPoints; ++i)
Ritor1
parents:
diff changeset
2735 {
Ritor1
parents:
diff changeset
2736 //v12 = 0;
Ritor1
parents:
diff changeset
2737 //while ( 1 )
Ritor1
parents:
diff changeset
2738 //{
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
2739 SpawnPointMM7* spawn = pOutdoor->pSpawnPoints + i;
0
Ritor1
parents:
diff changeset
2740 //v6 = &pOutdoor->pSpawnPoints[v12 / 0x18];
Ritor1
parents:
diff changeset
2741 if (spawn->uKind == 3 )
Ritor1
parents:
diff changeset
2742 SpawnEncounter(v4, spawn, 0, 0, 0);
Ritor1
parents:
diff changeset
2743 else
Ritor1
parents:
diff changeset
2744 v4->SpawnRandomTreasure(spawn);
Ritor1
parents:
diff changeset
2745 //++v13;
Ritor1
parents:
diff changeset
2746 //v12 += 24;
Ritor1
parents:
diff changeset
2747 //if ( v13 >= (signed int)pOutdoor->uNumSpawnPoints )
Ritor1
parents:
diff changeset
2748 // break;
Ritor1
parents:
diff changeset
2749 //v5 = 0;
Ritor1
parents:
diff changeset
2750 //}
Ritor1
parents:
diff changeset
2751 }
Ritor1
parents:
diff changeset
2752 RespawnGlobalDecorations();
Ritor1
parents:
diff changeset
2753 }
Ritor1
parents:
diff changeset
2754 pOutdoor->PrepareDecorations();
2065
87be06553c76 rename int _47F223_LooksLikeGenerateMonsterLoot() to void ArrangeSpriteObjects()
Ritor1
parents: 2061
diff changeset
2755 pOutdoor->ArrangeSpriteObjects();
0
Ritor1
parents:
diff changeset
2756 pOutdoor->InitalizeActors(v2);
Ritor1
parents:
diff changeset
2757 pOutdoor->MessWithLUN();
Ritor1
parents:
diff changeset
2758 v7 = strlen("levels\\");
Ritor1
parents:
diff changeset
2759 strcpy(Source, &pFilename[v7]);
Ritor1
parents:
diff changeset
2760 strcpy(pOutdoor->pLevelFilename, Source);
Ritor1
parents:
diff changeset
2761 pWeather->Initialize();
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
2762 pGame->pIndoorCameraD3D->sRotationY = pParty->sRotationY;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
2763 pGame->pIndoorCameraD3D->sRotationX = pParty->sRotationX;
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
2764 //pODMRenderParams->RotationToInts();
0
Ritor1
parents:
diff changeset
2765 pOutdoor->UpdateSunlightVectors();
1638
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2766
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2767 float fov_rad;
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2768 float fov_rad_inv;
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2769 //----- (0042394D) --------------------------------------------------------
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2770 //void IndoorCamera::Initialize(int degFov, unsigned int uViewportWidth, unsigned int uViewportHeight)
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2771 {
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2772 //pIndoorCamera->Initialize(65, viewparams->uScreen_BttmR_X - viewparams->uScreen_topL_X + 1,
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2773 // viewparams->uScreen_BttmR_Y - viewparams->uScreen_topL_Y + 1);
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2774
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2775 int uViewportWidth = viewparams->uScreen_BttmR_X - viewparams->uScreen_topL_X + 1;
1641
466c5e15f524 Excess wrapper (IndoorLocation_drawstru) removed.
Nomad
parents: 1640
diff changeset
2776
466c5e15f524 Excess wrapper (IndoorLocation_drawstru) removed.
Nomad
parents: 1640
diff changeset
2777 extern float _calc_fov(int viewport_width, int angle_degree);
466c5e15f524 Excess wrapper (IndoorLocation_drawstru) removed.
Nomad
parents: 1640
diff changeset
2778 fov_rad = _calc_fov(uViewportWidth, 65);
466c5e15f524 Excess wrapper (IndoorLocation_drawstru) removed.
Nomad
parents: 1640
diff changeset
2779 fov_rad_inv = 65536.0 / fov_rad;
1638
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2780 }
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2781 pODMRenderParams->int_fov_rad = (signed __int64)fov_rad;
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1637
diff changeset
2782 pODMRenderParams->int_fov_rad_inv = (signed __int64)fov_rad_inv;
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2783
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2784 for (int i = 0; i < 20000; ++i)
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2785 {
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2786 array_77EC08[i].ptr_38 = &stru_8019C8;
1644
dbd6f940f26c Fixed Celestia sky a bit.
Nomad
parents: 1642
diff changeset
2787
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2788 array_77EC08[i].ptr_48 = nullptr;
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2789 }
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2790
0
Ritor1
parents:
diff changeset
2791 MM7Initialization();
Ritor1
parents:
diff changeset
2792 }
Ritor1
parents:
diff changeset
2793
Ritor1
parents:
diff changeset
2794 //----- (0047C370) --------------------------------------------------------
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2795 unsigned int GetLevelFogColor()
0
Ritor1
parents:
diff changeset
2796 {
Ritor1
parents:
diff changeset
2797 signed __int64 v1; // qax@5
Ritor1
parents:
diff changeset
2798 int v2; // eax@6
Ritor1
parents:
diff changeset
2799
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2800 if (bUnderwater)
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2801 return 0xFF258F5C;
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2802
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2803 if (day_attrib & DAY_ATTRIB_FOG)
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2804 {
767
45615cacad31 Fog fixed
Nomad
parents: 755
diff changeset
2805 if ( pWeather->bNight ) // night-time fog
750
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2806 {
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2807 __debugbreak(); // decompilation can be inaccurate, please send savegame to Nomad
750
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2808 v2 = -(pWeather->bNight != 1);
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2809 return (v2 & 0xE0E0E1) - 0xE0E0E1;
0
Ritor1
parents:
diff changeset
2810 }
Ritor1
parents:
diff changeset
2811 else
Ritor1
parents:
diff changeset
2812 {
Ritor1
parents:
diff changeset
2813 v1 = (signed __int64)((1.0 - pOutdoor->fFogDensity) * 200.0 + pOutdoor->fFogDensity * 31.0);
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2814 return v1 | (((unsigned int)v1 | (((unsigned int)v1 | 0xFFFFFF00) << 8)) << 8);
0
Ritor1
parents:
diff changeset
2815 }
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2816 }
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2817
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
2818 return 0;
0
Ritor1
parents:
diff changeset
2819 }
Ritor1
parents:
diff changeset
2820
Ritor1
parents:
diff changeset
2821 //----- (0047C3D7) --------------------------------------------------------
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2822 int __fastcall sub_47C3D7_get_fog_specular(int a1, int a2, float a3)
0
Ritor1
parents:
diff changeset
2823 {
Ritor1
parents:
diff changeset
2824 double v5; // st7@10
Ritor1
parents:
diff changeset
2825 signed int v7; // ecx@11
Ritor1
parents:
diff changeset
2826 double v8; // st6@12
Ritor1
parents:
diff changeset
2827 double v9; // st7@15
Ritor1
parents:
diff changeset
2828 double v10; // st6@16
Ritor1
parents:
diff changeset
2829 float v11; // ST14_4@17
Ritor1
parents:
diff changeset
2830 double v12; // ST08_8@17
Ritor1
parents:
diff changeset
2831
767
45615cacad31 Fog fixed
Nomad
parents: 755
diff changeset
2832 if ( pParty->armageddon_timer || !(day_attrib & DAY_ATTRIB_FOG) && !bUnderwater )
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2833 return 0xFF000000;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2834 if ( a3 == 0.0 )
2196
628a0ad87136 Some more PVS error fixing
Grumpy7
parents: 2193
diff changeset
2835 return (unsigned int)(-1 - 216) << 24;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2836 if ( a2 )
2196
628a0ad87136 Some more PVS error fixing
Grumpy7
parents: 2193
diff changeset
2837 return (unsigned int)(-1 - 248) << 24;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2838 if (a3 < (double)day_fogrange_1)
2196
628a0ad87136 Some more PVS error fixing
Grumpy7
parents: 2193
diff changeset
2839 return (unsigned int)(-1) << 24;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2840 if (a3 < (double)day_fogrange_2)
2196
628a0ad87136 Some more PVS error fixing
Grumpy7
parents: 2193
diff changeset
2841 return (unsigned int)(-1 - 216) << 24;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2842
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2843 if ( pWeather->bNight && !bUnderwater)
0
Ritor1
parents:
diff changeset
2844 {
Ritor1
parents:
diff changeset
2845 v5 = (double)day_fogrange_1;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2846 v8 = (double)day_fogrange_2;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2847 v7 = (signed __int64)((a3 - v5) / (v8 - v5) * 216.0);
0
Ritor1
parents:
diff changeset
2848 }
Ritor1
parents:
diff changeset
2849 else
Ritor1
parents:
diff changeset
2850 {
Ritor1
parents:
diff changeset
2851 v9 = (double)day_fogrange_1;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2852 v10 = (double)day_fogrange_2;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2853 v11 = (a3 - v9) * 216.0 / (v10 - v9);
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2854 v7 = bankersRounding(v11);
1418
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2855 }
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2856 if ( v7 > 216 )
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2857 {
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2858 v7 = 216;
483b1b453986 more label cleaning
zipi
parents: 1413
diff changeset
2859 }
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
2860 return ( -1 - v7) << 24;
0
Ritor1
parents:
diff changeset
2861 }
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2862
0
Ritor1
parents:
diff changeset
2863 //----- (0047C4FC) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
2864 int __fastcall GetActorTintColor(int max_dimm, int min_dimm, float distance, int a4, RenderBillboard *a5)
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2865 {
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2866 //int v5; // esi@1
0
Ritor1
parents:
diff changeset
2867 signed int v6; // edx@1
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2868 //signed int result; // eax@2
0
Ritor1
parents:
diff changeset
2869 int v8; // eax@3
Ritor1
parents:
diff changeset
2870 double v9; // st7@12
750
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2871 //double v10; // ST0C_8@18
0
Ritor1
parents:
diff changeset
2872 int v11; // ecx@28
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2873 //signed int v12; // edi@28
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2874 //double v13; // ST0C_8@33
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2875 //double v14; // ST0C_8@34
0
Ritor1
parents:
diff changeset
2876 double v15; // st7@44
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2877 //double v16; // ST0C_8@44
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2878 //double v17; // ST0C_8@44
0
Ritor1
parents:
diff changeset
2879 int v18; // ST14_4@44
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2880 //double v19; // ST0C_8@44
0
Ritor1
parents:
diff changeset
2881 signed int v20; // [sp+10h] [bp-4h]@10
Ritor1
parents:
diff changeset
2882 float a3a; // [sp+1Ch] [bp+8h]@33
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2883 //float a3b; // [sp+1Ch] [bp+8h]@34
0
Ritor1
parents:
diff changeset
2884 float a3c; // [sp+1Ch] [bp+8h]@44
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2885 //float a3d; // [sp+1Ch] [bp+8h]@44
750
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2886 //float a4b; // [sp+20h] [bp+Ch]@18
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2887 //int a4a; // [sp+20h] [bp+Ch]@33
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2888 //float a4c; // [sp+20h] [bp+Ch]@44
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2889 //float a4d; // [sp+20h] [bp+Ch]@44
0
Ritor1
parents:
diff changeset
2890 int a5a; // [sp+24h] [bp+10h]@44
Ritor1
parents:
diff changeset
2891
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2892 //v5 = a2;
0
Ritor1
parents:
diff changeset
2893 v6 = 0;
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2894
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2895 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2896 return 8 * (31 - max_dimm) | ((8 * (31 - max_dimm) | ((31 - max_dimm) << 11)) << 8);
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2897
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2898 if (pParty->armageddon_timer)
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2899 return 0xFFFF0000;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2900
750
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2901 v8 = pWeather->bNight;
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2902 if (bUnderwater)
0
Ritor1
parents:
diff changeset
2903 v8 = 0;
Ritor1
parents:
diff changeset
2904 if ( v8 )
Ritor1
parents:
diff changeset
2905 {
Ritor1
parents:
diff changeset
2906 v20 = 1;
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2907 if ( (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_TORCHLIGHT].uExpireTime > 0 )
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2908 v20 = pParty->pPartyBuffs[PARTY_BUFF_TORCHLIGHT].uPower;
0
Ritor1
parents:
diff changeset
2909 v9 = (double)v20 * 1024.0;
Ritor1
parents:
diff changeset
2910 if ( a4 )
1901
Ritor1
parents: 1861
diff changeset
2911 {
Ritor1
parents: 1861
diff changeset
2912 v6 = 216;
Ritor1
parents: 1861
diff changeset
2913 goto LABEL_20;
Ritor1
parents: 1861
diff changeset
2914 }
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2915 if ( distance <= v9 )
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2916 {
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2917 if ( distance > 0.0 )
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2918 {
750
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2919 //a4b = distance * 216.0 / v9;
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2920 //v10 = a4b + 6.7553994e15;
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2921 //v6 = LODWORD(v10);
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2922 v6 = floorf(0.5f + distance * 216.0 / v9);
23a07ead5980 Night fixed.
Nomad
parents: 741
diff changeset
2923 if (v6 > 216 )
1901
Ritor1
parents: 1861
diff changeset
2924 {
Ritor1
parents: 1861
diff changeset
2925 v6 = 216;
Ritor1
parents: 1861
diff changeset
2926 goto LABEL_20;
Ritor1
parents: 1861
diff changeset
2927 }
0
Ritor1
parents:
diff changeset
2928 }
Ritor1
parents:
diff changeset
2929 }
Ritor1
parents:
diff changeset
2930 else
Ritor1
parents:
diff changeset
2931 {
Ritor1
parents:
diff changeset
2932 v6 = 216;
Ritor1
parents:
diff changeset
2933 }
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2934 if ( distance != 0.0 )
0
Ritor1
parents:
diff changeset
2935 {
Ritor1
parents:
diff changeset
2936 LABEL_20:
Ritor1
parents:
diff changeset
2937 if ( a5 )
Ritor1
parents:
diff changeset
2938 v6 = 8 * _43F55F_get_billboard_light_level(a5, v6 >> 3);
Ritor1
parents:
diff changeset
2939 if ( v6 > 216 )
Ritor1
parents:
diff changeset
2940 v6 = 216;
Ritor1
parents:
diff changeset
2941 return (255 - v6) | ((255 - v6) << 16) | ((255 - v6) << 8);
Ritor1
parents:
diff changeset
2942 }
1901
Ritor1
parents: 1861
diff changeset
2943 //LABEL_19:
0
Ritor1
parents:
diff changeset
2944 v6 = 216;
Ritor1
parents:
diff changeset
2945 goto LABEL_20;
Ritor1
parents:
diff changeset
2946 }
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2947
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2948
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2949
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2950 if (fabsf(distance) < 1.0e-6f)
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2951 return 0xFFF8F8F8;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2952
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2953 // dim in measured in 8-steps
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2954 v11 = 8 * (max_dimm - min_dimm);
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2955 //v12 = v11;
0
Ritor1
parents:
diff changeset
2956 if ( v11 >= 0 )
Ritor1
parents:
diff changeset
2957 {
Ritor1
parents:
diff changeset
2958 if ( v11 > 216 )
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2959 v11 = 216;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2960 }
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2961 else
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2962 v11 = 0;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2963
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2964 float fog_density_mult = 216.0f;
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2965 if (a4)
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2966 fog_density_mult += distance / (double)pODMRenderParams->shading_dist_shade * 32.0;
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2967
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2968 v6 = v11 + floorf(pOutdoor->fFogDensity * fog_density_mult + 0.5f);
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2969 /*if ( a4 )
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2970 {
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2971 //a3b = pOutdoor->fFogDensity * 216.0;
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2972 //v14 = a3b + 6.7553994e15;
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2973 //a4a = floorf(a3b + 0.5f);//LODWORD(v14);
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2974 }
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2975 else
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2976 {
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
2977 //a3a = (distance / (double)pODMRenderParams->shading_dist_shade * 32.0 + 216.0) * pOutdoor->fFogDensity;
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2978 //v13 = a3a + 6.7553994e15;
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2979 //a4a = floorf(a3a + 0.5f);//LODWORD(v13);
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2980 }
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2981 v6 = a4a + v11;*/
0
Ritor1
parents:
diff changeset
2982 if ( a5 )
Ritor1
parents:
diff changeset
2983 v6 = 8 * _43F55F_get_billboard_light_level(a5, v6 >> 3);
Ritor1
parents:
diff changeset
2984 if ( v6 > 216 )
Ritor1
parents:
diff changeset
2985 v6 = 216;
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2986 if ( v6 < v11 )
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2987 v6 = v11;
638
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2988 if ( v6 > 8 * pOutdoor->max_terrain_dimming_level )
ccf8b4815a1f GetActorTintColor fixed
Nomad
parents: 633
diff changeset
2989 v6 = 8 * pOutdoor->max_terrain_dimming_level;
0
Ritor1
parents:
diff changeset
2990 if ( !bUnderwater )
Ritor1
parents:
diff changeset
2991 return (255 - v6) | ((255 - v6) << 16) | ((255 - v6) << 8);
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2992 else
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2993 {
0
Ritor1
parents:
diff changeset
2994 v15 = (double)(255 - v6) * 0.0039215689;
Ritor1
parents:
diff changeset
2995 a3c = v15;
349
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2996 //a4c = v15 * 16.0;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2997 //v16 = a4c + 6.7553994e15;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2998 a5a = floorf(v15 * 16.0 + 0.5f);//LODWORD(v16);
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
2999 //a4d = a3c * 194.0;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
3000 //v17 = a4d + 6.7553994e15;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
3001 v18 = floorf(a3c * 194.0 + 0.5f);//LODWORD(v17);
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
3002 //a3d = a3c * 153.0;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
3003 //v19 = a3d + 6.7553994e15;
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
3004 return (int)floorf(a3c * 153.0 + 0.5f)/*LODWORD(v19)*/ | ((v18 | (a5a << 8)) << 8);
672b83584b0f GetActorTintColor
Nomad
parents: 336
diff changeset
3005 }
0
Ritor1
parents:
diff changeset
3006 }
Ritor1
parents:
diff changeset
3007 // 6BE3C4: using guessed type char bUnderwater;
Ritor1
parents:
diff changeset
3008
Ritor1
parents:
diff changeset
3009 //----- (0047F44B) --------------------------------------------------------
1412
182d58b2a34c Harmondale falling under terrain fixed
Nomad
parents: 1411
diff changeset
3010 unsigned int WorldPosToGridCellX(int sWorldPosX)
67
3b4f8bd48e3b 25.01.13 (I did sky)
Ritor1
parents: 65
diff changeset
3011 {
1412
182d58b2a34c Harmondale falling under terrain fixed
Nomad
parents: 1411
diff changeset
3012 return (sWorldPosX >> 9) + 64; // sar is in original exe, resulting -880 / 512 = -1
182d58b2a34c Harmondale falling under terrain fixed
Nomad
parents: 1411
diff changeset
3013 // and -880 sar 9 = -2
0
Ritor1
parents:
diff changeset
3014 }
Ritor1
parents:
diff changeset
3015
Ritor1
parents:
diff changeset
3016 //----- (0047F458) --------------------------------------------------------
1412
182d58b2a34c Harmondale falling under terrain fixed
Nomad
parents: 1411
diff changeset
3017 unsigned int WorldPosToGridCellZ(int sWorldPosZ)
67
3b4f8bd48e3b 25.01.13 (I did sky)
Ritor1
parents: 65
diff changeset
3018 {
1412
182d58b2a34c Harmondale falling under terrain fixed
Nomad
parents: 1411
diff changeset
3019 return 64 - (sWorldPosZ >> 9); // sar is in original exe, resulting -880 / 512 = -1
182d58b2a34c Harmondale falling under terrain fixed
Nomad
parents: 1411
diff changeset
3020 // and -880 sar 9 = -2
0
Ritor1
parents:
diff changeset
3021 }
Ritor1
parents:
diff changeset
3022
Ritor1
parents:
diff changeset
3023 //----- (0047F469) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
3024 int GridCellToWorldPosX(int a1)
0
Ritor1
parents:
diff changeset
3025 {
Ritor1
parents:
diff changeset
3026 return (a1 - 64) << 9;
Ritor1
parents:
diff changeset
3027 }
Ritor1
parents:
diff changeset
3028
Ritor1
parents:
diff changeset
3029 //----- (0047F476) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
3030 int GridCellToWorldPosZ(int a1)
0
Ritor1
parents:
diff changeset
3031 {
Ritor1
parents:
diff changeset
3032 return (64 - a1) << 9;
Ritor1
parents:
diff changeset
3033 }
Ritor1
parents:
diff changeset
3034
Ritor1
parents:
diff changeset
3035
Ritor1
parents:
diff changeset
3036
Ritor1
parents:
diff changeset
3037 //----- (00481ED9) --------------------------------------------------------
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
3038 void sub_481ED9_MessWithODMRenderParams()
0
Ritor1
parents:
diff changeset
3039 {
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3040 stru_8019C8._48616B_frustum_odm(65536, 0, 0, 0, 65536, 0);
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
3041 pODMRenderParams->uNumPolygons = 0;
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3042 //pODMRenderParams->uNumEdges = 0;
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3043 //pODMRenderParams->uNumSpans = 0;
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3044 //pODMRenderParams->uNumSurfs = 0;
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
3045 pODMRenderParams->uNumBillboards = 0;
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
3046 pODMRenderParams->field_44 = 0;
0
Ritor1
parents:
diff changeset
3047 }
Ritor1
parents:
diff changeset
3048
Ritor1
parents:
diff changeset
3049 //----- (004823F4) --------------------------------------------------------
138
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3050 bool IsTerrainSlopeTooHigh(int pos_x, int pos_z)
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3051 {
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3052 //unsigned int v2; // ebx@1
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3053 //unsigned int v3; // edi@1
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3054 //int v4; // eax@1
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3055 //int v6; // esi@5
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3056 //int v7; // ecx@6
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3057 //int v8; // edx@6
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3058 //int v9; // eax@6
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3059 //int y_min; // esi@10
138
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3060 //int v11; // [sp+14h] [bp-8h]@1
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3061 //int v12; // [sp+18h] [bp-4h]@1
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3062
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3063 //v12 = a1;
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3064 //v11 = a2;
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3065 unsigned int grid_x = WorldPosToGridCellX(pos_x);
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3066 unsigned int grid_z = WorldPosToGridCellZ(pos_z) - 1;
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3067
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3068 int party_grid_x1 = GridCellToWorldPosX(grid_x);
138
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3069 //dword_76D56C_terrain_cell_world_pos_around_party_x = GridCellToWorldPosX(grid_x + 1);
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3070 //dword_76D570_terrain_cell_world_pos_around_party_x = GridCellToWorldPosX(grid_x + 1);
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3071 //dword_76D574_terrain_cell_world_pos_around_party_x = GridCellToWorldPosX(grid_x);
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3072 int party_grid_z1 = GridCellToWorldPosZ(grid_z);
138
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3073 //dword_76D55C_terrain_cell_world_pos_around_party_z = GridCellToWorldPosZ(grid_z);
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3074 //dword_76D560_terrain_cell_world_pos_around_party_z = GridCellToWorldPosZ(grid_z + 1);
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3075 //dword_76D564_terrain_cell_world_pos_around_party_z = GridCellToWorldPosZ(grid_z + 1);
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3076 int party_x1z1_y = pOutdoor->DoGetHeightOnTerrain(grid_x, grid_z);
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3077 int party_x2z1_y = pOutdoor->DoGetHeightOnTerrain(grid_x + 1, grid_z);
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3078 int party_x2z2_y = pOutdoor->DoGetHeightOnTerrain(grid_x + 1, grid_z + 1);
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3079 int party_x1z2_y = pOutdoor->DoGetHeightOnTerrain(grid_x, grid_z + 1);
138
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3080 //dword_76D554_terrain_cell_world_pos_around_party_y = v4;
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3081 if (party_x1z1_y == party_x2z1_y &&
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3082 party_x2z1_y == party_x2z2_y &&
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3083 party_x2z2_y == party_x1z2_y )
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3084 return false;
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3085
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3086 int dx = abs(pos_x - party_grid_x1),
138
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3087 dz = abs(party_grid_z1 - pos_z);
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3088
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3089 int y1, y2, y3;
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3090 if (dz >= dx)
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3091 {
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3092 y1 = party_x1z2_y; // lower-left triangle
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3093 y2 = party_x2z2_y; // y3 | \
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3094 y3 = party_x1z1_y; // | \
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3095 /* | \
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3096 |______ \
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3097 y1 y2 */
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3098 }
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3099 else
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3100 {
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3101 y1 = party_x2z1_y; // upper-right
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3102 y2 = party_x1z1_y; // y2_______ y1
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3103 y3 = party_x2z2_y; // \ |
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3104 /* \ |
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3105 \ |
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3106 y3 */
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3107 }
a8ec7e1e18b6 Sliding downhill & relative subs.
Nomad
parents: 130
diff changeset
3108
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3109 int y_min = min(y1, min(y2, y3));// íå âåðíî ïðè ïîäú¸ìå íà ñêëîí
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3110 int y_max = max(y1, max(y2, y3));
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3111 return (y_max - y_min) > 512;
0
Ritor1
parents:
diff changeset
3112 }
Ritor1
parents:
diff changeset
3113
Ritor1
parents:
diff changeset
3114 //----- (0048257A) --------------------------------------------------------
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3115 int __fastcall GetTerrainHeightsAroundParty2(int a1, int a2, int *pIsOnWater, int bFloatAboveWater)
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3116 {
0
Ritor1
parents:
diff changeset
3117 int result; // eax@9
Ritor1
parents:
diff changeset
3118 int v8; // ebx@11
Ritor1
parents:
diff changeset
3119 int v9; // eax@11
Ritor1
parents:
diff changeset
3120 int v10; // ecx@11
Ritor1
parents:
diff changeset
3121 int v13; // [sp+10h] [bp-8h]@11
Ritor1
parents:
diff changeset
3122 signed int v14; // [sp+14h] [bp-4h]@3
Ritor1
parents:
diff changeset
3123 int v15; // [sp+24h] [bp+Ch]@11
Ritor1
parents:
diff changeset
3124
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3125 unsigned int grid_x = WorldPosToGridCellX(a1);
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3126 unsigned int grid_z = WorldPosToGridCellZ(a2) - 1;
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3127
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3128 int grid_x1 = GridCellToWorldPosX(grid_x),
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3129 grid_x2 = GridCellToWorldPosX(grid_x + 1);
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3130 int grid_z1 = GridCellToWorldPosZ(grid_z),
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3131 grid_z2 = GridCellToWorldPosZ(grid_z + 1);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3132
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
3133 int y_x1z1 = pOutdoor->DoGetHeightOnTerrain(grid_x, grid_z),
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3134 y_x2z1 = pOutdoor->DoGetHeightOnTerrain(grid_x + 1, grid_z),
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3135 y_x2z2 = pOutdoor->DoGetHeightOnTerrain(grid_x + 1, grid_z + 1),
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3136 y_x1z2 = pOutdoor->DoGetHeightOnTerrain(grid_x, grid_z + 1);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3137 //v4 = WorldPosToGridCellX(a1);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3138 //v5 = WorldPosToGridCellZ(v12) - 1;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3139 //dword_76D538_terrain_cell_world_pos_around_party_x = GridCellToWorldPosX(v4);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3140 //dword_76D53C_terrain_cell_world_pos_around_party_x = GridCellToWorldPosX(v4 + 1);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3141 //dword_76D540_terrain_cell_world_pos_around_party_x = GridCellToWorldPosX(v4 + 1);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3142 //dword_76D544_terrain_cell_world_pos_around_party_x = GridCellToWorldPosX(v4);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3143 //dword_76D528_terrain_cell_world_pos_around_party_z = GridCellToWorldPosZ(v5);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3144 //dword_76D52C_terrain_cell_world_pos_around_party_z = GridCellToWorldPosZ(v5);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3145 //dword_76D530_terrain_cell_world_pos_around_party_z = GridCellToWorldPosZ(v5 + 1);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3146 //dword_76D534_terrain_cell_world_pos_around_party_z = GridCellToWorldPosZ(v5 + 1);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3147 //dword_76D518_terrain_cell_world_pos_around_party_y = pOutdoor->DoGetHeightOnTerrain(v4, v5);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3148 //dword_76D51C_terrain_cell_world_pos_around_party_y = pOutdoor->DoGetHeightOnTerrain(v4 + 1, v5);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3149 //dword_76D520_terrain_cell_world_pos_around_party_y = pOutdoor->DoGetHeightOnTerrain(v4 + 1, v5 + 1);
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3150 //dword_76D524_terrain_cell_world_pos_around_party_y = pOutdoor->DoGetHeightOnTerrain(v4, v5 + 1);
791
346f7069676a Indoor::GetSector and various stuff
Nomad
parents: 790
diff changeset
3151 *pIsOnWater = false;
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3152 if ( pOutdoor->ActuallyGetSomeOtherTileInfo(grid_x, grid_z) & 2 )
791
346f7069676a Indoor::GetSector and various stuff
Nomad
parents: 790
diff changeset
3153 *pIsOnWater = true;
0
Ritor1
parents:
diff changeset
3154 v14 = 0;
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3155 if ( !bFloatAboveWater && *pIsOnWater )
0
Ritor1
parents:
diff changeset
3156 v14 = -60;
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3157 if ( y_x1z1 != y_x2z1 ||
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3158 y_x2z1 != y_x2z2 ||
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3159 y_x2z2 != y_x1z2 )
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3160 {
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3161 if ( abs(grid_z1 - a2) >= abs(a1 - grid_x1) )
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3162 {
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3163 v8 = y_x1z2;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3164 v9 = y_x2z2;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3165 v10 = y_x1z1;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3166 v15 = a1 - grid_x1;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3167 v13 = a2 - grid_z2;
0
Ritor1
parents:
diff changeset
3168 }
Ritor1
parents:
diff changeset
3169 else
Ritor1
parents:
diff changeset
3170 {
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3171 v8 = y_x2z1;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3172 v9 = y_x1z1;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3173 v10 = y_x2z2;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3174 v15 = grid_x2 - a1;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3175 v13 = grid_z1 - a2;
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3176 }
1643
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
3177 return v14 + v8 + fixpoint_mul(v13, (v10 - v8) * 128) + fixpoint_mul(v15, (v9 - v8) * 128);
812
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3178 }
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3179 else
9d2b911ef526 Fixed some odm terrain collision glitches.
Nomad
parents: 795
diff changeset
3180 return y_x1z1;
0
Ritor1
parents:
diff changeset
3181 }
Ritor1
parents:
diff changeset
3182
Ritor1
parents:
diff changeset
3183 //----- (00485F53) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1445
diff changeset
3184 void sr_485F53(Vec2_int_ *v)
0
Ritor1
parents:
diff changeset
3185 {
Ritor1
parents:
diff changeset
3186 ++v->y;
Ritor1
parents:
diff changeset
3187 if ( v->y > 1000 )
Ritor1
parents:
diff changeset
3188 v->y = 0;
Ritor1
parents:
diff changeset
3189 }
Ritor1
parents:
diff changeset
3190
Ritor1
parents:
diff changeset
3191 //----- (0048607B) --------------------------------------------------------
1427
Ritor1
parents: 1424
diff changeset
3192 void Polygon::Create_48607B(stru149 *a2)
0
Ritor1
parents:
diff changeset
3193 {
Ritor1
parents:
diff changeset
3194 this->pTexture = 0;
Ritor1
parents:
diff changeset
3195 this->ptr_38 = a2;
Ritor1
parents:
diff changeset
3196 }
Ritor1
parents:
diff changeset
3197
Ritor1
parents:
diff changeset
3198 //----- (00486089) --------------------------------------------------------
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
3199 void Polygon::_normalize_v_18()
0
Ritor1
parents:
diff changeset
3200 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3201 //double v2; // st7@1
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3202 //double v3; // st6@1
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3203 //double v5; // st5@1
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3204
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3205 // v2 = (double)this->v_18.x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3206 //v3 = (double)this->v_18.y;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3207 // v5 = (double)this->v_18.z;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3208 float len = sqrt((double)this->v_18.z * (double)this->v_18.z + (double)this->v_18.y * (double)this->v_18.y + (double)this->v_18.x * (double)this->v_18.x);
1410
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
3209 if (fabsf(len) < 1e-6f)
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
3210 {
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
3211 v_18.x = 0;
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
3212 v_18.y = 0;
38df78aba732 deleted stru220.h and stru220 (bezier terrain stuff)
Nomad
parents: 1401
diff changeset
3213 v_18.z = 65536;
0
Ritor1
parents:
diff changeset
3214 }
Ritor1
parents:
diff changeset
3215 else
Ritor1
parents:
diff changeset
3216 {
2125
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3217 v_18.x = round_to_int((double)this->v_18.x / len * 65536.0);
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3218 v_18.y = round_to_int((double)this->v_18.y / len * 65536.0);
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3219 v_18.y = round_to_int((double)this->v_18.z / len * 65536.0);
0
Ritor1
parents:
diff changeset
3220 }
Ritor1
parents:
diff changeset
3221 }
Ritor1
parents:
diff changeset
3222
Ritor1
parents:
diff changeset
3223 //----- (0048616B) --------------------------------------------------------
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3224 void stru149::_48616B_frustum_odm(int a2, int a3, int a4, int a5, int a6, int a7)
0
Ritor1
parents:
diff changeset
3225 {
Ritor1
parents:
diff changeset
3226 int v7; // ebx@1
Ritor1
parents:
diff changeset
3227 int v9; // edi@1
Ritor1
parents:
diff changeset
3228 int v11; // edx@1
Ritor1
parents:
diff changeset
3229 int v17; // ST0C_4@6
Ritor1
parents:
diff changeset
3230 int v19; // ST0C_4@9
Ritor1
parents:
diff changeset
3231 int v24; // [sp+14h] [bp-14h]@1
Ritor1
parents:
diff changeset
3232 int v25; // [sp+18h] [bp-10h]@1
Ritor1
parents:
diff changeset
3233 int v27; // [sp+24h] [bp-4h]@1
Ritor1
parents:
diff changeset
3234
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3235 v25 = pGame->pIndoorCameraD3D->int_cosine_x;
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3236 v7 = pGame->pIndoorCameraD3D->int_sine_y;
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3237 v27 = pGame->pIndoorCameraD3D->int_sine_x;
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3238 //v8 = -pIndoorCamera->pos.y;
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3239 v9 = pGame->pIndoorCameraD3D->int_cosine_y;
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3240 //v26 = -pIndoorCamera->pos.z;
1642
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3241 v11 = pGame->pIndoorCameraD3D->int_cosine_y * -pGame->pIndoorCameraD3D->vPartyPos.x + pGame->pIndoorCameraD3D->int_sine_y * -pGame->pIndoorCameraD3D->vPartyPos.y;
8971dc85b8fb More camera unifications.
Nomad
parents: 1641
diff changeset
3242 v24 = pGame->pIndoorCameraD3D->int_cosine_y * -pGame->pIndoorCameraD3D->vPartyPos.y - pGame->pIndoorCameraD3D->int_sine_y * -pGame->pIndoorCameraD3D->vPartyPos.x;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
3243 if (pGame->pIndoorCameraD3D->sRotationX)
0
Ritor1
parents:
diff changeset
3244 {
1643
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
3245 this->field_0_party_dir_x = fixpoint_mul(v11, pGame->pIndoorCameraD3D->int_cosine_x) +
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
3246 fixpoint_mul((-pGame->pIndoorCameraD3D->vPartyPos.z) << 16, pGame->pIndoorCameraD3D->int_sine_x);
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3247 this->field_4_party_dir_y = v24;
1643
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
3248 this->field_8_party_dir_z = fixpoint_mul((-pGame->pIndoorCameraD3D->vPartyPos.z) << 16, v25) - fixpoint_mul(v11, v27);
0
Ritor1
parents:
diff changeset
3249 }
Ritor1
parents:
diff changeset
3250 else
Ritor1
parents:
diff changeset
3251 {
755
e0914a9bc424 stru149 decompilation errors on some blv saves.
Nomad
parents: 750
diff changeset
3252 this->field_0_party_dir_x = v11;
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3253 this->field_4_party_dir_y = v24;
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
3254 this->field_8_party_dir_z = (-pGame->pIndoorCameraD3D->vPartyPos.z) << 16;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
3255 }
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
3256
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
3257 if (pGame->pIndoorCameraD3D->sRotationX)
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3258 {
1643
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
3259 v17 = fixpoint_mul(a2, v9) + fixpoint_mul(a3, v7);
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
3260
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3261 this->angle_from_north = fixpoint_mul(v17, v25) + fixpoint_mul(a4, v27);
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3262 this->angle_from_west = fixpoint_mul(a3, v9) - fixpoint_mul(a2, v7);
1844
Ritor1
parents: 1837
diff changeset
3263 this->viewing_angle_from_west_east = fixpoint_mul(a4, v25) - fixpoint_mul(v17, v27);
0
Ritor1
parents:
diff changeset
3264 }
Ritor1
parents:
diff changeset
3265 else
Ritor1
parents:
diff changeset
3266 {
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3267 this->angle_from_north = fixpoint_mul(a2, v9) + fixpoint_mul(a3, v7);
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3268 this->angle_from_west = fixpoint_mul(a3, v9) - fixpoint_mul(a2, v7);
1844
Ritor1
parents: 1837
diff changeset
3269 this->viewing_angle_from_west_east = a4;
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3270 }
499761153844 stru149
Nomad
parents: 1542
diff changeset
3271
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
3272 if (pGame->pIndoorCameraD3D->sRotationX)
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3273 {
1643
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
3274 v19 = fixpoint_mul(a5, v9) + fixpoint_mul(a6, v7);
7182930263b3 fixpoint functions renaming
zipi
parents: 1642
diff changeset
3275
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3276 this->angle_from_east = fixpoint_mul(v19, v25) + fixpoint_mul(a7, v27);
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3277 this->angle_from_south = fixpoint_mul(a6, v9) - fixpoint_mul(a5, v7);
1844
Ritor1
parents: 1837
diff changeset
3278 this->viewing_angle_from_north_south = fixpoint_mul(a7, v25) - fixpoint_mul(v19, v27);
0
Ritor1
parents:
diff changeset
3279 }
Ritor1
parents:
diff changeset
3280 else
Ritor1
parents:
diff changeset
3281 {
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3282 this->angle_from_east = fixpoint_mul(a5, v9) + fixpoint_mul(a6, v7);
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3283 this->angle_from_south = fixpoint_mul(a6, v9) - fixpoint_mul(a5, v7);
1844
Ritor1
parents: 1837
diff changeset
3284 this->viewing_angle_from_north_south = a7;
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3285 }
499761153844 stru149
Nomad
parents: 1542
diff changeset
3286
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3287 this->angle_from_east = -this->angle_from_east;
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3288 this->angle_from_south = -this->angle_from_south;
1844
Ritor1
parents: 1837
diff changeset
3289 this->viewing_angle_from_north_south = -this->viewing_angle_from_north_south;
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3290
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3291 this->field_24 = fixpoint_dot(this->angle_from_north, this->field_0_party_dir_x,
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3292 this->angle_from_west, this->field_4_party_dir_y,
1844
Ritor1
parents: 1837
diff changeset
3293 this->viewing_angle_from_west_east, this->field_8_party_dir_z);
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3294 this->field_28 = fixpoint_dot(this->angle_from_east, this->field_0_party_dir_x,
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3295 this->angle_from_south, this->field_4_party_dir_y,
1844
Ritor1
parents: 1837
diff changeset
3296 this->viewing_angle_from_north_south, this->field_8_party_dir_z);
0
Ritor1
parents:
diff changeset
3297 }
Ritor1
parents:
diff changeset
3298
Ritor1
parents:
diff changeset
3299 //----- (0048694B) --------------------------------------------------------
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3300 void stru149::_48694B_frustum_sky()
0
Ritor1
parents:
diff changeset
3301 {
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3302 this->angle_from_east = -this->angle_from_east;
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3303 this->angle_from_south = -this->angle_from_south;
1844
Ritor1
parents: 1837
diff changeset
3304 this->viewing_angle_from_north_south = -this->viewing_angle_from_north_south;
1544
499761153844 stru149
Nomad
parents: 1542
diff changeset
3305
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3306 this->field_24 = fixpoint_dot(this->angle_from_north, this->field_0_party_dir_x,
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3307 this->angle_from_west, this->field_4_party_dir_y,
1844
Ritor1
parents: 1837
diff changeset
3308 this->viewing_angle_from_west_east, this->field_8_party_dir_z);
1809
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3309 this->field_28 = fixpoint_dot(this->angle_from_east, this->field_0_party_dir_x,
8f20f7e1091d original DrawSkyD3D() fix
Ritor1
parents: 1801
diff changeset
3310 this->angle_from_south, this->field_4_party_dir_y,
1844
Ritor1
parents: 1837
diff changeset
3311 this->viewing_angle_from_north_south, this->field_8_party_dir_z);
0
Ritor1
parents:
diff changeset
3312 }
Ritor1
parents:
diff changeset
3313
Ritor1
parents:
diff changeset
3314 //----- (0044100D) --------------------------------------------------------
994
3431f6abc786 GameUI clean
Nomad
parents: 978
diff changeset
3315 bool sub_44100D()
0
Ritor1
parents:
diff changeset
3316 {
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 554
diff changeset
3317 return pCurrentScreen == SCREEN_NPC_DIALOGUE || pCurrentScreen == SCREEN_CHARACTERS ||
2186
7a517c9a1d5b CastSpell continue
Ritor1
parents: 2184
diff changeset
3318 pCurrentScreen == SCREEN_HOUSE || pCurrentScreen == SCREEN_E ||
7a517c9a1d5b CastSpell continue
Ritor1
parents: 2184
diff changeset
3319 pCurrentScreen == SCREEN_CHANGE_LOCATION || pCurrentScreen == SCREEN_INPUT_BLV || pCurrentScreen == SCREEN_CASTING;
0
Ritor1
parents:
diff changeset
3320 }
Ritor1
parents:
diff changeset
3321 // 4E28F8: using guessed type int pCurrentScreen;
Ritor1
parents:
diff changeset
3322
Ritor1
parents:
diff changeset
3323 //----- (00441A4E) --------------------------------------------------------
910
Ritor1
parents: 897
diff changeset
3324 __int16 __fastcall sub_441A4E(int a1)//for blessing
0
Ritor1
parents:
diff changeset
3325 {
Ritor1
parents:
diff changeset
3326 __int16 result; // ax@1
Ritor1
parents:
diff changeset
3327 int v2; // ebx@1
Ritor1
parents:
diff changeset
3328 char *v3; // esi@1
Ritor1
parents:
diff changeset
3329 int v4; // edi@4
1110
cf6cd674c398 bitwise operator ambiguity reduced
Grumpy7
parents: 1104
diff changeset
3330 bool v5; // ecx@4
1523
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3331 SpriteFrame *pFrame; // eax@6
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3332 //SpriteFrame *v7; // edi@6
0
Ritor1
parents:
diff changeset
3333 int v8; // eax@6
Ritor1
parents:
diff changeset
3334 unsigned __int16 v9; // ax@6
Ritor1
parents:
diff changeset
3335 RenderBillboardTransform_local0 v10; // [sp+Ch] [bp-5Ch]@1
Ritor1
parents:
diff changeset
3336 int v11; // [sp+5Ch] [bp-Ch]@6
Ritor1
parents:
diff changeset
3337 int v12; // [sp+60h] [bp-8h]@1
Ritor1
parents:
diff changeset
3338 int v13; // [sp+64h] [bp-4h]@6
Ritor1
parents:
diff changeset
3339
2002
2e6c63bdcfa9 RenderBillboardD3D initialization
zipi
parents: 1980
diff changeset
3340 v10.sParentBillboardID = -1;
0
Ritor1
parents:
diff changeset
3341 v10.pTarget = pRenderer->pTargetSurface;
Ritor1
parents:
diff changeset
3342 v10.pTargetZ = pRenderer->pActiveZBuffer;
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
3343 v10.uTargetPitch = pRenderer->GetRenderWidth();
0
Ritor1
parents:
diff changeset
3344 result = 0;
Ritor1
parents:
diff changeset
3345 v2 = a1;
Ritor1
parents:
diff changeset
3346 v10.uViewportX = 0;
Ritor1
parents:
diff changeset
3347 v10.uViewportY = 0;
Ritor1
parents:
diff changeset
3348 v10.uViewportZ = 639;
Ritor1
parents:
diff changeset
3349 v10.uViewportW = 479;
Ritor1
parents:
diff changeset
3350 v12 = 0;
921
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3351 //v3 = (char *)&pOtherOverlayList->pOverlays[0].field_C;
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3352 //do
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3353 for ( uint i = 0; i < 50; ++i )
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3354 {
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3355 if ( pOtherOverlayList->pOverlays[i].field_6 > 0 )
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3356 {
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3357 result = pOtherOverlayList->pOverlays[i].field_0;
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3358 if ( pOtherOverlayList->pOverlays[i].field_0 >= 300 )
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3359 {
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3360 //v4 = result;
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3361 v5 = pOtherOverlayList->pOverlays[i].field_0 == v2 + 320
1110
cf6cd674c398 bitwise operator ambiguity reduced
Grumpy7
parents: 1104
diff changeset
3362 || pOtherOverlayList->pOverlays[i].field_0 == v2 + 330
cf6cd674c398 bitwise operator ambiguity reduced
Grumpy7
parents: 1104
diff changeset
3363 || pOtherOverlayList->pOverlays[i].field_0 == v2 + 340
cf6cd674c398 bitwise operator ambiguity reduced
Grumpy7
parents: 1104
diff changeset
3364 || pOtherOverlayList->pOverlays[i].field_0 == v2 + 350;
921
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3365 pOtherOverlayList->pOverlays[i].field_0 = v2 + 310;
1110
cf6cd674c398 bitwise operator ambiguity reduced
Grumpy7
parents: 1104
diff changeset
3366 if ( pOtherOverlayList->pOverlays[i].field_0 == v2 + 310 || v5 )
921
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3367 {
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3368 if ( !pOtherOverlayList->pOverlays[i].field_0 )
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3369 {
1523
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3370 pFrame = pSpriteFrameTable->GetFrame(pOverlayList->pOverlays[pOtherOverlayList->pOverlays[i].field_2].uSpriteFramesetID,
921
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3371 pOtherOverlayList->pOverlays[i].field_4);
1523
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3372 //v7 = v6;
921
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3373 v11 = pOtherOverlayList->pOverlays[i].field_E;
1523
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3374 //v13 = pFrame->scale;
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3375 v13 = (unsigned __int64)(v11 * (signed __int64)pFrame->scale) >> 16;
921
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3376 v10.uScreenSpaceX = pOtherOverlayList->pOverlays[i].field_8;
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3377 v10.uScreenSpaceY = pOtherOverlayList->pOverlays[i].field_A;
144
8ab4484c22e0 Billboard drawing's up (actors, decorations, misc sprites)
Nomad
parents: 142
diff changeset
3378 v10._screenspace_x_scaler_packedfloat = v13;
8ab4484c22e0 Billboard drawing's up (actors, decorations, misc sprites)
Nomad
parents: 142
diff changeset
3379 v10._screenspace_y_scaler_packedfloat = v13;
1523
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3380 v10.pPalette = PaletteManager::Get_Dark_or_Red_LUT(pFrame->uPaletteIndex, 0, 1);
921
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3381 v8 = pOtherOverlayList->pOverlays[i].field_2;
0
Ritor1
parents:
diff changeset
3382 v10.sZValue = 0;
Ritor1
parents:
diff changeset
3383 v10.uFlags = 0;
Ritor1
parents:
diff changeset
3384 v9 = pOverlayList->pOverlays[v8].uOverlayType;
Ritor1
parents:
diff changeset
3385 if ( !v9 || v9 == 2 )
1523
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3386 v10.uScreenSpaceY += pSprites_LOD->pSpriteHeaders[pFrame->pHwSpriteIDs[0]].uHeight >> 1;
53265d238d94 interaction_distance_limit for 3DModel in DrawStatusText
Ritor1
parents: 1504
diff changeset
3387 result = pSprites_LOD->pSpriteHeaders[pFrame->pHwSpriteIDs[0]]._4AD2D1(&v10, 0);
0
Ritor1
parents:
diff changeset
3388 ++v12;
Ritor1
parents:
diff changeset
3389 if ( v12 == 5 )
Ritor1
parents:
diff changeset
3390 break;
Ritor1
parents:
diff changeset
3391 }
Ritor1
parents:
diff changeset
3392 }
Ritor1
parents:
diff changeset
3393 }
Ritor1
parents:
diff changeset
3394 }
921
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3395 //v3 += 20;
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3396 }
3696848c0413 meteorite rain and other spells fix
Ritor1
parents: 920
diff changeset
3397 //while ( (signed int)v3 < (signed int)&pOverlayList->pOverlays );
0
Ritor1
parents:
diff changeset
3398 return result;
Ritor1
parents:
diff changeset
3399 }
Ritor1
parents:
diff changeset
3400
Ritor1
parents:
diff changeset
3401 //----- (00443801) --------------------------------------------------------
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3402 void Initialize2DA()
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3403 {
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3404
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3405 int i;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3406 char* test_string;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3407 unsigned char c;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3408 bool break_loop;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3409 unsigned int temp_str_len;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3410 char* tmp_pos;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3411 int decode_step;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3412
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3413 if ( p2DEventsTXT_Raw )
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1563
diff changeset
3414 free(p2DEventsTXT_Raw);
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3415 p2DEventsTXT_Raw = NULL;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3416 p2DEventsTXT_Raw = (char *)pEvents_LOD->LoadRaw("2dEvents.txt", 0);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3417 strtok(p2DEventsTXT_Raw, "\r");
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3418 strtok(NULL, "\r");
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3419
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3420 for (i=0;i<525;++i)
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3421 {
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3422 test_string = strtok(NULL, "\r") + 1;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3423 break_loop = false;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3424 decode_step=0;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3425 do
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3426 {
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3427 c = *(unsigned char*)test_string;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3428 temp_str_len = 0;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3429 while((c!='\t')&&(c>0))
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3430 {
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3431 ++temp_str_len;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3432 c=test_string[temp_str_len];
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3433 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3434 tmp_pos=test_string+temp_str_len;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3435 if (*tmp_pos == 0)
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3436 break_loop = true;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3437 *tmp_pos = 0;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3438 if (temp_str_len)
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3439 {
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3440 switch (decode_step)
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3441 {
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3442 case 2:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3443 {
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3444 if ( !_strnicmp(test_string, "wea", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3445 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3446 p2DEvents[i].uType = BuildingType_WeaponShop;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3447 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3448 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3449 if ( !_strnicmp(test_string, "arm", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3450 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3451 p2DEvents[i].uType = BuildingType_ArmorShop;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3452 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3453 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3454 if ( !_strnicmp(test_string, "mag", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3455 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3456 p2DEvents[i].uType = BuildingType_MagicShop;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3457 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3458 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3459 if ( !_strnicmp(test_string, "alc", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3460 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3461 p2DEvents[i].uType = BuildingType_AlchemistShop;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3462 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3463 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3464 if ( !_strnicmp(test_string, "sta", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3465 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3466 p2DEvents[i].uType = BuildingType_Stables;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3467 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3468 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3469 if ( !_strnicmp(test_string, "boa", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3470 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3471 p2DEvents[i].uType = BuildingType_Boats;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3472 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3473 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3474 if ( !_strnicmp(test_string, "tem", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3475 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3476 p2DEvents[i].uType = BuildingType_Temple;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3477 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3478 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3479 if ( !_strnicmp(test_string, "tra", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3480 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3481 p2DEvents[i].uType = BuildingType_Training;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3482 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3483 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3484 if ( !_strnicmp(test_string, "tow", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3485 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3486 p2DEvents[i].uType = BuildingType_TownHall;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3487 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3488 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3489
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3490 if ( !_strnicmp(test_string, "tav", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3491 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3492 p2DEvents[i].uType = BuildingType_Tavern;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3493 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3494 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3495 if ( !_strnicmp(test_string, "ban", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3496 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3497 p2DEvents[i].uType = BuildingType_Bank;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3498 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3499 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3500 if ( !_strnicmp(test_string, "fir", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3501 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3502 p2DEvents[i].uType = BuildingType_FireGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3503 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3504 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3505 if ( !_strnicmp(test_string, "air", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3506 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3507 p2DEvents[i].uType = BuildingType_AirGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3508 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3509 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3510 if ( !_strnicmp(test_string, "wat", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3511 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3512 p2DEvents[i].uType = BuildingType_WaterGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3513 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3514 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3515 if ( !_strnicmp(test_string, "ear", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3516 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3517 p2DEvents[i].uType = BuildingType_EarthGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3518 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3519 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3520 if ( !_strnicmp(test_string, "spi", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3521 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3522 p2DEvents[i].uType = BuildingType_SpiritGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3523 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3524 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3525 if ( !_strnicmp(test_string, "min", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3526 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3527 p2DEvents[i].uType = BuildingType_MindGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3528 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3529 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3530 if ( !_strnicmp(test_string, "bod", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3531 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3532 p2DEvents[i].uType = BuildingType_BodyGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3533 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3534 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3535 if ( !_strnicmp(test_string, "lig", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3536 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3537 p2DEvents[i].uType = BuildingType_LightGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3538 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3539 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3540 if ( !_strnicmp(test_string, "dar", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3541 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3542 p2DEvents[i].uType = BuildingType_DarkGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3543 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3544 }
1644
dbd6f940f26c Fixed Celestia sky a bit.
Nomad
parents: 1642
diff changeset
3545 if ( !_strnicmp(test_string, "ele", 3) ) // "Element Guild" from mm6
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3546 {
1644
dbd6f940f26c Fixed Celestia sky a bit.
Nomad
parents: 1642
diff changeset
3547 p2DEvents[i].uType = BuildingType_ElementalGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3548 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3549 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3550 if ( !_strnicmp(test_string, "sel", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3551 {
1644
dbd6f940f26c Fixed Celestia sky a bit.
Nomad
parents: 1642
diff changeset
3552 p2DEvents[i].uType = BuildingType_SelfGuild;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3553 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3554 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3555 if ( !_strnicmp(test_string, "mir", 3) )
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3556 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3557 p2DEvents[i].uType = BuildingType_16;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3558 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3559 }
1644
dbd6f940f26c Fixed Celestia sky a bit.
Nomad
parents: 1642
diff changeset
3560 if ( !_strnicmp(test_string, "mer", 3) ) // "Merc Guild" from mm6
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3561 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3562 p2DEvents[i].uType = BuildingType_TownHall;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3563 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3564 }
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3565 p2DEvents[i].uType = BuildingType_18;
237
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3566 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3567 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3568
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3569 case 4:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3570 p2DEvents[i].uAnimationID = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3571 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3572 case 5:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3573 p2DEvents[i].pName = RemoveQuotes(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3574 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3575 case 6:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3576 p2DEvents[i].pProprieterName = RemoveQuotes(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3577 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3578 case 7:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3579 p2DEvents[i].pProprieterTitle = RemoveQuotes(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3580 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3581 case 8:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3582 p2DEvents[i].field_14 = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3583 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3584 case 9:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3585 p2DEvents[i]._state = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3586 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3587 case 10:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3588 p2DEvents[i]._rep = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3589 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3590 case 11:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3591 p2DEvents[i]._per = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3592 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3593 case 12:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3594 p2DEvents[i].fPriceMultiplier = atof(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3595 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3596 case 13:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3597 p2DEvents[i].flt_24 = atof(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3598 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3599 case 15:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3600 p2DEvents[i].field_1C = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3601 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3602 case 18:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3603 p2DEvents[i].uOpenTime = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3604 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3605 case 19:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3606 p2DEvents[i].uCloseTime = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3607 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3608 case 20:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3609 p2DEvents[i].uExitPicID = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3610 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3611 case 21:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3612 p2DEvents[i].uExitMapID = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3613 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3614 case 22:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3615 p2DEvents[i]._quest_related = atoi(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3616 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3617 case 23:
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3618 p2DEvents[i].pEnterText = RemoveQuotes(test_string);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3619 break;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3620 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3621 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3622 ++decode_step;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3623 test_string=tmp_pos+1;
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3624 } while ((decode_step<24)&&!break_loop);
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3625 }
2799737f8a74 more text parsers refactor
Gloval
parents: 226
diff changeset
3626
0
Ritor1
parents:
diff changeset
3627 }
Ritor1
parents:
diff changeset
3628
Ritor1
parents:
diff changeset
3629 //----- (00443E31) --------------------------------------------------------
601
d59398528e4f level events loading fix
Gloval
parents: 580
diff changeset
3630 void LoadLevel_InitializeLevelStr()
d59398528e4f level events loading fix
Gloval
parents: 580
diff changeset
3631 {
329
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3632
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3633 char Args[100];
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3634 int string_num;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3635 int max_string_length;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3636 int current_string_length;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3637 int prev_string_offset;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3638
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3639 if (sizeof(pLevelStrOffsets) != 2000)
0
Ritor1
parents:
diff changeset
3640 Log::Warning(L"pLevelStrOffsets: deserialization warning");
1202
0dbf6c4dd029 arrays to std::arrays phase 1
Grumpy7
parents: 1167
diff changeset
3641 memset(pLevelStrOffsets.data(), 0, 2000);
0
Ritor1
parents:
diff changeset
3642
329
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3643 max_string_length = 0;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3644 string_num = 1;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3645 prev_string_offset = 0;
336
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3646 pLevelStrOffsets[0]=0;
0
Ritor1
parents:
diff changeset
3647 for (uint i = 0; i < uLevelStrFileSize; ++i)
Ritor1
parents:
diff changeset
3648 {
Ritor1
parents:
diff changeset
3649 if ( !pLevelStr[i] )
Ritor1
parents:
diff changeset
3650 {
329
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3651 pLevelStrOffsets[string_num] = i + 1;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3652 ++string_num;
329
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3653 if ( i - prev_string_offset > max_string_length )
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3654 max_string_length = i - prev_string_offset;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3655 prev_string_offset = i;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3656 }
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3657 }
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3658
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3659 uLevelStrNumStrings = string_num - 1;
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3660 if ( max_string_length > 800 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1544
diff changeset
3661 Error("MAX_EVENT_TEXT_LENGTH needs to be increased to %lu", max_string_length+1);
329
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3662
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3663 if ( uLevelStrNumStrings > 0 )
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3664 {
336
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3665 for(uint i = 0; i <uLevelStrNumStrings ; ++i)
329
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3666 {
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3667 if ( RemoveQuotes(&pLevelStr[pLevelStrOffsets[i]]) != &pLevelStr[pLevelStrOffsets[i]] )
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3668 ++pLevelStrOffsets[i];
f76027321087 LoadLevel_InitializeLevelStr
Gloval
parents: 323
diff changeset
3669 }
0
Ritor1
parents:
diff changeset
3670 }
Ritor1
parents:
diff changeset
3671 }
Ritor1
parents:
diff changeset
3672
Ritor1
parents:
diff changeset
3673 //----- (00443F95) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1445
diff changeset
3674 void OnMapLeave()
0
Ritor1
parents:
diff changeset
3675 {
336
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3676 _evt_raw *test_event;
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3677 if ( uLevelEVT_NumEvents > 0 )
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3678 {
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3679 for (uint i = 0; i < uLevelEVT_NumEvents; ++i)
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3680 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3681 test_event=(_evt_raw*)&pLevelEVT[pLevelEVT_Index[i].uEventOffsetInEVT];
1052
d48c762de563 -nomarg
Nomad
parents: 1037
diff changeset
3682 if ( test_event->_e_type == EVENT_OnMapLeave )
d48c762de563 -nomarg
Nomad
parents: 1037
diff changeset
3683 {
d48c762de563 -nomarg
Nomad
parents: 1037
diff changeset
3684 EventProcessor(pLevelEVT_Index[i].uEventID, 0, 1, pLevelEVT_Index[i].event_sequence_num);
336
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3685 }
ea55d6414029 Event_proceccor preliminary
Gloval
parents: 329
diff changeset
3686 }
0
Ritor1
parents:
diff changeset
3687 }
Ritor1
parents:
diff changeset
3688 }
Ritor1
parents:
diff changeset
3689
Ritor1
parents:
diff changeset
3690 //----- (00443FDC) --------------------------------------------------------
Ritor1
parents:
diff changeset
3691 void OnMapLoad()
781
d170f23f70d1 tidy, code moving
zipi
parents: 774
diff changeset
3692 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3693 __int16 v4; // cx@9
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3694 int v6; // eax@9
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3695 unsigned __int64 v8; // qax@26
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3696 unsigned int v9; // ecx@26
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3697 unsigned __int64 v10; // qax@26
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3698 unsigned __int64 v11; // qax@26
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3699 unsigned __int64 v13; // qax@26
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3700 unsigned __int64 v14; // qax@26
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3701 int v15; // ST58_4@26
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3702 unsigned __int64 v16; // qax@26
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3703 int hours; // ebx@26
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3704 unsigned __int64 v18; // [sp+Ch] [bp-44h]@12
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3705 unsigned int seconds; // [sp+14h] [bp-3Ch]@26
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3706 unsigned __int64 v20; // [sp+1Ch] [bp-34h]@7
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3707 unsigned int minutes; // [sp+2Ch] [bp-24h]@26
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3708 unsigned int years; // [sp+34h] [bp-1Ch]@26
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3709 unsigned int weeks; // [sp+38h] [bp-18h]@26
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3710 int v26; // [sp+3Ch] [bp-14h]@15
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3711 unsigned int days; // [sp+3Ch] [bp-14h]@26
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3712 unsigned int months; // [sp+40h] [bp-10h]@26
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3713 __int16 v29; // [sp+46h] [bp-Ah]@9
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3714 __int16 v30; // [sp+48h] [bp-8h]@9
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3715 __int16 v32; // [sp+4Ch] [bp-4h]@9
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3716 __int16 v33; // [sp+4Eh] [bp-2h]@9
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3717
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3718 for (uint i = 0; i < uLevelEVT_NumEvents; ++i)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3719 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3720 EventIndex pEvent = pLevelEVT_Index[i];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3721
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3722 _evt_raw* _evt = (_evt_raw *)(&pLevelEVT[pEvent.uEventOffsetInEVT]);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3723
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3724 if (_evt->_e_type == EVENT_PlaySound)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3725 pSoundList->LoadSound(EVT_DWORD(_evt->v5), 0);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3726 else if (_evt->_e_type == EVENT_OnMapReload)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3727 EventProcessor(pEvent.uEventID, 0, 0, pEvent.event_sequence_num);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3728 else if (_evt->_e_type == EVENT_OnTimer || _evt->_e_type == EVENT_Initialize)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3729 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3730 //v3 = &array_5B5928_timers[dword_5B65C8_timers_count];
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3731 v20 = pOutdoor->loc_time.uLastVisitDay;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3732 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3733 v20 = pIndoor->stru1.uLastVisitDay;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3734
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3735 array_5B5928_timers[dword_5B65C8_timers_count].timer_evt_type = _evt->_e_type;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3736 array_5B5928_timers[dword_5B65C8_timers_count].timer_evt_ID = pEvent.uEventID;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3737 array_5B5928_timers[dword_5B65C8_timers_count].timer_evt_seq_num = pEvent.event_sequence_num;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3738
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3739 array_5B5928_timers[dword_5B65C8_timers_count].field_10 = _evt->v5;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3740 array_5B5928_timers[dword_5B65C8_timers_count].field_12 = _evt->v6;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3741 array_5B5928_timers[dword_5B65C8_timers_count].field_14 = _evt->v7;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3742 array_5B5928_timers[dword_5B65C8_timers_count].field_16 = _evt->v8;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3743 array_5B5928_timers[dword_5B65C8_timers_count].field_18 = _evt->v9;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3744 array_5B5928_timers[dword_5B65C8_timers_count].field_1A = _evt->v10;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3745
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3746
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3747 v6 = ((unsigned short)_evt->v12 << 8) + _evt->v11;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3748
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3749 array_5B5928_timers[dword_5B65C8_timers_count].time_left_to_fire = ((unsigned short)_evt->v12 << 8) + _evt->v11;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3750 array_5B5928_timers[dword_5B65C8_timers_count].fire_interval = ((unsigned short)_evt->v12 << 8) + _evt->v11;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3751 if (array_5B5928_timers[dword_5B65C8_timers_count].timer_evt_type == EVENT_Initialize && !(short)v6 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3752 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3753 if ( v20 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3754 v18 = pParty->uTimePlayed - v20;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3755 else
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3756 v18 = 0;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3757 v26 = (signed int)(signed __int64)((double)(signed __int64)v18 * 0.234375) / 60 / 60 / 24;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3758
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3759 if ( v26 / 7 / 4 / 12 != 0 && array_5B5928_timers[dword_5B65C8_timers_count].field_10 ||
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3760 v26 / 7 / 4 != 0 && array_5B5928_timers[dword_5B65C8_timers_count].field_12 != 0 ||
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3761 v26 / 7 != 0 && array_5B5928_timers[dword_5B65C8_timers_count].field_14 != 0 ||
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3762 v26 != 0 || !v20)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3763 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3764 ++dword_5B65C8_timers_count;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3765 array_5B5928_timers[dword_5B65C8_timers_count].next_fire_time = 0;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3766 continue;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3767 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3768 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3769 else
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3770 {
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3771 v8 = (__int64)((double)pParty->uTimePlayed * 0.234375);
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3772 seconds = v8 % 60;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3773 v10 = v8 / 60;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3774 minutes = v10 % 60;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3775 v11 = v10 / 60;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3776 hours = v11 % 24;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3777 v13 = v11 / 24;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3778 days = v13 % 7;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3779 v14 = v13 / 7;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3780 weeks = v14 % 4;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3781 v16 = v14 / 4;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3782 months = v16 % 12;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3783 years = v16 / 12;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3784
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3785 if ( array_5B5928_timers[dword_5B65C8_timers_count].field_10 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3786 ++years;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3787 else if ( array_5B5928_timers[dword_5B65C8_timers_count].field_12 )
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3788 ++months;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3789 else if ( array_5B5928_timers[dword_5B65C8_timers_count].field_14 )
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3790 ++weeks;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3791 else
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3792 {
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3793 ++days;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3794 minutes = array_5B5928_timers[dword_5B65C8_timers_count].field_18;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3795 hours = array_5B5928_timers[dword_5B65C8_timers_count].field_16;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3796 seconds = array_5B5928_timers[dword_5B65C8_timers_count].field_1A;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3797 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3798 array_5B5928_timers[dword_5B65C8_timers_count].next_fire_time = (signed __int64)((double)((seconds
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3799 + 60 * minutes
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3800 + 3600 * hours
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3801 + 86400 * days
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3802 + 604800 * weeks
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3803 + 2419200 * months
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3804 + 29030400 * years) << 7)
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3805 * 0.033333335);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3806
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3807 ++dword_5B65C8_timers_count;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3808 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3809 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3810 }
781
d170f23f70d1 tidy, code moving
zipi
parents: 774
diff changeset
3811 }
0
Ritor1
parents:
diff changeset
3812
Ritor1
parents:
diff changeset
3813 //----- (00444360) --------------------------------------------------------
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3814 void Level_LoadEvtAndStr(const char *pLevelName)
0
Ritor1
parents:
diff changeset
3815 {
Ritor1
parents:
diff changeset
3816 char pContainerName[120]; // [sp+8h] [bp-98h]@1
Ritor1
parents:
diff changeset
3817
Ritor1
parents:
diff changeset
3818 sprintf(pContainerName, "%s.evt", pLevelName);
1541
86cb7398d2a8 mm8 icons
Nomad
parents: 1477
diff changeset
3819 uLevelEVT_Size = LoadEventsToBuffer(pContainerName, pLevelEVT.data(), 9216);
0
Ritor1
parents:
diff changeset
3820
Ritor1
parents:
diff changeset
3821 sprintf(pContainerName, "%s.str", pLevelName);
1541
86cb7398d2a8 mm8 icons
Nomad
parents: 1477
diff changeset
3822 uLevelStrFileSize = LoadEventsToBuffer(pContainerName, pLevelStr.data(), 9216);
0
Ritor1
parents:
diff changeset
3823 if (uLevelStrFileSize)
Ritor1
parents:
diff changeset
3824 LoadLevel_InitializeLevelStr();
Ritor1
parents:
diff changeset
3825 }
Ritor1
parents:
diff changeset
3826
Ritor1
parents:
diff changeset
3827 //----- (00444D80) --------------------------------------------------------
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3828 int GetTravelTime()
0
Ritor1
parents:
diff changeset
3829 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3830 signed int new_travel_time; // esi@1
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3831
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3832 new_travel_time = uDefaultTravelTime_ByFoot;
652
1ff57450f090 * Some fixes to TravelByTransport
Nomad
parents: 638
diff changeset
3833 if ( CheckHiredNPCSpeciality(Guide) )
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3834 --new_travel_time;
652
1ff57450f090 * Some fixes to TravelByTransport
Nomad
parents: 638
diff changeset
3835 if ( CheckHiredNPCSpeciality(Tracker) )
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3836 new_travel_time -= 2;
652
1ff57450f090 * Some fixes to TravelByTransport
Nomad
parents: 638
diff changeset
3837 if ( CheckHiredNPCSpeciality(Pathfinder) )
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3838 new_travel_time -= 3;
652
1ff57450f090 * Some fixes to TravelByTransport
Nomad
parents: 638
diff changeset
3839 if ( CheckHiredNPCSpeciality(Explorer) )
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3840 --new_travel_time;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3841 if ( new_travel_time < 1 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3842 new_travel_time = 1;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3843 return new_travel_time;
0
Ritor1
parents:
diff changeset
3844 }
Ritor1
parents:
diff changeset
3845 // 6BD07C: using guessed type int uDefaultTravelTime_ByFoot;
Ritor1
parents:
diff changeset
3846
Ritor1
parents:
diff changeset
3847 //----- (004451A8) --------------------------------------------------------
Ritor1
parents:
diff changeset
3848 void __fastcall sub_4451A8_press_any_key(int a1, int a2, int a4)
Ritor1
parents:
diff changeset
3849 {
Ritor1
parents:
diff changeset
3850 if ( !pGUIWindow2 )
Ritor1
parents:
diff changeset
3851 {
Ritor1
parents:
diff changeset
3852 if ( pParty->uFlags & 2 )
Ritor1
parents:
diff changeset
3853 pGame->Draw();
1052
d48c762de563 -nomarg
Nomad
parents: 1037
diff changeset
3854 pAudioPlayer->StopChannels(-1, -1);
0
Ritor1
parents:
diff changeset
3855 pMiscTimer->Pause();
Ritor1
parents:
diff changeset
3856 pEventTimer->Pause();
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3857 dword_5C3418 = a1;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3858 dword_5C341C = a2;
520
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 515
diff changeset
3859 _591094_decoration = activeLevelDecoration;
948
5a2dbb00c399 Code cleaning.
Nomad
parents: 945
diff changeset
3860 pGUIWindow2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_GreetingNPC, a4, 0);
5a2dbb00c399 Code cleaning.
Nomad
parents: 945
diff changeset
3861 pGUIWindow2->CreateButton( 61, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);
5a2dbb00c399 Code cleaning.
Nomad
parents: 945
diff changeset
3862 pGUIWindow2->CreateButton(177, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);
5a2dbb00c399 Code cleaning.
Nomad
parents: 945
diff changeset
3863 pGUIWindow2->CreateButton(292, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 3, '3', "", 0);
5a2dbb00c399 Code cleaning.
Nomad
parents: 945
diff changeset
3864 pGUIWindow2->CreateButton(407, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 4, '4', "", 0);
0
Ritor1
parents:
diff changeset
3865 }
Ritor1
parents:
diff changeset
3866 }
Ritor1
parents:
diff changeset
3867
Ritor1
parents:
diff changeset
3868 //----- (004452BB) --------------------------------------------------------
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
3869 void sub_4452BB()
0
Ritor1
parents:
diff changeset
3870 {
Ritor1
parents:
diff changeset
3871 pGUIWindow2->Release();
Ritor1
parents:
diff changeset
3872 pGUIWindow2 = 0;
520
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 515
diff changeset
3873 activeLevelDecoration = _591094_decoration;
1052
d48c762de563 -nomarg
Nomad
parents: 1037
diff changeset
3874 EventProcessor(dword_5C3418, 0, 1, dword_5C341C);
520
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 515
diff changeset
3875 activeLevelDecoration = NULL;
0
Ritor1
parents:
diff changeset
3876 pEventTimer->Resume();
Ritor1
parents:
diff changeset
3877 }
Ritor1
parents:
diff changeset
3878
Ritor1
parents:
diff changeset
3879 //----- (004465DF) --------------------------------------------------------
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3880 bool sub_4465DF_check_season(int a1)
0
Ritor1
parents:
diff changeset
3881 {
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3882 unsigned int monthPlusOne; // eax@1
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3883 unsigned int daysPlusOne; // edx@1
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3884
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3885 monthPlusOne = pParty->uCurrentMonth + 1;
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3886 daysPlusOne = pParty->uDaysPlayed + 1;
2125
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3887
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3888 switch (a1)
0
Ritor1
parents:
diff changeset
3889 {
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3890 case 3: //winter 12.21 -> 3.20
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3891 return (monthPlusOne == 12 && daysPlusOne >= 21 || monthPlusOne == 1 || monthPlusOne == 2 || monthPlusOne == 3 && daysPlusOne <= 20);
2125
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3892 break;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3893 case 2:// autumn/fall 9.21 -> 12.20
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3894 return (monthPlusOne == 9 && daysPlusOne >= 21 || monthPlusOne == 10 || monthPlusOne == 11 || monthPlusOne == 12 && daysPlusOne <= 20);
2125
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3895 break;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3896 case 1://summer 6.21 -> 9.20
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3897 return (monthPlusOne == 6 && daysPlusOne >= 21 || monthPlusOne == 7 || monthPlusOne == 8 || monthPlusOne == 9 && daysPlusOne <= 20);
2125
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3898 break;
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3899 case 0: //spring 3.21 -> 6.20
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3900 return (monthPlusOne == 3 && daysPlusOne >= 21 || monthPlusOne == 4 || monthPlusOne == 5 || monthPlusOne == 6 && daysPlusOne <= 20);
2125
ba3de1337989 house animations working
zipi
parents: 2124
diff changeset
3901 break;
0
Ritor1
parents:
diff changeset
3902 }
2193
4842f58715ea sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Grumpy7
parents: 2186
diff changeset
3903 Error("Unknown season");
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3904 return false;
0
Ritor1
parents:
diff changeset
3905 }
Ritor1
parents:
diff changeset
3906
Ritor1
parents:
diff changeset
3907 //----- (0044861E) --------------------------------------------------------
Ritor1
parents:
diff changeset
3908 void __fastcall sub_44861E_set_texture(unsigned int uFaceCog, const char *pFilename)
Ritor1
parents:
diff changeset
3909 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3910 unsigned int texture; // eax@2
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3911
0
Ritor1
parents:
diff changeset
3912 if ( uFaceCog )
Ritor1
parents:
diff changeset
3913 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3914 texture = pBitmaps_LOD->LoadTexture(pFilename);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3915 if ( texture != -1 ? (int)&pBitmaps_LOD->pTextures[texture] : 0 )
0
Ritor1
parents:
diff changeset
3916 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3917 pBitmaps_LOD->pTextures[texture].palette_id2 = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[texture].palette_id1);
0
Ritor1
parents:
diff changeset
3918
Ritor1
parents:
diff changeset
3919 if ( uCurrentlyLoadedLevelType == 1 )
Ritor1
parents:
diff changeset
3920 {
Ritor1
parents:
diff changeset
3921 if ( (signed int)pIndoor->uNumFaceExtras > 1 )
Ritor1
parents:
diff changeset
3922 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3923 for ( uint i = 1; i < (signed int)pIndoor->uNumFaceExtras; ++i )
0
Ritor1
parents:
diff changeset
3924 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3925 if ( pIndoor->pFaceExtras[i].sCogNumber == uFaceCog )
0
Ritor1
parents:
diff changeset
3926 {
2166
00bd098f6435 fixpoint_mul in different functions and others
Ritor1
parents: 2155
diff changeset
3927 if ( pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uAttributes & FACE_TEXTURE_FRAME )
0
Ritor1
parents:
diff changeset
3928 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3929 pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uBitmapID = pTextureFrameTable->FindTextureByName(pFilename);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3930 if ( pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uBitmapID)
0
Ritor1
parents:
diff changeset
3931 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3932 pTextureFrameTable->LoadAnimationSequenceAndPalettes(pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uBitmapID);
0
Ritor1
parents:
diff changeset
3933 }
Ritor1
parents:
diff changeset
3934 else
Ritor1
parents:
diff changeset
3935 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3936 pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uBitmapID = texture;
2166
00bd098f6435 fixpoint_mul in different functions and others
Ritor1
parents: 2155
diff changeset
3937 pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uAttributes &= 0xBF00;
0
Ritor1
parents:
diff changeset
3938 }
Ritor1
parents:
diff changeset
3939 }
Ritor1
parents:
diff changeset
3940 else
Ritor1
parents:
diff changeset
3941 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3942 pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uBitmapID = texture;
0
Ritor1
parents:
diff changeset
3943 }
Ritor1
parents:
diff changeset
3944 }
Ritor1
parents:
diff changeset
3945 }
Ritor1
parents:
diff changeset
3946 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3947 pParty->uFlags |= 2;
0
Ritor1
parents:
diff changeset
3948 }
Ritor1
parents:
diff changeset
3949 else
Ritor1
parents:
diff changeset
3950 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3951 for ( uint j = 0; j < (unsigned int)pOutdoor->uNumBModels; ++j )
0
Ritor1
parents:
diff changeset
3952 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3953 for ( uint i = 0; i < pOutdoor->pBModels[j].uNumFaces; ++i )
0
Ritor1
parents:
diff changeset
3954 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3955 if ( pOutdoor->pBModels[j].pFaces[i].sCogNumber == uFaceCog )
0
Ritor1
parents:
diff changeset
3956 {
2166
00bd098f6435 fixpoint_mul in different functions and others
Ritor1
parents: 2155
diff changeset
3957 if ( pOutdoor->pBModels[j].pFaces[i].uAttributes & FACE_TEXTURE_FRAME )
0
Ritor1
parents:
diff changeset
3958 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3959 pOutdoor->pBModels[j].pFaces[i].uTextureID = pTextureFrameTable->FindTextureByName(pFilename);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3960 if ( pOutdoor->pBModels[j].pFaces[i].uTextureID )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3961 pTextureFrameTable->LoadAnimationSequenceAndPalettes(pOutdoor->pBModels[j].pFaces[i].uTextureID);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3962 else
0
Ritor1
parents:
diff changeset
3963 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3964 pOutdoor->pBModels[j].pFaces[i].uTextureID = texture;
2166
00bd098f6435 fixpoint_mul in different functions and others
Ritor1
parents: 2155
diff changeset
3965 pOutdoor->pBModels[j].pFaces[i].uAttributes &= 0xBF00;
0
Ritor1
parents:
diff changeset
3966 }
Ritor1
parents:
diff changeset
3967 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3968 else
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3969 pOutdoor->pBModels[j].pFaces[i].uTextureID = texture;
0
Ritor1
parents:
diff changeset
3970 }
Ritor1
parents:
diff changeset
3971 }
Ritor1
parents:
diff changeset
3972 }
Ritor1
parents:
diff changeset
3973 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3974 pParty->uFlags |= 2;
0
Ritor1
parents:
diff changeset
3975 }
Ritor1
parents:
diff changeset
3976 }
Ritor1
parents:
diff changeset
3977 }
Ritor1
parents:
diff changeset
3978
Ritor1
parents:
diff changeset
3979 //----- (0044882F) --------------------------------------------------------
1515
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3980 void __fastcall SetDecorationSprite(uint16_t uCog, bool bHide, const char *pFileName)
0
Ritor1
parents:
diff changeset
3981 {
1515
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3982 for (size_t i = 0; i < uNumLevelDecorations; i++)
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3983 {
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3984 if (pLevelDecorations[i].uCog == uCog)
0
Ritor1
parents:
diff changeset
3985 {
1515
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3986 if (pFileName && strcmp(pFileName, "0"))
0
Ritor1
parents:
diff changeset
3987 {
1515
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3988 pLevelDecorations[i].uDecorationDescID = pDecorationList->GetDecorIdByName(pFileName);
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3989 pDecorationList->InitializeDecorationSprite(pLevelDecorations[i].uDecorationDescID);
0
Ritor1
parents:
diff changeset
3990 }
1515
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3991
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3992 if (bHide)
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3993 pLevelDecorations[i].uFlags &= ~LEVEL_DECORATION_INVISIBLE;
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3994 else
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3995 pLevelDecorations[i].uFlags |= LEVEL_DECORATION_INVISIBLE;
46f6fc6f72fd Clean :-)
yoctozepto
parents: 1504
diff changeset
3996
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
3997 pParty->uFlags |= 2;
0
Ritor1
parents:
diff changeset
3998 }
Ritor1
parents:
diff changeset
3999 }
Ritor1
parents:
diff changeset
4000 }
Ritor1
parents:
diff changeset
4001
Ritor1
parents:
diff changeset
4002 //----- (0044892E) --------------------------------------------------------
Ritor1
parents:
diff changeset
4003 void __fastcall sub_44892E_set_faces_bit(int sCogNumber, int bit, int on)
Ritor1
parents:
diff changeset
4004 {
Ritor1
parents:
diff changeset
4005 if ( sCogNumber )
Ritor1
parents:
diff changeset
4006 {
Ritor1
parents:
diff changeset
4007 if ( uCurrentlyLoadedLevelType == 1 )
Ritor1
parents:
diff changeset
4008 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4009 for ( uint i = 1; i < (unsigned int)pIndoor->uNumFaceExtras; ++i )
0
Ritor1
parents:
diff changeset
4010 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4011 if ( pIndoor->pFaceExtras[i].sCogNumber == sCogNumber )
0
Ritor1
parents:
diff changeset
4012 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4013 if ( on )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4014 pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uAttributes |= bit;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4015 else
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4016 pIndoor->pFaces[pIndoor->pFaceExtras[i].field_C].uAttributes &= ~bit;
0
Ritor1
parents:
diff changeset
4017 }
Ritor1
parents:
diff changeset
4018 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4019 pParty->uFlags |= 2;
0
Ritor1
parents:
diff changeset
4020 }
Ritor1
parents:
diff changeset
4021 else
Ritor1
parents:
diff changeset
4022 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4023 for ( uint j = 0; j < (unsigned int)pOutdoor->uNumBModels; ++j )
0
Ritor1
parents:
diff changeset
4024 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4025 for ( uint i = 0; i < (unsigned int)pOutdoor->pBModels[j].uNumFaces; ++i )
0
Ritor1
parents:
diff changeset
4026 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4027 if ( pOutdoor->pBModels[j].pFaces[i].sCogNumber == sCogNumber )
0
Ritor1
parents:
diff changeset
4028 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4029 if ( on )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4030 pOutdoor->pBModels[j].pFaces[i].uAttributes |= bit;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4031 else
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4032 pOutdoor->pBModels[j].pFaces[i].uAttributes &= ~bit;
0
Ritor1
parents:
diff changeset
4033 }
Ritor1
parents:
diff changeset
4034 }
Ritor1
parents:
diff changeset
4035 }
Ritor1
parents:
diff changeset
4036 }
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4037 pParty->uFlags |= 2;
0
Ritor1
parents:
diff changeset
4038 }
Ritor1
parents:
diff changeset
4039 }
Ritor1
parents:
diff changeset
4040
Ritor1
parents:
diff changeset
4041
Ritor1
parents:
diff changeset
4042 //----- (00448B45) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1445
diff changeset
4043 void GameUI_StatusBar_UpdateTimedString(unsigned int bForceHide)
0
Ritor1
parents:
diff changeset
4044 {
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4045 if ( bForceHide || GameUI_Footer_TimeLeft && GetTickCount() >= GameUI_Footer_TimeLeft )
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4046 GameUI_Footer_TimeLeft = 0;
0
Ritor1
parents:
diff changeset
4047 }
Ritor1
parents:
diff changeset
4048
Ritor1
parents:
diff changeset
4049 //----- (00448B67) --------------------------------------------------------
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
4050 void OnTimer(int)
790
Nomad
parents: 789 788
diff changeset
4051 {
789
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4052 if (pEventTimer->bPaused)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4053 return;
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4054
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
4055 long long v13 = (signed __int64)(pParty->uTimePlayed - _5773B8_event_timer) / 128;
789
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4056 if (!v13)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4057 return;
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4058
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4059 //uint _v2v3 = pParty->uTimePlayed;
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4060 //v3 = HIDWORD(pParty->uTimePlayed);
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4061 //v2 = LODWORD(pParty->uTimePlayed);
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4062
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4063 _5773B8_event_timer = pParty->uTimePlayed;
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4064
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4065 for (uint i = 0; i < dword_5B65C8_timers_count; ++i)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4066 {
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4067 //v4 = (char *)&array_5B5928_timers[0].field_C;
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1951
diff changeset
4068 stru176* timer = &array_5B5928_timers[i];
789
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4069 //while ( 1 )
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4070 //{
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4071 //v5 = *(short *)v4;
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4072 if (timer->time_left_to_fire)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4073 {
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4074 if (v13 < timer->time_left_to_fire)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4075 timer->time_left_to_fire -= v13;
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4076 else
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4077 {
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4078 timer->time_left_to_fire = timer->fire_interval;
1052
d48c762de563 -nomarg
Nomad
parents: 1037
diff changeset
4079 EventProcessor(timer->timer_evt_ID, 0, 1, timer->timer_evt_seq_num);
789
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4080 }
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4081 }
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4082 else
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4083 {
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4084 if (timer->next_fire_time < pParty->uTimePlayed)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4085 {
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4086 uint next_trigger_time = 1 * 60 * 60 * 24; // 1 day
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4087 if (timer->field_10)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4088 next_trigger_time = 336 * 60 * 60 * 24; // 1 year
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4089 else if (timer->field_12)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4090 next_trigger_time = 28 * 60 * 60 * 24; // 1 month
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4091 else if (timer->field_14)
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4092 next_trigger_time = 7 * 60 * 60 * 24; // 1 week
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4093
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4094 timer->next_fire_time += (next_trigger_time * 128) / 3.0f;
1052
d48c762de563 -nomarg
Nomad
parents: 1037
diff changeset
4095 if (timer->next_fire_time < pParty->uTimePlayed) // make sure in wont fire several times in a row if big time interval has lapsed
789
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4096 timer->next_fire_time = pParty->uTimePlayed;
83a58d185d3c stru176 & OnTimer
Nomad
parents: 784
diff changeset
4097
1052
d48c762de563 -nomarg
Nomad
parents: 1037
diff changeset
4098 EventProcessor(timer->timer_evt_ID, 0, 1, timer->timer_evt_seq_num);
0
Ritor1
parents:
diff changeset
4099 }
Ritor1
parents:
diff changeset
4100 }
Ritor1
parents:
diff changeset
4101 }
Ritor1
parents:
diff changeset
4102 }
Ritor1
parents:
diff changeset
4103
Ritor1
parents:
diff changeset
4104 //----- (00481D77) --------------------------------------------------------
Ritor1
parents:
diff changeset
4105 void _outdoor_project(RenderVertexSoft *v)
Ritor1
parents:
diff changeset
4106 {
Ritor1
parents:
diff changeset
4107 double v1; // st7@1
Ritor1
parents:
diff changeset
4108 double v2; // st7@1
Ritor1
parents:
diff changeset
4109
Ritor1
parents:
diff changeset
4110 v1 = 1.0 / (v->vWorldViewPosition.x + 0.0000001);
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
4111 v->_rhw = v1;
1637
2c71fa8913d2 class OutdoorCamera -> ODMRenderParams
Nomad
parents: 1632
diff changeset
4112 v2 = v1 * (double)pODMRenderParams->int_fov_rad;
0
Ritor1
parents:
diff changeset
4113 v->vWorldViewProjX = (double)pViewport->uScreenCenterX - v2 * v->vWorldViewPosition.y;
Ritor1
parents:
diff changeset
4114 v->vWorldViewProjY = (double)pViewport->uScreenCenterY - v2 * v->vWorldViewPosition.z;
Ritor1
parents:
diff changeset
4115 }
Ritor1
parents:
diff changeset
4116
Ritor1
parents:
diff changeset
4117 //----- (00448CF4) --------------------------------------------------------
Ritor1
parents:
diff changeset
4118 void __fastcall sub_448CF4_spawn_monsters(__int16 typeindex, __int16 level, int count, int x, int y, int z, int group, unsigned int uUniqueName)
Ritor1
parents:
diff changeset
4119 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4120 unsigned int map_id; // eax@1
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4121 size_t old_num_actors; // ebx@2
0
Ritor1
parents:
diff changeset
4122 AIDirection v15; // [sp+28h] [bp-34h]@2
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4123 SpawnPointMM7 pSpawnPoint; // [sp+44h] [bp-18h]@1
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4124
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4125 pSpawnPoint.vPosition.x = x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4126 pSpawnPoint.vPosition.y = y;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4127 pSpawnPoint.vPosition.z = z;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4128 pSpawnPoint.uGroup = group;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4129 pSpawnPoint.uRadius = 32;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4130 pSpawnPoint.uKind = 3;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4131 pSpawnPoint.uIndex = typeindex + 2 * level + level;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4132 map_id = pMapStats->GetMapInfo(pCurrentMapName);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4133 if ( map_id )
0
Ritor1
parents:
diff changeset
4134 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4135 old_num_actors = uNumActors;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4136 SpawnEncounter(&pMapStats->pInfos[map_id], &pSpawnPoint, 0, count, 0);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4137 Actor::GetDirectionInfo(PID(OBJECT_Actor, old_num_actors), 4, &v15, 1);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4138 for ( uint i = (unsigned int)old_num_actors; i < (unsigned int)uNumActors; ++i )
0
Ritor1
parents:
diff changeset
4139 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4140 pActors[i].PrepareSprites(0);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4141 pActors[i].uYawAngle = v15.uYawAngle;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4142 pActors[i].dword_000334_unique_name = uUniqueName;
0
Ritor1
parents:
diff changeset
4143 }
Ritor1
parents:
diff changeset
4144 }
Ritor1
parents:
diff changeset
4145 }
Ritor1
parents:
diff changeset
4146
Ritor1
parents:
diff changeset
4147 //----- (0044987B) --------------------------------------------------------
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4148 void Transition_StopSound_Autosave(const char *pMapName, MapStartPoint start_point)
0
Ritor1
parents:
diff changeset
4149 {
Ritor1
parents:
diff changeset
4150 pAudioPlayer->StopChannels(-1, -1);
434
137c59c3dbc4 Temple of Moon and Dragon Lair can now be entered.
Nomad
parents: 433
diff changeset
4151 pGameLoadingUI_ProgressBar->Initialize(GUIProgressBar::TYPE_None);
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4152 if ( _stricmp(pCurrentMapName, pMapName) )
0
Ritor1
parents:
diff changeset
4153 SaveGame(1, 0);
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4154
2124
7f403ebf619f GAME_STATE_CHANGE_LOCATION
Ritor1
parents: 2121
diff changeset
4155 uGameState = GAME_STATE_CHANGE_LOCATION;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4156 strcpy(pCurrentMapName, pMapName);
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4157 uLevel_StartingPointType = start_point;
0
Ritor1
parents:
diff changeset
4158 }
Ritor1
parents:
diff changeset
4159 // 6BE35C: using guessed type int uLevel_StartingPointType;
Ritor1
parents:
diff changeset
4160
Ritor1
parents:
diff changeset
4161 //----- (004498D5) --------------------------------------------------------
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4162 void TeleportToStartingPoint(MapStartPoint point)
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4163 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4164 const char *model_name; // [sp-4h] [bp-84h]@6
0
Ritor1
parents:
diff changeset
4165 char pName[128]; // [sp+8h] [bp-78h]@11
Ritor1
parents:
diff changeset
4166
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4167 switch (point)
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4168 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4169 case MapStartPoint_Party: model_name = "Party Start"; break;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4170 case MapStartPoint_North: model_name = "North Start"; break;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4171 case MapStartPoint_South: model_name = "South Start"; break;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4172 case MapStartPoint_East: model_name = "East Start"; break;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4173 case MapStartPoint_West: model_name = "West Start"; break;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4174 default:
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4175 Error("Invalid enum value: %u", point);
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4176 }
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4177
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4178 strcpy(pName, model_name);
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4179 if ( pDecorationList->GetDecorIdByName(pName) )
0
Ritor1
parents:
diff changeset
4180 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4181
0
Ritor1
parents:
diff changeset
4182 if ( (signed int)uNumLevelDecorations > 0 )
Ritor1
parents:
diff changeset
4183 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4184 for ( uint i = 0; i < (signed int)uNumLevelDecorations; ++i )
0
Ritor1
parents:
diff changeset
4185 {
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4186 if ( pLevelDecorations[i].uDecorationDescID == (signed __int16)pDecorationList->GetDecorIdByName(pName) )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4187 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4188 pParty->vPosition.x = pLevelDecorations[i].vPosition.x;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4189 pParty->vPosition.y = pLevelDecorations[i].vPosition.y;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4190 pParty->vPosition.z = pLevelDecorations[i].vPosition.z;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4191 pParty->uFallStartY = pParty->vPosition.z;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4192 pParty->sRotationY = (signed int)(stru_5C6E00->uIntegerHalfPi * pLevelDecorations[i].field_1A) / 90;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4193 if ( pLevelDecorations[i].field_10_y_rot )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4194 pParty->sRotationY = pLevelDecorations[i].field_10_y_rot;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4195 pParty->sRotationX = 0;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4196 pParty->uFallSpeed = 0;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4197 }
0
Ritor1
parents:
diff changeset
4198 }
Ritor1
parents:
diff changeset
4199 }
Ritor1
parents:
diff changeset
4200 if ( dword_5B65C0 )
Ritor1
parents:
diff changeset
4201 {
Ritor1
parents:
diff changeset
4202 if ( _5B65A8_npcdata_uflags_or_other )
Ritor1
parents:
diff changeset
4203 pParty->vPosition.x = _5B65A8_npcdata_uflags_or_other;
Ritor1
parents:
diff changeset
4204 if ( _5B65AC_npcdata_fame_or_other )
Ritor1
parents:
diff changeset
4205 pParty->vPosition.y = _5B65AC_npcdata_fame_or_other;
Ritor1
parents:
diff changeset
4206 if ( _5B65B0_npcdata_rep_or_other )
Ritor1
parents:
diff changeset
4207 {
Ritor1
parents:
diff changeset
4208 pParty->vPosition.z = _5B65B0_npcdata_rep_or_other;
Ritor1
parents:
diff changeset
4209 pParty->uFallStartY = _5B65B0_npcdata_rep_or_other;
Ritor1
parents:
diff changeset
4210 }
1516
f3cd08b89476 Fix assertion error when exiting Harmondale's castle. Possibly original bug.
yoctozepto
parents: 1515
diff changeset
4211 if ( _5B65B4_npcdata_loword_house_or_other != -1 )
0
Ritor1
parents:
diff changeset
4212 pParty->sRotationY = _5B65B4_npcdata_loword_house_or_other;
Ritor1
parents:
diff changeset
4213 if ( _5B65B8_npcdata_hiword_house_or_other )
Ritor1
parents:
diff changeset
4214 pParty->sRotationX = _5B65B8_npcdata_hiword_house_or_other;
Ritor1
parents:
diff changeset
4215 if ( dword_5B65BC )
Ritor1
parents:
diff changeset
4216 pParty->uFallSpeed = dword_5B65BC;
Ritor1
parents:
diff changeset
4217 }
Ritor1
parents:
diff changeset
4218 _5B65B4_npcdata_loword_house_or_other = -1;
Ritor1
parents:
diff changeset
4219 dword_5B65C0 = 0;
Ritor1
parents:
diff changeset
4220 dword_5B65BC = 0;
Ritor1
parents:
diff changeset
4221 _5B65B8_npcdata_hiword_house_or_other = 0;
Ritor1
parents:
diff changeset
4222 _5B65B0_npcdata_rep_or_other = 0;
Ritor1
parents:
diff changeset
4223 _5B65AC_npcdata_fame_or_other = 0;
Ritor1
parents:
diff changeset
4224 _5B65A8_npcdata_uflags_or_other = 0;
Ritor1
parents:
diff changeset
4225 }
Ritor1
parents:
diff changeset
4226 }
1035
306ec23b37df 004C1EE5 & other stuff
Nomad
parents: 1033
diff changeset
4227
0
Ritor1
parents:
diff changeset
4228 //----- (00449B57) --------------------------------------------------------
521
663c4f618f56 Awards tab corrrection
Gloval
parents: 520
diff changeset
4229 bool _449B57_test_bit( unsigned __int8 *a1, __int16 a2 )
1035
306ec23b37df 004C1EE5 & other stuff
Nomad
parents: 1033
diff changeset
4230 {
1113
39eaa6b00141 something to bool cast (performance warning) mostly fixed
Grumpy7
parents: 1112
diff changeset
4231 return (a1[(a2 - 1) >> 3] & (0x80u >> (a2 - 1) % 8)) != 0;
0
Ritor1
parents:
diff changeset
4232 }
Ritor1
parents:
diff changeset
4233
Ritor1
parents:
diff changeset
4234 //----- (00449B7E) --------------------------------------------------------
501
6fa3ff8ef729 SubtractVariables
Ritor1
parents: 488
diff changeset
4235 void _449B7E_toggle_bit(unsigned char *pArray, __int16 a2, unsigned __int16 bToggle)
0
Ritor1
parents:
diff changeset
4236 {
Ritor1
parents:
diff changeset
4237 signed int v3; // esi@1
501
6fa3ff8ef729 SubtractVariables
Ritor1
parents: 488
diff changeset
4238 unsigned char set_bit; // edx@1
0
Ritor1
parents:
diff changeset
4239
Ritor1
parents:
diff changeset
4240 v3 = a2 - 1;
501
6fa3ff8ef729 SubtractVariables
Ritor1
parents: 488
diff changeset
4241 set_bit = 0x80 >> v3 % 8;
0
Ritor1
parents:
diff changeset
4242 if ( bToggle )
501
6fa3ff8ef729 SubtractVariables
Ritor1
parents: 488
diff changeset
4243 pArray[v3 / 8] |= set_bit;
6fa3ff8ef729 SubtractVariables
Ritor1
parents: 488
diff changeset
4244 else
6fa3ff8ef729 SubtractVariables
Ritor1
parents: 488
diff changeset
4245 pArray[v3 / 8] &= ~set_bit;
0
Ritor1
parents:
diff changeset
4246 }
Ritor1
parents:
diff changeset
4247
Ritor1
parents:
diff changeset
4248 //----- (0044C175) --------------------------------------------------------
1160
502b8b2e36b4 font cleaning
Gloval
parents: 1119
diff changeset
4249 void ShowStatusBarString( const char *pString, unsigned int uNumSeconds )
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4250 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
4251 strcpy(GameUI_Footer_TimedString.data(), pString);
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4252 GameUI_Footer_TimeLeft = 1000 * uNumSeconds + GetTickCount();
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4253
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
4254 for (int i = pFontLucida->GetLineWidth(GameUI_Footer_TimedString.data()); i > 450;
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
4255 i = pFontLucida->GetLineWidth(GameUI_Footer_TimedString.data()) )
1470
c987b5ed09af footer array fix
zipi
parents: 1459
diff changeset
4256 GameUI_Footer_TimedString[strlen(GameUI_Footer_TimedString.data()) - 1] = 0;
0
Ritor1
parents:
diff changeset
4257 }
Ritor1
parents:
diff changeset
4258
Ritor1
parents:
diff changeset
4259 //----- (0044C1D0) --------------------------------------------------------
1035
306ec23b37df 004C1EE5 & other stuff
Nomad
parents: 1033
diff changeset
4260 void ShowNothingHereStatus()
0
Ritor1
parents:
diff changeset
4261 {
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 774
diff changeset
4262 if ( !GameUI_Footer_TimeLeft )
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4263 ShowStatusBarString(pGlobalTXT_LocalizationStrings[521], 2);// Nothing here
0
Ritor1
parents:
diff changeset
4264 }
Ritor1
parents:
diff changeset
4265
Ritor1
parents:
diff changeset
4266 //----- (0044C28B) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4267 int const_2()
0
Ritor1
parents:
diff changeset
4268 {
Ritor1
parents:
diff changeset
4269 return 2;
Ritor1
parents:
diff changeset
4270 }
Ritor1
parents:
diff changeset
4271
Ritor1
parents:
diff changeset
4272 //----- (0044C28F) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4273 bool TeleportToNWCDungeon()
0
Ritor1
parents:
diff changeset
4274 {
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1470
diff changeset
4275 if (!_stricmp("nwc.blv", pCurrentMapName))
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4276 return false;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4277
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4278 _5B65A8_npcdata_uflags_or_other = 0;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4279 _5B65AC_npcdata_fame_or_other = 0;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4280 _5B65B0_npcdata_rep_or_other = 0;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4281 _5B65B4_npcdata_loword_house_or_other = 0;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4282 _5B65B8_npcdata_hiword_house_or_other = 0;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4283 dword_5B65BC = 0;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4284 dword_5B65C0 = 0;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4285
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4286 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2086
diff changeset
4287 Transition_StopSound_Autosave("nwc.blv", MapStartPoint_Party);
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4288 pCurrentScreen = SCREEN_GAME;
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
4289 return true;
0
Ritor1
parents:
diff changeset
4290 }
Ritor1
parents:
diff changeset
4291
Ritor1
parents:
diff changeset
4292 //----- (00401000) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1445
diff changeset
4293 void mm7__vector_constructor(void *a1, int objSize, int numObjs, int ( *constructor)(int))
0
Ritor1
parents:
diff changeset
4294 {
Ritor1
parents:
diff changeset
4295 void *v4; // esi@2
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
4296
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
4297 if ( numObjs > 0 )
0
Ritor1
parents:
diff changeset
4298 {
Ritor1
parents:
diff changeset
4299 v4 = a1;
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
4300 for ( int i = numObjs; i; --i )
0
Ritor1
parents:
diff changeset
4301 {
Ritor1
parents:
diff changeset
4302 constructor((int)v4);
Ritor1
parents:
diff changeset
4303 v4 = (char *)v4 + objSize;
Ritor1
parents:
diff changeset
4304 }
Ritor1
parents:
diff changeset
4305 }
Ritor1
parents:
diff changeset
4306 }
Ritor1
parents:
diff changeset
4307
Ritor1
parents:
diff changeset
4308 //----- (0040261D) --------------------------------------------------------
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4309 void stru298::Add(__int16 uID, __int16 a3, __int16 x, __int16 y, __int16 z, char a7, char a8)
0
Ritor1
parents:
diff changeset
4310 {
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4311 if (count < 100)
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4312 {
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4313 pIDs[count] = uID;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4314 pXs[count] = x;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4315 pYs[count] = y;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4316 pZs[count] = z;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4317 field_324[count] = a3;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4318 field_3EC[count] = a8;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4319 field_450[count++] = a7;
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
4320 }
0
Ritor1
parents:
diff changeset
4321 }
Ritor1
parents:
diff changeset
4322
Ritor1
parents:
diff changeset
4323 //----- (00402CAE) --------------------------------------------------------
323
d720a13e2273 Very basic picking & entering houses
Nomad
parents: 322
diff changeset
4324 int stru193_math::Cos(int angle)
0
Ritor1
parents:
diff changeset
4325 {
Ritor1
parents:
diff changeset
4326 int v2; // eax@1
Ritor1
parents:
diff changeset
4327
Ritor1
parents:
diff changeset
4328 //a2: (angle - uIntegerHalfPi) for sin(angle)
Ritor1
parents:
diff changeset
4329 // (angle) for cos(angle)
Ritor1
parents:
diff changeset
4330
Ritor1
parents:
diff changeset
4331 v2 = uDoublePiMask & angle;
Ritor1
parents:
diff changeset
4332
Ritor1
parents:
diff changeset
4333 if ( v2 > uIntegerPi )
Ritor1
parents:
diff changeset
4334 v2 = uIntegerDoublePi - v2;
Ritor1
parents:
diff changeset
4335 if ( v2 >= uIntegerHalfPi )
Ritor1
parents:
diff changeset
4336 return -pCosTable[uIntegerPi - v2];
Ritor1
parents:
diff changeset
4337 else
Ritor1
parents:
diff changeset
4338 return pCosTable[v2];
Ritor1
parents:
diff changeset
4339 }
Ritor1
parents:
diff changeset
4340