Mercurial > mm7
comparison UiGame.cpp @ 875:b7246c149957
Слияние
author | Ritor1 |
---|---|
date | Mon, 01 Apr 2013 17:37:42 +0600 |
parents | 2db21a810d48 |
children | 8cd0b155bebe |
comparison
equal
deleted
inserted
replaced
874:231523a39203 | 875:b7246c149957 |
---|---|
553 return; | 553 return; |
554 if (pCurrentScreen == SCREEN_GAME) | 554 if (pCurrentScreen == SCREEN_GAME) |
555 { | 555 { |
556 if ( (signed int)pX > 467 || (signed int)pY > 351 ) | 556 if ( (signed int)pX > 467 || (signed int)pY > 351 ) |
557 goto _click_on_game_ui; | 557 goto _click_on_game_ui; |
558 if ( pRenderer->pRenderD3D ) | 558 if ( pRenderer->pRenderD3D ) // inlined mm8::4C1E01 |
559 { | 559 { |
560 v18 = pGame->pVisInstance->get_picked_object_zbuf_val(); | 560 v18 = pGame->pVisInstance->get_picked_object_zbuf_val(); |
561 if ( (signed int)pX < (signed int)pViewport->uScreen_TL_X | 561 if ( (signed int)pX < (signed int)pViewport->uScreen_TL_X |
562 || (signed int)pX > (signed int)pViewport->uScreen_BR_X | 562 || (signed int)pX > (signed int)pViewport->uScreen_BR_X |
563 || (signed int)pY < (signed int)pViewport->uScreen_TL_Y | 563 || (signed int)pY < (signed int)pViewport->uScreen_TL_Y |