Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-06-24 12:29:29 +00:00
Code Issues Projects Releases Wiki Activity

tfv: update some bounding boxes

Browse Source
This commit is contained in:
Vince Weaver 2018-06-19 00:08:50 -04:00
parent 1396779bd2
commit 6756a8d506
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gr-sim/tfv/tfv_mapinfo.h
View File

@ -199,7 +199,7 @@ struct map_info_type map_info[33] = {
.s_exit=NOEXIT, .s_exit=NOEXIT,
.e_exit=OCEAN_CITY, .e_exit=OCEAN_CITY,
.w_exit=CACTUS_RANCH, .w_exit=CACTUS_RANCH,
.miny=4, .miny=2,
.scatter=SCATTER_NONE, .scatter=SCATTER_NONE,
.background_image=collegep_rle, .background_image=collegep_rle,
.num_locations=2, .num_locations=2,
@ -242,25 +242,25 @@ struct map_info_type map_info[33] = {
.num_locations=4, .num_locations=4,
.location[0] = { .location[0] = {
.name="Talbot Hall", .name="Talbot Hall",
.x0 = 0, .x1 = 14, .x0 = 0, .x1 = 10,
.y0 = 18, .y1 = 33, .y0 = 18, .y1 = 31,
.destination = TALBOT_HALL, .destination = TALBOT_HALL,
}, },
.location[1] = { .location[1] = {
.name="Dining Hall", .name="Dining Hall",
.x0 = 19, .x1 = 30, .x0 = 13, .x1 = 26,
.y0 = 18, .y1 = 26, .y0 = 10, .y1 = 24,
.destination = DINING_HALL, .destination = DINING_HALL,
}, },
.location[2] = { .location[2] = {
.name="Metro Station", .name="Metro Station",
.x0 = 32, .x1 = 39, .x0 = 30, .x1 = 39,
.y0 = 18, .y1 = 39, .y0 = 10, .y1 = 39,
.destination = METRO_STATION, .destination = METRO_STATION,
}, },
.location[3] = { .location[3] = {
.name="Fountain", .name="Fountain",
.x0 = 13, .x1 = 29, .x0 = 14, .x1 = 29,
.y0 = 28, .y1 = 39, .y0 = 28, .y1 = 39,
.destination = FOUNTAIN, .destination = FOUNTAIN,
}, },

14
gr-sim/tfv/tfv_worldmap.c
View File

@ -191,7 +191,7 @@ int world_map(void) {
} }
if (ch==13) { if (ch==13) {
if (special_destination) { if (special_destination!=NOEXIT) {
map_location=special_destination; map_location=special_destination;
} }
refresh=1; refresh=1;
@ -433,14 +433,14 @@ int world_map(void) {
special_destination=NOEXIT; special_destination=NOEXIT;
for(i=0;i<map_info[map_location].num_locations;i++) { for(i=0;i<map_info[map_location].num_locations;i++) {
if ( (tfv_x>map_info[map_location].location[i].x0) && if ( (tfv_x>=map_info[map_location].location[i].x0) &&
(tfv_x<map_info[map_location].location[i].x1) && (tfv_x<=map_info[map_location].location[i].x1) &&
(tfv_y>map_info[map_location].location[i].y0) && (tfv_y+11>=map_info[map_location].location[i].y0) &&
(tfv_y<map_info[map_location].location[i].y1)) { (tfv_y+11<=map_info[map_location].location[i].y1)) {
ram[CH]=20; ram[CH]=(40-strlen(map_info[map_location].location[i].name))/2;
ram[CV]=20; ram[CV]=20;
move_and_print(map_info[map_location].name); move_and_print(map_info[map_location].location[i].name);
special_destination=map_info[map_location].location[i].destination; special_destination=map_info[map_location].location[i].destination;
break; break;