diff --git a/src/common/scripting/core/dynarrays.cpp b/src/common/scripting/core/dynarrays.cpp index b4ead0bee..432e0158b 100644 --- a/src/common/scripting/core/dynarrays.cpp +++ b/src/common/scripting/core/dynarrays.cpp @@ -81,11 +81,11 @@ template int ArrayPop(T *self) return self->Pop(); } -template void ArrayDelete(T *self, int index, int count) +template void ArrayDelete(T *self, unsigned int index, int count) { - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -93,7 +93,7 @@ template void ArrayDelete(T *self, int index, int count) } } -template void ArrayInsert(T *self, int index, U val) +template void ArrayInsert(T *self, unsigned int index, U val) { int oldSize = self->Size(); self->Insert(index, static_cast(val)); @@ -108,12 +108,12 @@ template void ArrayShrinkToFit(T *self) self->ShrinkToFit(); } -template void ArrayGrow(T *self, int amount) +template void ArrayGrow(T *self, unsigned int amount) { self->Grow(amount); } -template void ArrayResize(T *self, int amount) +template void ArrayResize(T *self, unsigned int amount) { int oldSize = self->Size(); self->Resize(amount); @@ -125,12 +125,12 @@ template void ArrayResize(T *self, int amount) } } -template unsigned int ArrayReserve(T *self, int amount) +template unsigned int ArrayReserve(T *self, unsigned int amount) { return self->Reserve(amount); } -template<> unsigned int ArrayReserve(TArray *self, int amount) +template<> unsigned int ArrayReserve(TArray *self, unsigned int amount) { const unsigned int oldSize = self->Reserve(amount); const unsigned int fillCount = self->Size() - oldSize; @@ -207,11 +207,11 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, Pop, ArrayPop) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I8); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(count); - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -223,7 +223,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, Delete, ArrayDelete) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, Insert, ArrayInsert) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I8); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(val); ArrayInsert(self, index, val); return 0; @@ -239,7 +239,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, ShrinkToFit, ArrayShrinkToFit) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I8); - PARAM_INT(count); + PARAM_UINT(count); self->Grow(count); return 0; } @@ -247,7 +247,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, Grow, ArrayGrow) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, Resize, ArrayResize) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I8); - PARAM_INT(count); + PARAM_UINT(count); ArrayResize(self, count); return 0; } @@ -255,7 +255,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, Resize, ArrayResize) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I8, Reserve, ArrayReserve) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I8); - PARAM_INT(count); + PARAM_UINT(count); ACTION_RETURN_INT(self->Reserve(count)); } @@ -325,11 +325,11 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, Pop, ArrayPop) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I16); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(count); - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -341,7 +341,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, Delete, ArrayDelete) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, Insert, ArrayInsert) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I16); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(val); ArrayInsert(self, index, val); return 0; @@ -357,7 +357,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, ShrinkToFit, ArrayShrinkToFit) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I16); - PARAM_INT(count); + PARAM_UINT(count); self->Grow(count); return 0; } @@ -365,7 +365,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, Grow, ArrayGrow) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, Resize, ArrayResize) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I16); - PARAM_INT(count); + PARAM_UINT(count); ArrayResize(self, count); return 0; } @@ -373,7 +373,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, Resize, ArrayResize) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I16, Reserve, ArrayReserve) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I16); - PARAM_INT(count); + PARAM_UINT(count); ACTION_RETURN_INT(self->Reserve(count)); } @@ -465,11 +465,11 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, Pop, ArrayPop) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I32); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(count); - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -481,7 +481,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, Delete, ArrayDelete) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, Insert, ArrayInsert) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I32); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(val); ArrayInsert(self, index, val); return 0; @@ -497,7 +497,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, ShrinkToFit, ArrayShrinkToFit) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I32); - PARAM_INT(count); + PARAM_UINT(count); self->Grow(count); return 0; } @@ -505,7 +505,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, Grow, ArrayGrow) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, Resize, ArrayResize) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I32); - PARAM_INT(count); + PARAM_UINT(count); ArrayResize(self, count); return 0; } @@ -513,7 +513,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, Resize, ArrayResize) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_I32, Reserve, ArrayReserve) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I32); - PARAM_INT(count); + PARAM_UINT(count); ACTION_RETURN_INT(self->Reserve(count)); } @@ -583,11 +583,11 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, Pop, ArrayPop) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F32); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(count); - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -599,7 +599,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, Delete, ArrayDelete) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, Insert, ArrayInsert) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F32); - PARAM_INT(index); + PARAM_UINT(index); PARAM_FLOAT(val); ArrayInsert(self, index, val); return 0; @@ -615,7 +615,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, ShrinkToFit, ArrayShrinkToFit) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F32); - PARAM_INT(count); + PARAM_UINT(count); self->Grow(count); return 0; } @@ -623,7 +623,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, Grow, ArrayGrow) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, Resize, ArrayResize) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F32); - PARAM_INT(count); + PARAM_UINT(count); ArrayResize(self, count); return 0; } @@ -631,7 +631,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, Resize, ArrayResize) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F32, Reserve, ArrayReserve) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F32); - PARAM_INT(count); + PARAM_UINT(count); ACTION_RETURN_INT(self->Reserve(count)); } @@ -701,11 +701,11 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, Pop, ArrayPop) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F64); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(count); - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -717,7 +717,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, Delete, ArrayDelete) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, Insert, ArrayInsert) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F64); - PARAM_INT(index); + PARAM_UINT(index); PARAM_FLOAT(val); ArrayInsert(self, index, val); return 0; @@ -733,7 +733,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, ShrinkToFit, ArrayShrinkToFit) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F64); - PARAM_INT(count); + PARAM_UINT(count); self->Grow(count); return 0; } @@ -741,7 +741,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, Grow, ArrayGrow) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, Resize, ArrayResize) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F64); - PARAM_INT(count); + PARAM_UINT(count); ArrayResize(self, count); return 0; } @@ -749,7 +749,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, Resize, ArrayResize) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_F64, Reserve, ArrayReserve) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F64); - PARAM_INT(count); + PARAM_UINT(count); ACTION_RETURN_INT(self->Reserve(count)); } @@ -819,11 +819,11 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, Pop, ArrayPop) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Ptr); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(count); - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -835,7 +835,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, Delete, ArrayDelete) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, Insert, ArrayInsert) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Ptr); - PARAM_INT(index); + PARAM_UINT(index); PARAM_POINTER(val, void); ArrayInsert(self, index, val); return 0; @@ -851,7 +851,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, ShrinkToFit, ArrayShrinkToFit) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Ptr); - PARAM_INT(count); + PARAM_UINT(count); self->Grow(count); return 0; } @@ -859,7 +859,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, Grow, ArrayGrow) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, Resize, ArrayResize) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Ptr); - PARAM_INT(count); + PARAM_UINT(count); ArrayResize(self, count); return 0; } @@ -867,7 +867,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, Resize, ArrayResize) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Ptr, Reserve, ArrayReserve) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Ptr); - PARAM_INT(count); + PARAM_UINT(count); ACTION_RETURN_INT(self->Reserve(count)); } @@ -962,11 +962,11 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Pop, ArrayPop) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Obj); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(count); - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -986,7 +986,7 @@ void ObjArrayInsert(FDynArray_Obj *self,int index, DObject *obj) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Insert, ObjArrayInsert) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Obj); - PARAM_INT(index); + PARAM_UINT(index); PARAM_OBJECT(val, DObject); ObjArrayInsert(self, index, val); return 0; @@ -1002,7 +1002,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, ShrinkToFit, ArrayShrinkToFit) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Obj); - PARAM_INT(count); + PARAM_UINT(count); self->Grow(count); return 0; } @@ -1010,7 +1010,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Grow, ArrayGrow) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Resize, ArrayResize) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Obj); - PARAM_INT(count); + PARAM_UINT(count); ArrayResize(self, count); return 0; } @@ -1018,7 +1018,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Resize, ArrayResize) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Reserve, ArrayReserve) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Obj); - PARAM_INT(count); + PARAM_UINT(count); ACTION_RETURN_INT(ArrayReserve(self, count)); } @@ -1105,11 +1105,11 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_String, Pop, ArrayPop) DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_String, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_String); - PARAM_INT(index); + PARAM_UINT(index); PARAM_INT(count); - if(index < 0 || index >= self->Size()) + if(index >= self->Size()) { - ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %i, Count = %i",self->Size(), index, count); + ThrowAbortException(X_ARRAY_OUT_OF_BOUNDS, "Trying to delete past end of Array, Size = %u, Index = %u, Count = %i",self->Size(), index, count); } else { @@ -1121,7 +1121,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_String, Delete, ArrayDelete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_String); - PARAM_INT(index); + PARAM_UINT(index); PARAM_STRING(val); self->Insert(index, val); return 0; @@ -1137,7 +1137,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_String, ShrinkToFit, ArrayShrinkToFit) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_String); - PARAM_INT(count); + PARAM_UINT(count); self->Grow(count); return 0; } @@ -1145,7 +1145,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_String, Grow, ArrayGrow) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_String); - PARAM_INT(count); + PARAM_UINT(count); self->Resize(count); return 0; } @@ -1153,7 +1153,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_String, Resize, ArrayResize) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_String); - PARAM_INT(count); + PARAM_UINT(count); ACTION_RETURN_INT(self->Reserve(count)); }