- Added enum for scenario editor mode

- Rearranged the editor palette button code so that: - the gaps between rows are absent - the buttons that can't be used in town (set entrance) and outdoors (item buttons) are now hidden - the buttons are drawn one at a time instead of all at once, to pave the way for adding more buttons to fill the gaps - the buttons are shifted down enough to make room for the "Center:" line between the last terrain button and the buttons - the "Center:" line is no longer next to the final terrain button, to pave the way for adding more terrain buttons - the terrain picture for the current selection is shifted right to make room for a potential two more columns of buttons. - there are two separate lists each for whether a button exists and what it is - Also altered the editor buttons sheet to support these changes. git-svn-id: http://openexile.googlecode.com/svn/trunk@37 4ebdad44-0ea0-11de-aab3-ff745001d230
2009-04-27 17:10:16 +00:00
parent 74ec4c67b5
commit f28053ed0e
12 changed files with 340 additions and 275 deletions
--- a/Editor/pc.main.cpp
+++ b/Editor/pc.main.cpp
@@ -591,8 +591,8 @@ void handle_extra_menu(int item_hit)
 			univ.town.p_loc.y = PSD[SDF_PARTY_SPLIT_Y];
 			PSD[SDF_IS_PARTY_SPLIT] = 0;
 			for (i = 0; i < 6; i++)
-				if (ADVEN[i].main_status >= 10)
-					ADVEN[i].main_status -= 10;
+				if (ADVEN[i].main_status >= MAIN_STATUS_SPLIT)
+					ADVEN[i].main_status -= MAIN_STATUS_SPLIT;
 			break;
 			

@@ -614,9 +614,9 @@ void handle_extra_menu(int item_hit)
 		case 10: // raise dead
 			display_strings(20,3,0,0,"Editing party",57,15,PICT_DLG,0);
 			for (i = 0; i < 6; i++)
-				if ((ADVEN[i].main_status == 2) || (ADVEN[i].main_status == 3) ||
-					(ADVEN[i].main_status == 4))
-						ADVEN[i].main_status = 1;
+				if ((ADVEN[i].main_status == MAIN_STATUS_DEAD) || (ADVEN[i].main_status == MAIN_STATUS_DUST) ||
+					(ADVEN[i].main_status == MAIN_STATUS_STONE))
+						ADVEN[i].main_status = MAIN_STATUS_ALIVE;
 			break;
 		case 11: // conditions
 			display_strings(20,4,0,0,"Editing party",57,15,PICT_DLG,0);
--- a/Editor/Blades
+++ b/Editor/Blades
--- a/Editor/scen.actions.cpp
+++ b/Editor/scen.actions.cpp
@@ -31,12 +31,23 @@ cTown::cCreature null_monst = {0,0,loc(),0,0,0,0,0,0};
 Boolean sign_error_received = FALSE;
 short copied_spec = -1;

-Boolean good_palette_buttons[6][8] = {{1,1,1,1,1,1,1,1},
-									{1,1,1,1,1,1,0,1},
-									{1,1,1,1,1,1,1,1},
-									{1,1,1,0,1,1,1,1},
-									{1,1,1,1,1,1,0,1},
-									{1,1,1,1,1,1,1,1}};
+Boolean good_palette_buttons[2][6][10] = {
+	{
+		{1,1,1,1,1,1,1,1,0,0},
+		{1,1,1,1,1,1,0,1,0,0},
+		{0,0,0,1,1,1,1,1,0,0},
+		{0,0,0,0,0,0,0,0,0,0},
+		{0,0,0,0,0,0,0,0,0,0},
+		{0,0,0,0,0,0,0,0,0,0}
+	}, {
+		{1,1,1,1,1,1,1,1,0,0},
+		{1,1,1,1,1,1,0,0,0,0},
+		{1,1,1,1,1,1,1,1,0,0},
+		{1,1,1,0,1,1,1,1,0,0},
+		{1,1,1,1,1,1,0,1,0,0},
+		{1,1,1,1,1,1,1,1,0,0}
+	}
+};
 cTown::cItem store_place_item = {loc(),-1,0,0,0,0,0};

 short flood_count = 0;
@@ -45,7 +56,7 @@ Rect terrain_rects[256],terrain_rect_base = {0,0,16,16},command_rects[21];


 extern short cen_x, cen_y, cur_town;
-extern eGameMode overall_mode;
+extern eScenMode overall_mode;
 extern Boolean mouse_button_held,editing_town;
 extern short cur_viewing_mode,user_given_password;
 extern cTown* town;
@@ -67,8 +78,27 @@ Rect left_buttons[NLS][2]; // 0 - whole, 1 - blue button
 short left_button_status[NLS]; // 0 - clear, 1 - text, 2 - title text, +10 - button
 short right_button_status[NRS]; 
 Rect right_buttons[NRSONPAGE];
-Rect palette_buttons[8][6];
+Rect palette_buttons_from[71];
+Rect palette_buttons[10][6];
 short current_rs_top = 0;
+
+short out_buttons[6][10] = {
+	{0, 1, 2, 3, 4, 5, 6, 7, -1,-1},
+	{10,11,12,13,14,15,-1,17,-1,-1},
+	{-1,-1,-1,23,24,25,26,27,-1,-1},
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+};
+short town_buttons[6][10] = {
+	{0, 1, 2, 3, 4, 5, 6, 7, -1,-1},
+	{10,11,12,13,14,15,-1,-1,-1,-1},
+	{20,21,22,23,24,25,26,27,-1,-1},
+	{30,31,32,-1,34,35,36,37,-1,-1},
+	{40,41,42,43,44,45,-1,47,-1,-1},
+	{50,51,52,53,54,55,56,57,-1,-1},
+};
+
 cTown::cCreature last_placed_monst = {0,0,loc(),0,0,0,0,0,0,0};

 cSpecial null_spec_node;// = {0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
@@ -126,7 +156,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 	location spot_hit;
 	Point cur_point,cur_point2;
 	short right_top,right_hit;
-	short old_mode;
+	eScenMode old_mode;
 	Rect temp_rect;
 	unsigned long dummy;
 	
@@ -141,12 +171,12 @@ Boolean handle_action(Point the_point,EventRecord event)
 			play_sound(37);
 			Delay(10,&dummy);
 			draw_lb_slot(i,0);
-			if (overall_mode == 61) {
+			if (overall_mode == MODE_INTRO_SCREEN) {
 				switch(i)
 					{
 						case 3: // new
 							if (build_scenario()){
-								overall_mode = 60;
+								overall_mode = MODE_MAIN_SCREEN;
 								set_up_main_screen();
 							}
 							break;
@@ -160,14 +190,14 @@ Boolean handle_action(Point the_point,EventRecord event)
 									cur_out = scenario.last_out_edited;
 									augment_terrain(cur_out);
 								}
-								overall_mode = 60;
+								overall_mode = MODE_MAIN_SCREEN;
 								set_up_main_screen();
 								update_item_menu();
 							}
 							break;
 					}
 				}
