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

Fix Windows build

Browse Source
This commit is contained in:
Celtic Minstrel
2015-01-11 15:18:35 -05:00
parent ca85ec2060
commit f5db91547c
13 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1564,7 +1564,7 @@ bool edit_make_scen_2(short& out_w, short& out_h, short& town_l, short& town_m,
extern fs::path progDir;
extern eScenMode overall_mode;
bool build_scenario() {
short width, height, large, med, small, which_town;
short width, height, lg, med, sm, which_town;
bool default_town, grass;
std::string filename, title;
short i,j;
@@ -1573,7 +1573,7 @@ bool build_scenario() {
if(!edit_make_scen_1(filename, title, grass))
return false;
filename += ".boes";
if(!edit_make_scen_2(width, height, large, med, small, default_town))
if(!edit_make_scen_2(width, height, lg, med, sm, default_town))
return false;
scenario = cScenario(true);
scenario.scen_name = title;
@@ -1606,7 +1606,7 @@ bool build_scenario() {
scenario.towns.push_back(warriors_grove);
// TODO: Append i+1 to each town name
for(i = 0; i < large; i++) {
for(i = 0; i < lg; i++) {
which_town = scenario.num_towns;
scenario.num_towns++;
scenario.town_size[which_town] = 0;
@@ -1624,7 +1624,7 @@ bool build_scenario() {
scenario.addTown<cMedTown>();
town->town_name = "Medium town";
}
for(i = 0; i < small; i++) {
for(i = 0; i < sm; i++) {
which_town = scenario.num_towns;
scenario.num_towns++;
scenario.town_size[which_town] = 2;

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

@@ -465,7 +465,7 @@ void handle_menu_choice(eMenu item_hit) {
helpDlog = "about-scened";
isHelp = true;
break;
case eMenu::HELP_INDEX:
case eMenu::HELP_TOC:
launchURL("https://calref.net/~sylae/boe-doc/editor/About.html");
break;
case eMenu::HELP_START:

2
src/scenedit/scen.menus.h
View File

@@ -17,7 +17,7 @@ enum class eMenu {
NONE, ABOUT, QUIT, FRILL, UNFRILL,
FILE_NEW, FILE_OPEN, FILE_CLOSE, FILE_SAVE, FILE_REVERT,
EDIT_UNDO, EDIT_REDO, EDIT_CUT, EDIT_COPY, EDIT_PASTE, EDIT_DELETE, EDIT_SELECT_ALL,
HELP_INDEX, HELP_START, HELP_TEST, HELP_DIST, HELP_CONTEST,
HELP_TOC, HELP_START, HELP_TEST, HELP_DIST, HELP_CONTEST,
// Scenario menu
TOWN_CREATE, SCEN_DETAILS, SCEN_INTRO, TOWN_START,
SCEN_SPECIALS, SCEN_TEXT, SCEN_JOURNALS, TOWN_IMPORT,

2
src/scenedit/scen.menus.win.cpp
View File

@@ -85,7 +85,7 @@ void init_menubar() {
eMenu::OUT_SPECIALS, eMenu::OUT_TEXT, eMenu::OUT_SIGNS,
};
static const eMenu help_choices[] = {
eMenu::HELP_INDEX, eMenu::ABOUT, eMenu::NONE, eMenu::HELP_START, eMenu::HELP_TEST, eMenu::HELP_DIST,
eMenu::HELP_TOC, eMenu::ABOUT, eMenu::NONE, eMenu::HELP_START, eMenu::HELP_TEST, eMenu::HELP_DIST,
};
HMENU file_menu = GetSubMenu(menuHandle, FILE_MENU_POS);