Mercurial > mm7
comparison mm7_2.cpp @ 1410:38df78aba732
deleted stru220.h and stru220 (bezier terrain stuff)
stru167 -> TrailParticle
stru167warp -> TrailParticleGenerator
author | Nomad |
---|---|
date | Fri, 26 Jul 2013 22:19:29 +0200 |
parents | c9e3b93ec570 |
children | 2423bc2af692 |
comparison
equal
deleted
inserted
replaced
1409:c9e3b93ec570 | 1410:38df78aba732 |
---|---|
5365 assert(sizeof(PaletteManager) == 0x267AF0); | 5365 assert(sizeof(PaletteManager) == 0x267AF0); |
5366 assert(sizeof(ViewingParams) == 0x26C); | 5366 assert(sizeof(ViewingParams) == 0x26C); |
5367 assert(sizeof(IndoorCamera) == 0x50); | 5367 assert(sizeof(IndoorCamera) == 0x50); |
5368 assert(sizeof(Bloodsplat) == 0x28); | 5368 assert(sizeof(Bloodsplat) == 0x28); |
5369 assert(sizeof(BloodsplatContainer) == 0xA0C); | 5369 assert(sizeof(BloodsplatContainer) == 0xA0C); |
5370 assert(sizeof(stru167) == 0x18); | 5370 assert(sizeof(TrailParticle) == 0x18); |
5371 assert(sizeof(EventIndex) == 0xC); | 5371 assert(sizeof(EventIndex) == 0xC); |
5372 assert(sizeof(_2devent) == 0x34); | 5372 assert(sizeof(_2devent) == 0x34); |
5373 assert(sizeof(stru176) == 0x20); | 5373 assert(sizeof(stru176) == 0x20); |
5374 assert(sizeof(SavegameHeader) == 0x64); | 5374 assert(sizeof(SavegameHeader) == 0x64); |
5375 assert(sizeof(SavegameList) == 0x3138); | 5375 assert(sizeof(SavegameList) == 0x3138); |
5773 { | 5773 { |
5774 outdoor_grid_band_1 = 10; | 5774 outdoor_grid_band_1 = 10; |
5775 outdoor_grid_band_2 = 15; | 5775 outdoor_grid_band_2 = 15; |
5776 outdoor_grid_band_3 = 20; | 5776 outdoor_grid_band_3 = 20; |
5777 pOutdoorCamera->shading_dist_mist = 8192; | 5777 pOutdoorCamera->shading_dist_mist = 8192; |
5778 pOutdoorCamera->bNoSky = 0; | 5778 pOutdoorCamera->bNoSky = false; |
5779 LOBYTE(viewparams->field_20) = 0; | 5779 LOBYTE(viewparams->field_20) = 0; |
5780 } | 5780 } |
5781 mipmapping_terrain_mm1 = 1024; | 5781 mipmapping_terrain_mm1 = 1024; |
5782 mipmapping_terrain_mm2 = 2048; | 5782 mipmapping_terrain_mm2 = 2048; |
5783 mipmapping_building_mm1 = 1024; | 5783 mipmapping_building_mm1 = 1024; |
5787 pOutdoorCamera->building_gamme = 0; | 5787 pOutdoorCamera->building_gamme = 0; |
5788 mipmapping_terrain_mm3 = 4096; | 5788 mipmapping_terrain_mm3 = 4096; |
5789 mipmapping_building_mm3 = 4096; | 5789 mipmapping_building_mm3 = 4096; |
5790 pOutdoorCamera->shading_dist_shademist = 4096; | 5790 pOutdoorCamera->shading_dist_shademist = 4096; |
5791 pOutdoorCamera->outdoor_no_wavy_water = 0; | 5791 pOutdoorCamera->outdoor_no_wavy_water = 0; |
5792 sub_47F4D3(outdoor_grid_band_1, outdoor_grid_band_2, outdoor_grid_band_3); | 5792 //_47F4D3_initialize_terrain_bezier_stuff(outdoor_grid_band_1, outdoor_grid_band_2, outdoor_grid_band_3); |
5793 { | |
5794 pOutdoorCamera->outdoor_grid_band_3 = outdoor_grid_band_3; | |
5795 pOutdoorCamera->uPickDepth = outdoor_grid_band_3 * 512; | |
5796 } | |
5793 } | 5797 } |
5794 else | 5798 else |
5795 { | 5799 { |
5796 LOBYTE(viewparams->field_20) = 0; | 5800 LOBYTE(viewparams->field_20) = 0; |
5797 } | 5801 } |
7225 v2->vVelocity.x = 0; | 7229 v2->vVelocity.x = 0; |
7226 v40 = v2->vPosition.x; | 7230 v40 = v2->vPosition.x; |
7227 v2->uSpriteFrameID = 0; | 7231 v2->uSpriteFrameID = 0; |
7228 v147 = v38; | 7232 v147 = v38; |
7229 stru_50FE08.Add(v38, 512, v40, v39, v37, 0, 0); | 7233 stru_50FE08.Add(v38, 512, v40, v39, v37, 0, 0); |
7230 if ( HIBYTE(v3->uFlags) & 1 ) | 7234 if (v3->uFlags & OBJECT_DESC_TRIAL_PARTICLE) |
7231 array_5118E8._440E91(v2->vPosition.x, v2->vPosition.y, v2->vPosition.z, 0, v3->uParticleTrailColor); | 7235 trail_particle_generator.GenerateTrailParticles(v2->vPosition.x, v2->vPosition.y, v2->vPosition.z, v3->uParticleTrailColor); |
7232 v133 = 0; | 7236 v133 = 0; |
7233 v131 = 0; | 7237 v131 = 0; |
7234 v130 = 0; | 7238 v130 = 0; |
7235 v129 = 0; | 7239 v129 = 0; |
7236 v128 = -1; | 7240 v128 = -1; |
7283 v2->vVelocity.y = v32; | 7287 v2->vVelocity.y = v32; |
7284 v104 = v2->vPosition.x; | 7288 v104 = v2->vPosition.x; |
7285 v2->vVelocity.z = v32; | 7289 v2->vVelocity.z = v32; |
7286 v149 = v102; | 7290 v149 = v102; |
7287 stru_50FE08.Add(v102, 512, v104, v103, v101, v100, v32); | 7291 stru_50FE08.Add(v102, 512, v104, v103, v101, v100, v32); |
7288 if ( HIBYTE(v3->uFlags) & 1 ) | 7292 if (v3->uFlags & OBJECT_DESC_TRIAL_PARTICLE) |
7289 array_5118E8._440E91( | 7293 trail_particle_generator.GenerateTrailParticles( |
7290 v2->vPosition.x, | 7294 v2->vPosition.x, |
7291 v2->vPosition.y, | 7295 v2->vPosition.y, |
7292 v2->vPosition.z, | 7296 v2->vPosition.z, |
7293 v32, | |
7294 v3->uParticleTrailColor); | 7297 v3->uParticleTrailColor); |
7295 v105 = v2->uSoundID; | 7298 v105 = v2->uSoundID; |
7296 if ( v105 == (short)v32 ) | 7299 if ( v105 == (short)v32 ) |
7297 v47 = 0; | 7300 v47 = 0; |
7298 else | 7301 else |