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

Various code cleanup stuff

Browse Source
This commit is contained in:
Celtic Minstrel
2015-02-14 12:24:25 -05:00
parent dc7abb9502
commit 4fbc6cfa77
19 changed files with 79 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scenedit/scen.actions.cpp
View File

@@ -1866,8 +1866,6 @@ void adjust_space(location l) {
bool place_item(location spot_hit,short which_item,bool property,bool always,short odds) {
// odds 0 - 100, with 100 always
(void) property;
(void) always;
short x;
if((which_item < 0) || (which_item >= scenario.scen_items.size()))
@@ -1880,6 +1878,8 @@ bool place_item(location spot_hit,short which_item,bool property,bool always,sho
if(town->preset_items[x].code < 0) {
town->preset_items[x] = {spot_hit, which_item, scenario.scen_items[which_item]};
town->preset_items[x].contained = container_there(spot_hit);
town->preset_items[x].property = property;
town->preset_items[x].always_there = always;
return true;
}
town->preset_items.push_back({spot_hit, which_item, scenario.scen_items[which_item]});
@@ -2363,7 +2363,7 @@ void start_string_editing(short mode,short just_redo_text) {
// mode 0 - scen 1 - out 2 - town
// if just_redo_text not 0, simply need to update text portions
void start_special_editing(short mode,short just_redo_text) {
short i; // char str[256];
short i;
size_t num_specs;
bool draw_full = false;
switch(mode) {

2
src/scenedit/scen.core.cpp
View File

@@ -2831,7 +2831,7 @@ bool build_scenario() {
short width, height, lg, med, sm;
bool default_town, grass;
std::string filename, title;
short i,j;
short i;
cTown* warriors_grove = nullptr;
std::vector<cShop> warriors_grove_shops;

12
src/scenedit/scen.keydlgs.cpp
View File

@@ -95,13 +95,13 @@ pic_num_t choose_graphic(short cur_choice,ePicType g_type,cDialog* parent) {
std::vector<pic_num_t> all_pics;
size_t total_pics = 0;
cPictChoice* pic_dlg = nullptr;
switch(g_type) {
switch(g_type + PIC_PRESET) {
case PIC_TER: total_pics = 859; break;
case PIC_TER_ANIM: total_pics = 20; break;
case PIC_DLOG: total_pics = 44; break;
case PIC_TALK: total_pics = 84; break;
case PIC_SCEN: total_pics = 30; break;
case PIC_ITEM: total_pics = 123; break;
case PIC_ITEM: case PIC_TINY_ITEM: total_pics = 123; break;
case PIC_PC: total_pics = 36; break;
case PIC_FIELD: all_pics = field_pics; break;
case PIC_BOOM: all_pics = boom_pics; break;
@@ -110,6 +110,10 @@ pic_num_t choose_graphic(short cur_choice,ePicType g_type,cDialog* parent) {
case PIC_STATUS: total_pics = 27; break;
case PIC_SCEN_LG: total_pics = 4; break;
case PIC_TER_MAP: total_pics = 980; break;
case PIC_FULL: return NO_PIC; // TODO: Is it even possible to do a pict selection dialog for this?
default:
std::cerr << "Picture type " << (g_type + PIC_PRESET) << " is missing case in choose_graphic." << std::endl;
return NO_PIC;
case PIC_MONST: case PIC_MONST_WIDE:
case PIC_MONST_TALL: case PIC_MONST_LG:
std::vector<std::pair<pic_num_t,ePicType>> pics;
@@ -409,8 +413,8 @@ static bool edit_area_rect_event_filter(cDialog& me, std::string item_hit, short
me.toast(true);
std::string str = me["area"].getText().substr(0,29);
if(str_mode == 0)
current_terrain->info_rect[which_str].descr;
else town->room_rect[which_str].descr;
current_terrain->info_rect[which_str].descr = str;
else town->room_rect[which_str].descr = str;
} else if(item_hit == "cancel") {
me.setResult(false);
me.toast(false);