-			else if ((overall_mode == 60) || (overall_mode == 62)) {
+			else if ((overall_mode == MODE_MAIN_SCREEN) || (overall_mode == MODE_EDIT_TYPES)) {
 				switch(i)
 					{
 						case 0:
@@ -246,14 +276,14 @@ Boolean handle_action(Point the_point,EventRecord event)

 					}
 				}
-			if ((overall_mode < 60) && (i == NLS - 1)) {
+			if ((overall_mode < MODE_MAIN_SCREEN) && (i == NLS - 1)) {
 				set_cursor(0);
 				set_up_main_screen();
 				}
 		mouse_button_held = FALSE;
 		}
 	
-	if (overall_mode == 60) {
+	if (overall_mode == MODE_MAIN_SCREEN) {
 		right_top = GetControlValue(right_sbar);
 		for (i = 0; i < NRSONPAGE; i++)
 			if ((mouse_button_held == FALSE) && (PtInRect (the_point, &right_buttons[i]) )
@@ -367,7 +397,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 		mouse_button_held = FALSE;
 		}
 		}
-	if ((overall_mode < 60) //&& (PtInRect (the_point, &world_screen))
+	if ((overall_mode < MODE_MAIN_SCREEN) //&& (PtInRect (the_point, &world_screen))
 		&& (the_point.h > world_screen.left + 8) && (the_point.h < world_screen.right - 8)
 			&& (the_point.v > world_screen.top + 8) && (the_point.v < world_screen.bottom - 8) ) {	
 		if (cur_viewing_mode == 0) {	
@@ -399,7 +429,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 		if ((spot_hit.x < 0) || (spot_hit.x > ((editing_town == TRUE) ? town->max_dim() - 1 : 47)) ||
 			(spot_hit.y < 0) || (spot_hit.y > ((editing_town == TRUE) ? town->max_dim() - 1 : 47))) ;
 		else switch (overall_mode) {
-			case 0:
+			case MODE_DRAWING:
 			 if (((mouse_button_held == FALSE) && 
 			 (((editing_town == TRUE) && (town->terrain(spot_hit.x,spot_hit.y) == current_terrain_type)) ||
 			 ((editing_town == FALSE) && (current_terrain.terrain[spot_hit.x][spot_hit.y] == current_terrain_type)) ||
@@ -425,7 +455,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 					}
 			break;
 			
-			case 1: case 3: case 9: case 35: case 36:
+			case 1: case MODE_ROOM_RECT: case MODE_SET_TOWN_RECT: case MODE_HOLLOW_RECT: case MODE_FILLED_RECT:
 				if (mouse_button_held == TRUE)
 					break;
 				if (mode_count == 2) {
@@ -438,16 +468,16 @@ Boolean handle_action(Point the_point,EventRecord event)
 					}
 				working_rect.right = spot_hit.x;
 			 	working_rect.bottom = spot_hit.y;			
-						if ((overall_mode == 1) || (overall_mode == 36)) {
+						if ((overall_mode == 1) || (overall_mode == MODE_FILLED_RECT)) {
 							change_rect_terrain(working_rect,current_terrain_type,20,0);
 							}
-						else if (overall_mode == 35) {
+						else if (overall_mode == MODE_HOLLOW_RECT) {
 							change_rect_terrain(working_rect,current_terrain_type,20,1);
 							}
-							else if (overall_mode == 9) {
+							else if (overall_mode == MODE_SET_TOWN_RECT) {
 								town->in_town_rect = working_rect;
 								}
-							else {
+							else { // MODE_ROOM_RECT
 								if (editing_town == TRUE) {
 									for (x = 0; x < 16; x++)
 									if (town->room_rect(x).right == 0) {
@@ -457,8 +487,8 @@ Boolean handle_action(Point the_point,EventRecord event)
 											town->room_rect(x).right = 0;
 										x = 500;
 										}
-									}
-								if (editing_town == FALSE) {
+								}
+								else {
 									for (x = 0; x < 8; x++)
 									if (current_terrain.info_rect[x].right == 0) {
 										current_terrain.info_rect[x] = working_rect;
@@ -472,10 +502,10 @@ Boolean handle_action(Point the_point,EventRecord event)
 								if (x < 500)
 									give_error("You have placed the maximum number of area rectangles (16 in town, 8 outdoors).","",0);
 								}
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				set_cursor(0);
 				break;
-			case 2:					
+			case MODE_SET_WANDER_POINTS:					
 				if (mouse_button_held == TRUE)
 					break;
 				if (editing_town == FALSE) {
@@ -492,13 +522,13 @@ Boolean handle_action(Point the_point,EventRecord event)
 					case 2: set_string("Place third wandering monster arrival point","");break;
 					case 1: set_string("Place fourth wandering monster arrival point","");break;
 					case 0:
-						overall_mode = 0;
+						overall_mode = MODE_DRAWING;
 						set_cursor(0);
 						set_string("Drawing mode","");
 						break;
 					}
 				break;
-			case 6:
+			case MODE_TOGGLE_SPECIAL_DOT:
 //				town.special[spot_hit.x][spot_hit.y] = !town.special[spot_hit.x][spot_hit.y];
 				/*if (mouse_button_held == TRUE)
 					break;
@@ -508,27 +538,27 @@ Boolean handle_action(Point the_point,EventRecord event)
 				overall_mode = 0; */
 				break;
 				
-			case 29:
+			case MODE_LARGE_PAINTBRUSH:
 				mouse_button_held = TRUE;
 				change_circle_terrain(spot_hit,4,current_terrain_type,20);
 				break;
-			case 30:
+			case MODE_SMALL_PAINTBRUSH:
 				mouse_button_held = TRUE;
 				change_circle_terrain(spot_hit,1,current_terrain_type,20);
 				break;
-			case 31:
+			case MODE_LARGE_SPRAYCAN:
 				mouse_button_held = TRUE;
 				shy_change_circle_terrain(spot_hit,4,current_terrain_type,1);
 				break;
-			case 32:
+			case MODE_SMALL_SPRAYCAN:
 				mouse_button_held = TRUE;
 				shy_change_circle_terrain(spot_hit,2,current_terrain_type,1);
 				break;
-			case 37: // erase
+			case MODE_ERASER: // erase
 				change_circle_terrain(spot_hit,2,current_ground,20);
 				mouse_button_held = TRUE;
 				break;
-			case 4:
+			case MODE_PLACE_ITEM:
 				for (x = 0; x < 64; x++) 
 					if (town->preset_items[x].code < 0) {
 						town->preset_items[x].loc.x = spot_hit.x;
@@ -548,26 +578,26 @@ Boolean handle_action(Point the_point,EventRecord event)
 				if (x == 64) 
 					give_error("You can only have 64 preset items in each town.","",0);
 					
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				set_cursor(0);
 				set_string("Drawing mode","");
 				break;
-			case 5:
+			case MODE_EDIT_ITEM:
 				for (x = 0; x < 64; x++) 
 					if ((spot_hit.x == town->preset_items[x].loc.x) &&
 					(spot_hit.y == town->preset_items[x].loc.y) && (town->preset_items[x].code >= 0)) {			
 						edit_placed_item(x);
 						store_place_item = town->preset_items[x];
 						}
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				set_cursor(0);
 				break;
-			case 7:
+			case 7: // edit_monst does nothing at all, but I think this would otherwise be the same as mode 39
 				edit_monst(1,spot_hit.x,spot_hit.y);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				set_cursor(0);
 				break;
-			case 8:
+			case MODE_PLACE_SAME_CREATURE:
 				if (last_placed_monst.number == 0) {
 					give_error("Either no monster has been placed, or the last time you tried to place a monster the operation failed.","",0);
 					break;
@@ -586,10 +616,10 @@ Boolean handle_action(Point the_point,EventRecord event)
 							}
 						i = 60;	
 						}
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				set_cursor(0);
 				break;					
-			case 28:
+			case MODE_PLACE_CREATURE:
 				for (i = 0; i < 60; i++)
 					if (town->creatures(i).number == 0) {
 						town->creatures(i).start_loc = spot_hit;
@@ -623,30 +653,31 @@ Boolean handle_action(Point the_point,EventRecord event)
 				if ((i < 70) && (scenario.town_size[cur_town] == 0)) {
 					give_error("Large towns can have at most 60 preset monsters.","",0); // error
 					}
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				set_cursor(0);
 				break;

-			case 10: case 11: case 12: case 13:
+			case MODE_PLACE_NORTH_ENTRANCE: case MODE_PLACE_EAST_ENTRANCE:
+			case MODE_PLACE_SOUTH_ENTRANCE: case MODE_PLACE_WEST_ENTRANCE:
 				town->start_locs[overall_mode - 10].x = spot_hit.x; 
 				town->start_locs[overall_mode - 10].y = spot_hit.y; 
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 20:
-				make_web(spot_hit.x,spot_hit.y); overall_mode = 0; break;
-			case 21:
-				make_crate(spot_hit.x,spot_hit.y); overall_mode = 0; break;
-			case 22:
-				make_barrel(spot_hit.x,spot_hit.y); overall_mode = 0; break;
-			case 23:
-				make_fire_barrier(spot_hit.x,spot_hit.y); overall_mode = 0; break;
-			case 24:
-				make_force_barrier(spot_hit.x,spot_hit.y); overall_mode = 0; break;
-			case 25:
-				make_quickfire(spot_hit.x,spot_hit.y); overall_mode = 0; break;
+			case MODE_PLACE_WEB:
+				make_web(spot_hit.x,spot_hit.y); overall_mode = MODE_DRAWING; break;
+			case MODE_PLACE_CRATE:
+				make_crate(spot_hit.x,spot_hit.y); overall_mode = MODE_DRAWING; break;
+			case MODE_PLACE_BARREL:
+				make_barrel(spot_hit.x,spot_hit.y); overall_mode = MODE_DRAWING; break;
+			case MODE_PLACE_FIRE_BARRIER:
+				make_fire_barrier(spot_hit.x,spot_hit.y); overall_mode = MODE_DRAWING; break;
+			case MODE_PLACE_FORCE_BARRIER:
+				make_force_barrier(spot_hit.x,spot_hit.y); overall_mode = MODE_DRAWING; break;
+			case MODE_PLACE_QUICKFIRE:
+				make_quickfire(spot_hit.x,spot_hit.y); overall_mode = MODE_DRAWING; break;

-			case 26:
+			case MODE_CLEAR_FIELDS:
 				take_quickfire(spot_hit.x,spot_hit.y); 
 				take_force_barrier(spot_hit.x,spot_hit.y); 
 				take_fire_barrier(spot_hit.x,spot_hit.y); 
@@ -656,18 +687,18 @@ Boolean handle_action(Point the_point,EventRecord event)
 				for (i = 0; i < 8; i++)
 					take_sfx(spot_hit.x,spot_hit.y,i);
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 33:
-				make_sfx(spot_hit.x,spot_hit.y,mode_count); overall_mode = 0; break;
-			case 34:
+			case MODE_PLACE_SFX:
+				make_sfx(spot_hit.x,spot_hit.y,mode_count); overall_mode = MODE_DRAWING; break;
+			case MODE_EYEDROPPER:
 				if (editing_town == TRUE)
 					set_new_terrain(town->terrain(spot_hit.x,spot_hit.y));
 					else set_new_terrain(current_terrain.terrain[spot_hit.x][spot_hit.y]);
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 46:
+			case MODE_PLACE_SAME_ITEM:
 				if (store_place_item.code < 0) {
 					give_error("Either no item has been placed, or the last time you tried to place an item the operation failed.","",0);
 					break;
@@ -682,9 +713,9 @@ Boolean handle_action(Point the_point,EventRecord event)
 						x = 64;
 						}
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 38: //edit sign
+			case MODE_EDIT_SIGN: //edit sign
 				if (editing_town == TRUE) {
 					for (x = 0; x < 15; x++)
 						if ((town->sign_locs[x].x == spot_hit.x) && (town->sign_locs[x].y == spot_hit.y)) {
@@ -708,23 +739,23 @@ Boolean handle_action(Point the_point,EventRecord event)
 						}	
 					}
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 39: //edit monst
+			case MODE_EDIT_CREATURE: //edit monst
 				for (x = 0; x < 60; x++) 
 					if (monst_on_space(spot_hit,x) == TRUE) {
 						edit_placed_monst(x);
 						last_placed_monst = town->creatures(x);
 						}
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 40: //make special
+			case MODE_EDIT_SPECIAL: //make special
 				place_edit_special(spot_hit);
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 41: //copy special
+			case MODE_COPY_SPECIAL: //copy special
 				if (editing_town == TRUE) {
 					for (x = 0; x < 50; x++)
 						if ((town->special_locs[x].x == spot_hit.x) && (town->special_locs[x].y == spot_hit.y)) {
@@ -742,9 +773,9 @@ Boolean handle_action(Point the_point,EventRecord event)
 				if (x < 500)
 					give_error("There wasn't a special on that spot.","",0);
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 42: //paste special
+			case MODE_PASTE_SPECIAL: //paste special
 				if (copied_spec < 0) {
 					give_error("You need to select a special to copy first.","",0);
 					break;
@@ -774,9 +805,9 @@ Boolean handle_action(Point the_point,EventRecord event)
 					give_error("Each town can have at most 50 locations with special encounters. Each outdoor section can have at most 18. You'll need to erase some special spaces before you can place more.","",0);

 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 43: //erase special
+			case MODE_ERASE_SPECIAL: //erase special
 				if (editing_town == TRUE) {
 					for (x = 0; x < 50; x++)
 						if ((town->special_locs[x].x == spot_hit.x) && (town->special_locs[x].y == spot_hit.y)) {
@@ -792,19 +823,19 @@ Boolean handle_action(Point the_point,EventRecord event)
 							}
 					}
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 44: //edit special
+			case MODE_PLACE_SPECIAL: //edit special
 				set_special(spot_hit);
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 45: //edit town entry
+			case MODE_EDIT_TOWN_ENTRANCE: //edit town entry
 				town_entry(spot_hit);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				set_cursor(0);
 				break;
-			case 47: //edit out start loc
+			case MODE_SET_OUT_START: //edit out start loc
 				if (fancy_choice_dialog(864,0) == 2)
 					break;
 				if ((spot_hit.x != minmax(4,43,spot_hit.x)) ||
@@ -816,32 +847,32 @@ Boolean handle_action(Point the_point,EventRecord event)
 				scenario.out_sec_start.y = cur_out.y;
 				scenario.out_start = spot_hit;
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 48: //delete monst
+			case MODE_ERASE_CREATURE: //delete monst
 				for (x = 0; x < 60; x++) 
 					if (monst_on_space(spot_hit,x) == TRUE) {
 						town->creatures(x).number = 0;
 						}
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
-			case 49: // delete item
+			case MODE_ERASE_ITEM: // delete item
 				for (x = 0; x < 64; x++) 
 					if ((spot_hit.x == town->preset_items[x].loc.x) &&
 					(spot_hit.y == town->preset_items[x].loc.y) && (town->preset_items[x].code >= 0)) {			
 						town->preset_items[x].code = -1;
 						}
 				set_cursor(0);
-				overall_mode = 0;
+				overall_mode = MODE_DRAWING;
 				break;
 			}
-			if ((overall_mode == 0) && (old_mode != 0))
+			if ((overall_mode == MODE_DRAWING) && (old_mode != MODE_DRAWING))
 				set_string("Drawing mode","");
 			draw_terrain();

 		}
-	if (overall_mode < 60) {
+	if (overall_mode < MODE_MAIN_SCREEN) {
 		if ((PtInRect (the_point, &border_rect[0])) & (cen_y > ((editing_town == TRUE) ? 4 : 3))) {
 			cen_y--;
 			if ((event.modifiers & controlKey) != 0) 
@@ -877,7 +908,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 			}
 		}

-	if ((mouse_button_held == FALSE) && ((overall_mode < 60) || (overall_mode == 62))) {
+	if ((mouse_button_held == FALSE) && ((overall_mode < MODE_MAIN_SCREEN) || (overall_mode == MODE_EDIT_TYPES))) {
 		cur_point = the_point;
 		cur_point.h -= RIGHT_AREA_UL_X;
 		cur_point.v -= RIGHT_AREA_UL_Y;
@@ -887,7 +918,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 				temp_rect = terrain_rects[i];
 				OffsetRect(&temp_rect,RIGHT_AREA_UL_X, RIGHT_AREA_UL_Y );
 				flash_rect(temp_rect);
-				if (overall_mode < 60) {
+				if (overall_mode < MODE_MAIN_SCREEN) {
 					set_new_terrain(i);
 					}
 					else {
@@ -899,46 +930,46 @@ Boolean handle_action(Point the_point,EventRecord event)
 		cur_point2 = cur_point;
 		cur_point2.h -= 5;
 		cur_point2.v -= terrain_rects[255].bottom + 5;
-		for (i = 0; i < 8; i++)
+		for (i = 0; i < 10; i++)
 			for (j = 0; j < 6; j++) {
-			if ((good_palette_buttons[j][i] > 0) && (mouse_button_held == FALSE) && (PtInRect(cur_point2,&palette_buttons[i][j]))
-				&& ((j < 3) || (editing_town == TRUE)) && (overall_mode < 60)) {
+			if ((good_palette_buttons[editing_town][j][i] > 0) && (mouse_button_held == FALSE) && (PtInRect(cur_point2,&palette_buttons[i][j]))
+				&& /*((j < 3) || (editing_town == TRUE)) &&*/ (overall_mode < MODE_MAIN_SCREEN)) {
 					temp_rect = palette_buttons[i][j];
 					OffsetRect(&temp_rect,RIGHT_AREA_UL_X + 5, RIGHT_AREA_UL_Y + terrain_rects[255].bottom + 5);
 					flash_rect(temp_rect);
 					switch (i + 100 * j) {
 						case 0:
 							set_string("Drawing mode"," ");
-							overall_mode = 0;
+							overall_mode = MODE_DRAWING;
 							set_cursor(0);
 							break;
 						case 1: 
 							set_string("Paintbrush (large)","");
-							overall_mode = 28 + i;
+							overall_mode = MODE_LARGE_PAINTBRUSH;
 							set_cursor(2);
 							break;
 						case 2: 
 							set_string("Paintbrush (small)","");
 							set_cursor(2);
-							overall_mode = 28 + i;
+							overall_mode = MODE_SMALL_PAINTBRUSH;
 							break;
 						case 3: 
 							set_string("Spraycan (large)","");
 							set_cursor(3);
-							overall_mode = 28 + i;
+							overall_mode = MODE_LARGE_SPRAYCAN;
 							break;
 						case 4: 
 							set_string("Spraycan (small)","");
 							set_cursor(3);
-							overall_mode = 28 + i;
+							overall_mode = MODE_SMALL_SPRAYCAN;
 							break;
 						case 5: 
 							set_string("Eyedropper","Select terrain to draw");
 							set_cursor(1);
-							overall_mode = 34;
+							overall_mode = MODE_EYEDROPPER;
 							break;
 						case 6: case 7:
-							overall_mode = (i == 6) ? 35 : 36;
+							overall_mode = (i == 6) ? MODE_HOLLOW_RECT : MODE_FILLED_RECT;
 							mode_count = 2;
 							set_cursor(5);
 							if (i == 6)
@@ -951,22 +982,22 @@ Boolean handle_action(Point the_point,EventRecord event)
 							break;
 						case 101: 
 							set_string("Erase space","Select space to clear");
-							overall_mode = 37;
+							overall_mode = MODE_ERASER;
 							set_cursor(4);
 							break;
 						case 102: 
 							set_string("Edit sign","Select sign to edit");
 							set_cursor(7);
-							overall_mode = 38;
+							overall_mode = MODE_EDIT_SIGN;
 							break;
 						case 103: 
-							overall_mode = 3;
+							overall_mode = MODE_ROOM_RECT;
 							mode_count = 2;
 							set_cursor(5);
 							set_string("Create room rectangle","Select upper left corner");
 							break;				
 						case 104: 
-							overall_mode = 2;
+							overall_mode = MODE_SET_WANDER_POINTS;
 							mode_count = 4;
 							set_cursor(7);
 							set_string("Place first wandering monster arrival point","");
@@ -983,7 +1014,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 								}
 							set_string("Set town entrance","Select town to edit");
 							set_cursor(7);
-							overall_mode = 45;
+							overall_mode = MODE_EDIT_TOWN_ENTRANCE;
 							break;
 							
 						case 200:
@@ -993,7 +1024,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 								}
 							set_string("Edit placed item","Select item to edit");
 							set_cursor(7);
-							overall_mode = 5;
+							overall_mode = MODE_EDIT_ITEM;
 							break;
 						case 201:
 							if (editing_town == FALSE) {
@@ -1002,7 +1033,7 @@ Boolean handle_action(Point the_point,EventRecord event)
 								}
 							set_string("Place same item","Select location");
 							set_cursor(7);
-							overall_mode = 46;
+							overall_mode = MODE_PLACE_SAME_ITEM;
 							break;
 						case 202:
 							if (editing_town == FALSE) {
@@ -1011,145 +1042,145 @@ Boolean handle_action(Point the_point,EventRecord event)
 								}
 							set_string("Delete an item","Select item");
 							set_cursor(7);
-							overall_mode = 49;
+							overall_mode = MODE_ERASE_ITEM;
 							break;
 						case 203:
 							set_string("Create/Edit special","Select special location");
 							set_cursor(7);
-							overall_mode = 40;
+							overall_mode = MODE_EDIT_SPECIAL;
 							break;
 						case 204:
 							set_string("Copy special","Select special to copy");
 							set_cursor(7);
-							overall_mode = 41;
+							overall_mode = MODE_COPY_SPECIAL;
 							break;
 						case 205:
 							if (special_to_paste < 0) {
 								set_string("Can't paste special","No special to paste");
 								}
 							set_string("Paste special","Select location to paste");
-							overall_mode = 42;
+							overall_mode = MODE_PASTE_SPECIAL;
 							set_cursor(7);
 							break;
 						case 206:
 							set_string("Erase special","Select special to erase");
-							overall_mode = 43;
+							overall_mode = MODE_ERASE_SPECIAL;
 							set_cursor(4);
 							break;
 						case 207:
 							set_string("Set/place special","Select special location");
 							set_cursor(7);
-							overall_mode = 44;
+							overall_mode = MODE_PLACE_SPECIAL;
 							break;
 						
 						case 300: 
 							set_string("Edit creature","Select creature to edit");
 							set_cursor(7);
-							overall_mode = 39;
+							overall_mode = MODE_EDIT_CREATURE;
 							break;
 						case 301: 
 							set_string("Place same creature","Select creature location");
 							set_cursor(7);
-							overall_mode = 8;
+							overall_mode = MODE_PLACE_SAME_CREATURE;
 							break;
 						case 302:
 							set_string("Delete a creature","Select creature");
 							set_cursor(4);
-							overall_mode = 48;
+							overall_mode = MODE_ERASE_CREATURE;
 							break;
 						case 304: 
 							set_string("Place north entrace","Select entrance location");
 							set_cursor(7);
-							overall_mode = 10;
+							overall_mode = MODE_PLACE_NORTH_ENTRANCE;
 							break;
 						case 305: 
 							set_string("Place west entrace","Select entrance location");
 							set_cursor(7);
-							overall_mode = 13;
+							overall_mode = MODE_PLACE_WEST_ENTRANCE;
 							break;
 						case 306: 
 							set_string("Place south entrace","Select entrance location");
 							set_cursor(7);
-							overall_mode = 12;
+							overall_mode = MODE_PLACE_SOUTH_ENTRANCE;
 							break;
 						case 307: 
 							set_string("Place east entrace","Select entrance location");
 							set_cursor(7);
-							overall_mode = 11;
+							overall_mode = MODE_PLACE_EAST_ENTRANCE;
 							break;
 						case 400: 
 							set_string("Place web","Select location");
-							overall_mode = 20;
+							overall_mode = MODE_PLACE_WEB;
 							set_cursor(0);
 							break;
 						case 401: 
 							set_string("Place crate","Select location");
-							overall_mode = 21;
+							overall_mode = MODE_PLACE_CRATE;
 							set_cursor(0);
 							break;
 						case 402: 
 							set_string("Place barrel","Select location");
-							overall_mode = 22;
+							overall_mode = MODE_PLACE_BARREL;
 							set_cursor(0);
 							break;
 						case 403: 
 							set_string("Place fire barrier","Select location");
-							overall_mode = 23;
+							overall_mode = MODE_PLACE_FIRE_BARRIER;
 							set_cursor(0);
 							break;
 						case 404: 
 							set_string("Place force barrier","Select location");
-							overall_mode = 24;
+							overall_mode = MODE_PLACE_FORCE_BARRIER;
 							set_cursor(0);
 							break;
 						case 405: 
 							set_string("Place quickfire","Select location");
-							overall_mode = 25;
+							overall_mode = MODE_PLACE_QUICKFIRE;
 							set_cursor(0);
 							break;
 						case 407: 
 							set_string("Clear space","Select space to clear");
-							overall_mode = 26;
+							overall_mode = MODE_CLEAR_FIELDS;
 							set_cursor(4);
 							break;
 						case 500: 
 							set_string("Place small blood stain","Select stain location");
-							overall_mode = 33; mode_count = 0;
+							overall_mode = MODE_PLACE_SFX; mode_count = 0;
 							set_cursor(0);
 							break;
 						case 501: 
 							set_string("Place ave. blood stain","Select stain location");
-							overall_mode = 33; mode_count = 1;
+							overall_mode = MODE_PLACE_SFX; mode_count = 1;
 							set_cursor(0);
 							break;
 						case 502: 
 							set_string("Place large blood stain","Select stain location");
-							overall_mode = 33; mode_count = 2;
+							overall_mode = MODE_PLACE_SFX; mode_count = 2;
 							set_cursor(0);
 							break;
 						case 503: 
 							set_string("Place small slime pool","Select slime location");
-							overall_mode = 33; mode_count = 3;
+							overall_mode = MODE_PLACE_SFX; mode_count = 3;
 							set_cursor(0);
 							break;
 						case 504: 
 							set_string("Place large slime pool","Select slime location");
-							overall_mode = 33; mode_count = 4;
+							overall_mode = MODE_PLACE_SFX; mode_count = 4;
 							set_cursor(0);
 							break;
 						case 505: 
 							set_string("Place ash","Select ash location");
-							overall_mode = 33; mode_count = 5;
+							overall_mode = MODE_PLACE_SFX; mode_count = 5;
 							set_cursor(0);
 							break;
 						case 506: 
 							set_string("Place bones","Select bones location");
-							overall_mode = 33; mode_count = 6;
+							overall_mode = MODE_PLACE_SFX; mode_count = 6;
 							set_cursor(0);
 							break;
 						case 507: 
 							set_string("Place rocks","Select rocks location");
-							overall_mode = 33; mode_count = 7;					
+							overall_mode = MODE_PLACE_SFX; mode_count = 7;					
 							set_cursor(0);
 							break;
 						}
@@ -1235,7 +1266,7 @@ void handle_keystroke(char chr,char chr2,EventRecord event)
 	Boolean are_done;
 								
 	
-	if (overall_mode >= 60)
+	if (overall_mode >= MODE_MAIN_SCREEN)
 		return;

 	for (i = 0; i < 10; i++)
@@ -1343,19 +1374,19 @@ void handle_keystroke(char chr,char chr2,EventRecord event)
 				break;
 			case '.':
 				set_string("Pick item to edit.","");
-				overall_mode = 5;
+				overall_mode = MODE_EDIT_ITEM;
 				break;
 			case '`':
 				set_string("Place same creature","Select creature location");
-				overall_mode = 8;
+				overall_mode = MODE_PLACE_SAME_CREATURE;
 				break;
 			case ',':
 							set_string("Edit creature","Select creature to edit");
-							overall_mode = 39;
+							overall_mode = MODE_EDIT_CREATURE;
 							break;
 			case '/':
 							set_string("Place same item","Select location");
-							overall_mode = 46;
+							overall_mode = MODE_PLACE_SAME_ITEM;
 							break;

 			default:
@@ -3089,7 +3120,7 @@ void set_up_main_screen()
 	set_lb(-1,11,"Edit Town Dialogue",0);
 	//set_lb(NLS - 2,1,"Copyright 1997",0);
 	set_lb(NLS - 1,1,"Copyright 1997, All rights reserved.",0);
-	overall_mode = 60;
+	overall_mode = MODE_MAIN_SCREEN;
 	ShowControl(right_sbar);
 	shut_down_menus(4);
 	shut_down_menus(3);
@@ -3111,7 +3142,7 @@ void start_town_edit()
 	set_lb(NLS - 3,1,town->town_strs(0),0);
 	set_lb(NLS - 2,1,"(Click border to scroll view.)",0);
 	set_lb(NLS - 1,11,"Back to Main Menu",0);
-	overall_mode = 0;
+	overall_mode = MODE_DRAWING;
 	editing_town = TRUE;
 	set_up_terrain_buttons();
 	shut_down_menus(4);
@@ -3142,7 +3173,7 @@ void start_out_edit()
 	set_lb(NLS - 3,1,current_terrain.out_strs(0),0);
 	set_lb(NLS - 2,1,"(Click border to scroll view.)",0);
 	set_lb(NLS - 1,11,"Back to Main Menu",0);
-	overall_mode = 0;
+	overall_mode = MODE_DRAWING;
 	editing_town = FALSE;
 	set_up_terrain_buttons();
 	HideControl(right_sbar);
@@ -3218,7 +3249,7 @@ void start_terrain_editing()
 	Str255 str;
 	
 	HideControl(right_sbar);
-	overall_mode = 62;
+	overall_mode = MODE_EDIT_TYPES;
 	set_up_terrain_buttons();
 	place_location();
 		
@@ -3241,10 +3272,10 @@ void start_monster_editing(short just_redo_text)
 	Str255 str;
 	Boolean draw_full = FALSE;

-	if (overall_mode == 62)
+	if (overall_mode == MODE_EDIT_TYPES)
 		draw_full = TRUE;
 	if (just_redo_text == 0) {
-		overall_mode = 60;
+		overall_mode = MODE_MAIN_SCREEN;
 		ShowControl(right_sbar);
 		SetControlValue(right_sbar,0);
 	
@@ -3269,11 +3300,11 @@ void start_item_editing(short just_redo_text)
 	Boolean draw_full = FALSE;
 	
 	if (just_redo_text == 0) {
-		if (overall_mode < 60)
+		if (overall_mode < MODE_MAIN_SCREEN)
 			set_up_main_screen();
-		if (overall_mode == 62)
+		if (overall_mode == MODE_EDIT_TYPES)
 			draw_full = TRUE;
-		overall_mode = 60;
+		overall_mode = MODE_MAIN_SCREEN;
 		ShowControl(right_sbar);
 	
 		SetControlValue(right_sbar,0);
@@ -3297,11 +3328,11 @@ void start_special_item_editing()
 	Str255 str;
 	Boolean draw_full = FALSE;

-	if (overall_mode < 60)
+	if (overall_mode < MODE_MAIN_SCREEN)
 		set_up_main_screen();
-	if (overall_mode == 62)
+	if (overall_mode == MODE_EDIT_TYPES)
 		draw_full = TRUE;
-	overall_mode = 60;
+	overall_mode = MODE_MAIN_SCREEN;
 	ShowControl(right_sbar);
 	
 		SetControlValue(right_sbar,0);
@@ -3328,11 +3359,11 @@ void start_string_editing(short mode,short just_redo_text)
 	Boolean draw_full = FALSE;

 	if (just_redo_text == 0) {
-		if (overall_mode < 60)
+		if (overall_mode < MODE_MAIN_SCREEN)
 			set_up_main_screen();
-		if (overall_mode == 62)
+		if (overall_mode == MODE_EDIT_TYPES)
 			draw_full = TRUE;
-		overall_mode = 60;
+		overall_mode = MODE_MAIN_SCREEN;
 		ShowControl(right_sbar);
 	
 		reset_rb();
@@ -3373,11 +3404,11 @@ void start_special_editing(short mode,short just_redo_text)
 	Boolean draw_full = FALSE;

 	if (just_redo_text == 0) {
-		if (overall_mode < 60)
+		if (overall_mode < MODE_MAIN_SCREEN)
 			set_up_main_screen();
-		if (overall_mode == 62)
+		if (overall_mode == MODE_EDIT_TYPES)
 			draw_full = TRUE;
-		overall_mode = 60;
+		overall_mode = MODE_MAIN_SCREEN;
 		ShowControl(right_sbar);
 	
 		reset_rb();
@@ -3418,11 +3449,11 @@ void start_dialogue_editing(short restoring)
 	char s[15] = "    ,      ";
 	Boolean draw_full = FALSE;
 	
-	if (overall_mode < 60)
+	if (overall_mode < MODE_MAIN_SCREEN)
 		set_up_main_screen();
-	if (overall_mode == 62)
+	if (overall_mode == MODE_EDIT_TYPES)
 		draw_full = TRUE;
-	overall_mode = 60;
+	overall_mode = MODE_MAIN_SCREEN;
 	ShowControl(right_sbar);
 	
 	if (restoring == 0) {
--- a/Editor/scen.core.cpp
+++ b/Editor/scen.core.cpp
@@ -14,7 +14,7 @@
 #include "scen.fileio.h"
 #include "scen.actions.h"

-extern short cen_x, cen_y, overall_mode,cur_town;
+extern short cen_x, cen_y,/* overall_mode,*/cur_town;
 extern Boolean mouse_button_held;
 extern short cur_viewing_mode,dialog_answer,given_password,user_given_password;
 extern cTown* town;
@@ -650,7 +650,7 @@ cMonster return_monster_template(unsigned char store)
 		monst.a[2] += 100;
 	monst.a1_type = m_a1t[m_num];
 	monst.a23_type = m_a23t[m_num];
-	monst.m_type = m_type[m_num];
+	monst.m_type = (eMonsterType) m_type[m_num];
 	monst.speed = m_speed[m_num];
 	monst.ap = 0;
 	monst.mu = m_mu[m_num];
@@ -1228,7 +1228,8 @@ void edit_monst_type_event_filter (short item_hit)
 			if (save_monst_info() == FALSE) break;
 			i = choose_text_res(20,150,164,store_monst.m_type + 150,814,"Choose Monster Type:");
 			if (i >= 0) {
-				store_monst.m_type = i - 150;
+				i -= 150;
+				store_monst.m_type = (eMonsterType) i;
 				put_monst_info_in_dlog();
 				}
 			break;
--- a/Editor/scen.fileio.cpp
+++ b/Editor/scen.fileio.cpp
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "scen.global.h"
 #include "classes.h"
-#include <stdio.h>
+#include <iostream>
 #include "scen.fileio.h"
 #include "scen.keydlgs.h"
 #include "graphtool.h"
@@ -22,7 +22,7 @@ extern cScenario scenario;
 DialogPtr	the_dialog;
 extern cTown* town;
 //extern short town_type, max_dim[3];  // 0 - big 1 - ave 2 - small
-extern short cur_town,overall_mode,given_password,user_given_password;
+extern short cur_town,/*overall_mode,*/given_password,user_given_password;
 extern location cur_out;
 //extern piles_of_stuff_dumping_type *data_store;
 //extern cSpeech talking;
--- a/Editor/scen.global.h
+++ b/Editor/scen.global.h
@@ -35,6 +35,55 @@
 #define	CDST	cd_set_text_edit_str
 #define	CDSN	cd_set_text_edit_num

+enum eScenMode {
+	MODE_DRAWING = 0,
+	MODE_SET_WANDER_POINTS = 2,
+	MODE_ROOM_RECT = 3,
+	MODE_PLACE_ITEM = 4,
+	MODE_EDIT_ITEM = 5,
+	MODE_TOGGLE_SPECIAL_DOT = 6, // I suspect that's what this was for, anyway – it currently does nothing
+	MODE_SET_TOWN_START = 7, // unused; for something I'd like to add
+	MODE_PLACE_SAME_CREATURE = 8,
+	MODE_SET_TOWN_RECT = 9,
+	MODE_PLACE_NORTH_ENTRANCE = 10,
+	MODE_PLACE_EAST_ENTRANCE = 11,
+	MODE_PLACE_SOUTH_ENTRANCE = 12,
+	MODE_PLACE_WEST_ENTRANCE = 13,
+	MODE_PLACE_WEB = 20,
+	MODE_PLACE_CRATE = 21,
+	MODE_PLACE_BARREL = 22,
+	MODE_PLACE_FIRE_BARRIER = 23,
+	MODE_PLACE_FORCE_BARRIER = 24,
+	MODE_PLACE_QUICKFIRE = 25,
+	MODE_CLEAR_FIELDS = 26,
+	MODE_PLACE_STONE_BLOCK = 27, // unused; for something I'd like to add
+	MODE_PLACE_CREATURE = 28,
+	MODE_LARGE_PAINTBRUSH = 29, // uncertain
+	MODE_SMALL_PAINTBRUSH = 30, // uncertain
+	MODE_LARGE_SPRAYCAN = 31, // uncertain
+	MODE_SMALL_SPRAYCAN = 32, // uncertain
+	MODE_PLACE_SFX = 33, // eg bloodstain or ashes
+	MODE_EYEDROPPER = 34,
+	MODE_HOLLOW_RECT = 35,
+	MODE_FILLED_RECT = 36,
+	MODE_ERASER = 37,
+	MODE_EDIT_SIGN = 38,
+	MODE_EDIT_CREATURE = 39,
+	MODE_EDIT_SPECIAL = 40, // or create a special if there's none there
+	MODE_COPY_SPECIAL = 41,
+	MODE_PASTE_SPECIAL = 42,
+	MODE_ERASE_SPECIAL = 43,
+	MODE_PLACE_SPECIAL = 44, // or set the special to be called if there's already one there
+	MODE_EDIT_TOWN_ENTRANCE = 45, // for outdoors
+	MODE_PLACE_SAME_ITEM = 46,
+	MODE_SET_OUT_START = 47,
+	MODE_ERASE_CREATURE = 48,
+	MODE_ERASE_ITEM = 49,
+	MODE_MAIN_SCREEN = 60,
+	MODE_INTRO_SCREEN = 61,
+	MODE_EDIT_TYPES = 62, // currently only used for editing terrain, but I'd like to use it for editing monsters and items too.
+};
+
 //typedef struct {
 //	short personality,type;
 //	char link1[4],link2[4];
--- a/Editor/scen.graphics.cpp
+++ b/Editor/scen.graphics.cpp
@@ -35,7 +35,8 @@ extern cTown* town;
 //extern big_tr_type t_d;
 //extern template_town_type town_template;
 //extern short town_type;  // 0 - big 1 - ave 2 - small
-extern short cur_viewing_mode,overall_mode;
+extern short cur_viewing_mode;
+extern eScenMode overall_mode;
 extern short available_dlog_buttons[NUM_DLOG_B];
 extern Boolean editing_town;
 extern short max_dim[3];
@@ -84,10 +85,13 @@ PixPatHandle map_pat[25];


 // begin new stuff
-Rect blue_button_from = {112,91,126,107};						
-Rect start_button_from = {112,70,119,91};
-Rect base_small_button_from = {112,0,119,7};
-extern Rect palette_buttons[8][6];
+Rect blue_button_from = {120,91,134,107};						
+Rect start_button_from = {120,70,127,91};
+Rect base_small_button_from = {120,0,127,7};
+extern Rect palette_buttons[10][6];
+extern Rect palette_buttons_from[71];
+extern short town_buttons[6][10], out_buttons[6][10];
+extern Boolean good_palette_buttons[2][6][10];
 Rect palette_button_base = {0,0,18,25};
 Rect terrain_buttons_rect = {0,0,410,294};
 extern Rect left_buttons[NLS][2]; // 0 - whole, 1 - blue button
@@ -216,23 +220,26 @@ void init_dialogs(){
 void Set_up_win ()
 {
 	short i,j;
-
-
-	for (i = 0; i < 8; i++)
+	for (i = 0; i < 70; i++){
+		palette_buttons_from[i] = palette_button_base;
+		OffsetRect(&palette_buttons_from[i],(i%10) * 25, (i/10) * 17);
+		palette_buttons_from[i].right++;
+	}
+	for (i = 0; i < 10; i++)
 		for (j = 0; j < 6; j++) {
-		palette_buttons[i][j] = palette_button_base;
-		OffsetRect(&palette_buttons[i][j],i * 25, j * 17);
-		if (i == 7)
-			palette_buttons[i][j].right++;
+			palette_buttons[i][j] = palette_button_base;
+			OffsetRect(&palette_buttons[i][j],i * 25, j * 17);
+			if (i == 10 || !good_palette_buttons[1][j][i+1])
+				palette_buttons[i][j].right++;
 		}
-	for (i = 0; i < 8; i++)
-		for (j = 2; j < 6; j++) 
+	for (i = 0; i < 10; i++)
+		for (j = /*2*/0; j < 6; j++) 
 			OffsetRect(&palette_buttons[i][j],0,3);
-	for (i = 0; i < 8; i++)
-		for (j = 3; j < 6; j++) 
+	for (i = 0; i < 10; i++)
+		for (j = /*3*/0; j < 6; j++) 
 			OffsetRect(&palette_buttons[i][j],0,3);
-	for (i = 0; i < 8; i++)
-		for (j = 4; j < 6; j++) 
+	for (i = 0; i < 10; i++)
+		for (j = /*4*/0; j < 6; j++) 
 			OffsetRect(&palette_buttons[i][j],0,3);
 	
 	for (i = 0; i < NLS; i++) {
@@ -333,7 +340,7 @@ void redraw_screen()
 	SetPortWindowPort (mainPtr);
 	FillCRect(&windRect,bg[20]);
 	draw_main_screen();
-	if (overall_mode < 60);
+	if (overall_mode < MODE_MAIN_SCREEN);
 		draw_terrain();
 	SetPort (old_port);
 }
@@ -351,7 +358,7 @@ void draw_main_screen()
 	draw_lb();
 		
 	// draw right buttons (only when not editing terrain)
-	if (overall_mode >= 60) {
+	if (overall_mode >= MODE_MAIN_SCREEN) {
 		draw_rect.left = RIGHT_AREA_UL_X;
 		draw_rect.top = RIGHT_AREA_UL_Y;
 		draw_rect.right = RIGHT_AREA_UL_X + RIGHT_AREA_WIDTH - 16;
@@ -366,7 +373,7 @@ void draw_main_screen()
 		}
 		
 	// draw terrain palette
-	if ((overall_mode < 60) || (overall_mode == 62)) {
+	if ((overall_mode < MODE_MAIN_SCREEN) || (overall_mode == MODE_EDIT_TYPES)) {
 		//draw_rect = terrain_buttons_rect;
 		//OffsetRect(&draw_rect,RIGHT_AREA_UL_X,RIGHT_AREA_UL_Y);
 		//rect_draw_some_item(terrain_buttons_gworld,terrain_buttons_rect,
@@ -456,11 +463,11 @@ void draw_rb_slot (short which,short mode)

 void set_up_terrain_buttons()
 {
-	short i,pic,small_i;
+	short i,j,pic,small_i;
 	Rect ter_from,ter_to,ter_from_base = {0,0,36,28};
 	Rect tiny_from,tiny_to; 
 	
-	Rect palette_from = {0,0,0,0},palette_to;
+	Rect palette_from,palette_to = palette_button_base;
 					
 	SetPort( terrain_buttons_gworld);
 	FillCRect(&terrain_buttons_rect,bg[17]);
@@ -512,22 +519,44 @@ void set_up_terrain_buttons()
 				tiny_from,terrain_buttons_gworld,tiny_to,0,0);
 		}
 	
-	if (overall_mode < 60) {
-		palette_to.left = 5;
-		palette_to.top = terrain_rects[255].bottom + 5;
-		if (editing_town == TRUE) {
-			palette_from.bottom = palette_buttons[0][5].bottom;
-			palette_from.right = palette_buttons[7][5].right;
-			}
-			else {
-				palette_from.bottom = palette_buttons[0][2].bottom;
-				palette_from.right = palette_buttons[7][2].right;
+	if (overall_mode < MODE_MAIN_SCREEN) {
+//		palette_to.left = 5;
+//		palette_to.top = terrain_rects[255].bottom + 5;
+//		if (editing_town == TRUE) {
+//			palette_from.bottom = palette_buttons[0][5].bottom;
+//			palette_from.right = palette_buttons[7][5].right;
+//			}
+//			else {
+//				palette_from.bottom = palette_buttons[0][2].bottom;
+//				palette_from.right = palette_buttons[7][2].right;
+//				}
+//		palette_to.right = palette_to.left + palette_from.right;
+//		palette_to.bottom = palette_to.top + palette_from.bottom;
+//		rect_draw_some_item(editor_mixed,
+//			palette_from,terrain_buttons_gworld,palette_to,1,0);
+		OffsetRect(&palette_to,5,terrain_rects[255].bottom + 14);
+		palette_to.right++;
+		//printf("terrain_rects[255].bottom = %i\n", terrain_rects[255].bottom);
+		for(i = 0; i < 10; i++){
+			for(j = 0; j < 6; j++){
+				if(editing_town && town_buttons[j][i] >= 0)
+					palette_from = palette_buttons_from[town_buttons[j][i]];
+				else if(!editing_town && out_buttons[j][i] >= 0)
+					palette_from = palette_buttons_from[out_buttons[j][i]];
+				else palette_from = palette_button_base;
+				//printf("palette_from = {top = %i, left = %i, bottom = %i, right = %i\n",
+				//	   palette_from.top, palette_from.left, palette_from.bottom, palette_from.right);
+				//printf("palette_to = {top = %i, left = %i, bottom = %i, right = %i\n",
+				//	   palette_to.top, palette_to.left, palette_to.bottom, palette_to.right);
+				if(good_palette_buttons[editing_town][j][i]){
+					//printf("Drawing button %i at col %i, row %i\n",editing_town?town_buttons[j][i]:out_buttons[j][i],i,j);
+					rect_draw_some_item(editor_mixed,palette_from,terrain_buttons_gworld,palette_to,1,0);
 				}
-		palette_to.right = palette_to.left + palette_from.right;
-		palette_to.bottom = palette_to.top + palette_from.bottom;
-		rect_draw_some_item(editor_mixed,
-			palette_from,terrain_buttons_gworld,palette_to,1,0);
+				OffsetRect(&palette_to,0,17);
+			}
+			OffsetRect(&palette_to,25,-6*17);
 		}
+	}

 	SetPortWindowPort(mainPtr);
 }
@@ -540,7 +569,7 @@ void draw_terrain(){
 	Rect source_rect,tiny_to,tiny_to_base = {37,29,44,36},tiny_from,from_rect,to_rect;
 	Rect boat_rect[4] = {{0,0,36,28}, {0,28,36,56},{0,56,36,84},{0,84,36,112}};
 	
-	if (overall_mode >= 60)
+	if (overall_mode >= MODE_MAIN_SCREEN)
 		return;
 	
 	OffsetRect(&boat_rect[0],61,0);
@@ -1103,11 +1132,12 @@ void place_location()
 	erase_rect.bottom = erase_rect.top + 12;
 	FillCRect(&erase_rect,bg[17]);
 	
-	MoveTo(terrain_rects[255].left + 20 ,terrain_rects[255].top + 12);
-	if (overall_mode < 60)
+	//MoveTo(terrain_rects[255].left + 20 ,terrain_rects[255].top + 12);
+	MoveTo(5 ,terrain_rects[255].top + 26);
+	if (overall_mode < MODE_MAIN_SCREEN)
 		sprintf((char *) draw_str,"Center: x = %d, y = %d  ",cen_x,cen_y);
 		else {
-			MoveTo(5 ,terrain_rects[255].top + 28);		
+			//MoveTo(5 ,terrain_rects[255].top + 28);
 			sprintf((char *) draw_str,"Click terrain to edit. ",cen_x,cen_y);
 			}
 	c2pstr((char*) draw_str);
@@ -1120,7 +1150,7 @@ void place_location()
 	erase_rect.bottom = RIGHT_AREA_HEIGHT + 6;
 	FillCRect(&erase_rect,bg[17]);
 	
-	if (overall_mode < 60) {
+	if (overall_mode < MODE_MAIN_SCREEN) {
 		MoveTo(5,terrain_rects[255].bottom + 129);
 		DrawString(current_string);
 		MoveTo(RIGHT_AREA_WIDTH / 2,terrain_rects[255].bottom + 129);
@@ -1130,12 +1160,12 @@ void place_location()
 	SetPortWindowPort(mainPtr);

 	draw_rect.top = palette_buttons[0][0].top + terrain_rects[255].bottom + 5;
-	draw_rect.left = palette_buttons[7][0].right + 17;
+	draw_rect.left = palette_buttons[9][0].right + 10; // + 17;
 	draw_rect.bottom = draw_rect.top + 36;
 	draw_rect.right = draw_rect.left + 28;
 	picture_wanted = scenario.ter_types[current_terrain_type].picture;
 	
-	if (overall_mode < 60) {
+	if (overall_mode < MODE_MAIN_SCREEN) {
 		if (picture_wanted >= 1000)	{
 			source_rect = get_custom_rect(picture_wanted % 1000);
 			rect_draw_some_item(spec_scen_g,
@@ -1179,11 +1209,12 @@ void place_just_location()
 	erase_rect.bottom = erase_rect.top + 12;
 	FillCRect(&erase_rect,bg[17]);
 	
-	MoveTo(terrain_rects[255].left + 20 ,terrain_rects[255].top + 12);
-	if (overall_mode < 60)
+	//MoveTo(terrain_rects[255].left + 20 ,terrain_rects[255].top + 12);
+	MoveTo(5 ,terrain_rects[255].top + 26);
+	if (overall_mode < MODE_MAIN_SCREEN)
 		sprintf((char *) draw_str,"Center: x = %d, y = %d  ",cen_x,cen_y);
 		else {
-			MoveTo(5 ,terrain_rects[255].top + 28);		
+			//MoveTo(5 ,terrain_rects[255].top + 28);
 			sprintf((char *) draw_str,"Click terrain to edit. ",cen_x,cen_y);
 			}
 	c2pstr((char*) draw_str);
--- a/Editor/scen.keydlgs.cpp
+++ b/Editor/scen.keydlgs.cpp
@@ -8,7 +8,7 @@
 #include "scen.keydlgs.h"
 #include "scen.core.h"

-extern short cen_x, cen_y, overall_mode;
+extern short cen_x, cen_y/*, overall_mode*/;
 extern Boolean mouse_button_held;
 extern short cur_viewing_mode;
 extern cTown* town;
--- a/Editor/scen.locutils.cpp
+++ b/Editor/scen.locutils.cpp
@@ -19,7 +19,7 @@ location which_party_sec;

 //extern party_record_type party;
 //extern current_town_type c_town;
-extern short overall_mode/*,which_combat_type*/,current_pc,town_type;
+extern short /*overall_mode,which_combat_type,*/current_pc,town_type;
 extern big_tr_type t_d;
 //extern outdoor_record_type outdoors[2][2];
 extern unsigned char combat_terrain[64][64];
--- a/Editor/scen.main.cpp
+++ b/Editor/scen.main.cpp
@@ -30,7 +30,7 @@ short cur_viewing_mode = 0;
 //short town_type = 0;  // 0 - big 1 - ave 2 - small
 //short max_dim[3] = {64,48,32};
 short cen_x, cen_y;
-short overall_mode = 61;
+eScenMode overall_mode = MODE_INTRO_SCREEN;
 Handle menu_bar_handle;
 ControlHandle right_sbar;
 short mode_count = 0;
@@ -386,7 +386,7 @@ void handle_file_menu(int item_hit)
 					cur_out = scenario.last_out_edited;
 					augment_terrain(cur_out);
 				}
-				overall_mode = 60;
+				overall_mode = MODE_MAIN_SCREEN;
 				change_made = false;
 				update_item_menu();
 				set_up_main_screen();
@@ -398,7 +398,7 @@ void handle_file_menu(int item_hit)
 			break;
 		case 3: // new scen
 			build_scenario();
-			if (overall_mode == 60)
+			if (overall_mode == MODE_MAIN_SCREEN)
 				set_up_main_screen();
 			break;

@@ -529,7 +529,7 @@ void handle_town_menu(int item_hit)
 	switch (item_hit) {
 		case 1: edit_town_details(); break;
 		case 2: edit_town_wand(); break;
-		case 3: 							overall_mode = 9;
+		case 3: 							overall_mode = MODE_SET_TOWN_RECT;
 			mode_count = 2;
 			set_cursor(5);
 			set_string("Set town boundary","Select upper left corner");
@@ -570,7 +570,7 @@ void handle_outdoor_menu(int item_hit)
 		case 4: frill_up_terrain(); break;
 		case 5: unfrill_terrain(); break;
 		case 6: edit_out_strs(); break;
-		case 8: overall_mode = 47;
+		case 8: overall_mode = MODE_SET_OUT_START;
 			set_string("Select party starting location.",""); break;
 		case 11: SetControlValue(right_sbar,0); start_special_editing(1,0); break;
 		case 12: SetControlValue(right_sbar,0);  start_string_editing(1,0); break;
@@ -595,14 +595,14 @@ void handle_item_menu(int item_hit)
 		give_error("This item has its Variety set to No Item. You can only place items with a Variety set to an actual item type.","",0);
 		return;
 		}
-			overall_mode = 4;
+			overall_mode = MODE_PLACE_ITEM;
 			set_string("Place the item.","Select item location");
 			mode_count = item_hit;
 }

 void handle_monst_menu(int item_hit)
 {
-			overall_mode = 28;
+			overall_mode = MODE_PLACE_CREATURE;
 			set_string("Place the monster.","Select monster location");
 			mode_count = item_hit;
 }
--- a/osx/bladesofexile.rsrc
+++ b/osx/bladesofexile.rsrc
--- a/osx/boe.consts.h
+++ b/osx/boe.consts.h
@@ -85,53 +85,6 @@ enum eGameMode {
 	MODE_STARTUP = 45,
 	MODE_RESTING = 50,
 };
-// Scenario Editor Modes
-// 0 - drawing
-// 2 - town wandering arrival point
-// 3 - room rectangle
-// 4 - place item
-// 5 - edit placed item
-// 8 - place same creature
-// 9 - set town boundary
-// 10 - place north town entrance
-// 11 - place east town entrance
-// 12 - place south town entrance
-// 13 - place west town entrance
-// 20 - place web
-// 21 - place crate
-// 22 - place barrel
-// 23 - place fire barrier
-// 24 - place force barrier
-// 25 - place quickfire
-// 26 - clear fields on space
-// 28 - place monster
-// 29 - large paintbrush?
-// 30 - small paintbrush?
-// 31 - large spraycan?
-// 32 - small spraycan?
-// 33 - place effect field (eg bloodstain)
-// 34 - eyedropper
-// 35 - hollow rectangle
-// 36 - filled rectangle
-// 37 - eraser
-// 38 - edit sign
-// 39 - edit creature
-// 40 - create/edit special
-// 41 - copy special
-// 42 - paste special
-// 43 - erase special
-// 44 - set/place special
-// 45 - outdoor town entrance
-// 46 - place same item
-// 47 - set outdoors starting location
-// 48 - delete creature
-// 49 - delete item
-// 60 - main screen (including editing anything other than terrain in the right column)
-// 61 - main screen (intro mode, no scenario open)
-// 62 - edit terrain types
-//#define MODE_	60
-//#define MODE_SCEN_INTRO		61
-//#define MODE_	62

 ///* adven[i].main_status */ //complete
 //#define MAIN_STATUS_ABSENT	0 // absent, empty slot