From edf4ce1982a3b3431fc03d8757f7b358f6631c45 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Thu, 14 Sep 2017 15:55:43 -0400
Subject: [PATCH] tfv: fix up the graphics a bit

---
 gr-sim/tfv_backgrounds.c |  59 +++++++++++++++++----------------
 gr-sim/tfv_citymap.c     |  70 +++++++++++++++++++++++++++++++++++++++
 tfv/harfco.png           | Bin 316 -> 356 bytes
 tfv/umcp.png             | Bin 536 -> 541 bytes
 4 files changed, 100 insertions(+), 29 deletions(-)

diff --git a/gr-sim/tfv_backgrounds.c b/gr-sim/tfv_backgrounds.c
index 6c5eb9cd..4a71385e 100644
--- a/gr-sim/tfv_backgrounds.c
+++ b/gr-sim/tfv_backgrounds.c
@@ -108,15 +108,16 @@ unsigned char harfco_rle[]={
 	0x05,0x00, 0x1D,0xAA, 0x01,0x77, 0x09,0x00, 0x01,0xF0, 0x01,0x00, 0x1B,0xAA, 
 	0x01,0x77, 0x03,0x00, 0x01,0xF0, 0x03,0x00, 0x01,0xF0, 0x17,0x00, 0x01,0xF0, 
 	0x15,0x00, 0x01,0x0F, 0x19,0x00, 0x01,0xF0, 0x16,0x00, 0x01,0x0F, 0x17,0x00, 
-	0x28,0x22, 0x27,0x77, 0x01,0x22, 0x27,0x77, 0x01,0x22, 0x27,0x77, 0x01,0x22, 
-	0x11,0x77, 0x01,0x07, 0x01,0x77, 0x05,0x07, 0x01,0x77, 0x01,0x00, 0x01,0x77, 
-	0x01,0x07, 0x0B,0x77, 0x01,0x22, 0x0C,0x77, 0x01,0x57, 0x01,0x00, 0x01,0x57, 
-	0x01,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x05,0x00, 0x01,0x57, 0x01,0x00, 
-	0x01,0x57, 0x01,0x00, 0x01,0x57, 0x0A,0x77, 0x01,0x22, 0x0B,0x77, 0x01,0x75, 
-	0x01,0x55, 0x01,0x50, 0x03,0x55, 0x01,0x50, 0x09,0x55, 0x01,0x50, 0x01,0x55, 
-	0x01,0x75, 0x09,0x77, 0x01,0x22, 0x27,0x77, 0x01,0x22, 0x27,0x77, 0x01,0x22, 
-	0x27,0x77, 0x01,0x22, 0x27,0x77, 0x01,0x22, 0x27,0x77, 0x01,0x22, 0x27,0x77, 
-	0x01,0x22, 0x27,0x77, 0x01,0x22, 0x27,0x77, 0x01,0x22, 0xFF,0xFF,	};
+	0x28,0x22, 0x1D,0x77, 0x01,0x72, 0x0A,0x22, 0x1F,0x77, 0x01,0x72, 0x08,0x22, 
+	0x21,0x77, 0x01,0x72, 0x06,0x22, 0x11,0x77, 0x01,0x07, 0x01,0x77, 0x05,0x07, 
+	0x01,0x77, 0x01,0x00, 0x01,0x77, 0x01,0x07, 0x07,0x77, 0x05,0x22, 0x0C,0x77, 
+	0x01,0x57, 0x01,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 
+	0x05,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x07,0x77, 
+	0x04,0x22, 0x0B,0x77, 0x01,0x75, 0x01,0x55, 0x01,0x50, 0x03,0x55, 0x01,0x50, 
+	0x09,0x55, 0x01,0x50, 0x01,0x55, 0x01,0x75, 0x07,0x77, 0x03,0x22, 0x25,0x77, 
+	0x03,0x22, 0x24,0x77, 0x01,0x27, 0x03,0x22, 0x24,0x77, 0x04,0x22, 0x22,0x77, 
+	0x01,0x27, 0x05,0x22, 0x21,0x77, 0x01,0x27, 0x06,0x22, 0x20,0x77, 0x01,0x27, 
+	0x07,0x22, 0x1F,0x77, 0x01,0x27, 0x08,0x22, 0x1E,0x77, 0x01,0x27, 0x09,0x22, 0xFF,0xFF,	};
 unsigned char belair_rle[]={
 	0x28,0x28,
 	0x0A,0x00, 0x01,0x05, 0x01,0x57, 0x01,0x75, 0x01,0x57, 0x01,0x75, 0x01,0x57, 
@@ -253,16 +254,18 @@ unsigned char umcp_rle[]={
 	0x07,0x46, 0x1C,0x66, 0x01,0x44, 0x03,0x66, 0x09,0xD4, 0x12,0x66, 0x01,0x16, 
 	0x01,0x66, 0x01,0xF6, 0x01,0x66, 0x01,0x16, 0x03,0x66, 0x03,0x44, 0x02,0x66, 
 	0x01,0xDD, 0x01,0x5D, 0x02,0xDD, 0x01,0x5D, 0x02,0xDD, 0x01,0x5D, 0x01,0xDD, 
-	0x0D,0x66, 0x02,0xD6, 0x03,0x66, 0x01,0x51, 0x01,0x56, 0x01,0x5F, 0x01,0x56, 
-	0x01,0x51, 0x02,0x66, 0x02,0x64, 0x01,0x84, 0x02,0x64, 0x01,0x66, 0x01,0xDD, 
-	0x01,0xD5, 0x01,0xDD, 0x01,0x4D, 0x01,0x44, 0x01,0x4D, 0x01,0xDD, 0x01,0xD5, 
-	0x01,0xDD, 0x0B,0x66, 0x02,0x6D, 0x02,0x1D, 0x01,0xCC, 0x01,0x5C, 0x07,0x55, 
-	0x01,0x5C, 0x02,0xCC, 0x01,0x88, 0x03,0xCC, 0x01,0xDD, 0x01,0x5D, 0x02,0xDD, 
-	0x01,0x8D, 0x02,0xDD, 0x01,0x5D, 0x01,0xDD, 0x06,0xCC, 0x01,0xC0, 0x01,0x08, 
-	0x01,0x58, 0x01,0x50, 0x01,0x0C, 0x02,0xCC, 0x02,0x11, 0x01,0xCC, 0x01,0x1F, 
-	0x01,0xFF, 0x05,0x1F, 0x01,0xFF, 0x01,0x1F, 0x02,0xCC, 0x01,0x88, 0x03,0xCC, 
-	0x01,0xDD, 0x01,0xD5, 0x02,0xDD, 0x01,0x88, 0x02,0xDD, 0x01,0xD5, 0x01,0xDD, 
-	0x07,0xCC, 0x01,0xC0, 0x01,0x08, 0x01,0x58, 0x01,0x50, 0x01,0x05, 0x01,0x55, 
+	0x02,0x66, 0x02,0x86, 0x01,0x46, 0x08,0x66, 0x02,0xD6, 0x03,0x66, 0x01,0x51, 
+	0x01,0x56, 0x01,0x5F, 0x01,0x56, 0x01,0x51, 0x02,0x66, 0x02,0x64, 0x01,0x84, 
+	0x02,0x64, 0x01,0x66, 0x01,0xDD, 0x01,0xD5, 0x01,0xDD, 0x01,0x4D, 0x01,0x44, 
+	0x01,0x4D, 0x01,0xDD, 0x01,0xD5, 0x01,0xDD, 0x01,0x66, 0x01,0x86, 0x01,0x88, 
+	0x01,0x84, 0x02,0x44, 0x05,0x66, 0x02,0x6D, 0x02,0x1D, 0x01,0xCC, 0x01,0x5C, 
+	0x07,0x55, 0x01,0x5C, 0x02,0xCC, 0x01,0x88, 0x03,0xCC, 0x01,0xDD, 0x01,0x5D, 
+	0x02,0xDD, 0x01,0x8D, 0x02,0xDD, 0x01,0x5D, 0x01,0xDD, 0x01,0xCC, 0x01,0xC8, 
+	0x01,0x88, 0x03,0x44, 0x01,0xC0, 0x01,0x08, 0x01,0x58, 0x01,0x50, 0x01,0x0C, 
+	0x02,0xCC, 0x02,0x11, 0x01,0xCC, 0x01,0x1F, 0x01,0xFF, 0x05,0x1F, 0x01,0xFF, 
+	0x01,0x1F, 0x02,0xCC, 0x01,0x88, 0x03,0xCC, 0x01,0xDD, 0x01,0xD5, 0x02,0xDD, 
+	0x01,0x88, 0x02,0xDD, 0x01,0xD5, 0x01,0xDD, 0x02,0xCC, 0x02,0xC8, 0x01,0xC4, 
+	0x02,0xCC, 0x01,0xC0, 0x01,0x08, 0x01,0x58, 0x01,0x50, 0x01,0x05, 0x01,0x55, 
 	0x01,0x11, 0x01,0x10, 0x01,0xCC, 0x01,0x11, 0x01,0xFF, 0x01,0x10, 0x01,0x11, 
 	0x01,0x10, 0x01,0x11, 0x01,0x10, 0x01,0xFF, 0x01,0x11, 0x17,0xCC, 0x01,0x00, 
 	0x01,0x08, 0x01,0x58, 0x01,0x50, 0x01,0x05, 0x01,0x51, 0x01,0x11, 0x01,0xCC, 
@@ -271,16 +274,14 @@ unsigned char umcp_rle[]={
 	0x01,0x51, 0x01,0xCC, 0x01,0x11, 0x01,0x7F, 0x02,0x71, 0x01,0x78, 0x02,0x71, 
 	0x01,0x7F, 0x01,0x11, 0x19,0xCC, 0x01,0x00, 0x02,0x88, 0x01,0x00, 0x01,0x05, 
 	0x01,0xCC, 0x09,0xC7, 0x09,0xCC, 0x03,0x5C, 0x0D,0xCC, 0x01,0xC0, 0x01,0x05, 
-	0x02,0x85, 0x01,0x00, 0x01,0xCC, 0x01,0x88, 0x01,0x48, 0x01,0x44, 0x01,0x4C, 
-	0x0C,0xCC, 0x01,0x5C, 0x01,0xE5, 0x03,0xEE, 0x01,0xE5, 0x01,0x5C, 0x0C,0xCC, 
-	0x01,0x00, 0x02,0x58, 0x01,0x50, 0x02,0x88, 0x01,0x48, 0x02,0x44, 0x0B,0xCC, 
-	0x01,0x4C, 0x01,0xFF, 0x02,0x75, 0x04,0x55, 0x01,0x4C, 0x02,0xCC, 0x01,0xDC, 
-	0x03,0xCC, 0x01,0x3C, 0x04,0xCC, 0x01,0xC0, 0x01,0x00, 0x02,0x88, 0x01,0xCC, 
-	0x01,0x88, 0x01,0x84, 0x01,0x44, 0x01,0xC4, 0x0C,0xCC, 0x01,0xC4, 0x02,0x47, 
-	0x03,0x45, 0x01,0xC4, 0x02,0xCC, 0x01,0xCD, 0x01,0xD9, 0x01,0xCD, 0x01,0xCC, 
-	0x01,0xC3, 0x01,0x3D, 0x01,0xC3, 0x04,0xCC, 0x01,0x00, 0x01,0x05, 0x01,0x85, 
-	0x1B,0xCC, 0x01,0xC4, 0x03,0xCC, 0x01,0xC4, 0x06,0xCC, 0x01,0x00, 0x01,0x08, 
-	0x26,0xCC, 0x01,0xC0, 0x01,0x00, 0xFF,0xFF,	};
+	0x02,0x85, 0x01,0x00, 0x11,0xCC, 0x01,0x5C, 0x01,0xE5, 0x03,0xEE, 0x01,0xE5, 
+	0x01,0x5C, 0x0C,0xCC, 0x01,0x00, 0x02,0x58, 0x01,0x50, 0x11,0xCC, 0x01,0xFF, 
+	0x02,0x75, 0x04,0x55, 0x0C,0xCC, 0x01,0xC0, 0x01,0x00, 0x02,0x88, 0x10,0xCC, 
+	0x02,0x44, 0x02,0x47, 0x03,0x45, 0x02,0x44, 0x0C,0xCC, 0x01,0x00, 0x01,0x05, 
+	0x01,0x85, 0x10,0xCC, 0x01,0x44, 0x01,0xD4, 0x01,0x9D, 0x01,0xD4, 0x01,0x44, 
+	0x01,0x34, 0x01,0xD3, 0x01,0x34, 0x01,0x44, 0x0D,0xCC, 0x01,0x00, 0x01,0x08, 
+	0x0F,0xCC, 0x03,0x44, 0x01,0xCD, 0x03,0x44, 0x01,0xC3, 0x03,0x44, 0x0C,0xCC, 
+	0x01,0xC0, 0x01,0x00, 0xFF,0xFF,	};
 unsigned char dining_rle[]={
 	0x28,0x28,
 	0x01,0x88, 0x03,0x98, 0x02,0x88, 0x01,0x98, 0x02,0x88, 0x02,0x98, 0x02,0x88, 
diff --git a/gr-sim/tfv_citymap.c b/gr-sim/tfv_citymap.c
index 84b0450d..e633f04b 100644
--- a/gr-sim/tfv_citymap.c
+++ b/gr-sim/tfv_citymap.c
@@ -10,6 +10,76 @@
 #include "tfv_sprites.h"
 #include "tfv_backgrounds.h"
 
+
+
+
+#if 0
+
+WORLDMAP_LOCATIONS
+	COLLEGE_PARK
+	HARFORD_COUNTY
+	LANDING_SITE
+
+	umcp_rle
+		"TALBOT HALL",X1,Y1,X2,Y2,TALBOT_HALL,
+		"SOUTH CAMPUS DINING",X1,Y1,X2,Y2,SOUTH_CAMPUS,
+		"METRO STATION",X1,Y1,X2,Y2,METRO_STATION,
+	bel_air_rle
+		"C. MILTON",
+		"JOHN CARROLL",
+		"SHOPPING MALL",
+		"MINIGOLF",
+
+	jc_rle:
+		"VIDEO HOMEROOM"
+		"AP CALCULUS, TEAM I-1"
+		"DEUTSCH"
+		"HOMEROOM"
+		"MATH OFFICE"
+
+
+	dining_rle
+		"OSCAR",
+		"NICOLE",
+		"CINDY",
+		"ELAINE",
+		"CAFETERIA LADY",
+		"PATRIOT ROOM"
+
+	metro_rle:
+		"METRO WORKER",
+		"TINY CAPABARA",
+		"GIANT GUINEA PIG",
+		"LARGE BIRD",
+
+	talbot_rle:
+		"LIZ AND WILL",
+		"PETE",
+		"KENJESU",
+		"MATHEMAGICIAN",
+		"DARTH TATER",
+
+
+	math_office_rle:
+		"CAPTAIN STEVE",
+		"BRIGHID",
+		"RACHAEL YRBK",
+		"MREE",
+
+	video_hr_rle:
+		"GUS",
+		"RAISTLIN",
+		"FORD",
+		"SISTER SCARYNUN",
+
+#endif
+
+
+
+
+
+
+
 /* In Town */
 
 int city_map(void) {
diff --git a/tfv/harfco.png b/tfv/harfco.png
index 007c8042849f17dc014383cd22213ffcfa3e7219..ac93211bf0ca78243d820e8444a22384303b09c8 100644
GIT binary patch
delta 197
zcmV;$06PD?0^|aae+dZ=6DvC<7=EFVh%A4bNkl<ZNXO;Y+X{dn3<ls4451s}|7|10
zTs1X!Afq25l>C_BA%G*RG#CPKF$aZYjf+tW?t)K7<)QEW%JwVb{hAl!*n>eFbC4%h
zAV(^}JE;b*qycy)1t36+gl9n62)Qi)>EIq%$SQ~kK%bn_Hv}T4LG(?N`Z%&tVJ|WK
zq)nF1PeIeI_XTjS)5aZ~{luRAlA8Tq=KdTub%;MHw4?3~00000NkvXXu0mjf3dUAP

delta 157
zcmV;O0Al~-0=xo{e+dU40S_aOtNzrHh%A3|Nkl<ZNXPBdT?>F9429uCFb3WD|Nm`>
zn7inM%}EgF1&Jgdc9Fo@9!*qnRXP|X@3>NC!78lDE4#j5H}<+AzMpwZE+5p?2>t~G
zCcz4fi_qT#pgo)biU4-?#-0llX@~67*7lqezQrG#AVGozpTGkUtwg^vGiqZ1000R9
LNkvXXu0mjf%nC$v

