From c945c42989bfc91a3d02fe15062a60ce24e98dd6 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 24 Mar 2020 23:16:25 +0900 Subject: [PATCH] [gamecode] Fix some silly errors I forgot to compile-test :( --- libs/gamecode/pr_exec.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c index 0441e9b83..43681da79 100644 --- a/libs/gamecode/pr_exec.c +++ b/libs/gamecode/pr_exec.c @@ -292,8 +292,10 @@ PR_LeaveFunction (progs_t *pr, int to_engine) Sys_Printf ("Returning to engine\n"); } else { bfunction_t *rf = pr->pr_xfunction; - Sys_Printf ("Returning to function %s\n", - PR_GetString (pr, rf->descriptor->s_name)); + if (rf) { + Sys_Printf ("Returning to function %s\n", + PR_GetString (pr, rf->descriptor->s_name)); + } } } @@ -464,7 +466,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum) st = pr->pr_statements + pr->pr_xstatement; if (pr->watch) { - old_val = pr->watch; + old_val = *pr->watch; } while (1) { @@ -1715,10 +1717,10 @@ op_call: pr->debug_handler (prd_watchpoint, pr->debug_data); } else { PR_RunError (pr, "watchpoint hit: %d -> %d", - old_val.integer_var, watch->integer_var); + old_val.integer_var, pr->watch->integer_var); } } - old_val.integer_var = watch->integer_var; + old_val.integer_var = pr->watch->integer_var; } } exit_program: