Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/NPC.cpp	Wed Aug 21 20:58:36 2013 +0400
+++ b/NPC.cpp	Wed Aug 21 20:59:16 2013 +0400
@@ -903,7 +903,7 @@
 
 //----- (00476395) --------------------------------------------------------
 //0x26 Wizard eye at skill level 2
-bool __thiscall CheckHiredNPCSpeciality(unsigned int uProfession)
+bool  CheckHiredNPCSpeciality(unsigned int uProfession)
     {
 
     if ( bNoNPCHiring == 1 )
@@ -1142,7 +1142,7 @@
 	}
 
 //----- (00476750) --------------------------------------------------------
-void __cdecl InitializeAutonotes()
+void  InitializeAutonotes()
 	{
 	int i;
 	char* test_string;
@@ -1227,7 +1227,7 @@
 
 
 //----- (004768A9) --------------------------------------------------------
-void __cdecl InitializeQuests()
+void  InitializeQuests()
 	{
 	int i;
 	char* test_string;
@@ -1340,7 +1340,7 @@
   /*switch ( pEventNumber )
   {
     case 139:
-      sub_4B1ECE();
+      OracleDialogue();
       goto _return;
     case 311:
       sub_4BBA85_bounties();
@@ -1352,7 +1352,7 @@
       {
         if ( pEventNumber == 139 )
         {
-          sub_4B1ECE();
+          OracleDialogue();
         }
         else
         {