Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't overallocate mng array

Browse source
This commit is contained in:
Tim Felgentreff 2022-04-27 21:22:37 +02:00
parent 1be53f0dc9
commit 3a0c61d6ad
1 changed files with 8 additions and 2 deletions

10
src/unit/script_unittype.cpp
View file

@ -607,7 +607,14 @@ static int CclDefineUnitType(lua_State *l)
LuaError(l, "incorrect argument");
}
const int subargs = lua_rawlen(l, -1);
type->Portrait.Num = subargs;
int number = 0;
for (int k = 0; k < subargs; ++k) {
const char *s = LuaToString(l, -1, k + 1);
if (strcmp("talking", s)) {
number++;
}
}
type->Portrait.Num = number;
type->Portrait.Talking = 0;
type->Portrait.Files = new std::string[type->Portrait.Num];
type->Portrait.Mngs = new Mng *[type->Portrait.Num];
@ -616,7 +623,6 @@ static int CclDefineUnitType(lua_State *l)
const char *s = LuaToString(l, -1, k + 1);
if (!strcmp("talking", s)) {
type->Portrait.Talking = k;
type->Portrait.Num--;
} else {
type->Portrait.Files[k - (type->Portrait.Talking ? 1 : 0)] = s;
}