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

Fix game build and Windows build

Browse Source
This commit is contained in:
Celtic Minstrel
2015-06-08 18:27:30 -04:00
committed by Celtic Minstrel
parent 6ef026500f
commit 2b7e754fdc
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/classes/universe.cpp
View File

@@ -176,7 +176,7 @@ bool cCurTown::prep_talk(short which) {
void cCurTown::prep_arena() { void cCurTown::prep_arena() {
if(arena != nullptr) delete arena; if(arena != nullptr) delete arena;
arena = new cMedTown(univ.scenario, false); arena = new cMedTown(univ.scenario);
} }
cCurTown::~cCurTown() { cCurTown::~cCurTown() {

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

@@ -198,11 +198,7 @@ LRESULT CALLBACK menuProc(HWND handle, UINT message, WPARAM wParam, LPARAM lPara
} }
if(message == WM_COMMAND) { if(message == WM_COMMAND) {
int cmd = LOWORD(wParam); int cmd = LOWORD(wParam);
if(cmd >= 10000 && cmd < 20000) { // Item menus handle_menu_choice(menuChoices[cmd]);
handle_item_menu(cmd - 10000);
} else if(cmd >= 20000 && cmd < 30000) { // Monster menus
handle_monst_menu(cmd - 20000);
} else handle_menu_choice(menuChoices[cmd]);
} else if(message == WM_SETCURSOR) { } else if(message == WM_SETCURSOR) {
// Windows resets the cursor to an arrow whenever the mouse moves, unless we do this. // Windows resets the cursor to an arrow whenever the mouse moves, unless we do this.
// Note: By handling this message, sf::Window::setMouseCursorVisible() will NOT work. // Note: By handling this message, sf::Window::setMouseCursorVisible() will NOT work.