Fixed special spots; they now appear in-game, and disappear when they should.

git-svn-id: http://openexile.googlecode.com/svn/trunk@58 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
2009-05-17 01:03:22 +00:00
parent 1b68a09993
commit a52a4c20c1
20 changed files with 64 additions and 48 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 MiB

After

Width:  |  Height:  |  Size: 4.8 MiB

View File

@@ -690,7 +690,7 @@ bool handle_action(Point the_point,EventRecord event) {
overall_mode = MODE_DRAWING;
break;
}
make_field_type(spot_hit.x, spot_hit.y, 1);
make_field_type(spot_hit.x, spot_hit.y, 2);
overall_mode = MODE_DRAWING;
break;
case MODE_CLEAR_FIELDS:
@@ -700,7 +700,7 @@ bool handle_action(Point the_point,EventRecord event) {
take_barrel(spot_hit.x,spot_hit.y);
take_crate(spot_hit.x,spot_hit.y);
take_web(spot_hit.x,spot_hit.y);
take_field_type(spot_hit.x, spot_hit.y, 1);
take_field_type(spot_hit.x, spot_hit.y, 2);
for (i = 0; i < 8; i++)
take_sfx(spot_hit.x,spot_hit.y,i);
set_cursor(0);
@@ -3704,4 +3704,4 @@ bool monst_on_space(location loc,short m_num) {
return true;
return false;
}
}

View File

@@ -2782,4 +2782,4 @@ void edit_scenario_events() {
// val = val + pow[i] * (long) (pwd[i] - 97);
// val = val % 30000;
// return (short) val;
//}
//}

View File

@@ -1605,4 +1605,4 @@ void scen_text_dump(){
//
// FSClose(data_dump_file_id);
//
//}r->right = a;
//}r->right = a;

View File

@@ -732,7 +732,7 @@ void draw_terrain(){
}
draw_one_terrain_spot(q,r,t_to_draw);
if((editing_town && is_field_type(cen_x + q - 4,cen_y + r - 4, 1)) ||
if((editing_town && is_field_type(cen_x + q - 4,cen_y + r - 4, 2)) ||
(!editing_town && current_terrain.special_spot[cen_x + q - 4][cen_y + r - 4]))
Draw_Some_Item(roads_gworld, calc_rect(6, 0), ter_draw_gworld, where_draw, 1, 0);
@@ -1350,7 +1350,7 @@ void place_just_location() {
sprintf((char *) draw_str,"Center: x = %d, y = %d ",cen_x,cen_y);
else {
//MoveTo(5 ,terrain_rects[255].top + 28);
sprintf((char *) draw_str,"Click terrain to edit. ",cen_x,cen_y);
sprintf((char *) draw_str,"Click terrain to edit. ");
}
c2pstr((char*) draw_str);
DrawString(draw_str);
@@ -1585,4 +1585,4 @@ bool container_there(location l) {
// GetIndString(str, i, j);
// p2cstr(str);
//}
void record_display_strings(){}
void record_display_strings(){}

View File

@@ -61,4 +61,4 @@ short string_length(char *str);
Rect get_custom_rect (short which_rect);
GWorldPtr load_bmp(unsigned char *data, long length);
void init_dialogs();
void record_display_strings();
void record_display_strings();

View File

@@ -1225,7 +1225,7 @@ bool save_talk_node() {
if ((store_talk_node.personality >= 0) &&
((store_talk_node.personality < cur_town * 10) || (store_talk_node.personality >= (cur_town + 1) * 10))) {
sprintf((char *) str,"The legal range for personalities in this town is from %d to %d.",
cur_town * 10,cur_town * 10 + 9,817);
cur_town * 10,cur_town * 10 + 9);
give_error("Personalities in talk nodes must be -1 (for unused node), -2 (all personalities use) or in the legal range of personalities in this town.",
(char *) str,817);
return false;
@@ -1694,4 +1694,4 @@ short pick_import_town(short def, FSSpec* temp_file_to_load) {
cd_kill_dialog(841);
return dialog_answer;
}
}