1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

added slay

Browse Source 
> $$$ 4 iggy
fixed coop
stopped speck talking
preopened merc account
CREATURE_ENABLED = 0 no longer has any effect u can remove it from ur ini
ALLOW_CUSTOM_NIV = 1   -> new server ini variable, please add
added gear cost to MERC's

please feel free to make suggestion on MERC NPC costs...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2178 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
haydent
2008-05-18 02:53:59 +00:00
parent f17cc948a4
commit 741e5c03bf
7 changed files with 68 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/mercs.cpp
+6
View File
@@ -27,6 +27,7 @@
#include "Quests.h"
#endif
#include "connect.h"
UINT8 NUMBER_OF_MERCS;
UINT8 LAST_MERC_ID;
@@ -362,6 +363,7 @@ void GameInitMercs()
gubMercArray[ 24 ] = 69;
gubMercArray[ 25 ] = 70;
gubMercArray[ 26 ] = 72;
gubMercArray[ 27 ] = 64;
LaptopSaveInfo.gubPlayersMercAccountStatus = MERC_NO_ACCOUNT;
gubCurMercIndex = 0;
@@ -1068,6 +1070,8 @@ void InitMercVideoFace()
BOOLEAN StartSpeckTalking(UINT16 usQuoteNum)
{
if(is_networked)return( FALSE );
if( usQuoteNum == MERC_VIDEO_SPECK_SPEECH_NOT_TALKING || usQuoteNum == MERC_VIDEO_SPECK_HAS_TO_TALK_BUT_QUOTE_NOT_CHOSEN_YET )
return( FALSE );
@@ -2161,6 +2165,8 @@ BOOLEAN ShouldSpeckStartTalkingDueToActionOnSubPage()
BOOLEAN ShouldSpeckSayAQuote()
{
//if we are entering from anywhere except a sub page, and we should say the opening quote
if( gfJustEnteredMercSite && gubArrivedFromMercSubSite == MERC_CAME_FROM_OTHER_PAGE )
{