Mercurial > mm7

comparison NPC.cpp @ 1461:845907a747d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Wed, 21 Aug 2013 20:59:16 +0400
parents ff2118028c71 2ca62c9e7b3c
children 61458df2cb4f
comparison
equal deleted inserted replaced
1460:ff2118028c71 1461:845907a747d3
901 return pNPCStats->pNewNPCData[57].Hired(); 901 return pNPCStats->pNewNPCData[57].Hired();
902 } 902 }
903 903
904 //----- (00476395) -------------------------------------------------------- 904 //----- (00476395) --------------------------------------------------------
905 //0x26 Wizard eye at skill level 2 905 //0x26 Wizard eye at skill level 2
906 bool __thiscall CheckHiredNPCSpeciality(unsigned int uProfession) 906 bool CheckHiredNPCSpeciality(unsigned int uProfession)
907 { 907 {
908 908
909 if ( bNoNPCHiring == 1 ) 909 if ( bNoNPCHiring == 1 )
910 return 0; 910 return 0;
911 911
1140 } while ((decode_step<2)&&!break_loop); 1140 } while ((decode_step<2)&&!break_loop);
1141 } 1141 }
1142 } 1142 }
1143 1143
1144 //----- (00476750) -------------------------------------------------------- 1144 //----- (00476750) --------------------------------------------------------
1145 void __cdecl InitializeAutonotes() 1145 void InitializeAutonotes()
1146 { 1146 {
1147 int i; 1147 int i;
1148 char* test_string; 1148 char* test_string;
1149 unsigned char c; 1149 unsigned char c;
1150 bool break_loop; 1150 bool break_loop;
1225 } 1225 }
1226 } 1226 }
1227 1227
1228 1228
1229 //----- (004768A9) -------------------------------------------------------- 1229 //----- (004768A9) --------------------------------------------------------
1230 void __cdecl InitializeQuests() 1230 void InitializeQuests()
1231 { 1231 {
1232 int i; 1232 int i;
1233 char* test_string; 1233 char* test_string;
1234 unsigned char c; 1234 unsigned char c;
1235 bool break_loop; 1235 bool break_loop;
1338 goto _return; 1338 goto _return;
1339 } 1339 }
1340 /*switch ( pEventNumber ) 1340 /*switch ( pEventNumber )
1341 { 1341 {
1342 case 139: 1342 case 139:
1343 sub_4B1ECE(); 1343 OracleDialogue();
1344 goto _return; 1344 goto _return;
1345 case 311: 1345 case 311:
1346 sub_4BBA85_bounties(); 1346 sub_4BBA85_bounties();
1347 goto _return; 1347 goto _return;
1348 }*/ 1348 }*/
1350 { 1350 {
1351 if ( pEventNumber < 400 || pEventNumber > 410 ) 1351 if ( pEventNumber < 400 || pEventNumber > 410 )
1352 { 1352 {
1353 if ( pEventNumber == 139 ) 1353 if ( pEventNumber == 139 )
1354 { 1354 {
1355 sub_4B1ECE(); 1355 OracleDialogue();
1356 } 1356 }
1357 else 1357 else
1358 { 1358 {
1359 if ( pEventNumber == 311 ) 1359 if ( pEventNumber == 311 )
1360 { 1360 {