Network variable fix, build it

This commit is contained in:
simon.kagstrom 2009-01-20 17:42:21 +00:00
parent 6656508cd0
commit 6fbc179cb1
2 changed files with 4 additions and 4 deletions

View File

@ -28,7 +28,7 @@ INSTALL_DATA = ${INSTALL} -m 644
## Files ## Files
GUIOBJS = GUIOBJS =
OBJS = $(GUIOBJS) main.o Prefs.o SID.o REU.o IEC.o 1541fs.o \ OBJS = $(GUIOBJS) main.o Prefs.o SID.o REU.o IEC.o 1541fs.o \
1541d64.o 1541t64.o 1541job.o SAM.o CmdPipe.o menu.o char_to_kc.o 1541d64.o 1541t64.o 1541job.o SAM.o CmdPipe.o menu.o char_to_kc.o Network.o
SLOBJS = $(OBJS) C64.o CPUC64.o VIC.o CIA.o CPU1541.o Display.o SLOBJS = $(OBJS) C64.o CPUC64.o VIC.o CIA.o CPU1541.o Display.o
SLFLAGS = -DPRECISE_CPU_CYCLES=1 -DPRECISE_CIA_CYCLES=1 -DPC_IS_POINTER=0 SLFLAGS = -DPRECISE_CPU_CYCLES=1 -DPRECISE_CIA_CYCLES=1 -DPC_IS_POINTER=0
SCOBJS = $(OBJS) C64_SC.o CPUC64_SC.o VIC_SC.o CIA_SC.o CPU1541_SC.o CPU_common.o Display_SC.o SCOBJS = $(OBJS) C64_SC.o CPUC64_SC.o VIC_SC.o CIA_SC.o CPU1541_SC.o CPU_common.o Display_SC.o

View File

@ -163,9 +163,9 @@ bool Network::DecodeDisplayRaw(Uint8 *screen, struct NetworkDisplayUpdate *src,
{ {
for (int x = x_start; x < x_start + SQUARE_H; x += 2) for (int x = x_start; x < x_start + SQUARE_H; x += 2)
{ {
Uint8 x = src->data[(y - y_start) * raw_w + (x - x_start) / 2]; Uint8 v = src->data[(y - y_start) * raw_w + (x - x_start) / 2];
Uint8 a = x >> 4; Uint8 a = v >> 4;
Uint8 b = x & 0xf; Uint8 b = v & 0xf;
screen[ y * DISPLAY_X + x ] = a; screen[ y * DISPLAY_X + x ] = a;
screen[ y * DISPLAY_X + x + 1 ] = b; screen[ y * DISPLAY_X + x + 1 ] = b;