qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use handles rather than pointers (whatever was I thinking?)

This commit is contained in:
Bill Currie 2006-12-02 06:50:59 +00:00 committed by Jeff Teunissen
parent 48f8bbd12e
commit a6c50b8edd
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libs/gamecode/builtins/bi_inputline.c
View File

@ -58,18 +58,14 @@ typedef struct {
static inputline_t * static inputline_t *
get_inputline (progs_t *pr, int arg, const char *func) get_inputline (progs_t *pr, int arg, const char *func)
{ {
pr_type_t *handle; il_resources_t *res = PR_Resources_Find (pr, "InputLine");
inputline_t *line; inputline_t *line;
int min = (pr_type_t *) pr->zone - pr->pr_globals;
int max = min + pr->zone_size / sizeof (pr_type_t);
if (arg <= min || arg >= max) if (arg < 0 || arg >= res->max_lines)
PR_RunError (pr, "%s: Invalid inputline_t: $%x $%x $%x", func, arg, PR_RunError (pr, "%s: Invalid inputline_t: $%x $%x", func, arg,
min, max); res->max_lines);
handle = pr->pr_globals + arg; line = res->lines[arg];
line = *(inputline_t **)handle;
if (!line) if (!line)
PR_RunError (pr, "Invalid inputline_t"); PR_RunError (pr, "Invalid inputline_t");
@ -85,7 +81,6 @@ bi_InputLine_Create (progs_t *pr)
int lines = P_INT (pr, 0); int lines = P_INT (pr, 0);
int size = P_INT (pr, 1); int size = P_INT (pr, 1);
int prompt = P_INT (pr, 2); int prompt = P_INT (pr, 2);
pr_type_t *handle;
for (i = 0; i < res->max_lines; i++) for (i = 0; i < res->max_lines; i++)
if (!res->lines[i]) { if (!res->lines[i]) {
@ -104,16 +99,14 @@ bi_InputLine_Create (progs_t *pr)
return; return;
} }
(*line)->draw = res->draw; (*line)->draw = res->draw;
handle = PR_Zone_Malloc (pr, sizeof (inputline_t *)); R_INT (pr) = line - res->lines;
*(inputline_t**)handle = *line;
R_INT (pr) = handle - pr->pr_globals;
} }
static void static void
bi_InputLine_SetUserData (progs_t *pr) bi_InputLine_SetUserData (progs_t *pr)
{ {
inputline_t *line = get_inputline (pr, P_INT (pr, 0), inputline_t *line = get_inputline (pr, P_INT (pr, 0),
"InputLine_SetWidth"); "InputLine_SetUserData");
pr_type_t *data = P_GPOINTER (pr, 1); pr_type_t *data = P_GPOINTER (pr, 1);
line->user_data = data; line->user_data = data;
@ -133,27 +126,18 @@ static void
bi_InputLine_Destroy (progs_t *pr) bi_InputLine_Destroy (progs_t *pr)
{ {
il_resources_t *res = PR_Resources_Find (pr, "InputLine"); il_resources_t *res = PR_Resources_Find (pr, "InputLine");
pr_type_t *handle;
int arg = P_INT (pr, 0); int arg = P_INT (pr, 0);
int i;
inputline_t *line; inputline_t *line;
if (arg <= ((pr_type_t *) pr->zone - pr->pr_globals) if (arg < 0 || arg >= res->max_lines)
|| (size_t) arg >= (pr->zone_size / sizeof (pr_type_t)))
PR_RunError (pr, "InputLine_Destroy: Invalid inputline_t"); PR_RunError (pr, "InputLine_Destroy: Invalid inputline_t");
handle = pr->pr_globals + arg; line = res->lines[arg];
line = *(inputline_t **)handle;
if (!line) if (!line)
PR_RunError (pr, "InputLine_Destroy: Invalid inputline_t"); PR_RunError (pr, "InputLine_Destroy: Invalid inputline_t");
for (i = 0; i < res->max_lines; i++)
if (res->lines[i] == line) {
Con_DestroyInputLine (line); Con_DestroyInputLine (line);
res->lines = 0; res->lines[arg] = 0;
PR_Zone_Free (pr, handle);
}
} }
static void static void