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

FIx linker error in editors

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-12 12:55:54 -05:00
parent f1660cf7ed
commit 6151a24916
20 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osx/scenedit/scen.actions.cpp
View File

@@ -65,7 +65,6 @@ extern bool mouse_button_held,editing_town;
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 ter_num_t template_terrain[64][64];
extern cItemRec item_list[400];

1
osx/scenedit/scen.core.cpp
View File

@@ -23,7 +23,6 @@ extern short cen_x, cen_y,/* overall_mode,*/cur_town;
extern bool mouse_button_held;
extern short cur_viewing_mode;
extern cTown* town;
//extern short town_type; // 0 - big 1 - ave 2 - small
extern short max_dim[3];
extern short mode_count,to_create;
extern ter_num_t template_terrain[64][64];

2
osx/scenedit/scen.fileio.cpp
View File

@@ -20,7 +20,6 @@ using std::endl;
extern cScenario scenario;
extern cTown* town;
//extern short town_type, max_dim[3]; // 0 - big 1 - ave 2 - small
extern short cur_town;//overall_mode,given_password,user_given_password;
extern location cur_out;
//extern piles_of_stuff_dumping_type *data_store;
@@ -810,7 +809,6 @@ void make_new_scenario(std::string /*file_name*/,short /*out_width*/,short /*out
// scenario.format.prog_make_ver[1] = 0;
// scenario.format.prog_make_ver[2] = 0;
// cur_town = 0;
// town_type = 1;
// scenario.num_towns = 1;
// scenario.town_size[0] = 1;
// scenario.out_width = out_width;

1
osx/scenedit/scen.graphics.cpp
View File

@@ -38,7 +38,6 @@ extern short cen_x, cen_y,current_terrain_type,cur_town;
extern cTown* town;
//extern big_tr_type t_d;
//extern template_town_type town_template;
//extern short town_type; // 0 - big 1 - ave 2 - small
extern short cur_viewing_mode;
extern eScenMode overall_mode;
eDrawMode draw_mode = DRAW_TERRAIN;

1
osx/scenedit/scen.keydlgs.cpp
View File

@@ -16,7 +16,6 @@ extern bool mouse_button_held;
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 ter_num_t template_terrain[64][64];
extern cItemRec item_list[400];

2
osx/scenedit/scen.main.cpp
View File

@@ -31,8 +31,6 @@ cTown* town = NULL;
//big_tr_type t_d;
bool diff_depth_ok = false,mouse_button_held = false,editing_town = false;
short cur_viewing_mode = 0;
//short town_type = 0; // 0 - big 1 - ave 2 - small
//short max_dim[3] = {64,48,32};
short cen_x, cen_y;
eScenMode overall_mode = MODE_INTRO_SCREEN;
std::shared_ptr<cScrollbar> right_sbar;

4
osx/scenedit/scen.townout.cpp
View File

@@ -15,8 +15,7 @@ extern bool mouse_button_held,editing_town;
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 mode_count,to_create,cur_town;
extern ter_num_t template_terrain[64][64];
extern cItemRec item_list[400];
extern cScenario scenario;
@@ -1539,7 +1538,6 @@ bool new_town(short which_town) {
// scenario.last_town_edited = cur_town;
// init_town(size);
// strcpy(town->town_strs(0),(char *) temp_str);
// town_type = size;
//
// for (i = 0; i < max_dim[size]; i++)
// for (j = 0; j < max_dim[size]; j++)