Mercurial > mm7
comparison Render.cpp @ 1268:2929c4406d2c
guiwindow funcs cleanup
author | Gloval |
---|---|
date | Sat, 15 Jun 2013 01:22:17 +0400 |
parents | 0aeac0b9ca30 |
children | 1803172dffd9 |
comparison
equal
deleted
inserted
replaced
1267:33e360a9b4bf | 1268:2929c4406d2c |
---|---|
9564 if ( (signed __int16)v6 > 0 ) | 9564 if ( (signed __int16)v6 > 0 ) |
9565 DrawTextureIndexed(a2, a3, &tex); | 9565 DrawTextureIndexed(a2, a3, &tex); |
9566 } | 9566 } |
9567 | 9567 |
9568 //----- (004A6AB1) -------------------------------------------------------- | 9568 //----- (004A6AB1) -------------------------------------------------------- |
9569 void Render::DrawTextPalette(int x, int y, int a4, int a5, unsigned int uFontHeight, unsigned __int16 *pPalette, int a8) | 9569 void Render::DrawTextPalette( int x, int y, unsigned char* font_pixels, int a5, unsigned int uFontHeight, unsigned __int16 *pPalette, int a8 ) |
9570 { | 9570 { |
9571 int v8; // edi@2 | 9571 int v8; // edi@2 |
9572 unsigned int v9; // esi@2 | 9572 unsigned int v9; // esi@2 |
9573 unsigned __int16 *v10; // eax@2 | 9573 unsigned __int16 *v10; // eax@2 |
9574 unsigned char *v11; // edx@2 | 9574 unsigned char *v11; // edx@2 |
9575 unsigned int v12; // ebx@3 | 9575 unsigned int v12; // ebx@3 |
9598 if ( this->uNumSceneBegins ) | 9598 if ( this->uNumSceneBegins ) |
9599 { | 9599 { |
9600 v8 = a5; | 9600 v8 = a5; |
9601 v9 = a6; | 9601 v9 = a6; |
9602 v10 = &pTargetSurface[x + y * uTargetSurfacePitch]; | 9602 v10 = &pTargetSurface[x + y * uTargetSurfacePitch]; |
9603 v11 = (unsigned char *)a4; | 9603 v11 = (unsigned char *)font_pixels; |
9604 v25 = a4; | 9604 v25 = (int)font_pixels; |
9605 if ( this->bClip ) | 9605 if ( this->bClip ) |
9606 { | 9606 { |
9607 v12 = this->uClipX; | 9607 v12 = this->uClipX; |
9608 if ( a2 < (signed int)v12 ) | 9608 if ( a2 < (signed int)v12 ) |
9609 { | 9609 { |
9610 v25 = v12 - a2 + a4; | 9610 v25 = v12 - a2 + (int)font_pixels; |
9611 v10 += v12 - a2; | 9611 v10 += v12 - a2; |
9612 v8 = a5 + a2 - v12; | 9612 v8 = a5 + a2 - v12; |
9613 } | 9613 } |
9614 v13 = this->uClipY; | 9614 v13 = this->uClipY; |
9615 if ( a3 < v13 ) | 9615 if ( a3 < v13 ) |