Mercurial > mm7

comparison GUIWindow.cpp @ 474:442afd6c34a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Tue, 26 Feb 2013 07:40:26 +0400
parents 7f1b00901cf7
children d4ea191229ff
comparison
equal deleted inserted replaced
472:7dfe960c323c 474:442afd6c34a4
1068 } 1068 }
1069 v18.uFrameWidth += 8; 1069 v18.uFrameWidth += 8;
1070 v18.uFrameZ += 8; 1070 v18.uFrameZ += 8;
1071 if ( !pDialogueNPCCount ) 1071 if ( !pDialogueNPCCount )
1072 { 1072 {
1073 if ( dword_F8B198 == 31 ) 1073 if ( in_current_bilding_type == 31 )
1074 { 1074 {
1075 sub_4B4F4F(); 1075 sub_4B4F4F();
1076 goto LABEL_58; 1076 goto LABEL_58;
1077 } 1077 }
1078 if ( ptr_F8B1E8 ) 1078 if ( ptr_F8B1E8 )
1149 //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C], 1149 //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C],
1150 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterName, 1150 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterName,
1151 //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]); 1151 //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]);
1152 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterTitle); 1152 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterTitle);
1153 v18.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u); 1153 v18.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u);
1154 if ( dword_F8B198 <= 18 ) 1154 if ( in_current_bilding_type <= 18 )
1155 { 1155 {
1156 switch ( dword_F8B198 ) 1156 switch ( in_current_bilding_type )
1157 { 1157 {
1158 case 18: 1158 case 18:
1159 sub_4B6478(); 1159 sub_4B6478();
1160 break; 1160 break;
1161 case 1: 1161 case 1:
1169 break; 1169 break;
1170 case 4: 1170 case 4:
1171 AlchemistDialog(); 1171 AlchemistDialog();
1172 break; 1172 break;
1173 default: 1173 default:
1174 if ( dword_F8B198 > 4 ) 1174 if ( in_current_bilding_type > 4 )
1175 { 1175 {
1176 if ( dword_F8B198 <= 16 ) 1176 if ( in_current_bilding_type <= 16 )
1177 { 1177 {
1178 GuildDialog(); 1178 GuildDialog();
1179 } 1179 }
1180 else 1180 else
1181 { 1181 {
1182 if ( dword_F8B198 == 17 ) 1182 if ( in_current_bilding_type == 17 )
1183 sub_4B7911(); 1183 sub_4B7911();
1184 } 1184 }
1185 } 1185 }
1186 break; 1186 break;
1187 } 1187 }
1188 goto LABEL_58; 1188 goto LABEL_58;
1189 } 1189 }
1190 switch ( dword_F8B198 ) 1190 switch ( in_current_bilding_type )
1191 { 1191 {
1192 case 21: 1192 case 21:
1193 TavernDialog(); 1193 TavernDialog();
1194 break; 1194 break;
1195 case 22: 1195 case 22:
1197 break; 1197 break;
1198 case 23: 1198 case 23:
1199 TampleDialog(); 1199 TampleDialog();
1200 break; 1200 break;
1201 default: 1201 default:
1202 if ( dword_F8B198 <= 26 ) 1202 if ( in_current_bilding_type <= 26 )
1203 break; 1203 break;
1204 if ( dword_F8B198 <= 28 ) 1204 if ( in_current_bilding_type <= 28 )
1205 { 1205 {
1206 TravelByTransport(); 1206 TravelByTransport();
1207 } 1207 }
1208 else 1208 else
1209 { 1209 {
1210 if ( dword_F8B198 != 30 ) 1210 if ( in_current_bilding_type != 30 )
1211 { 1211 {
1212 if ( dword_F8B198 != 31 ) 1212 if ( in_current_bilding_type != 31 )
1213 break; 1213 break;
1214 sub_4B4F4F(); 1214 sub_4B4F4F();
1215 goto LABEL_58; 1215 goto LABEL_58;
1216 } 1216 }
1217 TrainingDialog(); 1217 TrainingDialog();