Mercurial > mm7
comparison Outdoor.cpp @ 207:f96601c7e503
m
author | Ritor1 |
---|---|
date | Sat, 16 Feb 2013 08:42:43 +0600 |
parents | d65528fc3bda |
children | 07eb7d649bd5 |
comparison
equal
deleted
inserted
replaced
206:f9cfc1867efd | 207:f96601c7e503 |
---|---|
2406 unsigned int OutdoorLocation::DoGetTileTexture(unsigned int uX, unsigned int uY) | 2406 unsigned int OutdoorLocation::DoGetTileTexture(unsigned int uX, unsigned int uY) |
2407 { | 2407 { |
2408 int v3; // esi@5 | 2408 int v3; // esi@5 |
2409 unsigned int result; // eax@9 | 2409 unsigned int result; // eax@9 |
2410 | 2410 |
2411 | |
2412 /* v3 = *(&this->pTerrain.pTilemap[128 * uZ] + uX); | |
2413 if ( v3 < 198 ) | |
2414 { | |
2415 if ( v3 >= 90 ) | |
2416 v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90; | |
2417 } | |
2418 else | |
2419 { | |
2420 v3 = v3 + this->pTileTypes[3].uTileID - 198; | |
2421 } | |
2422 result = pTileTable->pTiles[v3].uBitmapID; | |
2423 } | |
2424 return result;*/ | |
2425 if ( uX < 0 || uX > 127 || uY < 0 || uY > 127) | 2411 if ( uX < 0 || uX > 127 || uY < 0 || uY > 127) |
2426 return 0; | 2412 return 0; |
2427 | 2413 |
2428 v3 = this->pTerrain.pTilemap[uY * 128 + uX]; | 2414 v3 = this->pTerrain.pTilemap[uY * 128 + uX]; |
2429 if (v3 < 198) | 2415 if (v3 < 198) |
2451 | 2437 |
2452 //----- (0047EDB3) -------------------------------------------------------- | 2438 //----- (0047EDB3) -------------------------------------------------------- |
2453 int OutdoorLocation::ActuallyGetSomeOtherTileInfo(unsigned int uX, unsigned int uY) | 2439 int OutdoorLocation::ActuallyGetSomeOtherTileInfo(unsigned int uX, unsigned int uY) |
2454 { | 2440 { |
2455 int v3; // esi@5 | 2441 int v3; // esi@5 |
2456 //int result; // eax@7 | 2442 |
2457 | |
2458 /* if ( (uX & 0x80000000u) != 0 || (signed int)uX > 127 || (uY & 0x80000000u) != 0 || (signed int)uY > 127 ) | |
2459 { | |
2460 result = 0; | |
2461 } | |
2462 else | |
2463 { | |
2464 v3 = *(&this->pTerrain.pTilemap[128 * uY] + uX); | |
2465 if ( v3 >= 90 ) | |
2466 v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90; | |
2467 result = pTileTable->pTiles[v3].uAttributes; | |
2468 } | |
2469 return result;*/ | |
2470 if (uX < 0 || uX > 127 || uY < 0 || uY > 127) | 2443 if (uX < 0 || uX > 127 || uY < 0 || uY > 127) |
2471 return 0; | 2444 return 0; |
2472 else | 2445 else |
2473 { | 2446 { |
2474 v3 = this->pTerrain.pTilemap[uY * 128 + uX]; | 2447 v3 = this->pTerrain.pTilemap[uY * 128 + uX]; |