tfv: hookup some more of the ending

gr-sim/tfv/Makefile

@@ -46,7 +46,8 @@ tfv_backgrounds.c:	$(PNG2RLE) \
 			$(ARTDIR)/homeroom.png \
 			$(ARTDIR)/ap_calculus.png \
 			$(ARTDIR)/patriot_room.png \
-			$(ARTDIR)/jc_office.png
+			$(ARTDIR)/jc_office.png \
+			$(ARTDIR)/puzzle.png
 	$(PNG2RLE) c $(ARTDIR)/title.png title_rle > tfv_backgrounds.c
 	$(PNG2RLE) c $(ARTDIR)/map.png map_rle >> tfv_backgrounds.c
 	$(PNG2RLE) c $(ARTDIR)/landing.png landing_rle >> tfv_backgrounds.c
@@ -69,6 +70,7 @@ tfv_backgrounds.c:	$(PNG2RLE) \
 	$(PNG2RLE) c $(ARTDIR)/ap_calculus.png ap_calculus_rle >> tfv_backgrounds.c
 	$(PNG2RLE) c $(ARTDIR)/patriot_room.png patriot_room_rle >> tfv_backgrounds.c
 	$(PNG2RLE) c $(ARTDIR)/jc_office.png jc_office_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/puzzle.png puzzle_rle >> tfv_backgrounds.c
 
 
 ####

gr-sim/tfv/tfv_backgrounds.c

@@ -838,3 +838,36 @@ unsigned char jc_office_rle[]={
 	0x08,0x91,0x11,0x11,0x99,0xA0,0x11,0xDD,0xA0,0x13,0x00,0x09,
 	0x91,0x11,0x99,0xA0,0x11,0xDD,0xA0,0x14,0x00,0x09,0x91,
 	0x99,0xA0,0x11,0xDD,0xA0,0x15,0x00,0x09,0x99,0xA0,0x11,0xDD,0xA1,	};
+unsigned char puzzle_rle[]={
+	0x28, /* ysize=40 */
+	0xF0,0x0F,0x0F,0x00,0xF0,0x0F,0x0F,0x00,0xF0,
+	0x0F,0xF0,0xAE,0x00,0x5A,0xA5,0x00,0x50,0xA6,0x57,
+	0x50,0x00,0xFF,0xF0,0xF0,0x00,0xFF,0xF0,0xF0,
+	0x00,0xFF,0x00,0xFF,0x00,0xF0,0xA3,0x00,
+	0xF0,0xA8,0x00,0x5A,0xAE,0x00,0xFF,0x00,0xFF,
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,
+	0xFF,0x00,0xFF,0x0F,0xF0,0x00,0xFF,
+	0x0F,0xF0,0x0F,0xF0,0xA4,0x00,0x5A,0xAF,0x00,
+	0x0F,0xA3,0x00,0x0F,0xA3,0x00,0x0F,0x00,0x00,0x0F,
+	0x00,0x0F,0x00,0x0F,0x00,0x0F,0x00,
+	0x0F,0xA4,0x00,0x5A,0xAE,0x00,0xA3,0xF0,0xA7,0x00,0xA3,0xF0,
+	0xAC,0x00,0x5A,0xAE,0x00,0xFF,0xF0,0xFF,0x00,
+	0xFF,0xF0,0x00,0xF0,0x00,0x00,0xFF,0xF0,
+	0xFF,0xAC,0x00,0x5A,0xA0,0x10,0x00,0xFF,0x00,0xFF,
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,
+	0xFF,0xAC,0x00,0x5A,0xAE,0x00,0xA0,0x19,0x50,0x5A,0xA0,0x58,0x00,
+	0xA3,0x11,0xA0,0x24,0x00,0xA5,0x11,0xAC,0x00,0x04,0x74,0x04,
+	0x74,0x74,0x04,0x01,0x11,0xAF,0x00,0xA5,0x11,0xAC,0x00,
+	0x88,0x88,0xA4,0x99,0x00,0x11,0xAF,0x00,0x11,0x11,0x71,0x71,
+	0x11,0xAC,0x00,0x88,0x88,0xA4,0x99,0x00,0x11,0xAF,0x00,
+	0x11,0x11,0x17,0x77,0x11,0xAC,0x00,0x55,0x55,0xA3,0x17,
+	0x77,0x00,0x11,0x00,0x70,0x70,0xDD,0x88,
+	0xDD,0x00,0xDD,0x11,0xDD,0x70,0x70,0x00,0x00,
+	0x11,0x11,0x77,0x11,0x77,0x11,0x11,0xAB,0x00,0x55,0x55,
+	0x11,0x77,0x11,0x77,0x00,0x11,0x00,
+	0x77,0x00,0x0D,0x08,0x0D,0x00,0x0D,
+	0x01,0x0D,0x00,0x77,0xA4,0x00,0x77,0x00,
+	0x77,0xAD,0x00,0x55,0x55,0x71,0x71,0x11,0x77,0x00,
+	0x11,0x10,0x77,0xA9,0x00,0x77,0xA4,0x70,0x77,
+	0x00,0x77,0xAD,0x00,0x55,0x55,0x17,0x17,0x11,0x77,
+	0xA0,0x14,0x50,0x55,0xAD,0x00,0x55,0x55,0xA4,0x77,0xA0,0x40,0x00,0xA1,	};

gr-sim/tfv/tfv_backgrounds.h

@@ -20,3 +20,4 @@ extern unsigned char homeroom_rle[];
 extern unsigned char ap_calculus_rle[];
 extern unsigned char patriot_room_rle[];
 extern unsigned char jc_office_rle[];
+extern unsigned char puzzle_rle[];

gr-sim/tfv/tfv_defines.h

@@ -48,6 +48,7 @@
 #define LOCATION_PLACE		0
 #define LOCATION_CONVERSATION	1
 #define LOCATION_SPACESHIP	2
+#define LOCATION_PUZZLE		3
 
 struct location_type {
 	char *name;

gr-sim/tfv/tfv_mapinfo.h

@@ -649,6 +649,14 @@ struct map_info_type map_info[34] = {
 		.scatter=SCATTER_NONE,
 		.entry_type=ENTRY_CENTER, .entry_x=0, .entry_y=0,
 		.background_image=jc_office_rle,
+		.num_locations=1,
+		.location[0] = {
+			.name="Door Lock",
+			.x0 = 15, .x1 = 30,
+			.y0 = 28,  .y1 = 36,
+			.type = LOCATION_PUZZLE,
+		},
+
 	},
 	[VIDEO_HOMEROOM]={	// 27: VIDEO_HOMEROOM
 		.name="Video Homeroom",

gr-sim/tfv/tfv_worldmap.c

@@ -313,6 +313,9 @@ no_smartpass:;
 			else if (destination_type==LOCATION_SPACESHIP) {
 				return LOCATION_SPACESHIP;
 			}
+			else if (destination_type==LOCATION_PUZZLE) {
+				do_ending();
+			}
 			else if (special_destination!=NOEXIT) {
 				map_info[map_location].saved_x=tfv_x;
 				map_info[map_location].saved_y=tfv_y;