From 204e9c119a9dc4e2c13807fff6962a4efe9dd12d Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 19 Oct 2018 21:34:50 -0400 Subject: [PATCH] Fix compile problems with cc65 v2.17. It only compiles under cc65 v2.17 now. --- .../UserInterfaceState.xcuserstate | Bin 31887 -> 32554 bytes CurtaSim/curtaUI.c | 15 +++++++-------- CurtaSim/make/V2Make.scpt | Bin 4900 -> 4900 bytes 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CurtaSim.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate b/CurtaSim.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate index 50c5dfd1b48b8e1e7c2dc081f001e33e459ecb2d..bcb53cbf277c6c7b9e31140de2c01e122715add8 100644 GIT binary patch delta 15038 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 M@JeEWs_pjw01lr}BLDyZ diff --git a/CurtaSim/curtaUI.c b/CurtaSim/curtaUI.c index 4cc8442..44d3295 100644 --- a/CurtaSim/curtaUI.c +++ b/CurtaSim/curtaUI.c @@ -13,7 +13,6 @@ #include #include #include -#include #include "curtaModel.h" #include "joystick.h" @@ -35,12 +34,12 @@ typedef int8_t tAction; #define ACTION_NULL 9 -#define OPERAND_COLOR COLOR_WHITE -#define OPERAND_OFFSET 4 -#define SLIDER_BAR_COLOR COLOR_BLUE -#define SELECTED_SLIDER_BAR_COLOR COLOR_VIOLET -#define SLIDER_COLOR COLOR_ORANGE -#define SELECTED_SLIDER_COLOR COLOR_BLACK +#define OPERAND_COLOR TGI_COLOR_WHITE +#define OPERAND_OFFSET 12 +#define SLIDER_BAR_COLOR TGI_COLOR_BLUE +#define SELECTED_SLIDER_BAR_COLOR TGI_COLOR_VIOLET +#define SLIDER_COLOR TGI_COLOR_ORANGE +#define SELECTED_SLIDER_COLOR TGI_COLOR_BLACK #define SLIDER_X_BORDER 8 #define SLIDER_Y_BORDER 15 #define SLIDER_BAR_WIDTH 12 @@ -160,7 +159,7 @@ static void drawText(char xPos, tDigit digit) char buffer[2]; // Clear old text - tgi_setcolor(COLOR_BLACK); + tgi_setcolor(TGI_COLOR_BLACK); tgi_bar(xPos, 0, xPos + SLIDER_BAR_WIDTH, SLIDER_Y_BORDER - 1); // Draw text label diff --git a/CurtaSim/make/V2Make.scpt b/CurtaSim/make/V2Make.scpt index a4abb4196d9bccb9db8ccd4516f7ff7b1a06bba2..cea04a6ea59d685a43538bed29c0c978aa4dde1a 100644 GIT binary patch delta 196 zcmZ3YwnS}%6OW{UrK6#_o0*}mp|gpRu8FCmrLKjcv5BtbFjz7;G8i(LGq^FB0cl+zc4jbPFaokn7)*h3mOz#TP}CU6*9G!iz$(mu as*QncGX?`7=`#5wZwgVCZVu$T%mM&HI3`m7 delta 196 zcma)#F%H5o3`PII*s`;uZkC)jie;%w93{-mtlTJ9=mC&81Y+hwm;+Qo9{&6P>&x4; zO%EGRK|_jK3oVT+#hjT`Y9{Ho;dS0^O-m9>Y%}*Zu9pBsKtgn_C?G6oU}y3y`>~Tk bJjqT1b60%vqvWk&2KV=P|Lf`Vdi)%|qRb~H