From 6fbc179cb160b55975ed26f69a399093bb5426ca Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Tue, 20 Jan 2009 17:42:21 +0000 Subject: [PATCH] Network variable fix, build it --- Src/Makefile | 2 +- Src/Network.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/Makefile b/Src/Makefile index 1c70e4f..51d26d8 100644 --- a/Src/Makefile +++ b/Src/Makefile @@ -28,7 +28,7 @@ INSTALL_DATA = ${INSTALL} -m 644 ## Files GUIOBJS = 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 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 diff --git a/Src/Network.cpp b/Src/Network.cpp index 64bc68f..36498ba 100644 --- a/Src/Network.cpp +++ b/Src/Network.cpp @@ -163,9 +163,9 @@ bool Network::DecodeDisplayRaw(Uint8 *screen, struct NetworkDisplayUpdate *src, { 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 a = x >> 4; - Uint8 b = x & 0xf; + Uint8 v = src->data[(y - y_start) * raw_w + (x - x_start) / 2]; + Uint8 a = v >> 4; + Uint8 b = v & 0xf; screen[ y * DISPLAY_X + x ] = a; screen[ y * DISPLAY_X + x + 1 ] = b;