**********************************************************

** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-28 18:38:52 +00:00
parent a98c44ac78
commit 14750c6903
461 changed files with 23615 additions and 120157 deletions
+4 -4
View File
@@ -477,7 +477,7 @@ SCROLL_BOX gItemListBox; // The Npc Scroll box
SCROLL_BOX *gpActiveListBox; // Only 1 scroll box is active at a time, this is set to it.
INT16 gsQdsEnteringGridNo =0;
INT32 gsQdsEnteringGridNo =0;
UINT8 gubTextEntryAction = QD_DROP_DOWN_NO_ACTION;
@@ -3008,7 +3008,7 @@ void AddNPCToGridNo( INT32 iGridNo )
MercCreateStruct.sSectorX = sSectorX;
MercCreateStruct.sSectorY = sSectorY;
MercCreateStruct.bSectorZ = gbWorldSectorZ;
MercCreateStruct.sInsertionGridNo = (INT16) iGridNo;
MercCreateStruct.sInsertionGridNo = iGridNo;
// RandomizeNewSoldierStats( &MercCreateStruct );
@@ -3023,14 +3023,14 @@ void AddNPCToGridNo( INT32 iGridNo )
//Add all the npc in the current sectory the npc array
AddNPCsInSectorToArray();
gsQdsEnteringGridNo = (INT16)iGridNo;
gsQdsEnteringGridNo = iGridNo;
}
void AddItemToGridNo( INT32 iGridNo )
{
gsQdsEnteringGridNo = (INT16)iGridNo;
gsQdsEnteringGridNo = iGridNo;
if( Item[ gItemListBox.sCurSelectedItem ].usItemClass == IC_KEY )