Mercurial > mm7

comparison mm7_1.cpp @ 351:5f36449527c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru351 -> summoned/spell-enchanted item
author Nomad
date Thu, 21 Feb 2013 03:04:08 +0200
parents ea55d6414029
children ec6cc5cefa4b
comparison
equal deleted inserted replaced
350:77601b0fb14b 351:5f36449527c6
47 #include "stru272.h" 47 #include "stru272.h"
48 #include "stru298.h" 48 #include "stru298.h"
49 #include "StorylineTextTable.h" 49 #include "StorylineTextTable.h"
50 #include "Events2D.h" 50 #include "Events2D.h"
51 #include "texts.h" 51 #include "texts.h"
52 #include "stru351.h"
52 53
53 #include "mm7_data.h" 54 #include "mm7_data.h"
54 55
55 56
56 57
2354 char a1[300]; // [sp+8h] [bp-270h]@40 2355 char a1[300]; // [sp+8h] [bp-270h]@40
2355 //char Dest[100]; // [sp+6Ch] [bp-20Ch]@40 2356 //char Dest[100]; // [sp+6Ch] [bp-20Ch]@40
2356 //char v64[100]; // [sp+D0h] [bp-1A8h]@40 2357 //char v64[100]; // [sp+D0h] [bp-1A8h]@40
2357 char v65[120]; // [sp+134h] [bp-144h]@92 2358 char v65[120]; // [sp+134h] [bp-144h]@92
2358 char Source[40]; // [sp+1ACh] [bp-CCh]@49 2359 char Source[40]; // [sp+1ACh] [bp-CCh]@49
2359 int v67; // [sp+1D4h] [bp-A4h]@91 2360 stru351_summoned_item v67;
2360 int v68; // [sp+1D8h] [bp-A0h]@106 2361 //int v67; // [sp+1D4h] [bp-A4h]@91
2361 int v69; // [sp+1DCh] [bp-9Ch]@101 2362 //int v68; // [sp+1D8h] [bp-A0h]@106
2362 int v70; // [sp+1E0h] [bp-98h]@97 2363 //int v69; // [sp+1DCh] [bp-9Ch]@101
2363 int v71; // [sp+1E8h] [bp-90h]@93 2364 //int v70; // [sp+1E0h] [bp-98h]@97
2364 int v72; // [sp+1ECh] [bp-8Ch]@91 2365 //int v71; // [sp+1E8h] [bp-90h]@93
2366 //int v72; // [sp+1ECh] [bp-8Ch]@91
2365 int var88; // [sp+1F0h] [bp-88h]@1 2367 int var88; // [sp+1F0h] [bp-88h]@1
2366 Texture *v73; // [sp+1F4h] [bp-84h]@5 2368 Texture *v73; // [sp+1F4h] [bp-84h]@5
2367 //unsigned int v75; // [sp+1F8h] [bp-80h]@5 2369 //unsigned int v75; // [sp+1F8h] [bp-80h]@5
2368 //char *v76; // [sp+1FCh] [bp-7Ch]@5 2370 //char *v76; // [sp+1FCh] [bp-7Ch]@5
2369 int v77; // [sp+200h] [bp-78h]@12 2371 int v77; // [sp+200h] [bp-78h]@12
2654 } 2656 }
2655 else 2657 else
2656 { 2658 {
2657 if ( _this->uAttributes & 8 && (_this->uAdditionalValue || _this->_bonus_type) ) 2659 if ( _this->uAttributes & 8 && (_this->uAdditionalValue || _this->_bonus_type) )
2658 { 2660 {
2659 sub_493F79((stru351 *)&v67, _this->uExpireTime - pParty->uTimePlayed); 2661 sub_493F79(&v67, _this->uExpireTime - pParty->uTimePlayed);
2660 strcpy(pTmpBuf, "Duration:"); 2662 strcpy(pTmpBuf, "Duration:");
2661 Str = (char *)(v72 - 1168); 2663 Str = (char *)(v67.field_18_expire_year - 1168);
2662 if ( v72 != 1168 ) 2664 if (v67.field_18_expire_year != 1168 )
2663 { 2665 {
2664 sprintf(v65, " %d:yr", v72 - 1168); 2666 sprintf(v65, " %d:yr", v67.field_18_expire_year - 1168);
2665 strcat(pTmpBuf, v65); 2667 strcat(pTmpBuf, v65);
2666 } 2668 }
2667 if ( (((v71 || Str) && ((sprintf(v65, " %d:mo", v71), strcat(pTmpBuf, v65), v71) || Str) || v70) 2669 if ( (((v67.field_14_exprie_month || Str) && ((sprintf(v65, " %d:mo", v67.field_14_exprie_month), strcat(pTmpBuf, v65), v67.field_14_exprie_month) || Str) || v67.field_C_expire_day)
2668 && ((sprintf(v65, " %d:dy", v70), strcat(pTmpBuf, v65), v71) || Str || v70) 2670 && ((sprintf(v65, " %d:dy", v67.field_C_expire_day), strcat(pTmpBuf, v65), v67.field_14_exprie_month) || Str || v67.field_C_expire_day)
2669 || v69) 2671 || v67.field_8_expire_hour)
2670 && ((sprintf(v65, " %d:hr", v69), strcat(pTmpBuf, v65), v71) || Str || v70 || v69) 2672 && ((sprintf(v65, " %d:hr", v67.field_8_expire_hour), strcat(pTmpBuf, v65), v67.field_14_exprie_month) || Str || v67.field_C_expire_day || v67.field_8_expire_hour)
2671 || v68 ) 2673 || v67.field_4_expire_minute )
2672 { 2674 {
2673 sprintf(v65, " %d:mn", v68); 2675 sprintf(v65, " %d:mn", v67.field_4_expire_minute);
2674 strcat(pTmpBuf, v65); 2676 strcat(pTmpBuf, v65);
2675 } 2677 }
2676 v79.DrawText(v82, 100, v79.uFrameHeight - 2 * LOBYTE(v82->uFontHeight), 0, pTmpBuf, 0, 0, 0); 2678 v79.DrawText(v82, 100, v79.uFrameHeight - 2 * LOBYTE(v82->uFontHeight), 0, pTmpBuf, 0, 0, 0);
2677 } 2679 }
2678 v37 = _this->GetValue(); 2680 v37 = _this->GetValue();