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

Fix town advanced dialog

Browse Source 
- Also remove now-unused Windows accelerator table resources
This commit is contained in:
Celtic Minstrel
2015-02-14 22:58:41 -05:00
parent f683637945
commit f2f334551c
6 changed files with 10 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rsrc/dialogs/edit-town-advanced.xml
View File

@@ -56,13 +56,13 @@
<field name='bg-town' top='274' left='160' width='80' height='16'/> <field name='bg-town' top='274' left='160' width='80' height='16'/>
<button name='pick-fight' type='tiny' top='302' left='30' width='120'>Combat Background:</button> <button name='pick-fight' type='tiny' top='302' left='30' width='120'>Combat Background:</button>
<field name='bg-fight' top='298' left='160' width='80' height='16'/> <field name='bg-fight' top='298' left='160' width='80' height='16'/>
<text top='319' left='50' width='100' height='16'>Town Properties:</text> <text top='319' left='30' width='100' height='16'>Town Properties:</text>
<led name='hidden' font='plain' top='336' left='50' width='450'> <led name='hidden' font='plain' top='336' left='30' width='450'>
Town hidden? Town hidden?
(This town cannot be seen until it's made visible with a special encounter.) (Can't be seen until it's made visible with a special encounter.)
</led> </led>
<led name='nomap' font='plain' top='353' left='50' width='200'>No automap in this town</led> <led name='nomap' font='plain' top='353' left='30' width='200'>No automap in this town</led>
<led name='noscry' font='plain' top='370' left='50' width='200'>Defy scrying (Magic Map doesn't work)</led> <led name='noscry' font='plain' top='370' left='30' width='200'>Defy scrying (Magic Map doesn't work)</led>
<led name='barrier' font='plain' top='387' left='50' width='220'>Magical barriers are stronger in this town</led> <led name='barrier' font='plain' top='387' left='30' width='220'>Magical barriers are stronger in this town</led>
<led name='tavern' font='plain' top='404' left='50' width='220'>You can create new PCs in this town</led> <led name='tavern' font='plain' top='404' left='30' width='220'>You can create new PCs in this town</led>
</dialog> </dialog>

18
src/BoE.vsproj/Game/Blades of Exile.rc
View File

@@ -22,6 +22,7 @@
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
@@ -111,23 +112,6 @@ BEGIN
END END
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
IDC_BLADESOFEXILE ACCELERATORS
BEGIN
"^O", IDM_FILE_OPEN, ASCII, NOINVERT
"^S", IDM_FILE_SAVE, ASCII, NOINVERT
"^N", IDM_FILE_NEW, ASCII, NOINVERT
"^Q", IDM_FILE_QUIT, ASCII, NOINVERT
"^A", IDM_ACTIONS_ALCHEMY, ASCII, NOINVERT
"^W", IDM_ACTIONS_WAIT, ASCII, NOINVERT
"^M", IDM_ACTIONS_MAP, ASCII, NOINVERT
END
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //

13
src/BoE.vsproj/PcEdit/Char Editor.rc
View File

@@ -127,19 +127,6 @@ BEGIN
END END
END END
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
IDR_ACCELERATOR1 ACCELERATORS
BEGIN
"^O", 2, ASCII
"^S", 1, ASCII
"^Q", 4, ASCII
END
#endif // English (United States) resources #endif // English (United States) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

1
src/BoE.vsproj/PcEdit/resource.h
View File

@@ -6,7 +6,6 @@
#define IDM_FILE_OPEN 101 #define IDM_FILE_OPEN 101
#define IDM_FILE_CLOSE 102 #define IDM_FILE_CLOSE 102
#define IDM_FILE_SAVE 103 #define IDM_FILE_SAVE 103
#define IDR_ACCELERATOR1 104
#define IDM_FILE_SAVE_AS 104 #define IDM_FILE_SAVE_AS 104
#define IDM_FILE_REVERT 105 #define IDM_FILE_REVERT 105
#define IDM_FILE_QUIT 106 #define IDM_FILE_QUIT 106

35
src/BoE.vsproj/ScenEdit/Scen Editor.rc
View File

@@ -90,7 +90,7 @@ BEGIN
MENUITEM "&Scenario Details", IDM_SCEN_DETAILS MENUITEM "&Scenario Details", IDM_SCEN_DETAILS
MENUITEM "Scenario Intr&o Text", IDM_SCEN_INTRO MENUITEM "Scenario Intr&o Text", IDM_SCEN_INTRO
MENUITEM "Set Starting &Location", IDM_SCEN_START MENUITEM "Set Starting &Location", IDM_SCEN_START
MENUITEM "Classify Custom &Graphics" IDM_SCEN_CUSTOM_PICS MENUITEM "Classify Custom &Graphics", IDM_SCEN_CUSTOM_PICS
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Advanced:", IDM_SCEN_NEW_TOWN, GRAYED MENUITEM "Advanced:", IDM_SCEN_NEW_TOWN, GRAYED
MENUITEM " Edit Special &Nodes", IDM_SCEN_ADV_SPECIALS MENUITEM " Edit Special &Nodes", IDM_SCEN_ADV_SPECIALS
@@ -215,39 +215,6 @@ BEGIN
END END
END END
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
IDR_ACCELERATOR1 ACCELERATORS
BEGIN
VK_F1, 801, VIRTKEY
"^O", 1, ASCII
"^S", 2, ASCII
"^N", 3, ASCII
"^Q", 5, ASCII
"^B", 214, ASCII
"^U", 311, ASCII
"^T", 401, ASCII
"^R", 402, ASCII
"^L", 403, ASCII
"^E", 404, ASCII
"^F", 405, ASCII
"^G", 406, ASCII
"^M", 407, ASCII
"\t", 408, ASCII
"^J", 409, ASCII
"^K", 410, ASCII
"^P", 414, ASCII
VK_TAB, 408, VIRTKEY, CONTROL, NOINVERT
VK_LEFT, 409, VIRTKEY, CONTROL, NOINVERT
VK_RIGHT, 410, VIRTKEY, CONTROL, NOINVERT
VK_UP, 412, VIRTKEY, CONTROL, NOINVERT
VK_DOWN, 413, VIRTKEY, CONTROL, NOINVERT
END
#endif // English (United States) resources #endif // English (United States) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

1
src/BoE.vsproj/ScenEdit/resource.h
View File

@@ -4,7 +4,6 @@
// //
#define IDR_MENU1 101 #define IDR_MENU1 101
#define IDM_FILE_NEW 101 #define IDM_FILE_NEW 101
#define IDR_ACCELERATOR1 102
#define IDM_FILE_OPEN 102 #define IDM_FILE_OPEN 102
#define IDM_FILE_CLOSE 103 #define IDM_FILE_CLOSE 103
#define IDM_FILE_SAVE 104 #define IDM_FILE_SAVE 104