Mercurial > mm7

comparison Outdoor.cpp @ 179:f102bbff6fd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
15.02.13 Water
author Ritor1
date Fri, 15 Feb 2013 17:14:24 +0600
parents 49e74dee4eab
children 16d257ffc802
comparison
equal deleted inserted replaced
178:1dfa65be220e 179:f102bbff6fd8
2430 2430
2431 v3 = this->pTerrain.pTilemap[uY * 128 + uX]; 2431 v3 = this->pTerrain.pTilemap[uY * 128 + uX];
2432 if (v3 < 198) 2432 if (v3 < 198)
2433 { 2433 {
2434 if (v3 >= 90) 2434 if (v3 >= 90)
2435 v3 = v3 + this->pTileTypes[(v3 - 90) / 18].uTileID - 36 * (v3 - 90) / 36 - 90; 2435 v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90;
2436 } 2436 }
2437 else 2437 else
2438 v3 = v3 + this->pTileTypes[3].uTileID - 198; 2438 v3 = v3 + this->pTileTypes[3].uTileID - 198;
2439 2439
2440 return pTileTable->pTiles[v3].uBitmapID; 2440 return pTileTable->pTiles[v3].uBitmapID;
2468 if ( v3 >= 90 ) 2468 if ( v3 >= 90 )
2469 v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90; 2469 v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90;
2470 result = pTileTable->pTiles[v3].uAttributes; 2470 result = pTileTable->pTiles[v3].uAttributes;
2471 } 2471 }
2472 return result;*/ 2472 return result;*/
2473 if (uX > 127 || uY > 127) 2473 if (uX > 127 || uY > 127)
2474 return 0; 2474 return 0;
2475 else 2475 else
2476 { 2476 {
2477 v3 = this->pTerrain.pTilemap[128 * uY + uX]; 2477 v3 = this->pTerrain.pTilemap[uY * 128 + uX];
2478 if ( v3 >= 90 ) 2478 if ( v3 >= 90 )
2479 v3 = v3 + this->pTileTypes[(v3 - 90) / 18].uTileID - 36 * (v3 - 90) / 36 - 90; 2479 v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90;
2480 return pTileTable->pTiles[v3].uAttributes; 2480 return pTileTable->pTiles[v3].uAttributes;
2481 } 2481 }
2482 } 2482 }
2483 2483
2484 //----- (0047EE16) -------------------------------------------------------- 2484 //----- (0047EE16) --------------------------------------------------------
2487 int result; // eax@5 2487 int result; // eax@5
2488 2488
2489 if ( (signed int)uX < 0 || (signed int)uX > 127 || (signed int)uZ < 0 || (signed int)uZ > 127 ) 2489 if ( (signed int)uX < 0 || (signed int)uX > 127 || (signed int)uZ < 0 || (signed int)uZ > 127 )
2490 result = 0; 2490 result = 0;
2491 else 2491 else
2492 result = 32 * *(&this->pTerrain.pHeightmap[128 * uZ] + uX); 2492 result = 32 * *(&this->pTerrain.pHeightmap[uZ * 128 + uX]);
2493 return result; 2493 return result;
2494 } 2494 }
2495 2495
2496 //----- (0047EE49) -------------------------------------------------------- 2496 //----- (0047EE49) --------------------------------------------------------
2497 int OutdoorLocation::_47EE49(signed int a2, signed int a3, int a4) 2497 int OutdoorLocation::_47EE49(signed int a2, signed int a3, int a4)