Jaysyn/PRC8
1
0
Fork 0
Code Issues 21 Pull Requests Packages Projects Releases 1 Wiki Activity

Renamed inc_array to stop nwnx include collisions

Browse Source 
Renamed inc_array to stop nwnx include collisions  Added missing bonus feat 2da for Forest Master. Changed prc_newspellbook.hak to prc_nsb.hak to prevent issues with nwserver.  Updated tester module.  Updated release archive.
This commit is contained in:
Jaysyn904
2024-03-03 18:06:25 -05:00
parent 03567313e5
commit 57b8d88878
34 changed files with 37563 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nwn/nwnprc/trunk/include/inc_array_sort.nss
View File

@@ -116,7 +116,7 @@ void CountingSortInt(object oStore, string sArrayName);
/* Includes */
//////////////////////////////////////////////////
#include "inc_array"
#include "prc_inc_array"
#include "inc_debug"
//////////////////////////////////////////////////

2
nwn/nwnprc/trunk/include/inc_dynconv.nss
View File

@@ -312,7 +312,7 @@ void ClearCurrentStage(object oPC = OBJECT_INVALID);
/* Include section */
//////////////////////////////////////////////////
#include "inc_array"
#include "prc_inc_array"
#include "inc_debug"
//////////////////////////////////////////////////

2
nwn/nwnprc/trunk/include/inc_eventhook.nss
View File

@@ -395,7 +395,7 @@ int GetRunningEvent();
//////////////////////////////////////////////////
//#include "inc_utility"
//#include "inc_array"
//#include "prc_inc_array"
#include "inc_pers_array" // link higher than inc_array

2
nwn/nwnprc/trunk/include/inc_heap.nss
View File

@@ -214,7 +214,7 @@ int heap_remove(object oStore, string sName);
//////////////////////////////////////////////////
//#include "inc_utility"
#include "inc_array" //The only part of inc_utility it needs
#include "prc_inc_array" //The only part of inc_utility it needs
//////////////////////////////////////////////////

2
nwn/nwnprc/trunk/include/inc_item_props.nss
View File

@@ -291,7 +291,7 @@ void AddSkinFeat(int nFeat, int IPFeat, object oSkin, object oPC = OBJECT_SELF,
#include "inc_prc_npc"
//#include "inc_utility"
#include "prc_ipfeat_const"
#include "inc_array"
#include "prc_inc_array"
//////////////////////////////
// Function Definitions //

2
nwn/nwnprc/trunk/include/inc_lookups.nss
View File

@@ -98,7 +98,7 @@ string GetAMSDefinitionFileName(int nClass);
//////////////////////////////////////////////////
#include "inc_2dacache"
#include "inc_array"
#include "prc_inc_array"
#include "prc_class_const"
//////////////////////////////////////////////////

2
nwn/nwnprc/trunk/include/inc_pers_array.nss
View File

@@ -176,7 +176,7 @@ int persistant_array_exists(object store, string name);
/////////////////////////////////////
#include "inc_persist_loca"
#include "inc_array" // yes this is also got via inc_persist_loca if rather indirectly
#include "prc_inc_array" // yes this is also got via inc_persist_loca if rather indirectly
/////////////////////////////////////
// Implementation

6
nwn/nwnprc/trunk/include/inc_set.nss
View File

@@ -5,7 +5,7 @@
/** @file
This file defines a "data type" that behaves
like a set. It is implemented as an extension
of the arrays defined in inc_array.
of the arrays defined in prc_inc_array.
Operations:
- Get number of entities in the set. O(1)
@@ -270,8 +270,8 @@ int set_exists(object store, string name);
/* Includes */
//////////////////////////////////////////////////
// inc_array access is via inc_heap
//#include "inc_array"
// prc_inc_array access is via inc_heap
//#include "prc_inc_array"
#include "inc_debug"
#include "inc_heap"

2
nwn/nwnprc/trunk/include/inc_switch_setup.nss
View File

@@ -42,7 +42,7 @@ void CreateSwitchNameArray();
/* Include section */
//////////////////////////////////////////////////
#include "inc_array" // Needs direct include instead of inc_utility
#include "prc_inc_array" // Needs direct include instead of inc_utility
#include "prc_inc_switch"
//////////////////////////////////////////////////

2
nwn/nwnprc/trunk/include/inc_uniqueid.nss
View File

@@ -61,7 +61,7 @@ string GetUniqueID();
//////////////////////////////////////////////////
//#include "inc_utility"
#include "inc_array"
#include "prc_inc_array"
//////////////////////////////////////////////////

6
nwn/nwnprc/trunk/include/inc_utility.nss
View File

@@ -575,9 +575,9 @@ const int ERROR_CODE_5_ONCE_MORE5 = -1;
#include "inc_draw_prc"
#include "inc_eventhook"
#include "inc_metalocation"
#include "inc_array_sort" // Depends on inc_array and inc_debug
#include "inc_uniqueid" // Depends on inc_array
#include "inc_set" // Depends on inc_array, inc_heap
#include "inc_array_sort" // Depends on prc_inc_array and inc_debug
#include "inc_uniqueid" // Depends on prc_inc_array
#include "inc_set" // Depends on prc_inc_array, inc_heap
/**********************\

2
nwn/nwnprc/trunk/include/inc_array.nss → nwn/nwnprc/trunk/include/prc_inc_array.nss
View File

@@ -1,6 +1,6 @@
//::///////////////////////////////////////////////
//:: Array simulation include
//:: inc_array
//:: prc_inc_array
//:://////////////////////////////////////////////
/** @file
Array simulation include

2
nwn/nwnprc/trunk/include/prc_inc_nwscript.nss
View File

@@ -167,7 +167,7 @@ int GetAberrantFeatCount(object oPC);
#include "inv_invoc_const"
#include "psi_power_const"
#include "prc_inc_racial"
#include "inc_array"
#include "prc_inc_array"
#include "moi_meld_const"
#include "bnd_vestig_const"

2
nwn/nwnprc/trunk/include/prc_inc_teleport.nss
View File

@@ -247,7 +247,7 @@ int GetCanTeleport(object oCreature, location lTarget, int bMovesCreature = FALS
* 1 / 3 caster|manifester levels.
*
* The results will be stored in a local array on the caster,
* retrievable using functions from inc_array.
* retrievable using functions from prc_inc_array.
* The name of the array is contained within the constant PRC_TELEPORTING_OBJECTS_ARRAY.
*
* @param oCaster The object casting the teleportation spell