[Scummvm-cvs-logs] SF.net SVN: scummvm:[52410] scummvm/trunk/tools/create_hugo

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Fri Aug 27 16:03:21 CEST 2010


Revision: 52410
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52410&view=rev
Author:   strangerke
Date:     2010-08-27 14:03:20 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
TOOLS: Fix some warnings in create_hugo

Modified Paths:
--------------
    scummvm/trunk/tools/create_hugo/enums.h
    scummvm/trunk/tools/create_hugo/staticdata.h

Modified: scummvm/trunk/tools/create_hugo/enums.h
===================================================================
--- scummvm/trunk/tools/create_hugo/enums.h	2010-08-27 12:30:55 UTC (rev 52409)
+++ scummvm/trunk/tools/create_hugo/enums.h	2010-08-27 14:03:20 UTC (rev 52410)
@@ -819,7 +819,7 @@
 	FINTRO_3d,  NUM_PICS_3d
 };
 
-typedef enum string_t_1w {
+enum string_t_1w {
 //Hugo 1
 	kSTsOk_1w,            kSTNopurps_1w,        kSTtrywalk_1w,         kSTnothing_1w,         kSTenopurps_1w,
 	kSTnoidea_1w,         kSTedull_1w,          kSTeempty_1w,          kSTchop1_1w,           kSTnowayhose_1w,
@@ -871,7 +871,7 @@
 	kSTLookMonkey_1w
 };
 
-typedef enum string_t_2w {
+enum string_t_2w {
 //Hugo2
 	kSTOkgen_2w,        kSTNopurps_2w,    kSTClick_2w,         kSTNocarry_2w,     kSTEmpty_2w,
 	kSTMorespecific_2w, kSTStory_2w,      kSTSmaid1_1_2w,      kSTSmaid1_2_2w,    kSTSmaid1_3_2w,
@@ -950,7 +950,7 @@
 	kSTLookPMaid_2w,    kSTTalkPMaid_2w,  kSTUsePencil_2w,     kSTDoCrossword_2w
 };
 
-typedef enum string_t_3w {
+enum string_t_3w {
 //Hugo 3
 	kSTOkgen_3w,        kSTNopurps_3w,     kSTClick_3w,          kSTNocarry_3w,        kSTNonecarried_3w,
 	kSTGotit_3w,        kSTEmpty1_3w,      kSTMorespecific_3w,   kSTLookpen_3w,        kSTMmmm_3w,
@@ -1005,7 +1005,7 @@
 	kSTNoResponse_3w,   kSTCagePrompt_3w,  kSTDartElephant_3w
 };
 
-typedef enum string_t_1d {
+enum string_t_1d {
 //***************************************************************************
 // Hugo 1 Dos - Not stored in a dat file!!!
 //***************************************************************************
@@ -1051,7 +1051,7 @@
 	kSTnomagic_1d,            kSTnodig_1d,        kSTnorude_1d,        kSTnoknock_1d
 };
 
-typedef enum string_t_2d {
+enum string_t_2d {
 //Hugo 2 DOS
 	kSTOkgen_2d,         kSTNopurps_2d,     kSTClick_2d,      kSTNocarry_2d,      kSTEmpty_2d,
 	kSTMorespecific_2d,  kSTStory_2d,       kSTStory1_2d,     kSTSmaid1_1_2d,     kSTSmaid1_2_2d,
@@ -1126,7 +1126,7 @@
 	kSTSgraf_2d
 };
 
-typedef enum string_t_3d {
+enum string_t_3d {
 //Hugo 3 DOS
 	kSTOkgen_3d,          kSTNopurps_3d,       kSTClick_3d,          kSTNocarry_3d,        kSTNonecarried_3d,
 	kSTGotit_3d,          kSTEmpty1_3d,        kSTMorespecific_3d,   kSTLookpen_3d,        kSTMmmm_3d,
@@ -1231,7 +1231,7 @@
 	kRbell_3d
 };
 
-typedef enum cmdIdx_1w {
+enum cmdIdx_1w {
 	kCMDDummy,     kCMDboat_1w,  kCMDbolt_1w,  kCMDbung_1w,  kCMDcarpet_1w,
 	kCMDchop_1w,   kCMDcupb_1w,  kCMDdoor1_1w, kCMDdoor2_1w, kCMDdoor3_1w,
 	kCMDdoor4_1w,  kCMDdrac_1w,  kCMDfrank_1w, kCMDgold_1w,  kCMDgwen_1w,
@@ -1240,7 +1240,7 @@
 	kCMDshed_1w,   kCMDslime_1w, kCMDtrap_1w,  kCMDward_1w,  kCMDwhistle_1w
 };
 
-typedef enum cmdIdx_2w {
+enum cmdIdx_2w {
 	kCMDalbum_2w = 1, kCMDballoon_2w,  kCMDbanana_2w,   kCMDbell_2w,    kCMDblue_2w,
 	kCMDbook_2w,      kCMDbottle_2w,   kCMDbutton_2w,   kCMDcatnip_2w,  kCMDcupbp_2w,
 	kCMDdoor1_2w,     kCMDdoor2_2w,    kCMDdoor3_2w,    kCMDdoordum_2w, kCMDdumb_2w,
@@ -1252,7 +1252,7 @@
 	kCMDyellow_2w
 };
 
-typedef enum cmdIdx_3w {
+enum cmdIdx_3w {
 	kCMDcbell_3w = 1, kCMDcbook_3w,     kCMDcbouillon_3w, kCMDccage_3w,   kCMDccandle_3w,
 	kCMDccheese_3w,   kCMDcclay_3w,     kCMDccrystal_3w,  kCMDcdart_3w,   kCMDcdoctor_3w,
 	kCMDcdoor_3w,     kCMDcelephant_3w, kCMDcexit_3w,     kCMDcflask_3w,  kCMDcghost_3w,
@@ -1261,7 +1261,7 @@
 	kCMDcwfall_3w,    kCMDcwpool_3w,    kCMDcwstream_3w
 };
 
-typedef enum cmdIdx_1d {
+enum cmdIdx_1d {
 	kCMDboat_1d = 1, kCMDbolt_1d,    kCMDbung_1d,  kCMDcarpet_1d, kCMDchop_1d,
 	kCMDcupb_1d,     kCMDdoor1_1d,   kCMDdoor2_1d, kCMDdoor3_1d,  kCMDdoor4_1d,
 	kCMDgold_1d,     kCMDigor_1d,    kCMDknife_1d, kCMDmask_1d,   kCMDoilcan_1d,
@@ -1269,7 +1269,7 @@
 	kCMDward_1d,     kCMDwhistle_1d
 };
 
-typedef enum cmdIdx_2d {
+enum cmdIdx_2d {
 	kCMDballoon_2d = 1, kCMDbanana_2d, kCMDbell_2d,   kCMDblue_2d,     kCMDbook_2d,
 	kCMDbottle_2d,      kCMDbutton_2d, kCMDcatnip_2d, kCMDcupbp_2d,    kCMDdoor1_2d,
 	kCMDdoor2_2d,       kCMDdoor3_2d,  kCMDdumb_2d,   kCMDdynamite_2d, kCMDgarlic_2d,
@@ -1280,7 +1280,7 @@
 	kCMDwill_2d,        kCMDyellow_2d
 };
 
-typedef enum cmdIdx_3d {
+enum cmdIdx_3d {
 	kCMDcbell_3d = 1, kCMDcbook_3d,  kCMDcbouillon_3d, kCMDccage_3d,    kCMDccandle_3d,
 	kCMDccheese_3d,   kCMDcclay_3d,  kCMDccrystal_3d,  kCMDcdart_3d,    kCMDcdoor_3d,
 	kCMDcexit_3d,     kCMDcflask_3d, kCMDcghost_3d,    kCMDcnative_3d,  kCMDcpins_3d,

Modified: scummvm/trunk/tools/create_hugo/staticdata.h
===================================================================
--- scummvm/trunk/tools/create_hugo/staticdata.h	2010-08-27 12:30:55 UTC (rev 52409)
+++ scummvm/trunk/tools/create_hugo/staticdata.h	2010-08-27 14:03:20 UTC (rev 52410)
@@ -2223,172 +2223,172 @@
 };
 
 hotspot_t hotspots_1d[] = {
-	{0,  30,  159, 50,  165, kALscr1_1d},     // Front of house to hall
-	{1,  99,  180, 136, 184, kALscr10_1d},    // Hall to front of house
-	{1,  280, 160, 315, 175, kALscr13_1d},    // Hall to dining room
-	{1,  199, 151, 243, 158, kALscr15_1d},    // Hall to kitchen
-	{1,  264, 97,  302, 101, kALscr115_1d},   // Hall to lab
-	{2,  158, 132, 193, 140, kALscr21_1d},    // Bed1 to hall
-	{3,  0,   152, 17,  168, kALscr31_1d},    // Dining room to hall
-	{3,  51,  117, 63,  129, kALscr35_1d},    // Dining room to kitchen
-	{4,  126, 165, 160, 173, kALscr41_1d},    // Bathroom to hall
-	{5,  215, 169, 272, 177, kALscr51_1d},    // Kitchen to hall
-	{5,  248, 135, 291, 152, kALscr53_1d},    // Kitchen to dining room
-	{5,  212, 128, 245, 134, kALscr56_1d},    // Kitchen to garden
-	{5,  20,  140, 45,  156, kALscr57_1d},    // Kitchen to store room
-	{6,  232, 186, 312, 192, kALscr65_1d},    // Garden to kitchen
-	{7,  257, 142, 279, 157, kALscr75_1d},    // Store room to kitchen
-	{8,  156, 141, 186, 143, kALscr89_1d},    // Basement to batcave
-	{8,  108, 50,  141, 56,  kALscr87_1d},    // Basement to storeroom
-	{9,  95,  104, 147, 109, kALscr910_1d},   // Batcave to mummy room
-	{9,  250, 177, 319, 185, kALscr98_1d},    // Batcave to basement
-	{10, 30,  178, 223, 188, kALscr109_1d},  // Mummy room to batcave
-	{10, 258, 117, 282, 125, kALscr1011_1d}, // Mummy room to lake room
-	{11, 43,  183, 88,  191, kALscr1110_1d}, // Lake room to mummy room
-	{11, 300, 50,  319, 86,  kALscr1112_1d}, // Lake room to dead-end
-	{12, 52,  175, 295, 187, kALscr1211_1d}, // Dead-end to lake room
-	{12, 137, 67,  178, 76,  kALscr1213_1d}, // Dead-end to jail
-	{15, 19,  171, 34,  182, kALscr151_1d},  // Laboratory to hall
-	{15, 109, 150, 144, 156, kALbox_1d},     // Professor's box
+	{0,  30,  159, 50,  165, kALscr1_1d,    -1, -1, -1},   // Front of house to hall
+	{1,  99,  180, 136, 184, kALscr10_1d,   -1, -1, -1},   // Hall to front of house
+	{1,  280, 160, 315, 175, kALscr13_1d,   -1, -1, -1},   // Hall to dining room
+	{1,  199, 151, 243, 158, kALscr15_1d,   -1, -1, -1},   // Hall to kitchen
+	{1,  264, 97,  302, 101, kALscr115_1d,  -1, -1, -1},   // Hall to lab
+	{2,  158, 132, 193, 140, kALscr21_1d,   -1, -1, -1},   // Bed1 to hall
+	{3,  0,   152, 17,  168, kALscr31_1d,   -1, -1, -1},   // Dining room to hall
+	{3,  51,  117, 63,  129, kALscr35_1d,   -1, -1, -1},   // Dining room to kitchen
+	{4,  126, 165, 160, 173, kALscr41_1d,   -1, -1, -1},   // Bathroom to hall
+	{5,  215, 169, 272, 177, kALscr51_1d,   -1, -1, -1},   // Kitchen to hall
+	{5,  248, 135, 291, 152, kALscr53_1d,   -1, -1, -1},   // Kitchen to dining room
+	{5,  212, 128, 245, 134, kALscr56_1d,   -1, -1, -1},   // Kitchen to garden
+	{5,  20,  140, 45,  156, kALscr57_1d,   -1, -1, -1},   // Kitchen to store room
+	{6,  232, 186, 312, 192, kALscr65_1d,   -1, -1, -1},   // Garden to kitchen
+	{7,  257, 142, 279, 157, kALscr75_1d,   -1, -1, -1},   // Store room to kitchen
+	{8,  156, 141, 186, 143, kALscr89_1d,   -1, -1, -1},   // Basement to batcave
+	{8,  108, 50,  141, 56,  kALscr87_1d,   -1, -1, -1},   // Basement to storeroom
+	{9,  95,  104, 147, 109, kALscr910_1d,  -1, -1, -1},   // Batcave to mummy room
+	{9,  250, 177, 319, 185, kALscr98_1d,   -1, -1, -1},   // Batcave to basement
+	{10, 30,  178, 223, 188, kALscr109_1d,  -1, -1, -1},   // Mummy room to batcave
+	{10, 258, 117, 282, 125, kALscr1011_1d, -1, -1, -1},   // Mummy room to lake room
+	{11, 43,  183, 88,  191, kALscr1110_1d, -1, -1, -1},   // Lake room to mummy room
+	{11, 300, 50,  319, 86,  kALscr1112_1d, -1, -1, -1},   // Lake room to dead-end
+	{12, 52,  175, 295, 187, kALscr1211_1d, -1, -1, -1},   // Dead-end to lake room
+	{12, 137, 67,  178, 76,  kALscr1213_1d, -1, -1, -1},   // Dead-end to jail
+	{15, 19,  171, 34,  182, kALscr151_1d,  -1, -1, -1},   // Laboratory to hall
+	{15, 109, 150, 144, 156, kALbox_1d,     -1, -1, -1},   // Professor's box
 	{-1}                            // End of list marker
 };
 
 hotspot_t hotspots_2d[] = {
-	{2,   81, 177, 124, 190, kALscr0201_2d},  				// bed1 to hall
-	{3,    1, 155,  32, 168, kALscr0305_2d},  				// bed2 to bed3
-	{3,  230, 182, 277, 194, kALscr0301_2d},  				// bed2 to hall
-	{5,  207, 136, 240, 150, kALscr0503_2d},  				// bed3 to bed2
-	{5,  167, 155, 214, 165, kALscr0301_2d},  				// bed3 to hall (same as bed2 to hall)
-	{6,  201, 125, 238, 132, kALscr0607_2d},  				// kitchen to backdoor
-	{6,  279, 154, 313, 162, kALscr0631_2d},  				// kitchen to parlor
-	{7,  122, 154, 171, 159, kALscr0706_2d},  				// backdoor to kitchen
-	{7,    4, 179, 302, 199, kALscr0708_2d},  				// backdoor to shed
-	{7,    0, 174,  14, 190, kALscr0708_2d},  				// backdoor to shed (again)
-	{7,  294, 150, 319, 199, kALscr0710_2d},  				// backdoor to venus fly traps
-	{8,    0, 121,  20, 171, kALscr0807_2d},  				// shed to backdoor
-	{8,  305, 121, 319, 171, kALscrgate1_2d}, 				// shed to gates
-	{8,  160, 127, 191, 134, kALscr0809_2d},  				// shed to inside shed
-	{9,   34, 129,  66, 137, kALscr0908_2d},  				// inside shed to shed
-	{10,   0,  96,  12, 160, kALscr1007_2d},  				// venus to backdoor
-	{10, 299,  96, 319, 160, kALscrgate1_2d}, 				// venus to gates
-	{10,  32,  97, 298, 158, kALvenus_2d},    				// venus fly traps
-	{11,   0, 155,  12, 185, kALscr1108_2d},  				// gates (open) to shed
-	{12,   0, 155,  12, 185, kALscr1108_2d},  				// gates (close) to shed
-	{11, 300, 157, 319, 185, kALscr1113_2d},  				// gates (open) to stream
-	{12, 300, 157, 319, 185, kALscr1113_2d},  				// gates (close) to stream
-	{11, 145, 133, 195, 145, kAL11maze_2d},   				// gatesopn to maze
-	{13,   0, 133,  14, 163, kALscrgate2_2d}, 				// stream to gates
-	{13, 303, 146, 319, 173, kALscr1314_2d},  				// stream to zapper
-	{13, 158, 115, 226, 147, kALbridge_2d},   				// bridge over stream
-	{14,   0,  96,  14, 160, kALscr1413_2d},  				// zapper to stream
-	{14, 301,  96, 319, 160, kALscr1415_2d},  				// zapper to mushroom
-	{15,   0,  96,  16, 130, kALscr1514_2d},  				// mushroom to zapper
-	{15, 296,  96, 312, 130, kALscr1517_2d},  				// mushroom to snakepit
-	{15,  60, 182, 256, 196, kALscr1516_2d},  				// mushroom to well
-	{16,  83,  59, 144,  69, kALscr1615_2d},  				// well to mushroom
-	{17,   0, 128,  20, 152, kALscr1715_2d},  				// snakepit to mushroom
-	{17, 303, 144, 319, 172, kALscr1718_2d},  				// snakepit to phonebox
-	{17, 301,  98, 319, 115, kALscr1720_2d},  				// snakepit to kennel
-	{18,   0,  54,  15, 120, kALscr1817_2d},  				// phonebox to snakepit
-	{18,   0, 122,  15, 181, kALscr1819l_2d}, 				// phonebox to street (left)
-	{18,   0, 175, 319, 199, kALscr1819c_2d}, 				// phonebox to street (center)
-	{18, 304,  95, 319, 199, kALscr1819r_2d}, 				// phonebox to street (right)
-	{18,  15, 122,  56, 130, kALphonebox_2d}, 				// in the phonebox
-	{19,   0, 122,  20, 183, kALscr1918l_2d}, 				// street to phonebox (left)
-	{19,   0, 175, 319, 199, kALscr1918c_2d}, 				// street to phonebox (center)
-	{19, 301, 122, 319, 199, kALscr1918r_2d}, 				// street to phonebox (right)
-	{20,   5, 103,  22, 186, kALscr2017_2d},  				// kennel to snakepit
-	{22, 287,  75, 312, 102, kALscr2223_2d},  				// rockgone to threeway
-	{23,  59, 179, 245, 193, kALscr2322_2d},  				// threeway to rockgone
-	{23,  11,  82,  33, 103, kALscr2324_2d},  				// threeway to lampcave
-	{23, 141,  52, 178,  65, kALscr2325_2d},  				// threeway to chasm
-	{23, 273,  79, 296, 100, kALscr2326_2d},  				// threeway to passage
-	{24, 300,  83, 319, 183, kALscr2423_2d},  				// lampcave to threeway
-	{25,   0,  98,  15, 171, kALscr2523_2d},  				// chasm to threeway
-	{25, 172,  95, 221, 172, kALchasm_2d},    				// chasm
-	{26,   0,  94,  19, 179, kALscr2623_2d},  				// passage to threeway
-	{26, 300,  87, 319, 179, kALscr2627_2d},  				// passage to ladder
-	{27,   0, 100,  15, 180, kALscr2726_2d},  				// ladder to passage
-	{27, 200,  43, 243,  55, kALtrap_2d},     				// trapdoor at top of ladder
-	{28, 218, 143, 242, 149, kALscr2827_2d},  				// traproom to ladder
-	{28,  35, 146,  74, 153, kALscr2829_2d},  				// traproom to hall2
-	{29, 274, 126, 319, 142, kALscr2928_2d},  				// hall2 to traproom
-	{29, 235,  91, 275, 106, kALscr2930_2d},  				// hall2 to lounge
-	{29,  81,  58, 108,  74, kALscr2931_2d},  				// hall2 to parlor
-	{29,  15,  71,  54,  95, kALscr2934_2d},  				// hall2 to hall3
-	{29,   0, 130,  20, 144, kALscr2938_2d},  				// hall2 to hall1
-	{30, 222, 183, 258, 199, kALscr3029_2d},  				// lounge to hall2
-	{31, 263, 141, 287, 146, kALscr3132_2d},  				// parlor to catroom
-	{31, 172, 164, 211, 178, kALscr3129_2d},  				// parlor to hall2
-	{31,   0, 148,  46, 158, kALscr3106_2d},  				// parlor to kitchen
-	{32,  60, 118,  90, 123, kALscr3231_2d},  				// catroom to parlor
-	{34,   6, 167,  39, 179, kALscr3438_2d},  				// hall3 to hall1
-	{34,   7, 185, 311, 199, kALscr3429_2d},  				// hall3 to hall2
-	{35,  65, 176, 101, 188, kALscr3534_2d},  				// organ to hall3
-	{36, 238, 164, 272, 177, kALscr3634_2d},  				// hestroom to hall3
-	{36,  62, 140, 158, 158, kALhtable_2d},   				// hestroom table
-	{37, 253,  82, 286,  84, kALscr3718_2d},  				// retupmoc to phonebox
-	{38, 275, 156, 307, 166, kALscr3829_2d},  				// hall1 to hall2
-	{38, 142, 138, 172, 150, kALscr3834_2d},  				// hall1 to hall3
-	{MAZE_SCREEN+59, 100, 140, 180, 160, kALexitmaze_2d},  // Exit maze
-	{-1,  -1,  -1,  -1,  -1,  0,  -1,  -1,  -1}				// End of list marker
+	{2,   81, 177, 124, 190, kALscr0201_2d,  -1, -1, -1},  // bed1 to hall
+	{3,    1, 155,  32, 168, kALscr0305_2d,  -1, -1, -1},  // bed2 to bed3
+	{3,  230, 182, 277, 194, kALscr0301_2d,  -1, -1, -1},  // bed2 to hall
+	{5,  207, 136, 240, 150, kALscr0503_2d,  -1, -1, -1},  // bed3 to bed2
+	{5,  167, 155, 214, 165, kALscr0301_2d,  -1, -1, -1},  // bed3 to hall (same as bed2 to hall)
+	{6,  201, 125, 238, 132, kALscr0607_2d,  -1, -1, -1},  // kitchen to backdoor
+	{6,  279, 154, 313, 162, kALscr0631_2d,  -1, -1, -1},  // kitchen to parlor
+	{7,  122, 154, 171, 159, kALscr0706_2d,  -1, -1, -1},  // backdoor to kitchen
+	{7,    4, 179, 302, 199, kALscr0708_2d,  -1, -1, -1},  // backdoor to shed
+	{7,    0, 174,  14, 190, kALscr0708_2d,  -1, -1, -1},  // backdoor to shed (again)
+	{7,  294, 150, 319, 199, kALscr0710_2d,  -1, -1, -1},  // backdoor to venus fly traps
+	{8,    0, 121,  20, 171, kALscr0807_2d,  -1, -1, -1},  // shed to backdoor
+	{8,  305, 121, 319, 171, kALscrgate1_2d, -1, -1, -1},  // shed to gates
+	{8,  160, 127, 191, 134, kALscr0809_2d,  -1, -1, -1},  // shed to inside shed
+	{9,   34, 129,  66, 137, kALscr0908_2d,  -1, -1, -1},  // inside shed to shed
+	{10,   0,  96,  12, 160, kALscr1007_2d,  -1, -1, -1},  // venus to backdoor
+	{10, 299,  96, 319, 160, kALscrgate1_2d, -1, -1, -1},  // venus to gates
+	{10,  32,  97, 298, 158, kALvenus_2d,    -1, -1, -1},  // venus fly traps
+	{11,   0, 155,  12, 185, kALscr1108_2d,  -1, -1, -1},  // gates (open) to shed
+	{12,   0, 155,  12, 185, kALscr1108_2d,  -1, -1, -1},  // gates (close) to shed
+	{11, 300, 157, 319, 185, kALscr1113_2d,  -1, -1, -1},  // gates (open) to stream
+	{12, 300, 157, 319, 185, kALscr1113_2d,  -1, -1, -1},  // gates (close) to stream
+	{11, 145, 133, 195, 145, kAL11maze_2d,   -1, -1, -1},  // gatesopn to maze
+	{13,   0, 133,  14, 163, kALscrgate2_2d, -1, -1, -1},  // stream to gates
+	{13, 303, 146, 319, 173, kALscr1314_2d,  -1, -1, -1},  // stream to zapper
+	{13, 158, 115, 226, 147, kALbridge_2d,   -1, -1, -1},  // bridge over stream
+	{14,   0,  96,  14, 160, kALscr1413_2d,  -1, -1, -1},  // zapper to stream
+	{14, 301,  96, 319, 160, kALscr1415_2d,  -1, -1, -1},  // zapper to mushroom
+	{15,   0,  96,  16, 130, kALscr1514_2d,  -1, -1, -1},  // mushroom to zapper
+	{15, 296,  96, 312, 130, kALscr1517_2d,  -1, -1, -1},  // mushroom to snakepit
+	{15,  60, 182, 256, 196, kALscr1516_2d,  -1, -1, -1},  // mushroom to well
+	{16,  83,  59, 144,  69, kALscr1615_2d,  -1, -1, -1},  // well to mushroom
+	{17,   0, 128,  20, 152, kALscr1715_2d,  -1, -1, -1},  // snakepit to mushroom
+	{17, 303, 144, 319, 172, kALscr1718_2d,  -1, -1, -1},  // snakepit to phonebox
+	{17, 301,  98, 319, 115, kALscr1720_2d,  -1, -1, -1},  // snakepit to kennel
+	{18,   0,  54,  15, 120, kALscr1817_2d,  -1, -1, -1},  // phonebox to snakepit
+	{18,   0, 122,  15, 181, kALscr1819l_2d, -1, -1, -1},  // phonebox to street (left)
+	{18,   0, 175, 319, 199, kALscr1819c_2d, -1, -1, -1},  // phonebox to street (center)
+	{18, 304,  95, 319, 199, kALscr1819r_2d, -1, -1, -1},  // phonebox to street (right)
+	{18,  15, 122,  56, 130, kALphonebox_2d, -1, -1, -1},  // in the phonebox
+	{19,   0, 122,  20, 183, kALscr1918l_2d, -1, -1, -1},  // street to phonebox (left)
+	{19,   0, 175, 319, 199, kALscr1918c_2d, -1, -1, -1},  // street to phonebox (center)
+	{19, 301, 122, 319, 199, kALscr1918r_2d, -1, -1, -1},  // street to phonebox (right)
+	{20,   5, 103,  22, 186, kALscr2017_2d,  -1, -1, -1},  // kennel to snakepit
+	{22, 287,  75, 312, 102, kALscr2223_2d,  -1, -1, -1},  // rockgone to threeway
+	{23,  59, 179, 245, 193, kALscr2322_2d,  -1, -1, -1},  // threeway to rockgone
+	{23,  11,  82,  33, 103, kALscr2324_2d,  -1, -1, -1},  // threeway to lampcave
+	{23, 141,  52, 178,  65, kALscr2325_2d,  -1, -1, -1},  // threeway to chasm
+	{23, 273,  79, 296, 100, kALscr2326_2d,  -1, -1, -1},  // threeway to passage
+	{24, 300,  83, 319, 183, kALscr2423_2d,  -1, -1, -1},  // lampcave to threeway
+	{25,   0,  98,  15, 171, kALscr2523_2d,  -1, -1, -1},  // chasm to threeway
+	{25, 172,  95, 221, 172, kALchasm_2d,    -1, -1, -1},  // chasm
+	{26,   0,  94,  19, 179, kALscr2623_2d,  -1, -1, -1},  // passage to threeway
+	{26, 300,  87, 319, 179, kALscr2627_2d,  -1, -1, -1},  // passage to ladder
+	{27,   0, 100,  15, 180, kALscr2726_2d,  -1, -1, -1},  // ladder to passage
+	{27, 200,  43, 243,  55, kALtrap_2d,     -1, -1, -1},  // trapdoor at top of ladder
+	{28, 218, 143, 242, 149, kALscr2827_2d,  -1, -1, -1},  // traproom to ladder
+	{28,  35, 146,  74, 153, kALscr2829_2d,  -1, -1, -1},  // traproom to hall2
+	{29, 274, 126, 319, 142, kALscr2928_2d,  -1, -1, -1},  // hall2 to traproom
+	{29, 235,  91, 275, 106, kALscr2930_2d,  -1, -1, -1},  // hall2 to lounge
+	{29,  81,  58, 108,  74, kALscr2931_2d,  -1, -1, -1},  // hall2 to parlor
+	{29,  15,  71,  54,  95, kALscr2934_2d,  -1, -1, -1},  // hall2 to hall3
+	{29,   0, 130,  20, 144, kALscr2938_2d,  -1, -1, -1},  // hall2 to hall1
+	{30, 222, 183, 258, 199, kALscr3029_2d,  -1, -1, -1},  // lounge to hall2
+	{31, 263, 141, 287, 146, kALscr3132_2d,  -1, -1, -1},  // parlor to catroom
+	{31, 172, 164, 211, 178, kALscr3129_2d,  -1, -1, -1},  // parlor to hall2
+	{31,   0, 148,  46, 158, kALscr3106_2d,  -1, -1, -1},  // parlor to kitchen
+	{32,  60, 118,  90, 123, kALscr3231_2d,  -1, -1, -1},  // catroom to parlor
+	{34,   6, 167,  39, 179, kALscr3438_2d,  -1, -1, -1},  // hall3 to hall1
+	{34,   7, 185, 311, 199, kALscr3429_2d,  -1, -1, -1},  // hall3 to hall2
+	{35,  65, 176, 101, 188, kALscr3534_2d,  -1, -1, -1},  // organ to hall3
+	{36, 238, 164, 272, 177, kALscr3634_2d,  -1, -1, -1},  // hestroom to hall3
+	{36,  62, 140, 158, 158, kALhtable_2d,   -1, -1, -1},  // hestroom table
+	{37, 253,  82, 286,  84, kALscr3718_2d,  -1, -1, -1},  // retupmoc to phonebox
+	{38, 275, 156, 307, 166, kALscr3829_2d,  -1, -1, -1},  // hall1 to hall2
+	{38, 142, 138, 172, 150, kALscr3834_2d,  -1, -1, -1},  // hall1 to hall3
+	{MAZE_SCREEN+59, 100, 140, 180, 160, kALexitmaze_2d, -1, -1, -1},  // Exit maze
+	{-1,  -1,  -1,  -1,  -1,  0,  -1,  -1,  -1}            // End of list marker
 };
 
 hotspot_t hotspots_3d[] = {
-	{CRASH_3d,     65, 148, 309, 158, kALhorizon_3d},
-	{CRASH_3d,      0, 163,  30, 190, kALcrash_web_3d},
-	{WEB_3d,      296,  73, 319, 190, kALweb_crash_3d},
-	{WEB_3d,        0, 156,  30, 190, kALweb_path_3d},
-	{PATH_UL_3d,  293, 161, 319, 190, kALpath_web_3d},
-	{PATH_UL_3d,    0, 127,  24, 138, kALpath_brg_3d},
-	{BRIDGE_3d,   296, 131, 319, 135, kALbrg_path_3d},
-	{BRIDGE_3d,     0, 130,  21, 135, kALbrg_clftop_3d},
-	{BRIDGE_3d,   225, 132, 235, 135, kALblk_3d},
-	{BRIDGE2_3d,  296, 131, 319, 135, kALbrg_path_3d},
-	{BRIDGE2_3d,    0, 130,  21, 135, kALbrg_clftop_3d},
-	{CLIFFTOP_3d, 293,  69, 319,  79, kALclftop_brg_3d},
-	{CLIFFTOP_3d, 294, 131, 319, 149, kALclftop_slope_3d},
-	{CLIFFTOP_3d, 290, 171, 319, 186, kALclftop_clf_3d},
-	{SLOPE_3d,      0, 147,  25, 165, kALslope_clftop_3d},
-	{SLOPE_3d,    291, 127, 319, 143, kALslope_stream_3d},
-	{CLIFF_3d,      0, 152,  26, 190, kALclf_clftop_3d},
-	{CLIFF_3d,    293, 152, 319, 190, kALclf_wfall_3d},
-	{STREAM_3d,     0, 160,  26, 190, kALstream_slope_3d},
-	{STREAM_3d,   293, 163, 319, 190, kALstream_path_3d},
-	{STREAM_3d,   198, 140, 245, 160, kALfindbook_3d},
-	{STREAM2_3d,    0, 160,  26, 190, kALstream_slope_3d},
-	{STREAM2_3d,  293, 163, 319, 190, kALstream_path_3d},
-	{STREAM2_3d,  198, 140, 245, 160, kALfindbook_3d},
-	{PATH_3d,     292, 161, 319, 190, kALpath_village_3d},
-	{PATH_3d,       0, 161,  24, 190, kALpath_stream_3d},
-	{VILLAGE_3d,   14, 137,  41, 156, kALvillage_thing_3d},
-	{VILLAGE_3d,    0, 148,  24, 190, kALvillage_path_3d},
-	{VILLAGE_3d,  292, 161, 319, 190, kALvillage_turn_3d},
-	{VILLAGE_3d,   14, 139, 111, 155, kALvillage_camp_l_3d},
-	{VILLAGE_3d,  112, 139, 252, 155, kALvillage_camp_r_3d},
-	{HUT_OUT_3d,    0, 147,  30, 190, kALhut_camp_3d},
-	{HUT_OUT_3d,  290, 147, 319, 190, kALhut_village_r_3d},
-	{HUT_OUT_3d,   14, 178, 319, 190, kALhut_village_c_3d},
-	{HUT_OUT_3d,  132, 126, 177, 145, kALhut_enter_3d},
-	{HUT_IN_3d,   138, 183, 189, 199, kALhut_out_3d},
-	{CAMP_3d,     290, 136, 319, 190, kALcamp_hut_3d},
-	{CAMP_3d,       0, 109,  27, 190, kALcamp_village_l_3d},
-	{CAMP_3d,      13, 180, 303, 199, kALcamp_village_c_3d},
-	{TURN_3d,       0, 114,  28, 133, kALturn_village_3d},
-	{TURN_3d,       0, 165,  28, 190, kALturn_cave_3d},
-	{CAVE_3d,     291, 140, 319, 190, kALcave_turn_3d},
-	{CAVE_3d,       0, 146,  27, 190, kALcave_wfall_3d},
-	{CAVE_3d,      86, 128, 162, 141, kALcave_oldman_3d},
-	{WFALL_3d,      0, 166,  28, 190, kALwfall_clf_3d},
-	{WFALL_3d,    294, 159, 319, 190, kALwfall_cave_3d},
-	{WFALL_3d,    238, 147, 284, 158, kALwfall_wbase_3d},
-	{WFALL_B_3d,    0, 166,  28, 190, kALwfallb_clf_3d},
-	{WFALL_B_3d,  294, 159, 319, 190, kALwfallb_cave_3d},
-	{WFALL_B_3d,  238, 147, 284, 158, kALwfallb_wbase_3d},
-	{WBASE_3d,    295, 146, 319, 190, kALwbase_wfall_3d},
-	{WBASE_3d,      0, 149,  26, 190, kALwbase_garden_3d},
-	{GARDEN_3d,   294, 165, 319, 190, kALgarden_wbase_3d},
-	{-1}
+	{CRASH_3d,     65, 148, 309, 158, kALhorizon_3d,        -1, -1, -1},
+	{CRASH_3d,      0, 163,  30, 190, kALcrash_web_3d,      -1, -1, -1},
+	{WEB_3d,      296,  73, 319, 190, kALweb_crash_3d,      -1, -1, -1},
+	{WEB_3d,        0, 156,  30, 190, kALweb_path_3d,       -1, -1, -1},
+	{PATH_UL_3d,  293, 161, 319, 190, kALpath_web_3d,       -1, -1, -1},
+	{PATH_UL_3d,    0, 127,  24, 138, kALpath_brg_3d,       -1, -1, -1},
+	{BRIDGE_3d,   296, 131, 319, 135, kALbrg_path_3d,       -1, -1, -1},
+	{BRIDGE_3d,     0, 130,  21, 135, kALbrg_clftop_3d,     -1, -1, -1},
+	{BRIDGE_3d,   225, 132, 235, 135, kALblk_3d,            -1, -1, -1},
+	{BRIDGE2_3d,  296, 131, 319, 135, kALbrg_path_3d,       -1, -1, -1},
+	{BRIDGE2_3d,    0, 130,  21, 135, kALbrg_clftop_3d,     -1, -1, -1},
+	{CLIFFTOP_3d, 293,  69, 319,  79, kALclftop_brg_3d,     -1, -1, -1},
+	{CLIFFTOP_3d, 294, 131, 319, 149, kALclftop_slope_3d,   -1, -1, -1},
+	{CLIFFTOP_3d, 290, 171, 319, 186, kALclftop_clf_3d,     -1, -1, -1},
+	{SLOPE_3d,      0, 147,  25, 165, kALslope_clftop_3d,   -1, -1, -1},
+	{SLOPE_3d,    291, 127, 319, 143, kALslope_stream_3d,   -1, -1, -1},
+	{CLIFF_3d,      0, 152,  26, 190, kALclf_clftop_3d,     -1, -1, -1},
+	{CLIFF_3d,    293, 152, 319, 190, kALclf_wfall_3d,      -1, -1, -1},
+	{STREAM_3d,     0, 160,  26, 190, kALstream_slope_3d,   -1, -1, -1},
+	{STREAM_3d,   293, 163, 319, 190, kALstream_path_3d,    -1, -1, -1},
+	{STREAM_3d,   198, 140, 245, 160, kALfindbook_3d,       -1, -1, -1},
+	{STREAM2_3d,    0, 160,  26, 190, kALstream_slope_3d,   -1, -1, -1},
+	{STREAM2_3d,  293, 163, 319, 190, kALstream_path_3d,    -1, -1, -1},
+	{STREAM2_3d,  198, 140, 245, 160, kALfindbook_3d,       -1, -1, -1},
+	{PATH_3d,     292, 161, 319, 190, kALpath_village_3d,   -1, -1, -1},
+	{PATH_3d,       0, 161,  24, 190, kALpath_stream_3d,    -1, -1, -1},
+	{VILLAGE_3d,   14, 137,  41, 156, kALvillage_thing_3d,  -1, -1, -1},
+	{VILLAGE_3d,    0, 148,  24, 190, kALvillage_path_3d,   -1, -1, -1},
+	{VILLAGE_3d,  292, 161, 319, 190, kALvillage_turn_3d,   -1, -1, -1},
+	{VILLAGE_3d,   14, 139, 111, 155, kALvillage_camp_l_3d, -1, -1, -1},
+	{VILLAGE_3d,  112, 139, 252, 155, kALvillage_camp_r_3d, -1, -1, -1},
+	{HUT_OUT_3d,    0, 147,  30, 190, kALhut_camp_3d,       -1, -1, -1},
+	{HUT_OUT_3d,  290, 147, 319, 190, kALhut_village_r_3d,  -1, -1, -1},
+	{HUT_OUT_3d,   14, 178, 319, 190, kALhut_village_c_3d,  -1, -1, -1},
+	{HUT_OUT_3d,  132, 126, 177, 145, kALhut_enter_3d,      -1, -1, -1},
+	{HUT_IN_3d,   138, 183, 189, 199, kALhut_out_3d,        -1, -1, -1},
+	{CAMP_3d,     290, 136, 319, 190, kALcamp_hut_3d,       -1, -1, -1},
+	{CAMP_3d,       0, 109,  27, 190, kALcamp_village_l_3d, -1, -1, -1},
+	{CAMP_3d,      13, 180, 303, 199, kALcamp_village_c_3d, -1, -1, -1},
+	{TURN_3d,       0, 114,  28, 133, kALturn_village_3d,   -1, -1, -1},
+	{TURN_3d,       0, 165,  28, 190, kALturn_cave_3d,      -1, -1, -1},
+	{CAVE_3d,     291, 140, 319, 190, kALcave_turn_3d,      -1, -1, -1},
+	{CAVE_3d,       0, 146,  27, 190, kALcave_wfall_3d,     -1, -1, -1},
+	{CAVE_3d,      86, 128, 162, 141, kALcave_oldman_3d,    -1, -1, -1},
+	{WFALL_3d,      0, 166,  28, 190, kALwfall_clf_3d,      -1, -1, -1},
+	{WFALL_3d,    294, 159, 319, 190, kALwfall_cave_3d,     -1, -1, -1},
+	{WFALL_3d,    238, 147, 284, 158, kALwfall_wbase_3d,    -1, -1, -1},
+	{WFALL_B_3d,    0, 166,  28, 190, kALwfallb_clf_3d,     -1, -1, -1},
+	{WFALL_B_3d,  294, 159, 319, 190, kALwfallb_cave_3d,    -1, -1, -1},
+	{WFALL_B_3d,  238, 147, 284, 158, kALwfallb_wbase_3d,   -1, -1, -1},
+	{WBASE_3d,    295, 146, 319, 190, kALwbase_wfall_3d,    -1, -1, -1},
+	{WBASE_3d,      0, 149,  26, 190, kALwbase_garden_3d,   -1, -1, -1},
+	{GARDEN_3d,   294, 165, 319, 190, kALgarden_wbase_3d,   -1, -1, -1},
+	{-1,  -1,  -1,  -1,  -1,  0,  -1,  -1,  -1}            // End of list marker
 };
 
 // List all objects that can appear in inventory list
@@ -2417,305 +2417,305 @@
 int16 invent_3d[] = {-1};
 
 uses_t uses_1w[] = {
-	{PKIN_1w,    kDTupkin_1w,   {{kNHero_1w, kVOpen_1w},      {0}}},
-	{KEY_1w,     kDTukey_1w,    {{kNDoor_1w, kVUnlock_1w},    {0}}},
-	{CANDLE_1w,  kDTucandle_1w, {{0}}},
-	{MASK_1w,    kDTumasked_1w, {{kNHero_1w, kVMakeUseOf_1w}, {0}}},
-	{BUNG_1w,    kDTubung_1w,   {{kNBoat_1w, kVPlug_1w},      {0}}},
-	{CHOP_1w,    kDTuchop_1w,   {{kNHero_1w, kVEat_1w},       {kNDog_1w,   kVThrowit_1w},{kNButler_1w, kVGive_1w},{kNFrank_1w, kVGive_1w}, {kNDracula_1w, kVGive_1w}, {kNGwen_1w, kVGive_1w}, {kNHood_1w, kVGive_1w}, {kNSlime_1w, kVGive_1w}, {kNPeahead_1w, kVGive_1w}, {kNProf_1w, kVGive_1w}, {kNIgor_1w, kVGive_1w}, {0}}},
-	{KNIFE_1w,   kDTuknife_1w,  {{kNHero_1w, kVCut_1w},       {kNRope_1w,  kVCut_1w},    {0}}},
-	{OILCAN_1w,  kDTuoil_1w,    {{kNHero_1w, kVOil_1w},       {kNTrap_1w,  kVBolt_1w},   {kNBolt_1w,   kVOil_1w}, {kNDoor_1w,  kVOil_1w},  {0}}},
-	{GOLD_1w,    kDTugold_1w,   {{kNHero_1w, kVMakeUseOf_1w}, {kNGuard_1w, kVGive_1w},   {0}}},
-	{LASTOBJ_1w}
+	{PKIN_1w,    kDTupkin_1w,   {{kNHero_1w, kVOpen_1w},      {0, 0}}},
+	{KEY_1w,     kDTukey_1w,    {{kNDoor_1w, kVUnlock_1w},    {0, 0}}},
+	{CANDLE_1w,  kDTucandle_1w, {{0, 0}}},
+	{MASK_1w,    kDTumasked_1w, {{kNHero_1w, kVMakeUseOf_1w}, {0, 0}}},
+	{BUNG_1w,    kDTubung_1w,   {{kNBoat_1w, kVPlug_1w},      {0, 0}}},
+	{CHOP_1w,    kDTuchop_1w,   {{kNHero_1w, kVEat_1w},       {kNDog_1w,   kVThrowit_1w},{kNButler_1w, kVGive_1w},{kNFrank_1w, kVGive_1w}, {kNDracula_1w, kVGive_1w}, {kNGwen_1w, kVGive_1w}, {kNHood_1w, kVGive_1w}, {kNSlime_1w, kVGive_1w}, {kNPeahead_1w, kVGive_1w}, {kNProf_1w, kVGive_1w}, {kNIgor_1w, kVGive_1w}, {0, 0}}},
+	{KNIFE_1w,   kDTuknife_1w,  {{kNHero_1w, kVCut_1w},       {kNRope_1w,  kVCut_1w},    {0, 0}}},
+	{OILCAN_1w,  kDTuoil_1w,    {{kNHero_1w, kVOil_1w},       {kNTrap_1w,  kVBolt_1w},   {kNBolt_1w,   kVOil_1w}, {kNDoor_1w,  kVOil_1w},  {0, 0}}},
+	{GOLD_1w,    kDTugold_1w,   {{kNHero_1w, kVMakeUseOf_1w}, {kNGuard_1w, kVGive_1w},   {0, 0}}},
+	{LASTOBJ_1w, 0, {0, 0}}
 };
 
 uses_t uses_2w[] = {
-	{MATCHES_2w,  kDTumatches_2w,  {{kNHero_2w, kVStrike_2w},    {kNDynamite_2w, kVMakeUseOf_2w},{0}}},
-	{GARLIC_2w,   kDTugarlic_2w,   {{kNHero_2w, kVEat_2w},       {kNGardner_2w,  kVGive_2w},     {kNDog_2w,     kVGive_2w},      {kNCupb_2w,  kVDrop_2w},   {0}}},
-	{MAGNIFY_2w,  kDTumagnify_2w,  {{kNWill_2w, kVRead_2w},      {0}}},
-	{STICK_2w,    kDTustick_2w,    {{kNHero_2w, kVThrowit_2w},   {kNDog_2w,      kVGive_2w},     {kNSnake_2w,   kVAttack_2w},    {0}}},
-	{BOTTLE_2w,   kDTubottle_2w,   {{kNHero_2w, kVDrink_2w},     {kNDog_2w,      kVGive_2w},     {kNSnake_2w,   kVGive_2w},      {0}}},
-	{DYNAMITE_2w, kDTudynamite_2w, {{kNHero_2w, kVStrike_2w},    {kNRock_2w,     kVDrop_2w},     {kNMatches_2w, kVMakeUseOf_2w}, {kNSnake_2w, kVAttack_2w}, {0}}},
-	{GUN_2w,      kDTugun_2w,      {{kNHero_2w, kVFire_2w},      {kNSnake_2w,    kVAttack_2w},   {kNRobot_2w,   kVFire_2w},      {0}}},
-	{BANANA_2w,   kDTubanana_2w,   {{kNHero_2w, kVEat_2w},       {kNGenie_2w,    kVGive_2w},     {0}}},
-	{OILLAMP_2w,  kDTulamp_2w,     {{kNHero_2w, kVRub_2w},       {kNGenie_2w,    kVGive_2w},     {0}}},
-	{SCREW_2w,    kDTuscrew_2w,    {{kNHero_2w, kVMakeUseOf_2w}, {kNSafe_2w,     kVOpen_2w},     {0}}},
-	{BELL_2w,     kDTubell_2w,     {{kNHero_2w, kVRing_2w},      {kNMaid_2w,     kVGive_2w},     {kNCat_2w,     kVGive_2w},      {kNHarry_2w, kVGive_2w},   {kNHester_2w, kVGive_2w}, {kNCook_2w,   kVGive_2w}, {0}}},
-	{CATNIP_2w,   kDTucatnip_2w,   {{kNHero_2w, kVEat_2w},       {kNBell_2w,     kVRub_2w},      {kNMaid_2w,    kVGive_2w},      {kNCat_2w,   kVGive_2w},   {kNHarry_2w,  kVGive_2w}, {kNHester_2w, kVGive_2w}, {kNCook_2w, kVGive_2w}, {0}}},
-	{PAPER_2w,    kDTupaper_2w,    {{kNHero_2w, kVRead_2w},      {kNDoor_2w,     kVPush_2w},     {0}}},
-	{PENCIL_2w,   kDTupencil_2w,   {{kNHero_2w, kVMakeUseOf_2w}, {kNPaper_2w,    kVScribble_2w}, {kNDoor_2w,    kVMakeUseOf_2w}, {0}}},
-	{LASTOBJ_2w}
+	{MATCHES_2w,  kDTumatches_2w,  {{kNHero_2w, kVStrike_2w},    {kNDynamite_2w, kVMakeUseOf_2w},{0, 0}}},
+	{GARLIC_2w,   kDTugarlic_2w,   {{kNHero_2w, kVEat_2w},       {kNGardner_2w,  kVGive_2w},     {kNDog_2w,     kVGive_2w},      {kNCupb_2w,  kVDrop_2w},   {0, 0}}},
+	{MAGNIFY_2w,  kDTumagnify_2w,  {{kNWill_2w, kVRead_2w},      {0, 0}}},
+	{STICK_2w,    kDTustick_2w,    {{kNHero_2w, kVThrowit_2w},   {kNDog_2w,      kVGive_2w},     {kNSnake_2w,   kVAttack_2w},    {0, 0}}},
+	{BOTTLE_2w,   kDTubottle_2w,   {{kNHero_2w, kVDrink_2w},     {kNDog_2w,      kVGive_2w},     {kNSnake_2w,   kVGive_2w},      {0, 0}}},
+	{DYNAMITE_2w, kDTudynamite_2w, {{kNHero_2w, kVStrike_2w},    {kNRock_2w,     kVDrop_2w},     {kNMatches_2w, kVMakeUseOf_2w}, {kNSnake_2w, kVAttack_2w}, {0, 0}}},
+	{GUN_2w,      kDTugun_2w,      {{kNHero_2w, kVFire_2w},      {kNSnake_2w,    kVAttack_2w},   {kNRobot_2w,   kVFire_2w},      {0, 0}}},
+	{BANANA_2w,   kDTubanana_2w,   {{kNHero_2w, kVEat_2w},       {kNGenie_2w,    kVGive_2w},     {0, 0}}},
+	{OILLAMP_2w,  kDTulamp_2w,     {{kNHero_2w, kVRub_2w},       {kNGenie_2w,    kVGive_2w},     {0, 0}}},
+	{SCREW_2w,    kDTuscrew_2w,    {{kNHero_2w, kVMakeUseOf_2w}, {kNSafe_2w,     kVOpen_2w},     {0, 0}}},
+	{BELL_2w,     kDTubell_2w,     {{kNHero_2w, kVRing_2w},      {kNMaid_2w,     kVGive_2w},     {kNCat_2w,     kVGive_2w},      {kNHarry_2w, kVGive_2w},   {kNHester_2w, kVGive_2w}, {kNCook_2w,   kVGive_2w}, {0, 0}}},
+	{CATNIP_2w,   kDTucatnip_2w,   {{kNHero_2w, kVEat_2w},       {kNBell_2w,     kVRub_2w},      {kNMaid_2w,    kVGive_2w},      {kNCat_2w,   kVGive_2w},   {kNHarry_2w,  kVGive_2w}, {kNHester_2w, kVGive_2w}, {kNCook_2w, kVGive_2w}, {0, 0}}},
+	{PAPER_2w,    kDTupaper_2w,    {{kNHero_2w, kVRead_2w},      {kNDoor_2w,     kVPush_2w},     {0, 0}}},
+	{PENCIL_2w,   kDTupencil_2w,   {{kNHero_2w, kVMakeUseOf_2w}, {kNPaper_2w,    kVScribble_2w}, {kNDoor_2w,    kVMakeUseOf_2w}, {0, 0}}},
+	{LASTOBJ_2w,  0, {0, 0}}
 };
 
 uses_t uses_3w[] = {
-	{CLAY_3w,     kDTuclay_3w,     {{kNHero_3w, kVMake_3w},   {0}}},
-	{FLASK_3w,    kDTuflask_3w,    {{kNHero_3w, kVDrink_3w},  {kNPennylie_3w, kVGive_3w},     {kNWater_3w, kVFill_3w},     {kNPool_3w, kVFill_3w},   {0}}},
-	{BOUILLON_3w, kDTubouillon_3w, {{kNNat1_3w, kVGive_3w},   {kNNat2_3w,     kVGive_3w},     {kNNat3_3w,  kVGive_3w},     {kNNatb_3w, kVGive_3w},   {kNNatg_3w, kVGive_3w}, {kNPennylie_3w, kVGive_3w}, {kNDoctor_3w, kVGive_3w}, {0}}},
-	{CRYSTAL_3w,  kDTucrystal_3w,  {{kNHero_3w, kVRub_3w},    {0}}},
-	{CHEESE_3w,   kDTucheese_3w,   {{kNHero_3w, kVEat_3w},    {kNCage_3w,     kVPut_3w},      {0}}},
-	{SCROLL_3w,   kDTuread_3w,     {{kNHero_3w, kVRead_3w},   {0}}},
-	{BOOK_3w,     kDTuread_3w,     {{kNHero_3w, kVRead_3w},   {kNGhost_3w,    kVExorcise_3w}, {0}}},
-	{CANDLE_3w,   kDTucandle_3w,   {{kNHero_3w, kVStrike_3w}, {0}}},
-	{BELL_3w,     kDTubell_3w,     {{kNHero_3w, kVRing_3w},   {0}}},
-	{BLOWPIPE_3w, kDTupipe_3w,     {{kNHero_3w, kVShoot_3w},  {kNDoctor_3w,   kVShoot_3w},    {kNElephant_3w, kVShoot_3w}, {kNGhost_3w, kVShoot_3w}, {0}}},
-	{LASTOBJ_3w}
+	{CLAY_3w,     kDTuclay_3w,     {{kNHero_3w, kVMake_3w},   {0, 0}}},
+	{FLASK_3w,    kDTuflask_3w,    {{kNHero_3w, kVDrink_3w},  {kNPennylie_3w, kVGive_3w},     {kNWater_3w, kVFill_3w},     {kNPool_3w, kVFill_3w},   {0, 0}}},
+	{BOUILLON_3w, kDTubouillon_3w, {{kNNat1_3w, kVGive_3w},   {kNNat2_3w,     kVGive_3w},     {kNNat3_3w,  kVGive_3w},     {kNNatb_3w, kVGive_3w},   {kNNatg_3w, kVGive_3w}, {kNPennylie_3w, kVGive_3w}, {kNDoctor_3w, kVGive_3w}, {0, 0}}},
+	{CRYSTAL_3w,  kDTucrystal_3w,  {{kNHero_3w, kVRub_3w},    {0, 0}}},
+	{CHEESE_3w,   kDTucheese_3w,   {{kNHero_3w, kVEat_3w},    {kNCage_3w,     kVPut_3w},      {0, 0}}},
+	{SCROLL_3w,   kDTuread_3w,     {{kNHero_3w, kVRead_3w},   {0, 0}}},
+	{BOOK_3w,     kDTuread_3w,     {{kNHero_3w, kVRead_3w},   {kNGhost_3w,    kVExorcise_3w}, {0, 0}}},
+	{CANDLE_3w,   kDTucandle_3w,   {{kNHero_3w, kVStrike_3w}, {0, 0}}},
+	{BELL_3w,     kDTubell_3w,     {{kNHero_3w, kVRing_3w},   {0, 0}}},
+	{BLOWPIPE_3w, kDTupipe_3w,     {{kNHero_3w, kVShoot_3w},  {kNDoctor_3w,   kVShoot_3w},    {kNElephant_3w, kVShoot_3w}, {kNGhost_3w, kVShoot_3w}, {0, 0}}},
+	{LASTOBJ_3w,  0, {0, 0}}
 };
 
 // TODO: This use lists are only used in Win versions. Should we add them in the DOS versions?
 uses_t uses_1d[] = {
-	{LASTOBJ_1d}
+	{LASTOBJ_1d,  0, {0, 0}}
 };
 
 uses_t uses_2d[] = {
-	{LASTOBJ_2d}
+	{LASTOBJ_2d,  0, {0, 0}}
 };
 
 uses_t uses_3d[] = {
-	{LASTOBJ_3d}
+	{LASTOBJ_3d,  0, {0, 0}}
 };
 
 background_t catchall_1w[] = {					// Generally applicable phrases
-  {kVJump_1w,      0,         kSTnojump_1w,      false, 0, 0},
-  {kVGo_1w,        0,         kSTtrywalk_1w,     false, 0, 0},
-  {kVEnter_1w,     0,         kSTtrywalk_1w,     false, 0, 0},
-  {kVClimb_1w,     0,         kSTnoclimb_1w,     false, 0, 0},
-  {kVShout_1w,     0,         kSTnothing_1w,     false, 0, 0},
-  {kVTalk_1w,      0,         kSTnotalk_1w,      false, 0, 0},
-  {kVSwitch_1w,    0,         kSTenopurps_1w,    false, 0, 0},
-  {kVThrowit_1w,   0,         kSTenopurps_1w,    false, 0, 0},
-  {kVAttack_1w,    0,         kSTnoattack_1w,    false, 0, 0},
-  {kVBreak_1w,     0,         kSTnobreak_1w,     false, 0, 0},
-  {kVListen_1w,    0,         kSTnonoise_1w,     false, 0, 0},
-  {kVSmell_1w,     0,         kSTnosmell_1w,     false, 0, 0},
-  {kVQuery_1w,     0,         kSTnoidea_1w,      false, 0, 0},
-  {kVLook_1w,      kNSky_1w,     kSTlooksky_1w,     false, 0, 0},
-  {kVLook_1w,      kNWall_1w,    kSTedull_1w,       false, 0, 0},
-  {kVLook_1w,      kNGround_1w,  kSTedull_1w,       false, 0, 0},
-  {kVHelp_1w,      0,         kSTaskhelp_1w,     false, 0, 0},
-  {kVMagic_1w,     0,         kSTabracadabra_1w, false, 0, 0},
-  {kVDig_1w,       0,         kSTnodig_1w,       false, 0, 0},
-  {kVRude_1w,      0,         kSTnorude_1w,      false, 0, 0},
-  {kVKnock_1w,     0,         kSTnoanswer_1w,    false, 0, 0},
-  {kVTake_1w,      kNPicture_1w, kSTenopurps_1w,    false, 0, 0},
-  {kVHero,         kNCut_1w,     kSTCutHero_1w,     false, 0, 0},
-  {kVHero,         kNOil_1w,     kSTOilHero_1w,     false, 0, 0},
-  {kVMakeUseOf_1w, kNGold_1w,    kSTGoldHero_1w,    false, 0, 0},
-  {kVLook_1w,      kNMonkey_1w,  kSTLookMonkey_1w,  false, 0, 0},
-  {0,           0,         0,              false, 0, 0}
+	{kVJump_1w,      0,         kSTnojump_1w,      false, 0, 0},
+	{kVGo_1w,        0,         kSTtrywalk_1w,     false, 0, 0},
+	{kVEnter_1w,     0,         kSTtrywalk_1w,     false, 0, 0},
+	{kVClimb_1w,     0,         kSTnoclimb_1w,     false, 0, 0},
+	{kVShout_1w,     0,         kSTnothing_1w,     false, 0, 0},
+	{kVTalk_1w,      0,         kSTnotalk_1w,      false, 0, 0},
+	{kVSwitch_1w,    0,         kSTenopurps_1w,    false, 0, 0},
+	{kVThrowit_1w,   0,         kSTenopurps_1w,    false, 0, 0},
+	{kVAttack_1w,    0,         kSTnoattack_1w,    false, 0, 0},
+	{kVBreak_1w,     0,         kSTnobreak_1w,     false, 0, 0},
+	{kVListen_1w,    0,         kSTnonoise_1w,     false, 0, 0},
+	{kVSmell_1w,     0,         kSTnosmell_1w,     false, 0, 0},
+	{kVQuery_1w,     0,         kSTnoidea_1w,      false, 0, 0},
+	{kVLook_1w,      kNSky_1w,     kSTlooksky_1w,     false, 0, 0},
+	{kVLook_1w,      kNWall_1w,    kSTedull_1w,       false, 0, 0},
+	{kVLook_1w,      kNGround_1w,  kSTedull_1w,       false, 0, 0},
+	{kVHelp_1w,      0,         kSTaskhelp_1w,     false, 0, 0},
+	{kVMagic_1w,     0,         kSTabracadabra_1w, false, 0, 0},
+	{kVDig_1w,       0,         kSTnodig_1w,       false, 0, 0},
+	{kVRude_1w,      0,         kSTnorude_1w,      false, 0, 0},
+	{kVKnock_1w,     0,         kSTnoanswer_1w,    false, 0, 0},
+	{kVTake_1w,      kNPicture_1w, kSTenopurps_1w,    false, 0, 0},
+	{kVHero,         kNCut_1w,     kSTCutHero_1w,     false, 0, 0},
+	{kVHero,         kNOil_1w,     kSTOilHero_1w,     false, 0, 0},
+	{kVMakeUseOf_1w, kNGold_1w,    kSTGoldHero_1w,    false, 0, 0},
+	{kVLook_1w,      kNMonkey_1w,  kSTLookMonkey_1w,  false, 0, 0},
+	{0,           0,         0,              false, 0, 0}
 };
 
 background_t screen0_desc_1w[] = {						// Outside house
-  {kVLook_1w,  kNTree_1w,   kSTlooktree_1w,    false, 0, 0},
-  {kVLook_1w,  kNFence_1w,  kSTlookfence_1w,   false, 0, 0},
-  {kVLook_1w,  kNHouse_1w,  kSTlookhouse_1w,   false, 0, 0},
-  {kVLook_1w,  kNWindow_1w, kSTlookwindow_1w,  false, 0, 0},
-  {kVLook_1w,  kNRoof_1w,   kSTedull_1w,       false, 0, 0},
-  {kVLook_1w,  kNLight_1w,  kSTedull_1w,       false, 0, 0},
-  {kVLook_1w,  kNMoon_1w,   kSTlookmoon_1w,    false, 0, 0},
-  {kVClimb_1w, kNTree_1w,   kSTclimbtree1_1w,  false, 0, 0},
-  {kVClimb_1w, kNFence_1w,  kSTclimbfence_1w,  false, 0, 0},
-  {kVEat_1w,   kNPkin_1w,   kSTeatpumpkin_1w,  false, 0, 0},
-  {kVUnder_1w, kNCarpet_1w, kSTundermat_1w,    false, 0, 0},
-  {kVLook_1w,  0,        kSTlookscreen0_1w, true,  0, 0},
-  {0,       0,        0,              false, 0, 0}
+	{kVLook_1w,  kNTree_1w,   kSTlooktree_1w,    false, 0, 0},
+	{kVLook_1w,  kNFence_1w,  kSTlookfence_1w,   false, 0, 0},
+	{kVLook_1w,  kNHouse_1w,  kSTlookhouse_1w,   false, 0, 0},
+	{kVLook_1w,  kNWindow_1w, kSTlookwindow_1w,  false, 0, 0},
+	{kVLook_1w,  kNRoof_1w,   kSTedull_1w,       false, 0, 0},
+	{kVLook_1w,  kNLight_1w,  kSTedull_1w,       false, 0, 0},
+	{kVLook_1w,  kNMoon_1w,   kSTlookmoon_1w,    false, 0, 0},
+	{kVClimb_1w, kNTree_1w,   kSTclimbtree1_1w,  false, 0, 0},
+	{kVClimb_1w, kNFence_1w,  kSTclimbfence_1w,  false, 0, 0},
+	{kVEat_1w,   kNPkin_1w,   kSTeatpumpkin_1w,  false, 0, 0},
+	{kVUnder_1w, kNCarpet_1w, kSTundermat_1w,    false, 0, 0},
+	{kVLook_1w,  0,        kSTlookscreen0_1w, true,  0, 0},
+	{0,       0,        0,              false, 0, 0}
 };
 
 background_t screen1_desc_1w[] = {						// Hall
-  {kVLook_1w,   kNBat_1w,     kSTlookbat_1w,      false, 0, 0},
-  {kVLook_1w,   kNPicture_1w, kSTlookpicture_1w,  false, 0, 0},
-  {kVLook_1w,   kNTable_1w,   kSTlooktable_1w,    false, 0, 0},
-  {kVLook_1w,   kNCarpet_1w,  kSTedull_1w,        false, 0, 0},
-  {kVLook_1w,   kNStairs_1w,  kSTlookupstairs_1w, false, 0, 0},
-  {kVLook_1w,   kNLight_1w,   kSTlooklight_1w,    false, 0, 0},
-  {kVLook_1w,   0,         kSTlookscreen1_1w,  true,  0, 0},
-  {kVListen_1w, 0,         kSTlistenhall_1w,   false, 0, 0},
-  {0,        0,         0,               false, 0, 0}
+	{kVLook_1w,   kNBat_1w,     kSTlookbat_1w,      false, 0, 0},
+	{kVLook_1w,   kNPicture_1w, kSTlookpicture_1w,  false, 0, 0},
+	{kVLook_1w,   kNTable_1w,   kSTlooktable_1w,    false, 0, 0},
+	{kVLook_1w,   kNCarpet_1w,  kSTedull_1w,        false, 0, 0},
+	{kVLook_1w,   kNStairs_1w,  kSTlookupstairs_1w, false, 0, 0},
+	{kVLook_1w,   kNLight_1w,   kSTlooklight_1w,    false, 0, 0},
+	{kVLook_1w,   0,         kSTlookscreen1_1w,  true,  0, 0},
+	{kVListen_1w, 0,         kSTlistenhall_1w,   false, 0, 0},
+	{0,        0,         0,               false, 0, 0}
 };
 
 background_t screen2_desc_1w[] = {						// Bedroom 1
-  {kVLook_1w,  kNBed_1w,    kSTlookbed_1w,     false, 0, 0},
-  {kVUnder_1w, kNBed_1w,    kSTlookbed_1w,     false, 0, 0},
-  {kVRide_1w,  kNBed_1w,    kSTnosnooze_1w,    false, 0, 0},
-  {kVInto_1w,  kNBed_1w,    kSTnosnooze_1w,    false, 0, 0},
-  {kVLook_1w,  kNWard_1w,   kSTlookward_1w,    false, 0, 0},
-  {kVLook_1w,  kNCupb_1w,   kSTlookcupbd_1w,   false, 0, 0},
-  {kVLook_1w,  kNWindow_1w, kSTlookbed1win_1w, false, 0, 0},
-  {kVLook_1w,  kNLight_1w,  kSTedull_1w,       false, 0, 0},
-  {kVLook_1w,  kNFace_1w,   kSTlookface_1w,    false, 0, 0},
-  {kVLook_1w,  0,        kSTlookscreen2_1w, true,  0, 0},
-  {0,       0,        0,              false, 0, 0}
+	{kVLook_1w,  kNBed_1w,    kSTlookbed_1w,     false, 0, 0},
+	{kVUnder_1w, kNBed_1w,    kSTlookbed_1w,     false, 0, 0},
+	{kVRide_1w,  kNBed_1w,    kSTnosnooze_1w,    false, 0, 0},
+	{kVInto_1w,  kNBed_1w,    kSTnosnooze_1w,    false, 0, 0},
+	{kVLook_1w,  kNWard_1w,   kSTlookward_1w,    false, 0, 0},
+	{kVLook_1w,  kNCupb_1w,   kSTlookcupbd_1w,   false, 0, 0},
+	{kVLook_1w,  kNWindow_1w, kSTlookbed1win_1w, false, 0, 0},
+	{kVLook_1w,  kNLight_1w,  kSTedull_1w,       false, 0, 0},
+	{kVLook_1w,  kNFace_1w,   kSTlookface_1w,    false, 0, 0},
+	{kVLook_1w,  0,        kSTlookscreen2_1w, true,  0, 0},
+	{0,       0,        0,              false, 0, 0}
 };
 
 background_t screen3_desc_1w[] = {						// Dining room
-  {kVLook_1w,   kNTable_1w,   kSTlookspread_1w,      false, 0, 0},
-  {kVLook_1w,   kNButler_1w,  kSTlookbutler_1w,      false, 0, 0},
-  {kVLook_1w,   kNPlant_1w,   kSTlookplant_1w,       false, 0, 0},
-  {kVLook_1w,   kNPicture_1w, kSTlookzelda_1w,       false, 0, 0},
-  {kVLook_1w,   kNWitch_1w,   kSTlookzelda_1w,       false, 0, 0},
-  {kVLook_1w,   kNWindow_1w,  kSTlookdiningwin_1w,   false, 0, 0},
-  {kVLook_1w,   kNFood_1w,    kSTlookfood_1w,        false, 0, 0},
-  {kVLook_1w,   kNMan_1w,     kSTlookdiningman_1w,   false, 0, 0},
-  {kVLook_1w,   kNCupb_1w,    kSTedull_1w,           false, 0, 0},
-  {kVLook_1w,   kNWoman_1w,   kSTlookwoman_1w,       false, 0, 0},
-  {kVLook_1w,   0,         kSTlookscreen3_1w,     true,  0, 0},
-  {kVSit_1w,    0,         kSTsitdown_1w,         false, 0, 0},
-  {kVTake_1w,   kNFood_1w,    kSTtakefood_1w,        false, 0, 0},
-  {kVEat_1w,    0,         kSTtakefood_1w,        false, 0, 0},
-  {kVTalk_1w,   kNMan_1w,     kSTtalkdiningman_1w,   false, 0, 0},
-  {kVTalk_1w,   kNWoman_1w,   kSTtalkdiningwoman_1w, false, 0, 0},
-  {kVTalk_1w,   kNButler_1w,  kSTtalkbutler_1w,      false, 0, 0},
-  {kVKiss_1w,   0,         kSTskiss_1w,           false, 0, 0},
-  {kVListen_1w, 0,         kSTlistendining_1w,    false, 0, 0},
-  {kVDrink_1w,  0,         kSTdrinkdining_1w,     false, 0, 0},
-  {0,        0,         0,                  false, 0, 0}
+	{kVLook_1w,   kNTable_1w,   kSTlookspread_1w,      false, 0, 0},
+	{kVLook_1w,   kNButler_1w,  kSTlookbutler_1w,      false, 0, 0},
+	{kVLook_1w,   kNPlant_1w,   kSTlookplant_1w,       false, 0, 0},
+	{kVLook_1w,   kNPicture_1w, kSTlookzelda_1w,       false, 0, 0},
+	{kVLook_1w,   kNWitch_1w,   kSTlookzelda_1w,       false, 0, 0},
+	{kVLook_1w,   kNWindow_1w,  kSTlookdiningwin_1w,   false, 0, 0},
+	{kVLook_1w,   kNFood_1w,    kSTlookfood_1w,        false, 0, 0},
+	{kVLook_1w,   kNMan_1w,     kSTlookdiningman_1w,   false, 0, 0},
+	{kVLook_1w,   kNCupb_1w,    kSTedull_1w,           false, 0, 0},
+	{kVLook_1w,   kNWoman_1w,   kSTlookwoman_1w,       false, 0, 0},
+	{kVLook_1w,   0,         kSTlookscreen3_1w,     true,  0, 0},
+	{kVSit_1w,    0,         kSTsitdown_1w,         false, 0, 0},
+	{kVTake_1w,   kNFood_1w,    kSTtakefood_1w,        false, 0, 0},
+	{kVEat_1w,    0,         kSTtakefood_1w,        false, 0, 0},
+	{kVTalk_1w,   kNMan_1w,     kSTtalkdiningman_1w,   false, 0, 0},
+	{kVTalk_1w,   kNWoman_1w,   kSTtalkdiningwoman_1w, false, 0, 0},
+	{kVTalk_1w,   kNButler_1w,  kSTtalkbutler_1w,      false, 0, 0},
+	{kVKiss_1w,   0,         kSTskiss_1w,           false, 0, 0},
+	{kVListen_1w, 0,         kSTlistendining_1w,    false, 0, 0},
+	{kVDrink_1w,  0,         kSTdrinkdining_1w,     false, 0, 0},
+	{0,        0,         0,                  false, 0, 0}
 };
 
 background_t screen4_desc_1w[] = {						// Bathroom
-  {kVLook_1w, kNWindow_1w, kSTlookbathwin_1w, false, 0, 0},
-  {kVLook_1w, kNLight_1w,  kSTedull_1w,       false, 0, 0},
-  {kVLook_1w, kNMirror_1w, kSTlookmirror_1w,  false, 0, 0},
-  {kVLook_1w, kNToilet_1w, kSTlooktoilet_1w,  false, 0, 0},
-  {kVLook_1w, kNBath_1w,   kSTlooktub_1w,     false, 0, 0},
-  {kVLook_1w, kNSink_1w,   kSTedull_1w,       false, 0, 0},
-  {kVLook_1w, 0,        kSTlookscreen4_1w, true,  0, 0},
-  {kVCrap_1w, 0,        kSTdopoo_1w,       false, 0, 0},
-  {kVSit_1w,  kNToilet_1w, kSTdowee_1w,       false, 0, 0},
-  {kVRide_1w, kNToilet_1w, kSTdowee_1w,       false, 0, 0},
-  {kVInto_1w, kNBath_1w,   kSTusetub_1w,      false, 0, 0},
-  {kVTake_1w, kNBath_1w,   kSTusetub_1w,      false, 0, 0},
-  {kVSit_1w,  0,        kSTsittoilet_1w,   false, 0, 0},
-  {kVWash_1w, kNHands_1w,  kSTwashhands_1w,   false, 0, 0},
-  {0,      0,        0,              false, 0, 0}
+	{kVLook_1w, kNWindow_1w, kSTlookbathwin_1w, false, 0, 0},
+	{kVLook_1w, kNLight_1w,  kSTedull_1w,       false, 0, 0},
+	{kVLook_1w, kNMirror_1w, kSTlookmirror_1w,  false, 0, 0},
+	{kVLook_1w, kNToilet_1w, kSTlooktoilet_1w,  false, 0, 0},
+	{kVLook_1w, kNBath_1w,   kSTlooktub_1w,     false, 0, 0},
+	{kVLook_1w, kNSink_1w,   kSTedull_1w,       false, 0, 0},
+	{kVLook_1w, 0,        kSTlookscreen4_1w, true,  0, 0},
+	{kVCrap_1w, 0,        kSTdopoo_1w,       false, 0, 0},
+	{kVSit_1w,  kNToilet_1w, kSTdowee_1w,       false, 0, 0},
+	{kVRide_1w, kNToilet_1w, kSTdowee_1w,       false, 0, 0},
+	{kVInto_1w, kNBath_1w,   kSTusetub_1w,      false, 0, 0},
+	{kVTake_1w, kNBath_1w,   kSTusetub_1w,      false, 0, 0},
+	{kVSit_1w,  0,        kSTsittoilet_1w,   false, 0, 0},
+	{kVWash_1w, kNHands_1w,  kSTwashhands_1w,   false, 0, 0},
+	{0,      0,        0,              false, 0, 0}
 };
 
 background_t screen5_desc_1w[] = {						// Kitchen
-  {kVLook_1w,   kNLight_1w,  kSTedull_1w,          false, 0, 0},
-  {kVLook_1w,   kNUnits_1w,  kSTlookunits_1w,      false, 0, 0},
-  {kVOpen_1w,   kNUnits_1w,  kSTeempty_1w,         false, 0, 0},
-  {kVLook_1w,   kNWindow_1w, kSTlookkitchenwin_1w, false, 0, 0},
-  {kVLook_1w,   kNBroom_1w,  kSTlookbroom_1w,      false, 0, 0},
-  {kVTake_1w,   kNBroom_1w,  kSTtakebroom_1w,      false, 0, 0},
-  {kVRide_1w,   kNBroom_1w,  kSTridebroom_1w,      false, 0, 0},
-  {kVLook_1w,   0,        kSTlookscreen5_1w,    true,  0, 0},
-  {kVSweep_1w,  0,        kSTsweepbroom_1w,     false, 0, 0},
-  {kVListen_1w, 0,        kSTlistenkitchen_1w,  false, 0, 0},
-  {0,        0,        0,                 false, 0, 0}
+	{kVLook_1w,   kNLight_1w,  kSTedull_1w,          false, 0, 0},
+	{kVLook_1w,   kNUnits_1w,  kSTlookunits_1w,      false, 0, 0},
+	{kVOpen_1w,   kNUnits_1w,  kSTeempty_1w,         false, 0, 0},
+	{kVLook_1w,   kNWindow_1w, kSTlookkitchenwin_1w, false, 0, 0},
+	{kVLook_1w,   kNBroom_1w,  kSTlookbroom_1w,      false, 0, 0},
+	{kVTake_1w,   kNBroom_1w,  kSTtakebroom_1w,      false, 0, 0},
+	{kVRide_1w,   kNBroom_1w,  kSTridebroom_1w,      false, 0, 0},
+	{kVLook_1w,   0,        kSTlookscreen5_1w,    true,  0, 0},
+	{kVSweep_1w,  0,        kSTsweepbroom_1w,     false, 0, 0},
+	{kVListen_1w, 0,        kSTlistenkitchen_1w,  false, 0, 0},
+	{0,        0,        0,                 false, 0, 0}
 };
 
 background_t screen6_desc_1w[] = {						// Garden
-  {kVLook_1w,  kNShed_1w,       kSTlookShed_1w,    false, 0, 0},
-  {kVLook_1w,  kNMoon_1w,       kSTedull_1w,       false, 0, 0},
-  {kVLook_1w,  kNTree_1w,       kSTlooktree_1w,    false, 0, 0},
-  {kVClimb_1w, kNTree_1w,       kSTclimbtree_1w,   false, 0, 0},
-  {kVLook_1w,  kNGardenbits_1w, kSTlookgarden_1w,  false, 0, 0},
-  {kVLook_1w,  0,            kSTlookscreen6_1w, true,  0, 0},
-  {0,       0,            0,              false, 0, 0}
+	{kVLook_1w,  kNShed_1w,       kSTlookShed_1w,    false, 0, 0},
+	{kVLook_1w,  kNMoon_1w,       kSTedull_1w,       false, 0, 0},
+	{kVLook_1w,  kNTree_1w,       kSTlooktree_1w,    false, 0, 0},
+	{kVClimb_1w, kNTree_1w,       kSTclimbtree_1w,   false, 0, 0},
+	{kVLook_1w,  kNGardenbits_1w, kSTlookgarden_1w,  false, 0, 0},
+	{kVLook_1w,  0,            kSTlookscreen6_1w, true,  0, 0},
+	{0,       0,            0,              false, 0, 0}
 };
 
 background_t screen7_desc_1w[] = {						// Store room
-  {kVLook_1w,   kNCarpet_1w,    kSTLookCarpet_1w,    false, 0, 0},
-  {kVLook_1w,   kNLight_1w,     kSTedull_1w,         false, 0, 0},
-  {kVUnbolt_1w, kNTrap_1w,      kSTsayunbolt_1w,     false, 0, 0},
-  {kVLook_1w,   kNMousehole_1w, kSTlookmousehole_1w, false, 0, 0},
-  {kVTake_1w,   kNMousehole_1w, kSTtakedroppings_1w, false, 0, 0},
-  {kVTake_1w,   kNDroppings_1w, kSTtakedroppings_1w, false, 0, 0},
-  {kVStroke_1w, kNDog_1w,       kSTStrokeDog_1w,     false, 0, 0},
-  {kVGive_1w,   kNChop_1w,      kSTchop1_1w,         false, 0, 0},
-  {kVFeed_1w,   kNDog_1w,       kSTchop1_1w,         false, 0, 0},
-  {kVLook_1w,   0,           kSTlookscreen7_1w,   true,  0, 0},
-  {0,        0,           0,                false, 0, 0}
+	{kVLook_1w,   kNCarpet_1w,    kSTLookCarpet_1w,    false, 0, 0},
+	{kVLook_1w,   kNLight_1w,     kSTedull_1w,         false, 0, 0},
+	{kVUnbolt_1w, kNTrap_1w,      kSTsayunbolt_1w,     false, 0, 0},
+	{kVLook_1w,   kNMousehole_1w, kSTlookmousehole_1w, false, 0, 0},
+	{kVTake_1w,   kNMousehole_1w, kSTtakedroppings_1w, false, 0, 0},
+	{kVTake_1w,   kNDroppings_1w, kSTtakedroppings_1w, false, 0, 0},
+	{kVStroke_1w, kNDog_1w,       kSTStrokeDog_1w,     false, 0, 0},
+	{kVGive_1w,   kNChop_1w,      kSTchop1_1w,         false, 0, 0},
+	{kVFeed_1w,   kNDog_1w,       kSTchop1_1w,         false, 0, 0},
+	{kVLook_1w,   0,           kSTlookscreen7_1w,   true,  0, 0},
+	{0,        0,           0,                false, 0, 0}
 };
 
 background_t screen8_desc_1w[] = {						// Basement
-  {kVLook_1w,   kNLight_1w,    kSTedull_1w,          false, 0, 0},
-  {kVLook_1w,   kNDoor_1w,     kSTlookbasedoor_1w,   false, 0, 0},
-  {kVPush_1w,   kNDoor_1w,     kSTpushbasedoor_1w,   false, 0, 0},
-  {kVOil_1w,    kNDoor_1w,     kSToilbasedoor_1w,    false, 0, 0},
-  {kVLook_1w,   kNRock_1w,     kSTexaminerock_1w,    false, 0, 0},
-  {kVPush_1w,   kNRock_1w,     kSTnowayhose_1w,      false, 0, 0},
-  {kVLift_1w,   kNRock_1w,     kSTnowayhose_1w,      false, 0, 0},
-  {kVMove_1w,   kNRock_1w,     kSTnowayhose_1w,      false, 0, 0},
-  {kVUnder_1w,  kNRock_1w,     kSTnounder_1w,        false, 0, 0},
-  {kVAttack_1w, kNDoor_1w,     kSTbreakbasedoor_1w,  false, 0, 0},
-  {kVBreak_1w,  kNDoor_1w,     kSTbreakbasedoor_1w,  false, 0, 0},
-  {kVOpen_1w,   kNDoor_1w,     kSTopenbasedoor_1w,   false, 0, 0},
-  {kVUnlock_1w, kNDoor_1w,     kSTunlockbasedoor_1w, false, 0, 0},
-  {kVKnock_1w,  kNDoor_1w,     kSTknockbasedoor_1w,  false, 0, 0},
-  {kVTalk_1w,   kNPenelope_1w, kSTtalkpenelope_1w,   false, 0, 0},
-  {kVShout_1w,  kNPenelope_1w, kSTtalkpenelope_1w,   false, 0, 0},
-  {kVListen_1w, 0,          kSTlistenbase_1w,     false, 0, 0},
-  {kVLook_1w,   0,          kSTlookscreen8_1w,    true,  0, 0},
-  {0,        0,          0,                 false, 0, 0}
+	{kVLook_1w,   kNLight_1w,    kSTedull_1w,          false, 0, 0},
+	{kVLook_1w,   kNDoor_1w,     kSTlookbasedoor_1w,   false, 0, 0},
+	{kVPush_1w,   kNDoor_1w,     kSTpushbasedoor_1w,   false, 0, 0},
+	{kVOil_1w,    kNDoor_1w,     kSToilbasedoor_1w,    false, 0, 0},
+	{kVLook_1w,   kNRock_1w,     kSTexaminerock_1w,    false, 0, 0},
+	{kVPush_1w,   kNRock_1w,     kSTnowayhose_1w,      false, 0, 0},
+	{kVLift_1w,   kNRock_1w,     kSTnowayhose_1w,      false, 0, 0},
+	{kVMove_1w,   kNRock_1w,     kSTnowayhose_1w,      false, 0, 0},
+	{kVUnder_1w,  kNRock_1w,     kSTnounder_1w,        false, 0, 0},
+	{kVAttack_1w, kNDoor_1w,     kSTbreakbasedoor_1w,  false, 0, 0},
+	{kVBreak_1w,  kNDoor_1w,     kSTbreakbasedoor_1w,  false, 0, 0},
+	{kVOpen_1w,   kNDoor_1w,     kSTopenbasedoor_1w,   false, 0, 0},
+	{kVUnlock_1w, kNDoor_1w,     kSTunlockbasedoor_1w, false, 0, 0},
+	{kVKnock_1w,  kNDoor_1w,     kSTknockbasedoor_1w,  false, 0, 0},
+	{kVTalk_1w,   kNPenelope_1w, kSTtalkpenelope_1w,   false, 0, 0},
+	{kVShout_1w,  kNPenelope_1w, kSTtalkpenelope_1w,   false, 0, 0},
+	{kVListen_1w, 0,          kSTlistenbase_1w,     false, 0, 0},
+	{kVLook_1w,   0,          kSTlookscreen8_1w,    true,  0, 0},
+	{0,        0,          0,                 false, 0, 0}
 };
 
 background_t screen9_desc_1w[] = {						// Bat cave
-  {kVLook_1w,  0,      kSTlookscreen9_1w, true,  0, 0},
-  {kVLook_1w,  kNRock_1w, kSTlookrock_1w,    false, 0, 0},
-  {kVPush_1w,  kNRock_1w, kSTnowayhose_1w,   false, 0, 0},
-  {kVLift_1w,  kNRock_1w, kSTnowayhose_1w,   false, 0, 0},
-  {kVMove_1w,  kNRock_1w, kSTnowayhose_1w,   false, 0, 0},
-  {kVUnder_1w, kNRock_1w, kSTnounder_1w,     false, 0, 0},
-  {0,       0,      0,              false, 0, 0}
+	{kVLook_1w,  0,      kSTlookscreen9_1w, true,  0, 0},
+	{kVLook_1w,  kNRock_1w, kSTlookrock_1w,    false, 0, 0},
+	{kVPush_1w,  kNRock_1w, kSTnowayhose_1w,   false, 0, 0},
+	{kVLift_1w,  kNRock_1w, kSTnowayhose_1w,   false, 0, 0},
+	{kVMove_1w,  kNRock_1w, kSTnowayhose_1w,   false, 0, 0},
+	{kVUnder_1w, kNRock_1w, kSTnounder_1w,     false, 0, 0},
+	{0,       0,      0,              false, 0, 0}
 };
 
 background_t screen10_desc_1w[] = {					// Mummy room
-  {kVLook_1w,  0,       kSTlookscreen10_1w, true,  0, 0},
-  {kVLook_1w,  kNRock_1w,  kSTlookrock_1w,     false, 0, 0},
-  {kVPush_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
-  {kVLift_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
-  {kVMove_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
-  {kVUnder_1w, kNRock_1w,  kSTnounder_1w,      false, 0, 0},
-  {kVLook_1w,  kNTomb_1w,  kSTlooktomb_1w,     false, 0, 0},
-  {kVLook_1w,  kNMummy_1w, kSTLookMummy_1w,    false, 0, 0},
-  {kVTalk_1w,  kNMummy_1w, kSTTalkMummy_1w,    false, 0, 0},
-  {0,       0,       0,               false, 0, 0}
+	{kVLook_1w,  0,       kSTlookscreen10_1w, true,  0, 0},
+	{kVLook_1w,  kNRock_1w,  kSTlookrock_1w,     false, 0, 0},
+	{kVPush_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
+	{kVLift_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
+	{kVMove_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
+	{kVUnder_1w, kNRock_1w,  kSTnounder_1w,      false, 0, 0},
+	{kVLook_1w,  kNTomb_1w,  kSTlooktomb_1w,     false, 0, 0},
+	{kVLook_1w,  kNMummy_1w, kSTLookMummy_1w,    false, 0, 0},
+	{kVTalk_1w,  kNMummy_1w, kSTTalkMummy_1w,    false, 0, 0},
+	{0,       0,       0,               false, 0, 0}
 };
 
 background_t screen11_desc_1w[] = {					// Lake room
-  {kVLook_1w,      kNRock_1w, kSTlookrock_1w,     false, 0, 0},
-  {kVPush_1w,      kNRock_1w, kSTnowayhose_1w,    false, 0, 0},
-  {kVLift_1w,      kNRock_1w, kSTnowayhose_1w,    false, 0, 0},
-  {kVMove_1w,      kNRock_1w, kSTnowayhose_1w,    false, 0, 0},
-  {kVUnder_1w,     kNRock_1w, kSTnounder_1w,      false, 0, 0},
-  {kVLook_1w,      0,      kSTlookscreen11_1w, true,  0, 0},
-  {kVLakeverbs_1w, 0,      kSTsuggestboat_1w,  false, 0, 0},
-  {kVDrink_1w,     0,      kSTnotthirsty_1w,   false, 0, 0},
-  {kVPlug_1w,      0,      kSTqueryplug_1w,    false, 0, 0},
-  {kVMakeUseOf_1w, kNBoat_1w, kSTsShutup_1w,      false, 0, 0},
-  {0,           0,      0,               false, 0, 0}
+	{kVLook_1w,      kNRock_1w, kSTlookrock_1w,     false, 0, 0},
+	{kVPush_1w,      kNRock_1w, kSTnowayhose_1w,    false, 0, 0},
+	{kVLift_1w,      kNRock_1w, kSTnowayhose_1w,    false, 0, 0},
+	{kVMove_1w,      kNRock_1w, kSTnowayhose_1w,    false, 0, 0},
+	{kVUnder_1w,     kNRock_1w, kSTnounder_1w,      false, 0, 0},
+	{kVLook_1w,      0,      kSTlookscreen11_1w, true,  0, 0},
+	{kVLakeverbs_1w, 0,      kSTsuggestboat_1w,  false, 0, 0},
+	{kVDrink_1w,     0,      kSTnotthirsty_1w,   false, 0, 0},
+	{kVPlug_1w,      0,      kSTqueryplug_1w,    false, 0, 0},
+	{kVMakeUseOf_1w, kNBoat_1w, kSTsShutup_1w,      false, 0, 0},
+	{0,           0,      0,               false, 0, 0}
 };
 
 background_t screen12_desc_1w[] = {					// Dead end
-  {kVLook_1w,  kNRock_1w,  kSTlookrock_1w,     false, 0, 0},
-  {kVPush_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
-  {kVLift_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
-  {kVMove_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
-  {kVUnder_1w, kNRock_1w,  kSTnounder_1w,      false, 0, 0},
-  {kVLook_1w,  0,       kSTlookscreen12_1w, true,  0, 0},
-  {kVTalk_1w,  kNGuard_1w, kSTtalkguard_1w,    false, 0, 0},
-  {0,       0,       0,               false, 0, 0}
+	{kVLook_1w,  kNRock_1w,  kSTlookrock_1w,     false, 0, 0},
+	{kVPush_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
+	{kVLift_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
+	{kVMove_1w,  kNRock_1w,  kSTnowayhose_1w,    false, 0, 0},
+	{kVUnder_1w, kNRock_1w,  kSTnounder_1w,      false, 0, 0},
+	{kVLook_1w,  0,       kSTlookscreen12_1w, true,  0, 0},
+	{kVTalk_1w,  kNGuard_1w, kSTtalkguard_1w,    false, 0, 0},
+	{0,       0,       0,               false, 0, 0}
 };
 
 background_t screen13_desc_1w[] = {					// Jail
-  {0, 0, 0, false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen14_desc_1w[] = {					// The end
-  {0, 0, 0, false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen15_desc_1w[] =  {					// Laboratory
-  {kVLook_1w,  0,             kSTlookscreen15_1w, true,  0, 0},
-  {kVTalk_1w,  kNIgor_1w,        kSTtalkigor_1w,     false, 0, 0},
-  {kVTalk_1w,  kNProf_1w,        kSTtalkprof_1w,     false, 0, 0},
-  {kVLook_1w,  kNMachinebits_1w, kSTlookmachine_1w,  false, 0, 0},
-  {kVPush_1w,  kNMachinebits_1w, kSTusemachine_1w,   false, 0, 0},
-  {kVLook_1w,  kNTable_1w,       kSTlooklabtable_1w, false, 0, 0},
-  {kVClose_1w, kNDoor_1w,        kSTuseboxdoor_1w,   false, 0, 0},
-  {kVOpen_1w,  kNDoor_1w,        kSTuseboxdoor_1w,   false, 0, 0},
-  {kVLook_1w,  kNLight_1w,       kSTlooklights_1w,   false, 0, 0},
-  {kVLook_1w,  kNBooth_1w,       kSTlookbooth_1w,    false, 0, 0},
-  {0,       0,             0,               false, 0, 0}
+	{kVLook_1w,  0,             kSTlookscreen15_1w, true,  0, 0},
+	{kVTalk_1w,  kNIgor_1w,        kSTtalkigor_1w,     false, 0, 0},
+	{kVTalk_1w,  kNProf_1w,        kSTtalkprof_1w,     false, 0, 0},
+	{kVLook_1w,  kNMachinebits_1w, kSTlookmachine_1w,  false, 0, 0},
+	{kVPush_1w,  kNMachinebits_1w, kSTusemachine_1w,   false, 0, 0},
+	{kVLook_1w,  kNTable_1w,       kSTlooklabtable_1w, false, 0, 0},
+	{kVClose_1w, kNDoor_1w,        kSTuseboxdoor_1w,   false, 0, 0},
+	{kVOpen_1w,  kNDoor_1w,        kSTuseboxdoor_1w,   false, 0, 0},
+	{kVLook_1w,  kNLight_1w,       kSTlooklights_1w,   false, 0, 0},
+	{kVLook_1w,  kNBooth_1w,       kSTlookbooth_1w,    false, 0, 0},
+	{0,       0,             0,               false, 0, 0}
 };
 
 
@@ -2729,472 +2729,472 @@
 
 background_t catchall_2w[] = {					// Generally applicable phrases
 // Make sure verbs with nouns come before same verb with 0
-  {kVTake_2w,      kNPicture_2w,    kSTNopurps_2w,      false, DONT_CARE, 0},
-  {kVLook_2w,      kNPenny_2w,      kSTLookpen_2w,      false, DONT_CARE, 0},
-  {kVKiss_2w,      kNPenny_2w,      kSTMmmm_2w,         false, DONT_CARE, 0},
-  {kVRude_2w,      kNPenny_2w,      kSTHeadache_2w,     false, DONT_CARE, 0},
-  {kVLook_2w,      kNStairs_2w,     kSTDull_2w,         false, DONT_CARE, 0},
-  {kVUnder_2w,     kNStairs_2w,     kSTDull_2w,         false, DONT_CARE, 0},
-  {kVLook_2w,      kNPlant_2w,      kSTSplant_2w,       false, DONT_CARE, 0},
-  {kVLook_2w,      kNWindow_2w,     kSTS6garden_2w,     false, DONT_CARE, 0},
-  {kVLook_2w,      kNPicture_2w,    kSTSpicture_2w,     false, DONT_CARE, 0},
-  {kVLook_2w,      kNMirror_2w,     kSTDull_2w,         false, DONT_CARE, 0},
-  {kVLook_2w,      kNTable_2w,      kSTNo_on_2w,        false, DONT_CARE, 0},
-  {kVJump_2w,      0,            kSTSjump_2w,        false, DONT_CARE, 0},
-  {kVGo_2w,        0,            kSTTrywalk_2w,      false, DONT_CARE, 0},
-  {kVInto_2w,      0,            kSTTrywalk_2w,      false, DONT_CARE, 0},
-  {kVClimb_2w,     0,            kSTSclimb_2w,       false, DONT_CARE, 0},
-  {kVShout_2w,     0,            kSTNothing_2w,      false, DONT_CARE, 0},
-  {kVTalk_2w,      0,            kSTStalk_2w,        false, DONT_CARE, 0},
-  {kVSwitch_2w,    0,            kSTMorespecific_2w, false, DONT_CARE, 0},
-  {kVThrowit_2w,   0,            kSTNopurps_2w,      false, DONT_CARE, 0},
-  {kVAttack_2w,    0,            kSTSattack_2w,      false, DONT_CARE, 0},
-  {kVBreak_2w,     0,            kSTSbreak_2w,       false, DONT_CARE, 0},
-  {kVListen_2w,    0,            kSTQuiet_2w,        false, DONT_CARE, 0},
-  {kVSmell_2w,     0,            kSTAroma_2w,        false, DONT_CARE, 0},
-  {kVQuery_2w,     0,            kSTNoidea_2w,       false, DONT_CARE, 0},
-  {kVLook_2w,      kNSky_2w,        kSTFalling_2w,      false, DONT_CARE, 0},
-  {kVLook_2w,      kNWall_2w,       kSTDull_2w,         false, DONT_CARE, 0},
-  {kVLook_2w,      kNGround_2w,     kSTDull_2w,         false, DONT_CARE, 0},
-  {kVHelp_2w,      0,            kSTShelp_2w,        false, DONT_CARE, 0},
-  {kVMagic_2w,     0,            kSTSmagic_2w,       false, DONT_CARE, 0},
-  {kVWish_2w,      0,            kSTSmagic_2w,       false, DONT_CARE, 0},
-  {kVDig_2w,       0,            kSTSdig_2w,         false, DONT_CARE, 0},
-  {kVRude_2w,      0,            kSTSrude_2w,        false, DONT_CARE, 0},
-  {kVKnock_2w,     0,            kSTNoanswer_2w,     false, DONT_CARE, 0},
-  {kVOpen_2w,      kNDoor_2w,       kSTWontopen_2w,     false, DONT_CARE, 0},
-  {kVUnlock_2w,    kNDoor_2w,       kSTCantunlock_2w,   false, DONT_CARE, 0},
-  {kVLook_2w,      kNDoor_2w,       kSTDull_2w,         false, DONT_CARE, 0},
-  {kVLook_2w,      kNLight_2w,      kSTDull_2w,         false, DONT_CARE, 0},
-  {kVHello_2w,     0,            kSTHi_2w,           false, DONT_CARE, 0},
-  {kVLook_2w,      kNFence_2w,      kSTLookover_2w,     false, DONT_CARE, 0},
-  {kVLook_2w,      kNWall_2w,       kSTLookover_2w,     false, DONT_CARE, 0},
-  {kVLook_2w,      kNGardenbits_2w, kSTDull_2w,         false, DONT_CARE, 0},
-  {kVGive_2w,      0,            kSTNothanks_2w,     false, DONT_CARE, 0},
-  {kVLook_2w,      kNTree_2w,       kSTDull2_2w,        false, DONT_CARE, 0},
-  {kVFire_2w,      0,            kSTFire2_2w,        false, DONT_CARE, 0},
-  {kVShout_2w,     0,            kSTNoanswer_2w,     false, DONT_CARE, 0},
-  {kVHerring_2w,   0,            kSTSherring_2w,     false, DONT_CARE, 0},
-  {kVUndress_2w,   0,            kSTSundress_2w,     false, DONT_CARE, 0},
-  {kVSit_2w,       0,            kSTStired_2w,       false, DONT_CARE, 0},
-  {kVFeed_2w,      0,            kSTNothanks_2w,     false, DONT_CARE, 0},
-  {kVRub_2w,       kNCatnip_2w,     kSTRubcatnip1_2w,   false, DONT_CARE, 0},
-  {kVMakeUseOf_2w, kNScrew_2w,      kSTLookScrew_2w,    false, DONT_CARE, 0},
-  {0,           0,            0,               false, 0,         0}
+	{kVTake_2w,      kNPicture_2w,    kSTNopurps_2w,      false, DONT_CARE, 0},
+	{kVLook_2w,      kNPenny_2w,      kSTLookpen_2w,      false, DONT_CARE, 0},
+	{kVKiss_2w,      kNPenny_2w,      kSTMmmm_2w,         false, DONT_CARE, 0},
+	{kVRude_2w,      kNPenny_2w,      kSTHeadache_2w,     false, DONT_CARE, 0},
+	{kVLook_2w,      kNStairs_2w,     kSTDull_2w,         false, DONT_CARE, 0},
+	{kVUnder_2w,     kNStairs_2w,     kSTDull_2w,         false, DONT_CARE, 0},
+	{kVLook_2w,      kNPlant_2w,      kSTSplant_2w,       false, DONT_CARE, 0},
+	{kVLook_2w,      kNWindow_2w,     kSTS6garden_2w,     false, DONT_CARE, 0},
+	{kVLook_2w,      kNPicture_2w,    kSTSpicture_2w,     false, DONT_CARE, 0},
+	{kVLook_2w,      kNMirror_2w,     kSTDull_2w,         false, DONT_CARE, 0},
+	{kVLook_2w,      kNTable_2w,      kSTNo_on_2w,        false, DONT_CARE, 0},
+	{kVJump_2w,      0,            kSTSjump_2w,        false, DONT_CARE, 0},
+	{kVGo_2w,        0,            kSTTrywalk_2w,      false, DONT_CARE, 0},
+	{kVInto_2w,      0,            kSTTrywalk_2w,      false, DONT_CARE, 0},
+	{kVClimb_2w,     0,            kSTSclimb_2w,       false, DONT_CARE, 0},
+	{kVShout_2w,     0,            kSTNothing_2w,      false, DONT_CARE, 0},
+	{kVTalk_2w,      0,            kSTStalk_2w,        false, DONT_CARE, 0},
+	{kVSwitch_2w,    0,            kSTMorespecific_2w, false, DONT_CARE, 0},
+	{kVThrowit_2w,   0,            kSTNopurps_2w,      false, DONT_CARE, 0},
+	{kVAttack_2w,    0,            kSTSattack_2w,      false, DONT_CARE, 0},
+	{kVBreak_2w,     0,            kSTSbreak_2w,       false, DONT_CARE, 0},
+	{kVListen_2w,    0,            kSTQuiet_2w,        false, DONT_CARE, 0},
+	{kVSmell_2w,     0,            kSTAroma_2w,        false, DONT_CARE, 0},
+	{kVQuery_2w,     0,            kSTNoidea_2w,       false, DONT_CARE, 0},
+	{kVLook_2w,      kNSky_2w,        kSTFalling_2w,      false, DONT_CARE, 0},
+	{kVLook_2w,      kNWall_2w,       kSTDull_2w,         false, DONT_CARE, 0},
+	{kVLook_2w,      kNGround_2w,     kSTDull_2w,         false, DONT_CARE, 0},
+	{kVHelp_2w,      0,            kSTShelp_2w,        false, DONT_CARE, 0},
+	{kVMagic_2w,     0,            kSTSmagic_2w,       false, DONT_CARE, 0},
+	{kVWish_2w,      0,            kSTSmagic_2w,       false, DONT_CARE, 0},
+	{kVDig_2w,       0,            kSTSdig_2w,         false, DONT_CARE, 0},
+	{kVRude_2w,      0,            kSTSrude_2w,        false, DONT_CARE, 0},
+	{kVKnock_2w,     0,            kSTNoanswer_2w,     false, DONT_CARE, 0},
+	{kVOpen_2w,      kNDoor_2w,       kSTWontopen_2w,     false, DONT_CARE, 0},
+	{kVUnlock_2w,    kNDoor_2w,       kSTCantunlock_2w,   false, DONT_CARE, 0},
+	{kVLook_2w,      kNDoor_2w,       kSTDull_2w,         false, DONT_CARE, 0},
+	{kVLook_2w,      kNLight_2w,      kSTDull_2w,         false, DONT_CARE, 0},
+	{kVHello_2w,     0,            kSTHi_2w,           false, DONT_CARE, 0},
+	{kVLook_2w,      kNFence_2w,      kSTLookover_2w,     false, DONT_CARE, 0},
+	{kVLook_2w,      kNWall_2w,       kSTLookover_2w,     false, DONT_CARE, 0},
+	{kVLook_2w,      kNGardenbits_2w, kSTDull_2w,         false, DONT_CARE, 0},
+	{kVGive_2w,      0,            kSTNothanks_2w,     false, DONT_CARE, 0},
+	{kVLook_2w,      kNTree_2w,       kSTDull2_2w,        false, DONT_CARE, 0},
+	{kVFire_2w,      0,            kSTFire2_2w,        false, DONT_CARE, 0},
+	{kVShout_2w,     0,            kSTNoanswer_2w,     false, DONT_CARE, 0},
+	{kVHerring_2w,   0,            kSTSherring_2w,     false, DONT_CARE, 0},
+	{kVUndress_2w,   0,            kSTSundress_2w,     false, DONT_CARE, 0},
+	{kVSit_2w,       0,            kSTStired_2w,       false, DONT_CARE, 0},
+	{kVFeed_2w,      0,            kSTNothanks_2w,     false, DONT_CARE, 0},
+	{kVRub_2w,       kNCatnip_2w,     kSTRubcatnip1_2w,   false, DONT_CARE, 0},
+	{kVMakeUseOf_2w, kNScrew_2w,      kSTLookScrew_2w,    false, DONT_CARE, 0},
+	{0,           0,            0,               false, 0,         0}
 };
 
 background_t screen0_desc_2w[] = {						// Outside house
-  {kVLook_2w, 0, kSTWelcome_2w, false, 0, 0},
-  {0,      0, 0,          false, 0, 0}
+	{kVLook_2w, 0, kSTWelcome_2w, false, 0, 0},
+	{0,      0, 0,          false, 0, 0}
 };
 
 background_t screen1_desc_2w[] = {						// Hall
-  {kVLook_2w,   0,       kSTLookhall_2w,  true,  0, 0},
-  {kVLook_2w,   kNMaid_2w,  kSTTmaid_2w,     false, 0, 0},
-  {kVTalk_2w,   kNMaid_2w,  kSTChatmaid1_2w, false, 0, 0},
-  {kVTalk_2w,   kNPenny_2w, kSTChatmaid2_2w, false, 0, 0},
-  {kVKiss_2w,   kNMaid_2w,  kSTChatmaid3_2w, false, 0, 0},
-  {kVRude_2w,   kNMaid_2w,  kSTRudemaid_2w,  false, 0, 0},
-  {kVOpen_2w,   kNDoor_2w,  kSTTmaiddoor_2w, false, 0, 0},
-  {kVUnlock_2w, kNDoor_2w,  kSTTmaiddoor_2w, false, 0, 0},
-  {kVLook_2w,   kNDoor_2w,  kSTSdoor_2w,     false, 0, 0},
-  {0,        0,       0,            false, 0, 0}
+	{kVLook_2w,   0,       kSTLookhall_2w,  true,  0, 0},
+	{kVLook_2w,   kNMaid_2w,  kSTTmaid_2w,     false, 0, 0},
+	{kVTalk_2w,   kNMaid_2w,  kSTChatmaid1_2w, false, 0, 0},
+	{kVTalk_2w,   kNPenny_2w, kSTChatmaid2_2w, false, 0, 0},
+	{kVKiss_2w,   kNMaid_2w,  kSTChatmaid3_2w, false, 0, 0},
+	{kVRude_2w,   kNMaid_2w,  kSTRudemaid_2w,  false, 0, 0},
+	{kVOpen_2w,   kNDoor_2w,  kSTTmaiddoor_2w, false, 0, 0},
+	{kVUnlock_2w, kNDoor_2w,  kSTTmaiddoor_2w, false, 0, 0},
+	{kVLook_2w,   kNDoor_2w,  kSTSdoor_2w,     false, 0, 0},
+	{0,        0,       0,            false, 0, 0}
 };
 
 background_t screen2_desc_2w[] = { 					// Bed1
-  {kVLook_2w,  0,          kSTLookbed1_2w, true,  DONT_CARE, 0},
-  {kVLook_2w,  kNBed_2w,      kSTLookbed_2w,  false, DONT_CARE, 0},
-  {kVInto_2w,  kNBed_2w,      kSTS2bed_2w,    false, 0,         0},
-  {kVRide_2w,  kNBed_2w,      kSTS2bed_2w,    false, 0,         0},
-  {kVRest_2w,  kNBed_2w,      kSTS2bed_2w,    false, 0,         0},
-  {kVRide_2w,  kNPenny_2w,    kSTS2bed_2w,    false, 0,         0},
-  {kVTalk_2w,  kNPenny_2w,    kSTZzzz_2w,     false, 0,         0},
-  {kVLook_2w,  kNPennylie_2w, kSTZzzz_2w,     false, 0,         0},
-  {kVTalk_2w,  kNPennylie_2w, kSTS2bed_2w,    false, 0,         0},
-  {kVInto_2w,  kNBed_2w,      kSTNopurps_2w,  false, 1,         0},
-  {kVRide_2w,  kNBed_2w,      kSTNopurps_2w,  false, 1,         0},
-  {kVRest_2w,  kNBed_2w,      kSTNopurps_2w,  false, 1,         0},
-  {kVUnder_2w, kNBed_2w,      kSTSsearch_2w,  false, DONT_CARE, 0},
-  {kVRead_2w,  kNBook_2w,     kSTNocarry_2w,  false, DONT_CARE, 0},
-  {0,       0,          0,           false, 0,         0}
+	{kVLook_2w,  0,          kSTLookbed1_2w, true,  DONT_CARE, 0},
+	{kVLook_2w,  kNBed_2w,      kSTLookbed_2w,  false, DONT_CARE, 0},
+	{kVInto_2w,  kNBed_2w,      kSTS2bed_2w,    false, 0,         0},
+	{kVRide_2w,  kNBed_2w,      kSTS2bed_2w,    false, 0,         0},
+	{kVRest_2w,  kNBed_2w,      kSTS2bed_2w,    false, 0,         0},
+	{kVRide_2w,  kNPenny_2w,    kSTS2bed_2w,    false, 0,         0},
+	{kVTalk_2w,  kNPenny_2w,    kSTZzzz_2w,     false, 0,         0},
+	{kVLook_2w,  kNPennylie_2w, kSTZzzz_2w,     false, 0,         0},
+	{kVTalk_2w,  kNPennylie_2w, kSTS2bed_2w,    false, 0,         0},
+	{kVInto_2w,  kNBed_2w,      kSTNopurps_2w,  false, 1,         0},
+	{kVRide_2w,  kNBed_2w,      kSTNopurps_2w,  false, 1,         0},
+	{kVRest_2w,  kNBed_2w,      kSTNopurps_2w,  false, 1,         0},
+	{kVUnder_2w, kNBed_2w,      kSTSsearch_2w,  false, DONT_CARE, 0},
+	{kVRead_2w,  kNBook_2w,     kSTNocarry_2w,  false, DONT_CARE, 0},
+	{0,       0,          0,           false, 0,         0}
 };
 
 background_t screen3_desc_2w[] = {						// Bed2
-  {kVLook_2w,  0,         kSTLookbed2_2w,   true , 0, 0},
-  {kVLook_2w,  kNBird_2w,    kSTParrot_2w,     false, 0, 0},
-  {kVLook_2w,  kNPenny_2w,   kSTLookpen_2w,    false, 0, 0}, // since following cage has synonym "pen"
-  {kVLook_2w,  kNCage_2w,    kSTDull_2w,       false, 0, 0},
-  {kVLook_2w,  kNPencil_2w,  kSTDull_2w,       false, 0, 0},
-  {kVLook_2w,  kNPhone_2w,   kSTDull_2w,       false, 0, 0},
-  {kVLook_2w,  kNPaper_2w,   kSTBlotter_2w,    false, 0, 0},
-  {kVRead_2w,  kNPaper_2w,   kSTBlotter_2w,    false, 0, 0},
-  {kVTake_2w,  kNBlotpad_2w, kSTNouse_2w,      false, 0, 0},
-  {kVLook_2w,  kNChair_2w,   kSTDull_2w,       false, 0, 0},
-  {kVTake_2w,  kNPencil_2w,  kSTNouse_2w,      false, 0, 0},
-  {kVTake_2w,  kNPaper_2w,   kSTNouse_2w,      false, 0, 0},
-  {kVLook_2w,  kNKeyhole_2w, kSTKeyhole2_2w,   false, 0, 0},
-  {kVOpen_2w,  kNKeyhole_2w, kSTKeyhole3_2w,   false, 0, 0},
-  {kVLook_2w,  kNWall_2w,    kSTDumbwaiter_2w, false, 0, 0},
-  {kVLook_2w,  kNButton_2w,  kSTSbutton_2w,    false, 0, 0},
-  {kVPush_2w,  kNButton_2w,  kSTS3dumb_2w,     false, 0, 0},
-  {kVPush_2w,  kNSwitch_2w,  kSTS3dumb_2w,     false, 0, 0},
-  {kVDial_2w,  0,         kSTS3phone_2w,    false, 0, 4},
-  {kVTake_2w,  kNPhone_2w,   kSTS3phone_2w,    false, 0, 4},
-  {kVUse_2w,   kNPhone_2w,   kSTS3phone_2w,    false, 0, 4},
-  {kVLift_2w,  kNPhone_2w,   kSTS3phone_2w,    false, 0, 4},
-  {kVTalk_2w,  kNBird_2w,    kSTS3bird_2w,     false, 0, 5},
-  {kVInto_2w,  0,         kSTSinto_2w,      true,  0, 0},
-  {kVUnder_2w, kNCupb_2w,    kSTSsearch_2w,    false, 0, 0},
-  {kVFeed_2w,  kNBird_2w,    kSTBirdfull_2w,   false, 0, 0},
-  {0,       0,         0,             false, 0, 0}
+	{kVLook_2w,  0,         kSTLookbed2_2w,   true , 0, 0},
+	{kVLook_2w,  kNBird_2w,    kSTParrot_2w,     false, 0, 0},
+	{kVLook_2w,  kNPenny_2w,   kSTLookpen_2w,    false, 0, 0}, // since following cage has synonym "pen"
+	{kVLook_2w,  kNCage_2w,    kSTDull_2w,       false, 0, 0},
+	{kVLook_2w,  kNPencil_2w,  kSTDull_2w,       false, 0, 0},
+	{kVLook_2w,  kNPhone_2w,   kSTDull_2w,       false, 0, 0},
+	{kVLook_2w,  kNPaper_2w,   kSTBlotter_2w,    false, 0, 0},
+	{kVRead_2w,  kNPaper_2w,   kSTBlotter_2w,    false, 0, 0},
+	{kVTake_2w,  kNBlotpad_2w, kSTNouse_2w,      false, 0, 0},
+	{kVLook_2w,  kNChair_2w,   kSTDull_2w,       false, 0, 0},
+	{kVTake_2w,  kNPencil_2w,  kSTNouse_2w,      false, 0, 0},
+	{kVTake_2w,  kNPaper_2w,   kSTNouse_2w,      false, 0, 0},
+	{kVLook_2w,  kNKeyhole_2w, kSTKeyhole2_2w,   false, 0, 0},
+	{kVOpen_2w,  kNKeyhole_2w, kSTKeyhole3_2w,   false, 0, 0},
+	{kVLook_2w,  kNWall_2w,    kSTDumbwaiter_2w, false, 0, 0},
+	{kVLook_2w,  kNButton_2w,  kSTSbutton_2w,    false, 0, 0},
+	{kVPush_2w,  kNButton_2w,  kSTS3dumb_2w,     false, 0, 0},
+	{kVPush_2w,  kNSwitch_2w,  kSTS3dumb_2w,     false, 0, 0},
+	{kVDial_2w,  0,         kSTS3phone_2w,    false, 0, 4},
+	{kVTake_2w,  kNPhone_2w,   kSTS3phone_2w,    false, 0, 4},
+	{kVUse_2w,   kNPhone_2w,   kSTS3phone_2w,    false, 0, 4},
+	{kVLift_2w,  kNPhone_2w,   kSTS3phone_2w,    false, 0, 4},
+	{kVTalk_2w,  kNBird_2w,    kSTS3bird_2w,     false, 0, 5},
+	{kVInto_2w,  0,         kSTSinto_2w,      true,  0, 0},
+	{kVUnder_2w, kNCupb_2w,    kSTSsearch_2w,    false, 0, 0},
+	{kVFeed_2w,  kNBird_2w,    kSTBirdfull_2w,   false, 0, 0},
+	{0,       0,         0,             false, 0, 0}
 };
 
 background_t screen4_desc_2w[] = {						// Keyhole
-  {kVLook_2w, 0, kSTLooklook_2w, true,  0, 0},
-  {0,      0, 0,           false, 0, 0}
+	{kVLook_2w, 0, kSTLooklook_2w, true,  0, 0},
+	{0,      0, 0,           false, 0, 0}
 };
 
 background_t screen5_desc_2w[] = {						// Bed3
-  {kVLook_2w,  0,        kSTLookbed3_2w,     true,  0, 0},
-  {kVLook_2w,  kNBlock_2w,  kSTLookblocks_2w,   false, 0, 0},
-  {kVPlay_2w,  kNBlock_2w,  kSTSblock_2w,       false, 0, 0},
-  {kVBlock_2w, 0,        kSTSblock_2w,       false, 0, 0},
-  {kVLook_2w,  kNCage_2w,   kSTLookplaypen_2w,  false, 0, 0},
-  {kVInto_2w,  kNCage_2w,   kSTStoobigtofit_2w, false, 0, 0},
-  {kVLook_2w,  kNWindow_2w, kSTS6garden_2w,     false, 0, 0},
-  {0,       0,        0,               false, 0, 0}
+	{kVLook_2w,  0,        kSTLookbed3_2w,     true,  0, 0},
+	{kVLook_2w,  kNBlock_2w,  kSTLookblocks_2w,   false, 0, 0},
+	{kVPlay_2w,  kNBlock_2w,  kSTSblock_2w,       false, 0, 0},
+	{kVBlock_2w, 0,        kSTSblock_2w,       false, 0, 0},
+	{kVLook_2w,  kNCage_2w,   kSTLookplaypen_2w,  false, 0, 0},
+	{kVInto_2w,  kNCage_2w,   kSTStoobigtofit_2w, false, 0, 0},
+	{kVLook_2w,  kNWindow_2w, kSTS6garden_2w,     false, 0, 0},
+	{0,       0,        0,               false, 0, 0}
 };
 
 background_t screen6_desc_2w[] = {						// Kitchen
-  {kVLook_2w,   0,        kSTLookkitchen_2w,   true,  DONT_CARE, 0},
-  {kVLook_2w,   kNButton_2w, kSTSbutton_2w,       false, DONT_CARE, 0},
-  {kVPush_2w,   kNButton_2w, kSTS3dumb_2w,        false, DONT_CARE, 0},
-  {kVLook_2w,   kNWindow_2w, kSTS6garden_2w,      false, DONT_CARE, 0},
-  {kVLook_2w,   kNUnits_2w,  kSTS6dull_2w,        false, DONT_CARE, 0},
-  {kVOpen_2w,   kNUnits_2w,  kSTS6dull_2w,        false, DONT_CARE, 0},
-  {kVInto_2w,   0,        kSTSinto_2w,         true,  DONT_CARE, 0},
-  {kVOpen_2w,   kNDoor_2w,   kSTMorespecific_2w,  false, DONT_CARE, 0},
-  {kVLook_2w,   kNDoor_2w,   kSTMorespecific_2w,  false, DONT_CARE, 0},
-  {kVTalk_2w,   kNCook_2w,   kSTTalkcook_2w,      false, 1,         0},
-  {kVLook_2w,   kNCook_2w,   kSTLookcook_2w,      false, 1,         0},
-  {kVLook_2w,   kNKnife_2w,  kSTLookknife_2w,     false, 1,         0},
-  {kVTake_2w,   kNKnife_2w,  kSTTakeknife_2w,     false, 1,         0},
-  {kVListen_2w, 0,        kSTListenkitchen_2w, false, 1,         0},
-  {0,        0,        0,                false, 0,         0}
+	{kVLook_2w,   0,        kSTLookkitchen_2w,   true,  DONT_CARE, 0},
+	{kVLook_2w,   kNButton_2w, kSTSbutton_2w,       false, DONT_CARE, 0},
+	{kVPush_2w,   kNButton_2w, kSTS3dumb_2w,        false, DONT_CARE, 0},
+	{kVLook_2w,   kNWindow_2w, kSTS6garden_2w,      false, DONT_CARE, 0},
+	{kVLook_2w,   kNUnits_2w,  kSTS6dull_2w,        false, DONT_CARE, 0},
+	{kVOpen_2w,   kNUnits_2w,  kSTS6dull_2w,        false, DONT_CARE, 0},
+	{kVInto_2w,   0,        kSTSinto_2w,         true,  DONT_CARE, 0},
+	{kVOpen_2w,   kNDoor_2w,   kSTMorespecific_2w,  false, DONT_CARE, 0},
+	{kVLook_2w,   kNDoor_2w,   kSTMorespecific_2w,  false, DONT_CARE, 0},
+	{kVTalk_2w,   kNCook_2w,   kSTTalkcook_2w,      false, 1,         0},
+	{kVLook_2w,   kNCook_2w,   kSTLookcook_2w,      false, 1,         0},
+	{kVLook_2w,   kNKnife_2w,  kSTLookknife_2w,     false, 1,         0},
+	{kVTake_2w,   kNKnife_2w,  kSTTakeknife_2w,     false, 1,         0},
+	{kVListen_2w, 0,        kSTListenkitchen_2w, false, 1,         0},
+	{0,        0,        0,                false, 0,         0}
 };
 
 background_t screen7_desc_2w[] = {						// Backdoor
-  {kVLook_2w, 0,        kSTLookback_2w, true,  0, 0},
-  {kVLook_2w, kNWindow_2w, kSTLookwin_2w,  false, 0, 0},
-  {0,      0,        0,           false, 0, 0}
+	{kVLook_2w, 0,        kSTLookback_2w, true,  0, 0},
+	{kVLook_2w, kNWindow_2w, kSTLookwin_2w,  false, 0, 0},
+	{0,      0,        0,           false, 0, 0}
 };
 
 background_t screen8_desc_2w[] = {						// Shed
-  {kVLook_2w, 0,        kSTLookshed_2w,   true,  0, 0},
-  {kVLook_2w, kNWindow_2w, kSTLookwin_2w,    false, 0, 0},
-  {kVLook_2w, kNShed_2w,   kSTLookatshed_2w, false, 0, 0},
-  {0,      0,        0,             false, 0, 0}
+	{kVLook_2w, 0,        kSTLookshed_2w,   true,  0, 0},
+	{kVLook_2w, kNWindow_2w, kSTLookwin_2w,    false, 0, 0},
+	{kVLook_2w, kNShed_2w,   kSTLookatshed_2w, false, 0, 0},
+	{0,      0,        0,             false, 0, 0}
 };
 
 background_t screen9_desc_2w[] = {						// In shed
-  {kVLook_2w,  0,         kSTLookinshed_2w,  true,  0, 0},
-  {kVLook_2w,  kNWall_2w,    kSTS9tools1_2w,    false, 0, 0},
-  {kVLook_2w,  kNTools_2w,   kSTS9tools1_2w,    false, 0, 0},
-  {kVTake_2w,  kNTools_2w,   kSTS9tools2_2w,    false, 0, 0},
-  {kVLook_2w,  kNBroom_2w,   kSTDull_2w,        false, 0, 0},
-  {kVTake_2w,  kNBroom_2w,   kSTNouse_2w,       false, 0, 0},
-  {kVLook_2w,  kNTable_2w,   kSTSomebuttons_2w, false, 0, 0},
-  {kVKiss_2w,  kNGardner_2w, kSTMore_2w,        false, 0, 0},
-  {kVRude_2w,  kNGardner_2w, kSTRudeshed_2w,    false, 0, 0},
-  {kVTalk_2w,  kNGardner_2w, kSTIgnore_2w,      false, 0, 0},
-  {kVClose_2w, kNDoor_2w,    kSTShedclose_2w,   false, 0, 0},
-  {0,       0,         0,              false, 0, 0}
+	{kVLook_2w,  0,         kSTLookinshed_2w,  true,  0, 0},
+	{kVLook_2w,  kNWall_2w,    kSTS9tools1_2w,    false, 0, 0},
+	{kVLook_2w,  kNTools_2w,   kSTS9tools1_2w,    false, 0, 0},
+	{kVTake_2w,  kNTools_2w,   kSTS9tools2_2w,    false, 0, 0},
+	{kVLook_2w,  kNBroom_2w,   kSTDull_2w,        false, 0, 0},
+	{kVTake_2w,  kNBroom_2w,   kSTNouse_2w,       false, 0, 0},
+	{kVLook_2w,  kNTable_2w,   kSTSomebuttons_2w, false, 0, 0},
+	{kVKiss_2w,  kNGardner_2w, kSTMore_2w,        false, 0, 0},
+	{kVRude_2w,  kNGardner_2w, kSTRudeshed_2w,    false, 0, 0},
+	{kVTalk_2w,  kNGardner_2w, kSTIgnore_2w,      false, 0, 0},
+	{kVClose_2w, kNDoor_2w,    kSTShedclose_2w,   false, 0, 0},
+	{0,       0,         0,              false, 0, 0}
 };
 
 background_t screen10_desc_2w[] = {					// Venus fly traps
-  {kVLook_2w, 0,        kSTLookvenus_2w, true,  0, 0},
-  {kVTake_2w, kNMirror_2w, kSTNotmirror_2w, false, 0, 0},
-  {kVLook_2w, kNFly_2w,    kSTLookFly_2w,   false, 0, 0},
-  {kVLook_2w, kNLeaf_2w,   kSTLookTrap_2w,  false, 0, 0},
-  {0,      0,        0,            false, 0, 0}
+	{kVLook_2w, 0,        kSTLookvenus_2w, true,  0, 0},
+	{kVTake_2w, kNMirror_2w, kSTNotmirror_2w, false, 0, 0},
+	{kVLook_2w, kNFly_2w,    kSTLookFly_2w,   false, 0, 0},
+	{kVLook_2w, kNLeaf_2w,   kSTLookTrap_2w,  false, 0, 0},
+	{0,      0,        0,            false, 0, 0}
 };
 
 background_t screen11_desc_2w[] = {					// Gates open
-  {kVLook_2w,  0,      kSTS11look_2w, true,  0, 0},
-  {kVClose_2w, kNDoor_2w, kSTNopurps_2w, false, 0, 0},
-  {0,       0,      0,          false, 0, 0}
+	{kVLook_2w,  0,      kSTS11look_2w, true,  0, 0},
+	{kVClose_2w, kNDoor_2w, kSTNopurps_2w, false, 0, 0},
+	{0,       0,      0,          false, 0, 0}
 };
 
 background_t screen12_desc_2w[] = {					// Gates closed
-  {kVLook_2w,   0,      kSTS12look_2w, true,  0, 0},
-  {kVLook_2w,   kNDoor_2w, kSTGates1_2w,  false, 0, 0},
-  {kVOpen_2w,   kNDoor_2w, kSTGates1_2w,  false, 0, 0},
-  {kVBreak_2w,  kNDoor_2w, kSTGates2_2w,  false, 0, 0},
-  {kVAttack_2w, kNDoor_2w, kSTGates2_2w,  false, 0, 0},
-  {kVUnlock_2w, kNDoor_2w, kSTGates3_2w,  false, 0, 0},
-  {kVUnlock_2w, kNGate_2w, kSTGates3_2w,  false, 0, 0},
-  {0,        0,      0,          false, 0, 0}
+	{kVLook_2w,   0,      kSTS12look_2w, true,  0, 0},
+	{kVLook_2w,   kNDoor_2w, kSTGates1_2w,  false, 0, 0},
+	{kVOpen_2w,   kNDoor_2w, kSTGates1_2w,  false, 0, 0},
+	{kVBreak_2w,  kNDoor_2w, kSTGates2_2w,  false, 0, 0},
+	{kVAttack_2w, kNDoor_2w, kSTGates2_2w,  false, 0, 0},
+	{kVUnlock_2w, kNDoor_2w, kSTGates3_2w,  false, 0, 0},
+	{kVUnlock_2w, kNGate_2w, kSTGates3_2w,  false, 0, 0},
+	{0,        0,      0,          false, 0, 0}
 };
 
 background_t screen13_desc_2w[] = {					// Stream
-  {kVLook_2w,    0,         kSTS13look_2w,    true,  0, 0},
-  {kVLook_2w,    kNBridge_2w,  kSTNospecial_2w,  false, 0, 0},
-  {kVUnder_2w,   kNBridge_2w,  kSTSsearch_2w,    false, 0, 0},
-  {kVLook_2w,    kNWater_2w,   kSTDull_2w,       false, 0, 0},
-  {kVThrowit_2w, kNMatches_2w, kSTThrowmatch_2w, false, 0, 0},
-  {0,         0,         0,             false, 0, 0}
+	{kVLook_2w,    0,         kSTS13look_2w,    true,  0, 0},
+	{kVLook_2w,    kNBridge_2w,  kSTNospecial_2w,  false, 0, 0},
+	{kVUnder_2w,   kNBridge_2w,  kSTSsearch_2w,    false, 0, 0},
+	{kVLook_2w,    kNWater_2w,   kSTDull_2w,       false, 0, 0},
+	{kVThrowit_2w, kNMatches_2w, kSTThrowmatch_2w, false, 0, 0},
+	{0,         0,         0,             false, 0, 0}
 };
 
 background_t screen14_desc_2w[] = {					// Zapper
-  {kVLook_2w,   0,        kSTS14look_2w,  true,  0, 0},
-  {kVSwitch_2w, kNZapper_2w, kSTNoswitch_2w, false, 0, 0},
-  {kVWind_2w,   kNZapper_2w, kSTNoswitch_2w, false, 0, 0},
-  {0,        0,        0,           false, 0, 0}
+	{kVLook_2w,   0,        kSTS14look_2w,  true,  0, 0},
+	{kVSwitch_2w, kNZapper_2w, kSTNoswitch_2w, false, 0, 0},
+	{kVWind_2w,   kNZapper_2w, kSTNoswitch_2w, false, 0, 0},
+	{0,        0,        0,           false, 0, 0}
 };
 
 background_t screen15_desc_2w[] = {					// Mushroom
-  {kVLook_2w,   0,        kSTS15look_2w,  true,  0, 0},
-  {kVUse_2w,    kNOldman_2w, kSTS15wand2_2w, false, 0, 0},
-  {kVTalk_2w,   kNOldman_2w, kSTNoreply_2w,  false, 0, 0},
-  {kVLook_2w,   kNWand_2w,   kSTS15wand1_2w, false, 0, 0},
-  {kVTake_2w,   kNWand_2w,   kSTS15wand2_2w, false, 0, 0},
-  {kVSearch_2w, kNOldman_2w, kSTSsearch_2w,  false, 0, 0},
-  {0,        0,        0,           false, 0, 0}
+	{kVLook_2w,   0,        kSTS15look_2w,  true,  0, 0},
+	{kVUse_2w,    kNOldman_2w, kSTS15wand2_2w, false, 0, 0},
+	{kVTalk_2w,   kNOldman_2w, kSTNoreply_2w,  false, 0, 0},
+	{kVLook_2w,   kNWand_2w,   kSTS15wand1_2w, false, 0, 0},
+	{kVTake_2w,   kNWand_2w,   kSTS15wand2_2w, false, 0, 0},
+	{kVSearch_2w, kNOldman_2w, kSTSsearch_2w,  false, 0, 0},
+	{0,        0,        0,           false, 0, 0}
 };
 
 background_t screen16_desc_2w[] = {					// Well
-  {kVLook_2w,  0,        kSTS16look_2w,     true,  0, 0},
-  {kVClimb_2w, 0,        kSTTryrope_2w,     false, 0, 0},
-  {kVGo_2w,    kNWell_2w,   kSTTryrope_2w,     false, 0, 0},
-  {kVWind_2w,  kNRope_2w,   kSTWindwell_2w,    false, 0, 0},
-  {kVTie_2w,   kNRope_2w,   kSTNopurps_2w,     false, 0, 0},
-  {kVTake_2w,  kNBucket_2w, kSTNosee_2w,       false, 0, 0},
-  {kVLook_2w,  kNBucket_2w, kSTNosee_2w,       false, 0, 0},
-  {kVWind_2w,  kNBucket_2w, kSTWindwell_2w,    false, 0, 0},
-  {kVTake_2w,  kNWater_2w,  kSTNosee_2w,       false, 0, 0},
-  {kVWind_2w,  kNHandle_2w, kSTWindwell_2w,    false, 0, 0},
-  {kVInto_2w,  kNBucket_2w, kSTNosee_2w,       false, 0, 0},
-  {kVInto_2w,  kNWell_2w,   kSTIntowell_2w,    false, 0, 0},
-  {kVWish_2w,  0,        kSTGetonwithit_2w, false, 0, 0},
-  {0,       0,        0,              false, 0, 0}
+	{kVLook_2w,  0,        kSTS16look_2w,     true,  0, 0},
+	{kVClimb_2w, 0,        kSTTryrope_2w,     false, 0, 0},
+	{kVGo_2w,    kNWell_2w,   kSTTryrope_2w,     false, 0, 0},
+	{kVWind_2w,  kNRope_2w,   kSTWindwell_2w,    false, 0, 0},
+	{kVTie_2w,   kNRope_2w,   kSTNopurps_2w,     false, 0, 0},
+	{kVTake_2w,  kNBucket_2w, kSTNosee_2w,       false, 0, 0},
+	{kVLook_2w,  kNBucket_2w, kSTNosee_2w,       false, 0, 0},
+	{kVWind_2w,  kNBucket_2w, kSTWindwell_2w,    false, 0, 0},
+	{kVTake_2w,  kNWater_2w,  kSTNosee_2w,       false, 0, 0},
+	{kVWind_2w,  kNHandle_2w, kSTWindwell_2w,    false, 0, 0},
+	{kVInto_2w,  kNBucket_2w, kSTNosee_2w,       false, 0, 0},
+	{kVInto_2w,  kNWell_2w,   kSTIntowell_2w,    false, 0, 0},
+	{kVWish_2w,  0,        kSTGetonwithit_2w, false, 0, 0},
+	{0,       0,        0,              false, 0, 0}
 };
 
 background_t screen17_desc_2w[] = {					// Snakepit
-  {kVLook_2w,   0,       kSTS17look_2w, true,  0, 0},
-  {kVAttack_2w, kNSnake_2w, kSTS17kill_2w, false, 0, 0},
-  {kVBreak_2w,  kNSnake_2w, kSTS17kill_2w, false, 0, 0},
-  {0,        0,       0,          false, 0, 0}
+	{kVLook_2w,   0,       kSTS17look_2w, true,  0, 0},
+	{kVAttack_2w, kNSnake_2w, kSTS17kill_2w, false, 0, 0},
+	{kVBreak_2w,  kNSnake_2w, kSTS17kill_2w, false, 0, 0},
+	{0,        0,       0,          false, 0, 0}
 };
 
 background_t screen18_desc_2w[] = {					// Phonebox
-  {kVLook_2w, 0,       kSTS18look_2w, true,  0, 0},
-  {kVLook_2w, kNPhone_2w, kSTS18look_2w, false, 0, 0},
-  {0,      0,       0,          false, 0, 0}
+	{kVLook_2w, 0,       kSTS18look_2w, true,  0, 0},
+	{kVLook_2w, kNPhone_2w, kSTS18look_2w, false, 0, 0},
+	{0,      0,       0,          false, 0, 0}
 };
 
 background_t screen19_desc_2w[] = {					// Street
-  {kVLook_2w, 0,      kSTS19look_2w, true,  0, 0},
-  {kVLook_2w, kNWall_2w, kSTSgraf_2w,   false, 0, 0},
-  {kVRead_2w, kNWall_2w, kSTSgraf_2w,   false, 0, 0},
-  {kVLook_2w, kNGraf_2w, kSTSgraf_2w,   false, 0, 0},
-  {kVRead_2w, kNGraf_2w, kSTSgraf_2w,   false, 0, 0},
-  {0,      0,      0,          false, 0, 0}
+	{kVLook_2w, 0,      kSTS19look_2w, true,  0, 0},
+	{kVLook_2w, kNWall_2w, kSTSgraf_2w,   false, 0, 0},
+	{kVRead_2w, kNWall_2w, kSTSgraf_2w,   false, 0, 0},
+	{kVLook_2w, kNGraf_2w, kSTSgraf_2w,   false, 0, 0},
+	{kVRead_2w, kNGraf_2w, kSTSgraf_2w,   false, 0, 0},
+	{0,      0,      0,          false, 0, 0}
 };
 
 background_t screen20_desc_2w[] = {					// Kennel
-  {kVLook_2w,    0,        kSTS20look_2w,      true,  0, 0},
-  {kVLook_2w,    kNWindow_2w, kSTMorespecific_2w, false, 0, 0},
-  {kVThrowit_2w, kNStick_2w,  kSTDonthaveone_2w,  false, 0, 0},
-  {kVStroke_2w,  kNDog_2w,    kSTStrokedog_2w,    false, 0, 0},
-  {kVTalk_2w,    kNDog_2w,    kSTStrokedog_2w,    false, 0, 0},
-  {kVInto_2w,    0,        kSTStoobigtofit_2w, false, 0, 0},
-  {kVTake_2w,    kNStick_2w,  kSTThrown_2w,       false, 0, 0},
-  {0,         0,        0,               false, 0, 0}
+	{kVLook_2w,    0,        kSTS20look_2w,      true,  0, 0},
+	{kVLook_2w,    kNWindow_2w, kSTMorespecific_2w, false, 0, 0},
+	{kVThrowit_2w, kNStick_2w,  kSTDonthaveone_2w,  false, 0, 0},
+	{kVStroke_2w,  kNDog_2w,    kSTStrokedog_2w,    false, 0, 0},
+	{kVTalk_2w,    kNDog_2w,    kSTStrokedog_2w,    false, 0, 0},
+	{kVInto_2w,    0,        kSTStoobigtofit_2w, false, 0, 0},
+	{kVTake_2w,    kNStick_2w,  kSTThrown_2w,       false, 0, 0},
+	{0,         0,        0,               false, 0, 0}
 };
 
 background_t screen21_desc_2w[] = {					// Rockroom
-  {kVLook_2w,  0,      kSTS21look_2w,   true,  0, 0},
-  {kVClimb_2w, kNRope_2w, kSTNotclose_2w,  false, 0, 0},
-  {kVMove_2w,  kNRock_2w, kSTTooheavy_2w,  false, 0, 0},
-  {kVUnder_2w, kNRock_2w, kSTNounder_2w,   false, 0, 0},
-  {kVLift_2w,  kNRock_2w, kSTNowayhose_2w, false, 0, 0},
-  {kVLook_2w,  kNRock_2w, kSTDull_2w,      false, 0, 0},
-  {kVTake_2w,  kNRock_2w, kSTNowayhose_2w, false, 0, 0},
-  {0,       0,      0,            false, 0, 0}
+	{kVLook_2w,  0,      kSTS21look_2w,   true,  0, 0},
+	{kVClimb_2w, kNRope_2w, kSTNotclose_2w,  false, 0, 0},
+	{kVMove_2w,  kNRock_2w, kSTTooheavy_2w,  false, 0, 0},
+	{kVUnder_2w, kNRock_2w, kSTNounder_2w,   false, 0, 0},
+	{kVLift_2w,  kNRock_2w, kSTNowayhose_2w, false, 0, 0},
+	{kVLook_2w,  kNRock_2w, kSTDull_2w,      false, 0, 0},
+	{kVTake_2w,  kNRock_2w, kSTNowayhose_2w, false, 0, 0},
+	{0,       0,      0,            false, 0, 0}
 };
 
 background_t screen22_desc_2w[] = {					// Rockgone
-  {kVLook_2w,  0,      kSTS22look_2w,  true,  0, 0},
-  {kVClimb_2w, kNRope_2w, kSTNotclose_2w, false, 0, 0},
-  {kVLift_2w,  kNRock_2w, kSTNopurps_2w,  false, 0, 0},
-  {kVLook_2w,  kNRock_2w, kSTDull_2w,     false, 0, 0},
-  {kVTake_2w,  kNRock_2w, kSTNopurps_2w,  false, 0, 0},
-  {kVUnder_2w, kNRock_2w, kSTSsearch_2w,  false, 0, 0},
-  {0,       0,      0,           false, 0, 0}
+	{kVLook_2w,  0,      kSTS22look_2w,  true,  0, 0},
+	{kVClimb_2w, kNRope_2w, kSTNotclose_2w, false, 0, 0},
+	{kVLift_2w,  kNRock_2w, kSTNopurps_2w,  false, 0, 0},
+	{kVLook_2w,  kNRock_2w, kSTDull_2w,     false, 0, 0},
+	{kVTake_2w,  kNRock_2w, kSTNopurps_2w,  false, 0, 0},
+	{kVUnder_2w, kNRock_2w, kSTSsearch_2w,  false, 0, 0},
+	{0,       0,      0,           false, 0, 0}
 };
 
 background_t screen23_desc_2w[] = {					// Threeway
-  {kVLook_2w,  0,      kSTS23look_2w, true,  0, 0},
-  {kVLift_2w,  kNRock_2w, kSTNopurps_2w, false, 0, 0},
-  {kVLook_2w,  kNRock_2w, kSTDull_2w,    false, 0, 0},
-  {kVUnder_2w, kNRock_2w, kSTDull2_2w,   false, 0, 0},
-  {kVTake_2w,  kNRock_2w, kSTNopurps_2w, false, 0, 0},
-  {0,       0,      0,          false, 0, 0}
+	{kVLook_2w,  0,      kSTS23look_2w, true,  0, 0},
+	{kVLift_2w,  kNRock_2w, kSTNopurps_2w, false, 0, 0},
+	{kVLook_2w,  kNRock_2w, kSTDull_2w,    false, 0, 0},
+	{kVUnder_2w, kNRock_2w, kSTDull2_2w,   false, 0, 0},
+	{kVTake_2w,  kNRock_2w, kSTNopurps_2w, false, 0, 0},
+	{0,       0,      0,          false, 0, 0}
 };
 
 background_t screen24_desc_2w[] = {					// Lampcave
-  {kVLook_2w,  0,      kSTS24look_2w,   true,  0, 0},
-  {kVLift_2w,  kNRock_2w, kSTSsearch_2w,   false, 0, 0},
-  {kVLook_2w,  kNRock_2w, kSTNospecial_2w, false, 0, 0},
-  {kVUnder_2w, kNRock_2w, kSTDull2_2w,     false, 0, 0},
-  {kVTake_2w,  kNRock_2w, kSTNopurps_2w,   false, 0, 0},
-  {0,       0,      0,            false, 0, 0}
+	{kVLook_2w,  0,      kSTS24look_2w,   true,  0, 0},
+	{kVLift_2w,  kNRock_2w, kSTSsearch_2w,   false, 0, 0},
+	{kVLook_2w,  kNRock_2w, kSTNospecial_2w, false, 0, 0},
+	{kVUnder_2w, kNRock_2w, kSTDull2_2w,     false, 0, 0},
+	{kVTake_2w,  kNRock_2w, kSTNopurps_2w,   false, 0, 0},
+	{0,       0,      0,            false, 0, 0}
 };
 
 background_t screen25_desc_2w[] = {					// Chasm
-  {kVLook_2w,  0,      kSTS25look_2w, true,  0, 0},
-  {kVUnder_2w, kNRock_2w, kSTSsearch_2w, false, 0, 0},
-  {kVLift_2w,  kNRock_2w, kSTSsearch_2w, false, 0, 0},
-  {kVLook_2w,  kNRock_2w, kSTDull_2w,    false, 0, 0},
-  {kVTake_2w,  kNRock_2w, kSTNopurps_2w, false, 0, 0},
-  {kVJump_2w,  0,      kSTSnojump_2w, false, 0, 0},
-  {0,       0,      0,          false, 0, 0}
+	{kVLook_2w,  0,      kSTS25look_2w, true,  0, 0},
+	{kVUnder_2w, kNRock_2w, kSTSsearch_2w, false, 0, 0},
+	{kVLift_2w,  kNRock_2w, kSTSsearch_2w, false, 0, 0},
+	{kVLook_2w,  kNRock_2w, kSTDull_2w,    false, 0, 0},
+	{kVTake_2w,  kNRock_2w, kSTNopurps_2w, false, 0, 0},
+	{kVJump_2w,  0,      kSTSnojump_2w, false, 0, 0},
+	{0,       0,      0,          false, 0, 0}
 };
 
 background_t screen26_desc_2w[] = {					// Passage
-  {kVLook_2w,  0,      kSTS26look_2w, true,  0, 0},
-  {kVUnder_2w, kNRock_2w, kSTSsearch_2w, false, 0, 0},
-  {kVLift_2w,  kNRock_2w, kSTSsearch_2w, false, 0, 0},
-  {kVLook_2w,  kNRock_2w, kSTDull_2w,    false, 0, 0},
-  {kVTake_2w,  kNRock_2w, kSTNopurps_2w, false, 0, 0},
-  {0,       0,      0,          false, 0, 0}
+	{kVLook_2w,  0,      kSTS26look_2w, true,  0, 0},
+	{kVUnder_2w, kNRock_2w, kSTSsearch_2w, false, 0, 0},
+	{kVLift_2w,  kNRock_2w, kSTSsearch_2w, false, 0, 0},
+	{kVLook_2w,  kNRock_2w, kSTDull_2w,    false, 0, 0},
+	{kVTake_2w,  kNRock_2w, kSTNopurps_2w, false, 0, 0},
+	{0,       0,      0,          false, 0, 0}
 };
 
 background_t screen27_desc_2w[] = {					// genie
-  {kVLook_2w,    0,        kSTS27look_2w,   true,  0, 0},
-  {kVUnder_2w,   kNRock_2w,   kSTSsearch_2w,   false, 0, 0},
-  {kVLift_2w,    kNRock_2w,   kSTSsearch_2w,   false, 0, 0},
-  {kVLook_2w,    kNRock_2w,   kSTDull_2w,      false, 0, 0},
-  {kVLook_2w,    kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
-  {kVOpen_2w,    kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
-  {kVUnscrew_2w, kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
-  {kVUnlock_2w,  kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
-  {kVPush_2w,    kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
-  {kVTalk_2w,    kNGenie_2w,  kSTTalkgenie_2w, false, 0, 0},
-  {kVRude_2w,    kNGenie_2w,  kSTRudeshed_2w,  false, 0, 0},
-  {kVKiss_2w,    kNGenie_2w,  kSTRudeshed_2w,  false, 0, 0},
-  {kVGive_2w,    kNBanana_2w, kSTNobanana_2w,  false, 0, 0},
-  {kVClimb_2w,   kNStairs_2w, kSTTrywalk_2w,   false, 0, 0},
-  {0,         0,        0,            false, 0, 0}
+	{kVLook_2w,    0,        kSTS27look_2w,   true,  0, 0},
+	{kVUnder_2w,   kNRock_2w,   kSTSsearch_2w,   false, 0, 0},
+	{kVLift_2w,    kNRock_2w,   kSTSsearch_2w,   false, 0, 0},
+	{kVLook_2w,    kNRock_2w,   kSTDull_2w,      false, 0, 0},
+	{kVLook_2w,    kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
+	{kVOpen_2w,    kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
+	{kVUnscrew_2w, kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
+	{kVUnlock_2w,  kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
+	{kVPush_2w,    kNTrap_2w,   kSTBudge_2w,     false, 0, 0},
+	{kVTalk_2w,    kNGenie_2w,  kSTTalkgenie_2w, false, 0, 0},
+	{kVRude_2w,    kNGenie_2w,  kSTRudeshed_2w,  false, 0, 0},
+	{kVKiss_2w,    kNGenie_2w,  kSTRudeshed_2w,  false, 0, 0},
+	{kVGive_2w,    kNBanana_2w, kSTNobanana_2w,  false, 0, 0},
+	{kVClimb_2w,   kNStairs_2w, kSTTrywalk_2w,   false, 0, 0},
+	{0,         0,        0,            false, 0, 0}
 };
 
 background_t screen28_desc_2w[] = {					// traproom
-  {kVLook_2w,    0,           kSTS28look_2w,      true,  0, 0},
-  {kVBreak_2w,   kNSafe_2w,      kSTNowayhose_2w,    false, 0, 0},
-  {kVLook_2w,    kNHole_2w,      kSTS28hole_2w,      false, 0, 28},
-  {kVTake_2w,    kNMouse_2w,     kSTS28mouse_2w,     false, 0, 0},
-  {kVTake_2w,    kNMousehole_2w, kSTS28mouse_2w,     false, 0, 0},
-  {kVTake_2w,    kNDroppings_2w, kSTSdroppings_2w,   false, 0, 0},
-  {kVUnscrew_2w, kNSafe_2w,      kSTMorespecific_2w, false, 0, 0},
-  {kVOpen_2w,    0,           kSTUnlocksafe_2w,   false, 0, 0},
-  {kVUnlock_2w,  kNSafe_2w,      kSTUnlocksafe_2w,   false, 0, 0},
-  {0,         0,           0,               false, 0, 0}
+	{kVLook_2w,    0,           kSTS28look_2w,      true,  0, 0},
+	{kVBreak_2w,   kNSafe_2w,      kSTNowayhose_2w,    false, 0, 0},
+	{kVLook_2w,    kNHole_2w,      kSTS28hole_2w,      false, 0, 28},
+	{kVTake_2w,    kNMouse_2w,     kSTS28mouse_2w,     false, 0, 0},
+	{kVTake_2w,    kNMousehole_2w, kSTS28mouse_2w,     false, 0, 0},
+	{kVTake_2w,    kNDroppings_2w, kSTSdroppings_2w,   false, 0, 0},
+	{kVUnscrew_2w, kNSafe_2w,      kSTMorespecific_2w, false, 0, 0},
+	{kVOpen_2w,    0,           kSTUnlocksafe_2w,   false, 0, 0},
+	{kVUnlock_2w,  kNSafe_2w,      kSTUnlocksafe_2w,   false, 0, 0},
+	{0,         0,           0,               false, 0, 0}
 };
 
 background_t screen29_desc_2w[] = {					// Hall 2
-  {kVLook_2w, 0, kSTLookhall_2w, true,  0, 0},
-  {0,      0, 0,           false, 0, 0}
+	{kVLook_2w, 0, kSTLookhall_2w, true,  0, 0},
+	{0,      0, 0,           false, 0, 0}
 };
 
 background_t screen30_desc_2w[] = {					// Lounge
-  {kVLook_2w, 0,        kSTS30look_2w,  true,  0, 0},
-  {kVLook_2w, kNWindow_2w, kSTS6garden_2w, false, 0, 0},
-  {0,      0,        0,           false, 0, 0}
+	{kVLook_2w, 0,        kSTS30look_2w,  true,  0, 0},
+	{kVLook_2w, kNWindow_2w, kSTS6garden_2w, false, 0, 0},
+	{0,      0,        0,           false, 0, 0}
 };
 
 background_t screen31_desc_2w[] = {					// parlor
-  {kVLook_2w,   0,      kSTS31look_2w,      true,  0, 0},
-  {kVListen_2w, 0,      kSTBlah_2w,         false, 0, 0},
-  {kVOpen_2w,   kNDoor_2w, kSTMorespecific_2w, false, 0, 0},
-  {kVLook_2w,   kNDoor_2w, kSTMorespecific_2w, false, 0, 0},
-  {kVLook_2w,   kNMaid_2w, kSTLookPMaid_2w,    false, 0, 0},
-  {kVTalk_2w,   kNMaid_2w, kSTTalkPMaid_2w,    false, 0, 0},
-  {0,        0,      0,               false, 0, 0}
+	{kVLook_2w,   0,      kSTS31look_2w,      true,  0, 0},
+	{kVListen_2w, 0,      kSTBlah_2w,         false, 0, 0},
+	{kVOpen_2w,   kNDoor_2w, kSTMorespecific_2w, false, 0, 0},
+	{kVLook_2w,   kNDoor_2w, kSTMorespecific_2w, false, 0, 0},
+	{kVLook_2w,   kNMaid_2w, kSTLookPMaid_2w,    false, 0, 0},
+	{kVTalk_2w,   kNMaid_2w, kSTTalkPMaid_2w,    false, 0, 0},
+	{0,        0,      0,               false, 0, 0}
 };
 
 background_t screen32_desc_2w[] = {					// catroom
-  {kVLook_2w,   0,        kSTS32look_2w,    true,  0, 0},
-  {kVStroke_2w, kNCat_2w,    kSTSstrokecat_2w, false, 0, 0},
-  {kVPlay_2w,   kNCat_2w,    kSTSplaycat_2w,   false, 0, 0},
-  {kVTalk_2w,   kNCat_2w,    kSTStalkcat_2w,   false, 0, 0},
-  {kVLook_2w,   kNPost_2w,   kSTSlookpost_2w,  false, 0, 0},
-  {kVGive_2w,   0,        kSTSgivecat_2w,   false, 0, 0},
-  {kVLook_2w,   kNWindow_2w, kSTS6garden_2w,   false, 0, 0},
-  {kVRub_2w,    kNCatnip_2w, kSTRubcatnip2_2w, false, 0, 0},
-  {0,        0,        0,             false, 0, 0}
+	{kVLook_2w,   0,        kSTS32look_2w,    true,  0, 0},
+	{kVStroke_2w, kNCat_2w,    kSTSstrokecat_2w, false, 0, 0},
+	{kVPlay_2w,   kNCat_2w,    kSTSplaycat_2w,   false, 0, 0},
+	{kVTalk_2w,   kNCat_2w,    kSTStalkcat_2w,   false, 0, 0},
+	{kVLook_2w,   kNPost_2w,   kSTSlookpost_2w,  false, 0, 0},
+	{kVGive_2w,   0,        kSTSgivecat_2w,   false, 0, 0},
+	{kVLook_2w,   kNWindow_2w, kSTS6garden_2w,   false, 0, 0},
+	{kVRub_2w,    kNCatnip_2w, kSTRubcatnip2_2w, false, 0, 0},
+	{0,        0,        0,             false, 0, 0}
 };
 
 background_t screen33_desc_2w[] = {					// Boxroom
-  {kVLook_2w,      0,        kSTS33look_2w,      true,  0, 0},
-  {kVLook_2w,      kNDoor_2w,   kSTLookboxdoor_2w,  false, 0, 0},
-  {kVOpen_2w,      kNDoor_2w,   kSTWontopen_2w,     false, 0, 0},
-  {kVRead_2w,      kNPaper_2w,  kSTReadpaper_2w,    false, 0, 29},
-  {kVLook_2w,      kNPaper_2w,  kSTReadpaper_2w,    false, 0, 29},
-  {kVLook_2w,      kNCrate_2w,  kSTSlookbox_2w,     false, 0, 0},
-  {kVInto_2w,      kNCrate_2w,  kSTSgetinbox_2w,    false, 0, 0},
-  {kVLook_2w,      kNChute_2w,  kSTLookchute_2w,    false, 0, 0},

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list