Skip to content

Commit 2380a9d

Browse files
Update a8libwin.c
shorten SCRMEM, SCRMEM_row Signed-off-by: Ripjetski <[email protected]>
1 parent 1d2f9e6 commit 2380a9d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/a8libwin.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ byte WOrn(byte bN, byte bT, byte bL, unsigned char *pS);
3434
byte WDiv(byte bN, byte y, byte bD);
3535
byte WClr(byte bN);
3636

37-
unsigned int SCRMEM;
38-
unsigned int SCRMEM_row[24];
37+
unsigned int iSM;
38+
unsigned int iSMr[24];
3939

4040
// --------------------------------------------------
4141
// Function: void WInit(void)
@@ -75,9 +75,9 @@ void WInit(void)
7575
vCur.vX = 0;
7676
vCur.vY = 0;
7777

78-
SCRMEM = PEEKW(88);
78+
iSM = PEEKW(88);
7979
for (bL = 0; bL < 24; bL++) {
80-
SCRMEM_row[bL] = SCRMEM + (bL * 40);
80+
iSMr[bL] = iSM + (bL * 40);
8181
}
8282
}
8383

@@ -91,7 +91,7 @@ void WInit(void)
9191
void WBack(byte bN)
9292
{
9393
// Fill screen memory with char
94-
memset(SCRMEM, bN, 960);
94+
memset(iSM, bN, 960);
9595
}
9696

9797

@@ -135,7 +135,7 @@ byte WOpen(byte x, byte y, byte w, byte h, byte bT)
135135
baW.bI[bL] = bT;
136136

137137
// Find top left corner of window in memory
138-
pS = SCRMEM_row[y] + x;
138+
pS = iSMr[y] + x;
139139

140140
// Draw window
141141
for(bD=0; bD <= h-1; bD++) {
@@ -211,7 +211,7 @@ byte WClose(byte bN)
211211
// Only if handle in use
212212
if (baW.bU[bN] == WON) {
213213
// Find top left corner of window in screen memory
214-
pS = SCRMEM_row[baW.bY[bN]] + baW.bX[bN];
214+
pS = iSMr[baW.bY[bN]] + baW.bX[bN];
215215

216216
// Set temp ptr to start of win mem
217217
pA = baW.cM[bN];
@@ -381,7 +381,7 @@ byte WPrint(byte bN, byte x, byte y, byte bI, unsigned char *pS)
381381
}
382382

383383
// Find row, from top left corner of window, in scrn mem (inside frame)
384-
cS = SCRMEM_row[baW.bY[bN] + y] + baW.bX[bN];
384+
cS = iSMr[baW.bY[bN] + y] + baW.bX[bN];
385385

386386
// If not center, move to X pos
387387
if (x != WPCNT) {
@@ -442,7 +442,7 @@ byte WOrn(byte bN, byte bT, byte bL, unsigned char *pS)
442442
}
443443

444444
// Find window top screen location
445-
cS = SCRMEM_row[baW.bY[bN]];
445+
cS = iSMr[baW.bY[bN]];
446446

447447
// If bottom find lower location
448448
if (bT == WPBOT) {
@@ -519,7 +519,7 @@ byte WDiv(byte bN, byte y, byte bD)
519519
}
520520

521521
// Find location on screen
522-
cS = SCRMEM_row[baW.bY[bN] + y] + baW.bX[bN];
522+
cS = iSMr[baW.bY[bN] + y] + baW.bX[bN];
523523

524524
// Move to screen
525525
memcpy(cS, cL, bS);
@@ -549,7 +549,7 @@ byte WClr(byte bN)
549549
// Only if window in use
550550
if (baW.bU[bN] == WON) {
551551
// Find top left corner of window in screen memory (inside frame)
552-
cS = SCRMEM_row[baW.bY[bN]] + baW.bX[bN] + 41;
552+
cS = iSMr[baW.bY[bN]] + baW.bX[bN] + 41;
553553

554554
// Determine width (minus frames)
555555
bS = baW.bW[bN] - 2;

0 commit comments

Comments
 (0)