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 007c8042..ac93211b 100644 Binary files a/tfv/harfco.png and b/tfv/harfco.png differ diff --git a/tfv/umcp.png b/tfv/umcp.png index 9c187b02..5cfe8292 100644 Binary files a/tfv/umcp.png and b/tfv/umcp.png differ