fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Corrected code in Arrays.cpp

Browse Source
This commit is contained in:
NovaRain
2020-10-12 11:03:55 +08:00
parent 466b79f5e8
commit 540b68070b
8 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Arrays.cpp
+19 -21
View File
@@ -264,7 +264,7 @@ long LoadArrays(HANDLE h) {
arrayVar.keyHash[arrayVar.val[j]] = j;
}
}
while (arrays.find(nextArrayID) != arrays.end()) nextArrayID++;
while (ArrayExist(nextArrayID)) nextArrayID++;
if (nextArrayID == 0) nextArrayID++;
arrays.insert(array_pair(nextArrayID, arrayVar));
@@ -295,7 +295,7 @@ void SaveArrays(HANDLE h) {
for (it = savedArrays.begin(); it != savedArrays.end(); ++it) {
arrayIt = arrays.find(it->second);
if (arrayIt != arrays.end()) {
sArrayVar &var = arrays[it->second];
sArrayVar &var = arrayIt->second; //arrays[it->second];
SaveArrayElement(&var.key, h); // type, key/length of key and string of key
WriteFile(h, &var.flags, 4, &unused, 0);
elCount = var.val.size();
@@ -426,11 +426,11 @@ DWORD __stdcall CreateArray(int len, DWORD flags) {
}
sArrayVar var(len, flags);
if (!var.isAssoc()) {
if (!var.isAssoc() && len) {
var.val.resize(len);
}
while (arrays.find(nextArrayID) != arrays.end()) nextArrayID++;
while (ArrayExist(nextArrayID)) nextArrayID++;
if (nextArrayID == 0) nextArrayID++;
if (arraysBehavior == 0) {
@@ -442,7 +442,7 @@ DWORD __stdcall CreateArray(int len, DWORD flags) {
return nextArrayID++;
}
DWORD __stdcall TempArray(DWORD len, DWORD flags) {
DWORD __stdcall CreateTempArray(DWORD len, DWORD flags) {
DWORD id = CreateArray(len, flags);
temporaryArrays.insert(id);
return id;
@@ -468,7 +468,7 @@ void DeleteAllTempArrays() {
DWORD __stdcall GetArrayKey(DWORD id, int index, DWORD* resultType) {
*resultType = VAR_TYPE_INT;
if (arrays.find(id) == arrays.end() || index < -1 || index > arrays[id].size()) {
if (!ArrayExist(id) || index < -1 || index > arrays[id].size()) {
return 0;
}
if (index == -1) { // special index to indicate if array is associative
@@ -479,10 +479,10 @@ DWORD __stdcall GetArrayKey(DWORD id, int index, DWORD* resultType) {
// for associative array - return key at the specified index
switch(arrays[id].val[index].type) {
case DATATYPE_INT:
return *(DWORD *)&arrays[id].val[index].intVal;
return *(DWORD*)&arrays[id].val[index].intVal;
case DATATYPE_FLOAT:
*resultType = VAR_TYPE_FLOAT;
return *(DWORD *)&arrays[id].val[index].intVal;
return *(DWORD*)&arrays[id].val[index].intVal;
case DATATYPE_STR:
*resultType = VAR_TYPE_STR;
return (DWORD)arrays[id].val[index].strVal;
@@ -498,9 +498,8 @@ DWORD __stdcall GetArrayKey(DWORD id, int index, DWORD* resultType) {
DWORD __stdcall GetArray(DWORD id, DWORD key, DWORD keyType, DWORD* resultType) {
*resultType = VAR_TYPE_INT;
if (arrays.find(id) == arrays.end()) {
return 0;
}
if (!ArrayExist(id)) return 0;
int el;
sArrayVar &arr = arrays[id];
if (arr.isAssoc()) {
@@ -520,10 +519,10 @@ DWORD __stdcall GetArray(DWORD id, DWORD key, DWORD keyType, DWORD* resultType)
case DATATYPE_NONE:
return 0;
case DATATYPE_INT:
return *(DWORD *)&arr.val[el].intVal;
return *(DWORD*)&arr.val[el].intVal;
case DATATYPE_FLOAT:
*resultType = VAR_TYPE_FLOAT;
return *(DWORD *)&arr.val[el].intVal;
return *(DWORD*)&arr.val[el].intVal;
case DATATYPE_STR:
*resultType = VAR_TYPE_STR;
return (DWORD)arr.val[el].strVal;
@@ -580,8 +579,7 @@ void __stdcall setArray(DWORD id, DWORD key, DWORD keyType, DWORD val, DWORD val
}
void __stdcall SetArray(DWORD id, DWORD key, DWORD keyType, DWORD val, DWORD valType, DWORD allowUnset) {
if (!ArrayExist(id)) return;
setArray(id, key, keyType, val, valType, allowUnset);
if (ArrayExist(id)) setArray(id, key, keyType, val, valType, allowUnset);
}
int __stdcall LenArray(DWORD id) {
@@ -646,7 +644,7 @@ static void MapSort(sArrayVar& arr, int type) {
}
void __stdcall ResizeArray(DWORD id, int newlen) {
if (newlen == -1 || arrays.find(id) == arrays.end()) return;
if (newlen == -1 || !ArrayExist(id)) return;
sArrayVar &arr = arrays[id];
int arrSize = arr.size();
@@ -698,18 +696,18 @@ void __stdcall FixArray(DWORD id) {
int __stdcall ScanArray(DWORD id, DWORD val, DWORD datatype, DWORD* resultType) {
*resultType = VAR_TYPE_INT;
datatype = getSfallTypeByScriptType(datatype);
if (arrays.find(id) == arrays.end()) {
if (!ArrayExist(id)) {
return -1;
}
char step = arrays[id].isAssoc() ? 2 : 1;
for (DWORD i = 0; i < arrays[id].val.size(); i += step) {
for (size_t i = 0; i < arrays[id].val.size(); i += step) {
sArrayElement &el = arrays[id].val[i + step - 1];
if (el.type == datatype) {
if ((datatype != DATATYPE_STR && *(DWORD*)&(el.intVal) == val) ||
(datatype == DATATYPE_STR && strcmp(el.strVal, (char*)val) == 0)) {
if (arrays[id].isAssoc()) { // return key instead of index for associative arrays
*resultType = getScriptTypeBySfallType(arrays[id].val[i].type);
return *(DWORD *)&arrays[id].val[i].intVal;
return *(DWORD*)&arrays[id].val[i].intVal;
} else {
return i;
}
@@ -725,7 +723,7 @@ DWORD __stdcall LoadArray(DWORD key, DWORD keyType) {
sArrayElement keyEl = sArrayElement(key, dataType);
if (keyEl.type == DATATYPE_STR && strcmp(keyEl.strVal, get_all_arrays_special_key) == 0) { // this is a special case to get temp array containing all saved arrays
DWORD tmpArrId = TempArray(savedArrays.size(), 0);
DWORD tmpArrId = CreateTempArray(savedArrays.size(), 0);
if (tmpArrId > 0) {
std::vector<sArrayElement>::iterator elIt;
ArrayKeysMap::iterator it;
@@ -790,7 +788,7 @@ long __stdcall StackArray(DWORD key, DWORD keyType, DWORD val, DWORD valType) {
if (!arrays[stackArrayId].isAssoc()) { // automatically resize array to fit one new element
size_t size = arrays[stackArrayId].val.size();
if (size >= ARRAY_MAX_SIZE) return 0;
if (key >= size) arrays[stackArrayId].val.resize(size + 10); // resize with a small margin
if (key >= size) arrays[stackArrayId].val.resize(size + 1);
}
setArray(stackArrayId, key, keyType, val, valType, 0);
return 0;
sfall/Arrays.h
+4 -2
View File
@@ -84,6 +84,7 @@ struct sArrayVarOld
#define ARRAYFLAG_ASSOC (1) // is map
#define ARRAYFLAG_CONSTVAL (2) // don't update value of key if the key exists in map
#define ARRAYFLAG_RESERVED (4)
typedef std::tr1::unordered_map<sArrayElement, DWORD, sArrayElement_HashFunc, sArrayElement_EqualFunc> ArrayKeysMap;
@@ -104,7 +105,8 @@ public:
sArrayVar() : flags(0), key() {}
sArrayVar(int len, int flag) : flags(flag), key() {
if (len > 0) val.reserve(len + 10);
if (len == 0) val.reserve((flag & 0x7FFF0000) >> 16);
if (len < 0) val.reserve(20); // for assoc
}
bool isAssoc() const {
@@ -165,7 +167,7 @@ DWORD __stdcall getScriptTypeBySfallType(DWORD dataType);
DWORD __stdcall CreateArray(int len, DWORD flags);
// same as CreateArray, but creates temporary array instead (will die at the end of the frame)
DWORD __stdcall TempArray(DWORD len, DWORD flags);
DWORD __stdcall CreateTempArray(DWORD len, DWORD flags);
// destroys array
void __stdcall FreeArray(DWORD id);
sfall/ScriptExtender.cpp
+1 -1
View File
@@ -658,7 +658,7 @@ static void mf_get_sfall_arg_at() {
static DWORD __stdcall GetSfallArgs() {
DWORD argCount = GetHSArgCount();
DWORD id = TempArray(argCount, 0);
DWORD id = CreateTempArray(argCount, 0);
DWORD* args = GetHSArgs();
for (DWORD i = 0; i < argCount; i++) {
arrays[id].val[i].set(*(long*)&args[i]);
sfall/ScriptOps/MetaruleOps.hpp
+1 -1
View File
@@ -84,7 +84,7 @@ static void mf_test() {
// returns current contents of metarule table
static void mf_get_metarule_table() {
DWORD arrId = TempArray(metaruleTable.size(), 0);
DWORD arrId = CreateTempArray(metaruleTable.size(), 0);
int i = 0;
for (MetaruleTableType::iterator it = metaruleTable.begin(); it != metaruleTable.end(); ++it) {
arrays[arrId].val[i].set(it->first.c_str());
sfall/ScriptOps/ObjectsOps.hpp
+4 -4
View File
@@ -287,7 +287,7 @@ static void __stdcall op_make_path2() {
char pathData[800];
long pathLength = MakePathFunc(objFrom, objFrom->tile, tileTo, pathData, checkFlag, (void*)func);
DWORD arrayId = TempArray(pathLength, 0);
DWORD arrayId = CreateTempArray(pathLength, 0);
for (int i = 0; i < pathLength; i++) {
arrays[arrayId].val[i].set((long)pathData[i]);
}
@@ -335,7 +335,7 @@ static void __stdcall op_tile_get_objects2() {
if (tileArg.isInt() && elevArg.isInt()) {
DWORD tile = tileArg.rawValue(),
elevation = elevArg.rawValue();
DWORD arrayId = TempArray(0, 4);
DWORD arrayId = CreateTempArray(0, 4);
TGameObj* obj = ObjFindFirstAtTile(elevation, tile);
while (obj) {
arrays[arrayId].push_back(reinterpret_cast<long>(obj));
@@ -358,7 +358,7 @@ static void __stdcall op_get_party_members2() {
if (modeArg.isInt()) {
DWORD includeHidden = modeArg.rawValue();
int actualCount = *ptr_partyMemberCount;
DWORD arrayId = TempArray(0, 4);
DWORD arrayId = CreateTempArray(0, 4);
DWORD* partyMemberList = *ptr_partyMemberList;
for (int i = 0; i < actualCount; i++) {
TGameObj* obj = reinterpret_cast<TGameObj*>(partyMemberList[i * 4]);
@@ -670,7 +670,7 @@ static void mf_objects_in_radius() {
objects.reserve(25);
GetObjectsTileRadius(objects, tileArg.rawValue(), radius, elev, type);
size_t sz = objects.size();
id = TempArray(sz, 0);
id = CreateTempArray(sz, 0);
for (size_t i = 0; i < sz; i++) {
arrays[id].val[i].set((long)objects[i]);
}
sfall/ScriptOps/ScriptArrays.hpp
+2 -2
View File
@@ -308,7 +308,7 @@ static void __declspec(naked) op_temp_array() {
jne fail;
push ecx;
push eax;
call TempArray;
call CreateTempArray;
mov edx, eax;
jmp end;
fail:
@@ -559,7 +559,7 @@ static DWORD __stdcall ListAsArray(DWORD type) {
std::vector<TGameObj*> vec = std::vector<TGameObj*>();
FillListVector(type, vec);
size_t sz = vec.size();
DWORD id = TempArray(sz, 0);
DWORD id = CreateTempArray(sz, 0);
for (size_t i = 0; i < sz; i++) {
arrays[id].val[i].set((long)vec[i]);
}
sfall/ScriptOps/ScriptUtils.hpp
+2 -2
View File
@@ -171,7 +171,7 @@ static int __stdcall StringSplit(const char* str, const char* split) {
size_t count, splitLen = strlen(split);
if (!splitLen) {
count = strlen(str);
id = TempArray(count, 0);
id = CreateTempArray(count, 0);
for (DWORD i = 0; i < count; i++) {
arrays[id].val[i].set(&str[i], 1);
}
@@ -184,7 +184,7 @@ static int __stdcall StringSplit(const char* str, const char* split) {
count++;
ptr = newptr + splitLen;
}
id = TempArray(count, 0);
id = CreateTempArray(count, 0);
ptr = str;
count = 0;
while (true) {
sfall/ScriptOps/WorldmapOps.hpp
+1 -1
View File
@@ -223,7 +223,7 @@ static void mf_set_map_enter_position() {
}
static void mf_get_map_enter_position() {
DWORD id = TempArray(3, 0);
DWORD id = CreateTempArray(3, 0);
arrays[id].val[0].set((long)*ptr_tile);
arrays[id].val[1].set((long)*ptr_elevation);
arrays[id].val[2].set((long)*ptr_rotation);