From 4bad00fba8fec98078497e714594eaa82a928236 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 22 May 2005 13:07:08 +0000 Subject: [PATCH] small bug. functionname wasn't offset by the string table. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1046 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/qclib/execloop.h | 2 +- engine/qclib/execloop16d.h | 8 ++++---- engine/qclib/execloop32.h | 8 ++++---- engine/qclib/execloop32d.h | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/engine/qclib/execloop.h b/engine/qclib/execloop.h index 07ab799a4..b1268556b 100644 --- a/engine/qclib/execloop.h +++ b/engine/qclib/execloop.h @@ -1012,7 +1012,7 @@ reeval: { pr_xstatement = s = st-pr_statements; - printf("Break point hit in %s.\n", pr_xfunction->s_name); + printf("Break point hit in %s.\n", pr_xfunction->s_name+progfuncs->stringtable); if (pr_trace<1) pr_trace=1; //this is what it's for diff --git a/engine/qclib/execloop16d.h b/engine/qclib/execloop16d.h index e38820dc4..b1268556b 100644 --- a/engine/qclib/execloop16d.h +++ b/engine/qclib/execloop16d.h @@ -987,8 +987,8 @@ reeval: PR_RunError(progfuncs, "Progs boundcheck failed. Value is %i.", OPA->_int); } break; - case OP_PUSH: - OPC->_int = (int)&localstack[localstack_used+pr_spushed]; +/* case OP_PUSH: + OPC->_int = ENGINEPOINTER(&localstack[localstack_used+pr_spushed]); pr_spushed += OPA->_int; if (pr_spushed + localstack_used >= LOCALSTACK_SIZE) { @@ -1006,13 +1006,13 @@ reeval: PR_RunError(progfuncs, "Progs poped more than it pushed"); } break; - +*/ default: if (st->op & 0x8000) //break point! { pr_xstatement = s = st-pr_statements; - printf("Break point hit in %s.\n", pr_xfunction->s_name); + printf("Break point hit in %s.\n", pr_xfunction->s_name+progfuncs->stringtable); if (pr_trace<1) pr_trace=1; //this is what it's for diff --git a/engine/qclib/execloop32.h b/engine/qclib/execloop32.h index e38820dc4..b1268556b 100644 --- a/engine/qclib/execloop32.h +++ b/engine/qclib/execloop32.h @@ -987,8 +987,8 @@ reeval: PR_RunError(progfuncs, "Progs boundcheck failed. Value is %i.", OPA->_int); } break; - case OP_PUSH: - OPC->_int = (int)&localstack[localstack_used+pr_spushed]; +/* case OP_PUSH: + OPC->_int = ENGINEPOINTER(&localstack[localstack_used+pr_spushed]); pr_spushed += OPA->_int; if (pr_spushed + localstack_used >= LOCALSTACK_SIZE) { @@ -1006,13 +1006,13 @@ reeval: PR_RunError(progfuncs, "Progs poped more than it pushed"); } break; - +*/ default: if (st->op & 0x8000) //break point! { pr_xstatement = s = st-pr_statements; - printf("Break point hit in %s.\n", pr_xfunction->s_name); + printf("Break point hit in %s.\n", pr_xfunction->s_name+progfuncs->stringtable); if (pr_trace<1) pr_trace=1; //this is what it's for diff --git a/engine/qclib/execloop32d.h b/engine/qclib/execloop32d.h index e38820dc4..b1268556b 100644 --- a/engine/qclib/execloop32d.h +++ b/engine/qclib/execloop32d.h @@ -987,8 +987,8 @@ reeval: PR_RunError(progfuncs, "Progs boundcheck failed. Value is %i.", OPA->_int); } break; - case OP_PUSH: - OPC->_int = (int)&localstack[localstack_used+pr_spushed]; +/* case OP_PUSH: + OPC->_int = ENGINEPOINTER(&localstack[localstack_used+pr_spushed]); pr_spushed += OPA->_int; if (pr_spushed + localstack_used >= LOCALSTACK_SIZE) { @@ -1006,13 +1006,13 @@ reeval: PR_RunError(progfuncs, "Progs poped more than it pushed"); } break; - +*/ default: if (st->op & 0x8000) //break point! { pr_xstatement = s = st-pr_statements; - printf("Break point hit in %s.\n", pr_xfunction->s_name); + printf("Break point hit in %s.\n", pr_xfunction->s_name+progfuncs->stringtable); if (pr_trace<1) pr_trace=1; //this is what it's for