From b870e05547bc189f29569a5d21db0c875c8f9983 Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Tue, 30 Oct 2012 21:29:30 +0000 Subject: Imported Upstream version 0.67 --- markers.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'markers.c') diff --git a/markers.c b/markers.c index 6731e24..925f890 100644 --- a/markers.c +++ b/markers.c @@ -95,10 +95,10 @@ int writemarkerfile(tMarkers* markers,char* filename) fclose(f); return RETOK; } -tInt8 gotomask(tOutput* output,tMarkers* markers,tUInt64* cursorpos) +tInt8 gotomask(tOutput* output,tMarkers* markers,tUInt64* cursorpos,tInt64 baseaddr) { - tUInt64 actcursorpos=*cursorpos; - tUInt64 newcursorpos=*cursorpos; + tUInt64 actcursorpos=*cursorpos+baseaddr; + tUInt64 newcursorpos=*cursorpos+baseaddr; tInt8 itemnums[25]; tInt8 selected; tMenu Menu1; @@ -177,7 +177,7 @@ tInt8 gotomask(tOutput* output,tMarkers* markers,tUInt64* cursorpos) newcursorpos=actcursorpos; hexinput(output,offsy+3,offsx+8,&newcursorpos,NULL,17); } - if (selected==itemnums[1]) {*cursorpos=newcursorpos;return RETOK;} + if (selected==itemnums[1]) {*cursorpos=newcursorpos-baseaddr;return RETOK;} //FIXME if (selected==itemnums[2]) return RETNOK; for (i=0;irelative[i]=='=') newcursorpos =markers->cursorpos[i]; + if (markers->relative[i]=='=') newcursorpos =markers->cursorpos[i]-baseaddr; // FIXME if (markers->relative[i]=='-') newcursorpos=actcursorpos-markers->cursorpos[i]; if (markers->relative[i]=='+') newcursorpos=actcursorpos+markers->cursorpos[i]; } -- cgit v1.2.3