diff --git a/Scenario Editor/BLSCENED.CPP b/Scenario Editor/BLSCENED.CPP index 4b70fcc9..b274a606 100644 --- a/Scenario Editor/BLSCENED.CPP +++ b/Scenario Editor/BLSCENED.CPP @@ -85,7 +85,7 @@ Boolean editing_town = FALSE; short town_type = 0; // 0 - big 1 - ave 2 - small char szWinName[] = "BoE for Win32 dialogs"; char szAppName[] = "Classic BoE Scenario Editor"; -extern void object_scenario_data_dump(); + char szBladBase[128]; void loadSettingsFromFile() diff --git a/Scenario Editor/BLSCENED.RC b/Scenario Editor/BLSCENED.RC index 56d078c2..ee5ac51b 100644 --- a/Scenario Editor/BLSCENED.RC +++ b/Scenario Editor/BLSCENED.RC @@ -77,7 +77,7 @@ Exile MENU MENUITEM "Clear All Stains", 220 MENUITEM SEPARATOR MENUITEM "Advanced:", 212 - MENUITEM " Edit Special Nodes\tCtrl+A", 213 + MENUITEM " Edit Special Nodes", 213 MENUITEM " Edit Town Text\tCtrl+B", 214 MENUITEM " Advanced Town Details", 215 MENUITEM " Set Town Event Timers", 216 @@ -96,7 +96,7 @@ Exile MENU MENUITEM SEPARATOR MENUITEM "Advanced:", 310 MENUITEM " Edit Special Nodes\tCtrl+U", 311 - MENUITEM " Edit Outdoor Text\tCtrl+V", 312 + MENUITEM " Edit Outdoor Text", 312 } POPUP "&Additional Features" @@ -210,10 +210,8 @@ ACCELERATORS_1 ACCELERATORS "^S", 2, ASCII "^N", 3, ASCII "^Q", 5, ASCII - "^A", 213, ASCII "^B", 214, ASCII "^U", 311, ASCII - "^V", 312, ASCII "^T", 401, ASCII "^R", 402, ASCII "^L", 403, ASCII @@ -231,7 +229,8 @@ ACCELERATORS_1 ACCELERATORS VK_DOWN, 413, VIRTKEY, CONTROL, NOINVERT // Defined elsewhere: D,L -// Keys currently available: C,H,P,W,X,Y,Z +// Keys currently available: H,P,W,Y,Z +// Don't use keys A, X, C and V as they are Windows shortcuts (select all, cut, copy and paste) } diff --git a/Scenario Editor/GAMEDLOG.RC b/Scenario Editor/GAMEDLOG.RC index 55ea7690..6ab41f7b 100644 --- a/Scenario Editor/GAMEDLOG.RC +++ b/Scenario Editor/GAMEDLOG.RC @@ -1987,7 +1987,7 @@ STYLE WS_POPUP | WS_DLGFRAME { LTEXT "1_63", 1, 435, 295, 61, 20 LTEXT "5_716", 2, 6, 6, 36, 36 - LTEXT "Classic Blades of Exile Scenario Editor version 23.09.2009 | Copyright 1997, Spiderweb Software, Inc., All rights reserved.||Blades of Exile is distributed for free under GNU General Public License version 2.", 3, 50, 6, 420, 33 + LTEXT "Classic Blades of Exile Scenario Editor version 24.09.2009 | Copyright 1997, Spiderweb Software, Inc., All rights reserved.||Blades of Exile is distributed for free under GNU General Public License version 2.", 3, 50, 6, 420, 33 LTEXT "CREDITS : Initial coding/32-bit porting by Ormus . Aesthetic touches by Ishad Nha.", 4, 50, 227, 424, 33 LTEXT "Comments? Questions? Bugs? Post them at the Blades section of the Irony Central Board: www.ironycentral.com/forum/", 5, 50, 271, 354, 32 LTEXT "Blades of Exile was brought to you by Spiderweb Software - | _Where our aberrations become your reality._ |_Blades of Exile_ and Spiderweb Software are trademarks of Spiderweb Software.", 7, 50, 154, 410, 51 diff --git a/Scenario Editor/TFILEIO.CPP b/Scenario Editor/TFILEIO.CPP index a42f71e0..0f9f767a 100644 --- a/Scenario Editor/TFILEIO.CPP +++ b/Scenario Editor/TFILEIO.CPP @@ -51,8 +51,6 @@ Boolean cur_scen_is_win = TRUE; talking_record_type *dummy_talk_ptr; town_record_type *dummy_town_ptr; extern char file_path_name[256]; -void object_scenario_data_dump(); -extern item_storage_shortcut_type store_storage; // Big waste! char last_load_file[63] = "newscen.exs"; @@ -1342,51 +1340,52 @@ void object_scenario_data_dump() return; } sprintf(get_text,"\n\nConcise Scenario Object Data Printout for %s\n\n",scen_strs[0]); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - sprintf(get_text," For rectangles: \"tl\" = the top and left corner of the rectangle while \"br\" = the bottom and right corner.\n\n Maximum number of any given type of town object is shown by \"[ # ]\".\n Null objects are frequently not listed.\n\n"); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + sprintf(get_text," For rectangles: \"tl\" = the top and left corner of the rectangle while \"br\" = the bottom and right corner.\n\n Maximum number of any given type of town object is shown by \"[ # ]\".\n Null objects are frequently not listed.\n\n"); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); sprintf(get_text,"The Special Items [50]\n Special Item Properties: A value of 1 means that the Special Item can be used,\n while a value of 10 means that the party starts the scenario with the item. \n A value of 11 means that it can be used and the party starts with it.\n\n"); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + + for (i = 0; i < 50; i++) { + sprintf(get_text,"Special Item %d: Scenario Special Called = %d, Properties = %d, Name = \"%s\"\n",i,scenario.special_item_special[i],scenario.special_items[i],scen_strs[60 + i * 2]); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + } + sprintf(get_text,"\n\nItem Storage Shortcuts [10]\n"); WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - for (short i = 0; i < 50; i++) { - sprintf(get_text,"Special Item %d: Scenario Special Called = %d, Properties = %d, Name = \"%s\"\n",i,scenario.special_item_special[i],scenario.special_items[i],scen_strs[60 + i * 2]); + for (i = 0; i < 10; i++) { + sprintf(get_text,"Shortcut %d: All Items Property = %d, Terrain type = %d, Name = %s\n",i,scenario.storage_shortcuts[i].property,scenario.storage_shortcuts[i].ter_type,scen_item_list.ter_names[scenario.storage_shortcuts[i].ter_type]); WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); } - sprintf(get_text,"\n\nItem Storage Shortcuts [10]\n"); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - - for (short i = 0; i < 10; i++) { - sprintf(get_text,"Shortcut %d: All Items Property = %d, Terrain type = %d, Name = %s\n",i,scenario.storage_shortcuts[i].property,scenario.storage_shortcuts[i].ter_type,scen_item_list.ter_names[scenario.storage_shortcuts[i].ter_type]); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - } - sprintf(get_text,"\n\n Scenario Horse Records: [30]\n"); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - for (short i = 0; i < 30; i++) { - if (scenario.scen_horses[i].which_town >= 0) { - sprintf(get_text," Scenario Horse %d: Town = %d, X = %d, Y = %d, Property = %d\n",i,scenario.scen_horses[i].which_town,scenario.scen_horses[i].horse_loc.x,scenario.scen_horses[i].horse_loc.y,scenario.scen_horses[i].property); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - } - } + sprintf(get_text,"\n\n Scenario Horse Records: [30]\n"); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + for (i = 0; i < 30; i++) { + if (scenario.scen_horses[i].which_town >= 0) { + sprintf(get_text," Scenario Horse %d: Town = %d, X = %d, Y = %d, Property = %d\n",i,scenario.scen_horses[i].which_town,scenario.scen_horses[i].horse_loc.x,scenario.scen_horses[i].horse_loc.y,scenario.scen_horses[i].property); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + } + } sprintf(get_text,"\n\n Scenario Boat Records: [30]\n"); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + + for (i = 0; i < 30; i++) { + if (scenario.scen_boats[i].which_town >= 0) { + sprintf(get_text," Scenario Boat %d: Town = %d, X = %d, Y = %d, Property = %d\n",i,scenario.scen_boats[i].which_town,scenario.scen_boats[i].boat_loc.x,scenario.scen_boats[i].boat_loc.y,scenario.scen_boats[i].property); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + } + } - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - for (short i = 0; i < 30; i++) { - if (scenario.scen_boats[i].which_town >= 0) { - sprintf(get_text," Scenario Boat %d: Town = %d, X = %d, Y = %d, Property = %d\n",i,scenario.scen_boats[i].which_town,scenario.scen_boats[i].boat_loc.x,scenario.scen_boats[i].boat_loc.y,scenario.scen_boats[i].property); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - } - } - - sprintf(get_text,"\n\n Scenario Special Nodes: [256]\n"); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - for (short i = 0; i < 256; i++) { - if ((scenario.scen_specials[i].type > 0) || (scenario.scen_specials[i].jumpto >= 0)) { - get_str(spec_name,22,town.specials[i].type + 1); - sprintf(get_text," Scenario special %d: Type = %d, SD1 = %d, SD2 = %d, Pic = %d, M1 = %d, M2 = %d, Ex1a = %d, Ex1b = %d, Ex2a = %d, Ex2b = %d, JumpTo = %d, Name = %s\n",i,scenario.scen_specials[i].type,scenario.scen_specials[i].sd1,scenario.scen_specials[i].sd2,scenario.scen_specials[i].pic,scenario.scen_specials[i].m1,scenario.scen_specials[i].m2,scenario.scen_specials[i].ex1a,scenario.scen_specials[i].ex1b,scenario.scen_specials[i].ex2a,scenario.scen_specials[i].ex2b,scenario.scen_specials[i].jumpto,spec_name); - WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); - } - } + sprintf(get_text,"\n\n Scenario Special Nodes: [256]\n"); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + + for (i = 0; i < 256; i++) { + if ((scenario.scen_specials[i].type > 0) || (scenario.scen_specials[i].jumpto >= 0)) { + get_str(spec_name,22,town.specials[i].type + 1); + sprintf(get_text," Scenario special %d: Type = %d, SD1 = %d, SD2 = %d, Pic = %d, M1 = %d, M2 = %d, Ex1a = %d, Ex1b = %d, Ex2a = %d, Ex2b = %d, JumpTo = %d, Name = %s\n",i,scenario.scen_specials[i].type,scenario.scen_specials[i].sd1,scenario.scen_specials[i].sd2,scenario.scen_specials[i].pic,scenario.scen_specials[i].m1,scenario.scen_specials[i].m2,scenario.scen_specials[i].ex1a,scenario.scen_specials[i].ex1b,scenario.scen_specials[i].ex2a,scenario.scen_specials[i].ex2b,scenario.scen_specials[i].jumpto,spec_name); + WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); + } + } sprintf(get_text,"\n\n"); WriteFile(data_dump_file_id, get_text,strlen(get_text),&dwByteRead,NULL); diff --git a/Scenario Editor/TFILEIO.H b/Scenario Editor/TFILEIO.H index d013a051..3774f578 100644 --- a/Scenario Editor/TFILEIO.H +++ b/Scenario Editor/TFILEIO.H @@ -36,4 +36,5 @@ void make_new_scenario(char *file_name,short out_width,short out_height,short ma short use_grass,char *title); void flip_rect(RECT16 *s); void alter_rect(RECT16 *r); +void object_scenario_data_dump(); #endif