cleanup some silly more warnings

This commit is contained in:
Wolfgang Bumiller 2017-07-23 10:05:34 +02:00
parent 5a0d645ede
commit fb3af2831b

View file

@ -113,6 +113,7 @@ qc_program_t* prog_load(const char *filename, bool skipversion)
/* spawn the world entity */ /* spawn the world entity */
prog->entitypool.emplace_back(true); prog->entitypool.emplace_back(true);
prog->entitydata.resize(prog->entityfields); prog->entitydata.resize(prog->entityfields);
if (prog->entitydata.size())
memset(prog->entitydata.data(), 0, sizeof(prog->entitydata[0]) * prog->entityfields); memset(prog->entitydata.data(), 0, sizeof(prog->entitydata[0]) * prog->entityfields);
prog->entities = 1; prog->entities = 1;
@ -517,8 +518,10 @@ static qcint_t prog_leavefunction(qc_program_t *prog) {
oldsp = prog->stack[prog->stack.size()-1].localsp; oldsp = prog->stack[prog->stack.size()-1].localsp;
#endif #endif
if (prev) { if (prev) {
if (prev->locals) {
qcint_t *globals = &prog->globals[0] + prev->firstlocal; qcint_t *globals = &prog->globals[0] + prev->firstlocal;
memcpy(globals, &prog->localstack[oldsp], prev->locals * sizeof(prog->localstack[0])); memcpy(globals, &prog->localstack[oldsp], prev->locals * sizeof(prog->localstack[0]));
}
prog->localstack.resize(oldsp); prog->localstack.resize(oldsp);
} }