diff --git a/tfv/umcp.png b/tfv/umcp.png
index 9c187b02a2a0b4ea2f553b1f7af00973efa78ed3..5cfe829291709a09a2895eecc0363ca9f2355ee4 100644
GIT binary patch
delta 424
zcmV;Z0ayN*1f2wse}4%M6DK!-8-0cV00DhTL_t(Y$Hmrxa)TfY2H<eYh&vtc|F$E<
zlwcfC?A`vmR&TA}{-CvmuMY?24~;n?_?*XJ;X<J2F1V$%xDbTnM+e-tBjt`1ihIex
z)1c-w**z&Ouwd7AHz2P|Z{)%?E*pIj^iRsbby&{Zzg^hV;D4$!56ZEt$wTlknF33f
zNzgeu&%C{Y{+k%@<(dA9DQ5Wm?`}c8UIMOb4PMt%`k$cv7$NF6^5HTvA~(EtbSbc>
z_$qr2B5&;)(reNXfc63Sy(j2RYLHhCQAXxh8QgaOI)cd)j3y%>k+dfriA@~I&c*0n
zq5Zp&8RU`cNPkBHb3;M^NT-K@<0%~#XdAu*>W-=*;#|YhG0#{U5;)UPR*^e?1k~%8
z!BFK1m@k`PG6TxcFm{0cP<A?waX&dN@(ob9Hu)O555{QkMfaC??l=PKA0FMIdmP=Q
z3dpyt*3d&>o%YZ}pnL@^OAF+o2SEB2M&z;_2a)aj4k3&TTsLeFJp|hA-{dcduxG-K
SU5W+(0000<MNUMnLSTZBfytEs

delta 419
zcmV;U0bKr_1egSne}4x710?|Q<+n@#00DSOL_t(Y$IaG@Zo?o91yG~Ha3(VT|8IwJ
z985_dA(gf(wR@;Jy9Uw~zCIk7zcl7}?{Xf4h4Y@Chv1UZ<GdG+9|Le%)|4YsDDEW#
zPlKA%<Zx4ZV8Pzo9e}(pqmc{OIX3zbj5p=NIV}73X9s&4w0}C&;C`uX@(^5`%z&!O
zBxnrnGk<*t-8V7L$@8g||J)H+Eti1S_Ce{tfz54%SiO+_(a0tRLW-+GzX^ze)2?Aq
z0l*Xh{%HeUlN#jJLzIz2s7bnl$qkH6?t$Eq*u;@+OpIm^eSb7EgYP5jjs)h0gaD9E
zj}5$$(oum;!+%?#?x-3f&NVC@^Ngh-fin$d6}jU_K)sF`^i`gK`Pld-GoTC&*Dg>u
z<)|Z_VMJ^D+)qxAtU!J*8F77b9~zMxo`W$q??oraJ9iZB478R%D+tK1lRNtLYK9(<
zY;6IBqmL@Yt!p8-8}Q1el>Z4~e-AopNF5<eMd-T7103*tWBxZt<S&~dX%bgK1+)MF
N002ovPDHLkV1hM|!94%~