darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-24 04:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

error builtin to bail out, pawn now _always_ nulls the new entity data

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-22 15:35:28 +02:00
parent 77e5807a83
commit ce956fa0fb
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
exec.c
View file

@ -218,11 +218,12 @@ qcany* prog_getedict(qc_program *prog, qcint e)
qcint prog_spawn_entity(qc_program *prog) qcint prog_spawn_entity(qc_program *prog)
{ {
char *data;
size_t i; size_t i;
qcint e; qcint e;
for (e = 0; e < (qcint)prog->entitypool_count; ++e) { for (e = 0; e < (qcint)prog->entitypool_count; ++e) {
if (!prog->entitypool[e]) { if (!prog->entitypool[e]) {
char *data = (char*)(prog->entitydata + (prog->entityfields * e)); data = (char*)(prog->entitydata + (prog->entityfields * e));
memset(data, 0, prog->entityfields * sizeof(qcint)); memset(data, 0, prog->entityfields * sizeof(qcint));
return e; return e;
} }
@ -239,6 +240,8 @@ qcint prog_spawn_entity(qc_program *prog)
return 0; return 0;
} }
} }
data = (char*)(prog->entitydata + (prog->entityfields * e));
memset(data, 0, prog->entityfields * sizeof(qcint));
return e; return e;
} }
@ -648,6 +651,14 @@ static int qc_print(qc_program *prog)
return 0; return 0;
} }
static int qc_error(qc_program *prog)
{
printf("*** VM raised an error:\n");
qc_print(prog);
prog->vmerror++;
return -1;
}
static int qc_ftos(qc_program *prog) static int qc_ftos(qc_program *prog)
{ {
char buffer[512]; char buffer[512];
@ -699,6 +710,7 @@ static prog_builtin qc_builtins[] = {
&qc_spawn, &qc_spawn,
&qc_kill, &qc_kill,
&qc_vtos, &qc_vtos,
&qc_error
}; };
static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]); static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]);