openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fixed a few errors from the previous revision, and nuked some of the compiler errors.

Browse Source 
git-svn-id: http://openexile.googlecode.com/svn/trunk@46 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-04-30 04:21:24 +00:00
parent c7f9c17130
commit 27b95287bc
81 changed files with 347 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osx/Scenario Editor/scen.actions.cpp
View File

@@ -62,7 +62,7 @@ extern short cur_viewing_mode,user_given_password;
extern cTown* town;
//extern big_tr_type t_d;
//extern short town_type; // 0 - big 1 - ave 2 - small
extern short max_dim[3],mode_count,to_create;
extern short /*max_dim[3],*/mode_count,to_create;
extern unsigned char template_terrain[64][64];
extern cItemRec item_list[400];
extern cScenario scenario;

38
osx/Scenario Editor/scen.core.cpp
View File

@@ -19,7 +19,7 @@ extern bool mouse_button_held;
extern short cur_viewing_mode,dialog_answer,given_password,user_given_password;
extern cTown* town;
//extern short town_type; // 0 - big 1 - ave 2 - small
short max_dim[3] = {64,48,32};
extern short max_dim[3];
extern short mode_count,to_create;
extern unsigned char template_terrain[64][64];
cItemRec item_list[400];
@@ -1069,7 +1069,7 @@ short edit_ter_type(short which_ter) {
cd_attach_key(813,11,0);
item_hit = cd_run_dialog();
cd_kill_dialog(813,0);
cd_kill_dialog(813);
return 0;
}
@@ -1313,7 +1313,7 @@ short edit_monst_type(short which_monst) {
cd_attach_key(814,22,0);
item_hit = cd_run_dialog();
cd_kill_dialog(814,0);
cd_kill_dialog(814);
return 0;
}
@@ -1454,7 +1454,7 @@ cMonster edit_monst_abil(cMonster starting_record,short parent_num) {
cd_add_label(815,20,"Immune To Poison",55);
item_hit = cd_run_dialog();
cd_kill_dialog(815,0);
cd_kill_dialog(815);
return store_monst2;
}
@@ -1621,7 +1621,7 @@ short edit_item_type(short which_item) {
item_hit = cd_run_dialog();
cd_kill_dialog(818,0);
cd_kill_dialog(818);
return 0;
}
@@ -1792,7 +1792,7 @@ cItemRec edit_item_abil(cItemRec starting_record,short parent_num) {
cd_add_label(824,12,"Conceal ability",50);
item_hit = cd_run_dialog();
cd_kill_dialog(824,0);
cd_kill_dialog(824);
return store_item2;
}
@@ -1904,7 +1904,7 @@ void edit_spec_item(short which_item) {
spec_item_hit = cd_run_dialog();
cd_kill_dialog(806,0);
cd_kill_dialog(806);
}
void put_save_rects_in_dlog() {
@@ -1978,7 +1978,7 @@ void edit_save_rects() {
put_save_rects_in_dlog();
save_rects_hit = cd_run_dialog();
cd_kill_dialog(807,0);
cd_kill_dialog(807);
}
bool save_horses() {
@@ -2054,7 +2054,7 @@ void edit_horses() {
put_horses_in_dlog();
horses_hit = cd_run_dialog();
cd_kill_dialog(808,0);
cd_kill_dialog(808);
}
bool save_boats() {
@@ -2130,7 +2130,7 @@ void edit_boats() {
put_boats_in_dlog();
boats_hit = cd_run_dialog();
cd_kill_dialog(809,0);
cd_kill_dialog(809);
}
bool save_add_town() {
@@ -2186,7 +2186,7 @@ void edit_add_town() {
put_add_town_in_dlog();
add_town_hit = cd_run_dialog();
cd_kill_dialog(810,0);
cd_kill_dialog(810);
}
bool save_item_placement() {
@@ -2282,7 +2282,7 @@ void edit_item_placement() {
put_item_placement_in_dlog();
item_placement_hit = cd_run_dialog();
cd_kill_dialog(812,0);
cd_kill_dialog(812);
}
bool save_scen_details() {
@@ -2348,7 +2348,7 @@ void edit_scen_details() {
put_scen_details_in_dlog();
scen_details_hit = cd_run_dialog();
cd_kill_dialog(803,0);
cd_kill_dialog(803);
}
@@ -2409,7 +2409,7 @@ short edit_make_scen_1(char *filename,char *title,short *grass) {
title[30] = 0;
CDGT(800,3,filename);
*grass = cd_get_led(800,11);
cd_kill_dialog(800,0);
cd_kill_dialog(800);
return dialog_answer;
}
@@ -2477,7 +2477,7 @@ short edit_make_scen_2(short *val_array) {
for (i = 0; i < 5; i++)
val_array[i] = CDGN(801,2 + i);
val_array[5] = cd_get_led(801,26);
cd_kill_dialog(801,0);
cd_kill_dialog(801);
return dialog_answer;
}
@@ -2601,7 +2601,7 @@ short get_password() {
CDGT(802,2,(char *) temp_str);
i = wd_to_pwd(temp_str);
cd_kill_dialog(802,0);
cd_kill_dialog(802);
return i;
}
@@ -2650,7 +2650,7 @@ void set_starting_loc() {
town_strs_hit = cd_run_dialog();
cd_kill_dialog(805,0);
cd_kill_dialog(805);
}
@@ -2726,7 +2726,7 @@ void edit_scenario_events() {
advanced_town_hit = cd_run_dialog();
cd_kill_dialog(811,0);
cd_kill_dialog(811);
}
void give_password_filter (short item_hit) {
@@ -2757,7 +2757,7 @@ short enter_password() {
i = wd_to_pwd(temp_str);
given_password = user_given_password = i;
cd_kill_dialog(823,0);
cd_kill_dialog(823);
return i;
}

2
osx/Scenario Editor/scen.graphics.cpp
View File

@@ -39,7 +39,7 @@ extern short cur_viewing_mode;
extern eScenMode overall_mode;
extern short available_dlog_buttons[NUM_DLOG_B];
extern bool editing_town;
extern short max_dim[3];
//extern short max_dim[3];
extern short dungeon_font_num,geneva_font_num;
extern Rect windRect;
//extern piles_of_stuff_dumping_type *data_store;

20
osx/Scenario Editor/scen.keydlgs.cpp
View File

@@ -14,7 +14,7 @@ extern short cur_viewing_mode;
extern cTown* town;
//extern big_tr_type t_d;
extern short town_type; // 0 - big 1 - ave 2 - small
extern short max_dim[3],mode_count,to_create;
extern short /*max_dim[3],*/mode_count,to_create;
extern unsigned char template_terrain[64][64];
extern cItemRec item_list[400];
extern cScenario scenario;
@@ -257,7 +257,7 @@ short choose_graphic(short first_g,short last_g,short cur_choice,short g_type,sh
item_hit = cd_run_dialog();
cd_kill_dialog(819,0);
cd_kill_dialog(819);
return dialog_answer;
}
@@ -345,7 +345,7 @@ short choose_text_res(short res_list,short first_t,short last_t,short cur_choice
item_hit = cd_run_dialog();
cd_kill_dialog(820,0);
cd_kill_dialog(820);
return dialog_answer;
}
@@ -407,7 +407,7 @@ void edit_text_str(short which_str,short mode) {
item_hit = cd_run_dialog();
cd_kill_dialog(816,0);
cd_kill_dialog(816);
}
void edit_area_rect_event_filter (short item_hit) {
@@ -448,7 +448,7 @@ bool edit_area_rect_str(short which_str,short mode) {
item_hit = cd_run_dialog();
cd_kill_dialog(840,0);
cd_kill_dialog(840);
return dialog_answer;
}
@@ -910,7 +910,7 @@ void edit_spec_enc(short which_node,short mode,short parent_num) {
spec_enc_hit = cd_run_dialog();
cd_kill_dialog(822,0);
cd_kill_dialog(822);
}
short get_fresh_spec(short which_mode) {
@@ -1072,7 +1072,7 @@ void edit_spec_text(short mode,short *str1,short *str2,short parent) {
}
item_hit = cd_run_dialog();
cd_kill_dialog(826,0);
cd_kill_dialog(826);
}
void edit_dialog_text_event_filter (short item_hit){
@@ -1191,7 +1191,7 @@ void edit_dialog_text(short mode,short *str1,short parent) {
item_hit = cd_run_dialog();
cd_kill_dialog(842,0);
cd_kill_dialog(842);
}
void edit_special_num_event_filter (short item_hit) {
@@ -1228,7 +1228,7 @@ short edit_special_num(short mode,short what_start) {
item_hit = cd_run_dialog();
cd_kill_dialog(825,0);
cd_kill_dialog(825);
return dialog_answer;
}
@@ -1278,7 +1278,7 @@ void edit_scen_intro() {
item_hit = cd_run_dialog();
cd_kill_dialog(804,0);
cd_kill_dialog(804);
}
void make_cursor_sword() {

42
osx/Scenario Editor/scen.townout.cpp
View File

@@ -18,7 +18,7 @@ extern short cur_viewing_mode;
extern cTown* town;
//extern big_tr_type t_d;
//extern short town_type; // 0 - big 1 - ave 2 - small
extern short max_dim[3],mode_count,to_create,cur_town;
extern short /*max_dim[3],*/mode_count,to_create,cur_town;
extern unsigned char template_terrain[64][64];
extern cItemRec item_list[400];
extern cScenario scenario;
@@ -63,8 +63,8 @@ void init_town(short size) {
sprintf((char *)town->town_strs(i), "%s", temp_str);
town->strlens[i] = strlen((char *) town->town_strs(i));
}
for (i = 0; i < 64; i++)
for (j = 0; j < 64; j++) {
for (i = 0; i < town->max_dim(); i++)
for (j = 0; j < town->max_dim(); j++) {
town->terrain(i,j) = scenario.default_ground * 2;
town->lighting(i / 8,j) = 0;
}
@@ -201,7 +201,7 @@ void edit_placed_monst(short which_m) {
item_hit = cd_run_dialog();
cd_kill_dialog(837,0);
cd_kill_dialog(837);
}
@@ -297,7 +297,7 @@ cTown::cCreature edit_placed_monst_adv(cTown::cCreature monst_record) {
item_hit = cd_run_dialog();
cd_kill_dialog(838,0);
cd_kill_dialog(838);
return store_placed_monst2;
}
@@ -391,7 +391,7 @@ void edit_placed_item(short which_i) {
item_hit = cd_run_dialog();
cd_kill_dialog(836,0);
cd_kill_dialog(836);
}
@@ -452,7 +452,7 @@ void edit_sign(short which_sign,short picture) {
item_hit = cd_run_dialog();
cd_kill_dialog(831,0);
cd_kill_dialog(831);
}
bool save_out_strs() {
@@ -522,7 +522,7 @@ void edit_out_strs() {
out_strs_hit = cd_run_dialog();
cd_kill_dialog(850,0);
cd_kill_dialog(850);
}
@@ -593,7 +593,7 @@ void edit_town_strs() {
town_strs_hit = cd_run_dialog();
cd_kill_dialog(839,0);
cd_kill_dialog(839);
}
@@ -635,7 +635,7 @@ short pick_town_num(short which_dlog,short def) {
town_strs_hit = cd_run_dialog();
cd_kill_dialog(store_which_town_dlg,0);
cd_kill_dialog(store_which_town_dlg);
return dialog_answer;
}
@@ -686,7 +686,7 @@ void change_ter(short *change_from,short *change_to,short *chance) {
*change_to = b;
*chance = c;
cd_kill_dialog(857,0);
cd_kill_dialog(857);
}
void outdoor_details_event_filter (short item_hit) {
@@ -718,7 +718,7 @@ void outdoor_details() {
town_strs_hit = cd_run_dialog();
cd_kill_dialog(851,0);
cd_kill_dialog(851);
}
void put_out_wand_in_dlog() {
@@ -871,7 +871,7 @@ void edit_out_wand(short mode) {
item_hit = cd_run_dialog();
cd_kill_dialog(852,0);
cd_kill_dialog(852);
}
@@ -934,7 +934,7 @@ void edit_town_details() {
put_town_details_in_dlog();
town_details_hit = cd_run_dialog();
cd_kill_dialog(832,0);
cd_kill_dialog(832);
}
bool save_town_events() {
@@ -1004,7 +1004,7 @@ void edit_town_events() {
advanced_town_hit = cd_run_dialog();
cd_kill_dialog(833,0);
cd_kill_dialog(833);
}
bool save_advanced_town() {
@@ -1077,7 +1077,7 @@ void edit_advanced_town() {
advanced_town_hit = cd_run_dialog();
cd_kill_dialog(834,0);
cd_kill_dialog(834);
}
bool save_town_wand() {
@@ -1141,7 +1141,7 @@ void edit_town_wand() {
town_wand_hit = cd_run_dialog();
cd_kill_dialog(835,0);
cd_kill_dialog(835);
}
bool save_basic_dlog() {
@@ -1213,7 +1213,7 @@ void edit_basic_dlog(short which_node) {
put_basic_dlog_in_dlog();
basic_dlog_hit = cd_run_dialog();
cd_kill_dialog(821,0);
cd_kill_dialog(821);
}
bool save_talk_node() {
@@ -1489,7 +1489,7 @@ void edit_talk_node(short which_node,short parent_num) {
talk_node_hit = cd_run_dialog();
cd_kill_dialog(817,0);
cd_kill_dialog(817);
}
void pick_out_event_filter (short item_hit) {
@@ -1546,7 +1546,7 @@ short pick_out(location default_loc) {
basic_dlog_hit = cd_run_dialog();
cd_kill_dialog(854,0);
cd_kill_dialog(854);
return dialog_answer;
}
@@ -1692,6 +1692,6 @@ short pick_import_town(short def, FSSpec* temp_file_to_load) {
town_strs_hit = cd_run_dialog();
cd_kill_dialog(841,0);
cd_kill_dialog(841);
return dialog_answer;
}