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

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Sun Oct 31 19:27:53 CET 2010


Revision: 53983
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53983&view=rev
Author:   strangerke
Date:     2010-10-31 18:27:53 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
TOOLS: Fix GCC warnings reported by Fingolgin in create_hugo

Also realign arrays to make them (a bit) more readable.
These modifications don't modify Hugo.dat

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

Modified: scummvm/trunk/tools/create_hugo/create_hugo.cpp
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.cpp	2010-10-31 17:24:27 UTC (rev 53982)
+++ scummvm/trunk/tools/create_hugo/create_hugo.cpp	2010-10-31 18:27:53 UTC (rev 53983)
@@ -58,6 +58,10 @@
 	fwrite(&b, 1, 1, fp);
 }
 
+static void writeSByte(FILE *fp, int8 b) {
+	fwrite(&b, 1, 1, fp);
+}
+
 static void writeUint16BE(FILE *fp, uint16 value) {
 	writeByte(fp, (uint8)(value >> 8));
 	writeByte(fp, (uint8)(value & 0xFF));
@@ -703,29 +707,29 @@
 	nbrElem = sizeof(actListArr_3d) / sizeof(actList);
 	writeActListArray(outFile, actListArr_3d, nbrElem);
 
-	writeByte(outFile, NUM_TUNES_1w);
-	writeByte(outFile, SILENCE_1w);
-	writeByte(outFile, TEST_SOUND_1w);
+	writeSByte(outFile, NUM_TUNES_1w);
+	writeSByte(outFile, SILENCE_1w);
+	writeSByte(outFile, TEST_SOUND_1w);
 
-	writeByte(outFile, NUM_TUNES_2w);
-	writeByte(outFile, SILENCE_2w);
-	writeByte(outFile, TEST_SOUND_2w);
+	writeSByte(outFile, NUM_TUNES_2w);
+	writeSByte(outFile, SILENCE_2w);
+	writeSByte(outFile, TEST_SOUND_2w);
 
-	writeByte(outFile, NUM_TUNES_3w);
-	writeByte(outFile, SILENCE_3w);
-	writeByte(outFile, TEST_SOUND_3w);
+	writeSByte(outFile, NUM_TUNES_3w);
+	writeSByte(outFile, SILENCE_3w);
+	writeSByte(outFile, TEST_SOUND_3w);
 
-	writeByte(outFile, NUM_TUNES_1d);
-	writeByte(outFile, SILENCE_1d);
-	writeByte(outFile, TEST_SOUND_1d);
+	writeSByte(outFile, NUM_TUNES_1d);
+	writeSByte(outFile, SILENCE_1d);
+	writeSByte(outFile, TEST_SOUND_1d);
 
-	writeByte(outFile, NUM_TUNES_2d);
-	writeByte(outFile, SILENCE_2d);
-	writeByte(outFile, TEST_SOUND_2d);
+	writeSByte(outFile, NUM_TUNES_2d);
+	writeSByte(outFile, SILENCE_2d);
+	writeSByte(outFile, TEST_SOUND_2d);
 
-	writeByte(outFile, NUM_TUNES_3d);
-	writeByte(outFile, SILENCE_3d);
-	writeByte(outFile, TEST_SOUND_3d);
+	writeSByte(outFile, NUM_TUNES_3d);
+	writeSByte(outFile, SILENCE_3d);
+	writeSByte(outFile, TEST_SOUND_3d);
 
 	// def_tunes_1w
 	nbrElem = sizeof(def_tunes_1w) / sizeof(int16);

Modified: scummvm/trunk/tools/create_hugo/staticdata.h
===================================================================
--- scummvm/trunk/tools/create_hugo/staticdata.h	2010-10-31 17:24:27 UTC (rev 53982)
+++ scummvm/trunk/tools/create_hugo/staticdata.h	2010-10-31 18:27:53 UTC (rev 53983)
@@ -2245,33 +2245,33 @@
 };
 
 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},
+	{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},
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen0_desc_1w[] = {						// Outside house
@@ -2286,8 +2286,8 @@
 	{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,  0,           kSTlookscreen0_1w, true,  0, 0},
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen1_desc_1w[] = {						// Hall
@@ -2297,9 +2297,9 @@
 	{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,   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
@@ -2312,8 +2312,8 @@
 	{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,  0,           kSTlookscreen2_1w, true,  0, 0},
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen3_desc_1w[] = {						// Dining room
@@ -2327,17 +2327,17 @@
 	{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},
+	{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},
+	{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}
+	{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
@@ -2347,15 +2347,15 @@
 	{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},
+	{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},
+	{kVSit_1w,  0,           kSTsittoilet_1w,   false, 0, 0},
 	{kVWash_1w, kNHands_1w,  kSTwashhands_1w,   false, 0, 0},
-	{0,      0,        0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen5_desc_1w[] = {						// Kitchen
@@ -2366,10 +2366,10 @@
 	{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,   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
@@ -2378,8 +2378,8 @@
 	{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,  0,               kSTlookscreen6_1w, true,  0, 0},
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen7_desc_1w[] = {						// Store room
@@ -2392,8 +2392,8 @@
 	{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,   0,              kSTlookscreen7_1w,   true,  0, 0},
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen8_desc_1w[] = {						// Basement
@@ -2413,23 +2413,23 @@
 	{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}
+	{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,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen10_desc_1w[] = {					// Mummy room
-	{kVLook_1w,  0,       kSTlookscreen10_1w, true,  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},
@@ -2438,7 +2438,7 @@
 	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen11_desc_1w[] = {					// Lake room
@@ -2447,12 +2447,12 @@
 	{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},
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen12_desc_1w[] = {					// Dead end
@@ -2461,9 +2461,9 @@
 	{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},
+	{kVLook_1w,  0,          kSTlookscreen12_1w, true,  0, 0},
 	{kVTalk_1w,  kNGuard_1w, kSTtalkguard_1w,    false, 0, 0},
-	{0,       0,       0,               false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen13_desc_1w[] = {					// Jail
@@ -2475,7 +2475,7 @@
 };
 
 background_t screen15_desc_1w[] =  {					// Laboratory
-	{kVLook_1w,  0,             kSTlookscreen15_1w, true,  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},
@@ -2485,7 +2485,7 @@
 	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 
@@ -2510,56 +2510,56 @@
 	{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},
+	{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},
+	{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},
+	{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},
+	{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},
+	{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}
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen1_desc_2w[] = {						// Hall
-	{kVLook_2w,   0,       kSTLookhall_2w,  true,  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},
@@ -2568,11 +2568,11 @@
 	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen2_desc_2w[] = { 					// Bed1
-	{kVLook_2w,  0,          kSTLookbed1_2w, true,  DONT_CARE, 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},
@@ -2586,11 +2586,11 @@
 	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen3_desc_2w[] = {						// Bed2
-	{kVLook_2w,  0,         kSTLookbed2_2w,   true , 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},
@@ -2608,66 +2608,66 @@
 	{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},
+	{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},
+	{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}
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen5_desc_2w[] = {						// Bed3
-	{kVLook_2w,  0,        kSTLookbed3_2w,     true,  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},
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen6_desc_2w[] = {						// Kitchen
-	{kVLook_2w,   0,        kSTLookkitchen_2w,   true,  DONT_CARE, 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},
+	{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}
+	{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, 0,           kSTLookback_2w, true,  0, 0},
 	{kVLook_2w, kNWindow_2w, kSTLookwin_2w,  false, 0, 0},
-	{0,      0,        0,           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, 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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen9_desc_2w[] = {						// In shed
-	{kVLook_2w,  0,         kSTLookinshed_2w,  true,  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},
@@ -2678,63 +2678,63 @@
 	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen10_desc_2w[] = {					// Venus fly traps
-	{kVLook_2w, 0,        kSTLookvenus_2w, true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen11_desc_2w[] = {					// Gates open
-	{kVLook_2w,  0,      kSTS11look_2w, true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen12_desc_2w[] = {					// Gates closed
-	{kVLook_2w,   0,      kSTS12look_2w, true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen13_desc_2w[] = {					// Stream
-	{kVLook_2w,    0,         kSTS13look_2w,    true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen14_desc_2w[] = {					// Zapper
-	{kVLook_2w,   0,        kSTS14look_2w,  true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen15_desc_2w[] = {					// Mushroom
-	{kVLook_2w,   0,        kSTS15look_2w,  true,  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}
+	{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},
+	{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},
@@ -2745,103 +2745,103 @@
 	{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}
+	{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},
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen18_desc_2w[] = {					// Phonebox
-	{kVLook_2w, 0,       kSTS18look_2w, true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen19_desc_2w[] = {					// Street
-	{kVLook_2w, 0,      kSTS19look_2w, true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen20_desc_2w[] = {					// Kennel
-	{kVLook_2w,    0,        kSTS20look_2w,      true,  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},
+	{kVInto_2w,    0,           kSTStoobigtofit_2w, false, 0, 0},
 	{kVTake_2w,    kNStick_2w,  kSTThrown_2w,       false, 0, 0},
-	{0,         0,        0,               false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen21_desc_2w[] = {					// Rockroom
-	{kVLook_2w,  0,      kSTS21look_2w,   true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen22_desc_2w[] = {					// Rockgone
-	{kVLook_2w,  0,      kSTS22look_2w,  true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen23_desc_2w[] = {					// Threeway
-	{kVLook_2w,  0,      kSTS23look_2w, true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen24_desc_2w[] = {					// Lampcave
-	{kVLook_2w,  0,      kSTS24look_2w,   true,  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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen25_desc_2w[] = {					// Chasm
-	{kVLook_2w,  0,      kSTS25look_2w, true,  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}
+	{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},
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen27_desc_2w[] = {					// genie
-	{kVLook_2w,    0,        kSTS27look_2w,   true,  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},
@@ -2855,57 +2855,57 @@
 	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen28_desc_2w[] = {					// traproom
-	{kVLook_2w,    0,           kSTS28look_2w,      true,  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},
+	{kVOpen_2w,    0,              kSTUnlocksafe_2w,   false, 0, 0},
 	{kVUnlock_2w,  kNSafe_2w,      kSTUnlocksafe_2w,   false, 0, 0},
-	{0,         0,           0,               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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen30_desc_2w[] = {					// Lounge
-	{kVLook_2w, 0,        kSTS30look_2w,  true,  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}
+	{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},
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen32_desc_2w[] = {					// catroom
-	{kVLook_2w,   0,        kSTS32look_2w,    true,  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},
+	{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}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen33_desc_2w[] = {					// Boxroom
-	{kVLook_2w,      0,        kSTS33look_2w,      true,  0, 0},
+	{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},
@@ -2920,27 +2920,27 @@
 	{kVPush_2w,      kNKey_2w,    kSTMorespecific_2w, false, 0, 0},
 	{kVMakeUseOf_2w, kNPencil_2w, kSTUsePencil_2w,    false, 0, 0},
 	{kVScribble_2w,  kNPencil_2w, kSTDoCrossword_2w,  false, 0, 0},
-	{0,           0,        0,               false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen34_desc_2w[] = {					// hall3
-	{kVLook_2w, 0,        kSTLookhall_2w,   true,  0, 0},
+	{kVLook_2w, 0,           kSTLookhall_2w,   true,  0, 0},
 	{kVLook_2w, kNMirror_2w, kSTLookMirror_2w, false, 0, 0},
 	{kVTake_2w, kNMirror_2w, kSTNouse_2w,      false, 0, 0},
-	{0,      0,        0,             false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen35_desc_2w[] = {					// Organ
-	{kVLook_2w,   0,       kSTS35look_2w,   true,  DONT_CARE, 0},
+	{kVLook_2w,   0,          kSTS35look_2w,   true,  DONT_CARE, 0},
 	{kVLook_2w,   kNOrgan_2w, kSTLookOrgan_2w, false, DONT_CARE, 0},
 	{kVPlay_2w,   kNOrgan_2w, kSTPlayorgan_2w, false, DONT_CARE, 0},
-	{kVListen_2w, 0,       kSTHearorgan_2w, false, 0,         0},
-	{kVListen_2w, 0,       kSTHearlaugh_2w, false, 1,         0},
-	{0,        0,       0,            false, 0,         0}
+	{kVListen_2w, 0,          kSTHearorgan_2w, false, 0,         0},
+	{kVListen_2w, 0,          kSTHearlaugh_2w, false, 1,         0},
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen36_desc_2w[] = {					// Hestroom
-	{kVLook_2w, 0,          kSTLookhest_2w,    true,  0, 0},
+	{kVLook_2w, 0,             kSTLookhest_2w,    true,  0, 0},
 	{kVTake_2w, kNBook_2w,     kSTS36book_2w,     false, 0, 0},
 	{kVTake_2w, kNBookcase_2w, kSTS36book_2w,     false, 0, 0},
 	{kVRead_2w, kNBook_2w,     kSTS36book_2w,     false, 0, 0},
@@ -2948,23 +2948,23 @@
 	{kVLook_2w, kNTable_2w,    kSTS36table_2w,    false, 0, 0},
 	{kVTalk_2w, kNHester_2w,   kSTTalkhester_2w,  false, 0, 0},
 	{kVLook_2w, kNWindow_2w,   kSTS6garden_2w,    false, 0, 0},
-	{0,      0,          0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen37_desc_2w[] = {					// Retupmoc
 // Screen states: 0: default, 1: Got screwdriver
-	{kVLook_2w,  0,        kSTS37look_2w,   true,  DONT_CARE, 0},
+	{kVLook_2w,  0,           kSTS37look_2w,   true,  DONT_CARE, 0},
 	{kVLift_2w,  kNRock_2w,   kSTNopurps_2w,   false, 0,         0},
 	{kVLook_2w,  kNRock_2w,   kSTNospecial_2w, false, 0,         0},
 	{kVUnder_2w, kNRock_2w,   kSTDull2_2w,     false, 0,         0},
 	{kVTalk_2w,  kNDoctor_2w, kSTComeHere_2w,  false, 0,         0},
 	{kVTalk_2w,  kNDoctor_2w, kSTPleasego_2w,  false, 1,         0},
-	{0,       0,        0,            false, 0,         0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen38_desc_2w[] = {					// hall1
 	{kVLook_2w, 0, kSTS38look_2w, true,  0, 0},
-	{0,      0, 0,          false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 // Array of ptrs to object_list_t
@@ -2987,138 +2987,138 @@
 	{kVNaughty_3w, kNPenny_3w,  kSTHeadache_3w,     false, DONT_CARE, 0},
 	{kVInto_3w,    kNWindow_3w, kSTThruwindow_3w,   false, DONT_CARE, 0},
 	{kVOutof_3w,   kNWindow_3w, kSTThruwindow_3w,   false, DONT_CARE, 0},
-	{kVJump_3w,    0,        kSTSjump_3w,        false, DONT_CARE, 0},
-	{kVGo_3w,      0,        kSTTrywalk_3w,      false, DONT_CARE, 0},
-	{kVInto_3w,    0,        kSTTrywalk_3w,      false, DONT_CARE, 0},
-	{kVClimb_3w,   0,        kSTSclimb_3w,       false, DONT_CARE, 0},
-	{kVShout_3w,   0,        kSTNothing_3w,      false, DONT_CARE, 0},
-	{kVTalk_3w,    0,        kSTStalk_3w,        false, DONT_CARE, 0},
-	{kVSwitch_3w,  0,        kSTMorespecific_3w, false, DONT_CARE, 0},
-	{kVUse_3w,     0,        kSTMorespecific_3w, false, DONT_CARE, 0},
-	{kVThrowit_3w, 0,        kSTNopurps_3w,      false, DONT_CARE, 0},
-	{kVRude_3w,    0,        kSTSrude_3w,        false, DONT_CARE, 0},
-	{kVAttack_3w,  0,        kSTSattack_3w,      false, DONT_CARE, 0},
-	{kVBreak_3w,   0,        kSTSbreak_3w,       false, DONT_CARE, 0},
-	{kVListen_3w,  0,        kSTQuiet_3w,        false, DONT_CARE, 0},
-	{kVSmell_3w,   0,        kSTAroma_3w,        false, DONT_CARE, 0},
-	{kVQuery_3w,   0,        kSTNoidea_3w,       false, DONT_CARE, 0},
+	{kVJump_3w,    0,           kSTSjump_3w,        false, DONT_CARE, 0},
+	{kVGo_3w,      0,           kSTTrywalk_3w,      false, DONT_CARE, 0},
+	{kVInto_3w,    0,           kSTTrywalk_3w,      false, DONT_CARE, 0},
+	{kVClimb_3w,   0,           kSTSclimb_3w,       false, DONT_CARE, 0},
+	{kVShout_3w,   0,           kSTNothing_3w,      false, DONT_CARE, 0},
+	{kVTalk_3w,    0,           kSTStalk_3w,        false, DONT_CARE, 0},
+	{kVSwitch_3w,  0,           kSTMorespecific_3w, false, DONT_CARE, 0},
+	{kVUse_3w,     0,           kSTMorespecific_3w, false, DONT_CARE, 0},
+	{kVThrowit_3w, 0,           kSTNopurps_3w,      false, DONT_CARE, 0},
+	{kVRude_3w,    0,           kSTSrude_3w,        false, DONT_CARE, 0},
+	{kVAttack_3w,  0,           kSTSattack_3w,      false, DONT_CARE, 0},
+	{kVBreak_3w,   0,           kSTSbreak_3w,       false, DONT_CARE, 0},
+	{kVListen_3w,  0,           kSTQuiet_3w,        false, DONT_CARE, 0},
+	{kVSmell_3w,   0,           kSTAroma_3w,        false, DONT_CARE, 0},
+	{kVQuery_3w,   0,           kSTNoidea_3w,       false, DONT_CARE, 0},
 	{kVLook_3w,    kNSky_3w,    kSTFalling_3w,      false, DONT_CARE, 0},
 	{kVLook_3w,    kNWall_3w,   kSTDull_3w,         false, DONT_CARE, 0},
 	{kVLook_3w,    kNGround_3w, kSTDull_3w,         false, DONT_CARE, 0},
-	{kVHelp_3w,    0,        kSTShelp_3w,        false, DONT_CARE, 0},
-	{kVMagic_3w,   0,        kSTSmagic_3w,       false, DONT_CARE, 0},
-	{kVWish_3w,    0,        kSTSmagic_3w,       false, DONT_CARE, 0},
-	{kVDig_3w,     0,        kSTSdig_3w,         false, DONT_CARE, 0},
-	{kVNaughty_3w, 0,        kSTSnaughty_3w,     false, DONT_CARE, 0},
-	{kVKnock_3w,   0,        kSTNoanswer_3w,     false, DONT_CARE, 0},
+	{kVHelp_3w,    0,           kSTShelp_3w,        false, DONT_CARE, 0},
+	{kVMagic_3w,   0,           kSTSmagic_3w,       false, DONT_CARE, 0},
+	{kVWish_3w,    0,           kSTSmagic_3w,       false, DONT_CARE, 0},
+	{kVDig_3w,     0,           kSTSdig_3w,         false, DONT_CARE, 0},
+	{kVNaughty_3w, 0,           kSTSnaughty_3w,     false, DONT_CARE, 0},
+	{kVKnock_3w,   0,           kSTNoanswer_3w,     false, DONT_CARE, 0},
 	{kVOpen_3w,    kNDoor_3w,   kSTWontopen_3w,     false, DONT_CARE, 0},
 	{kVUnlock_3w,  kNDoor_3w,   kSTCantunlock_3w,   false, DONT_CARE, 0},
 	{kVLook_3w,    kNDoor_3w,   kSTDull_3w,         false, DONT_CARE, 0},
-	{kVHello_3w,   0,        kSTHi_3w,           false, DONT_CARE, 0},
-	{kVGive_3w,    0,        kSTNothanks_3w,     false, DONT_CARE, 0},
-	{kVShout_3w,   0,        kSTNoanswer_3w,     false, DONT_CARE, 0},
-	{kVUndress_3w, 0,        kSTSundress_3w,     false, DONT_CARE, 0},
-	{kVSit_3w,     0,        kSTStired_3w,       false, DONT_CARE, 0},
-	{kVFeed_3w,    0,        kSTNothanks_3w,     false, DONT_CARE, 0},
+	{kVHello_3w,   0,           kSTHi_3w,           false, DONT_CARE, 0},
+	{kVGive_3w,    0,           kSTNothanks_3w,     false, DONT_CARE, 0},
+	{kVShout_3w,   0,           kSTNoanswer_3w,     false, DONT_CARE, 0},
+	{kVUndress_3w, 0,           kSTSundress_3w,     false, DONT_CARE, 0},
+	{kVSit_3w,     0,           kSTStired_3w,       false, DONT_CARE, 0},
+	{kVFeed_3w,    0,           kSTNothanks_3w,     false, DONT_CARE, 0},
 	{kVTake_3w,    kNVine_3w,   kSTNopurps_3w,      false, DONT_CARE, 0},
 	{kVClimb_3w,   kNJungle_3w, kSTNopurps_3w,      false, DONT_CARE, 0},
 	{kVLook_3w,    kNJungle_3w, kSTLookjungle_3w,   false, DONT_CARE, 0},
 	{kVPut_3w,     kNFire_3w,   kSTNopurps_3w,      false, DONT_CARE, 0},
-	{kVSwim_3w,    0,        kSTCantswim_3w,     false, DONT_CARE, 0},
+	{kVSwim_3w,    0,           kSTCantswim_3w,     false, DONT_CARE, 0},
 	{kVTake_3w,    kNMouse_3w,  kSTCantcatch_3w,    false, DONT_CARE, 0},
 	{kVLook_3w,    kNMouse_3w,  kSTNospecial_3w,    false, DONT_CARE, 0},
-	{0,         0,        0,               false, 0,         0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t crash_desc_3w[] = {						// At the crash site
-	{kVLook_3w,   0,       kSTLookcrash_3w,     false, 0, 0},
+	{kVLook_3w,   0,          kSTLookcrash_3w,     false, 0, 0},
 	{kVRepair_3w, kNPlane_3w, kSTNopurps_3w,       false, 0, 0},
 	{kVFly_3w,    kNPlane_3w, kSTNopurps_3w,       false, 0, 0},
-	{kVInto_3w,   0,       kSTMorespecific_3w,  true , 0, 0},
+	{kVInto_3w,   0,          kSTMorespecific_3w,  true , 0, 0},
 	{kVOpen_3w,   kNDoor_3w,  kSTOpenplanedoor_3w, false, 0, 0},
-	{0,        0,       0,                false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t plane_desc_3w[] = {						// Inside the plane
 	{kVLook_3w,   0, kSTLookplane_3w, true , 0, 0},
 	{kVSearch_3w, 0, kSTSaylook_3w,   false, 0, 0},
 	{kVInto_3w,   0, kSTYouarein_3w,  false, 0, 0},
-	{0,        0, 0,            false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t web_desc_3w[] = { 						// At the spider's web
-	{kVLook_3w, 0,        kSTLookweb_3w,   true,  0, 0},
+	{kVLook_3w, 0,           kSTLookweb_3w,   true,  0, 0},
 	{kVTake_3w, kNNative_3w, kSTTakegirl_3w,  false, 0, 0},
 	{kVLook_3w, kNWeb_3w,    kSTLookatweb_3w, false, 0, 0},
 	{kVTake_3w, kNPenny_3w,  kSTTakepenny_3w, false, 0, 0},
 	{kVTalk_3w, kNPenny_3w,  kSTTalkpenny_3w, false, 0, 0},
-	{0,      0,        0,            false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t wfall_desc_3w[] = {						// Waterfall and stream
-	{kVLook_3w,   0,       kSTLookwfall_3w,  true,  0, 0},
+	{kVLook_3w,   0,          kSTLookwfall_3w,  true,  0, 0},
 	{kVLook_3w,   kNWater_3w, kSTLookwfall_3w,  false, 0, 0},
 	{kVCross_3w,  kNWater_3w, kSTCantcross_3w,  false, 0, 0},
-	{kVListen_3w, 0,       kSTListenfall_3w, false, 0, 0},
-	{0,        0,       0,             false, 0, 0}
+	{kVListen_3w, 0,          kSTListenfall_3w, false, 0, 0},
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t wfall_b_desc_3w[] = {						// Same as above but no water
-	{kVLook_3w,  0,       kSTLookwfall_b_3w, true,  0, 0},
+	{kVLook_3w,  0,          kSTLookwfall_b_3w, true,  0, 0},
 	{kVLook_3w,  kNWater_3w, kSTLookwfall_b_3w, false, 0, 0},
 	{kVCross_3w, kNWater_3w, kSTToomuddy_3w,    false, 0, 0},
-	{0,       0,       0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t wbase_desc_3w[] = {						// Base of waterfall
-	{kVLook_3w,  0,       kSTLookwbase_3w, true , 0, 0},
+	{kVLook_3w,  0,          kSTLookwbase_3w, true , 0, 0},
 	{kVLook_3w,  kNWater_3w, kSTLookwbase_3w, false, 0, 0},
 	{kVCross_3w, kNWater_3w, kSTToomuddy_3w,  false, 0, 0},
-	{0,       0,       0,            false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t path_ul_desc_3w[] = {						// Path at left of spider's web
 	{kVLook_3w, 0, kSTLookpath_ul_3w, true,  0, 0},
-	{0,      0, 0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t bridge_desc_3w[] = {						// At the bridge
-	{kVLook_3w,  0,      kSTLookbridge1_3w,    true,  0, 0},
-	{kVSwing_3w, 0,      kSTSwingbridge_3w,    false, 0, 0},
+	{kVLook_3w,  0,         kSTLookbridge1_3w,    true,  0, 0},
+	{kVSwing_3w, 0,         kSTSwingbridge_3w,    false, 0, 0},
 	{kVTake_3w,  kNVine_3w, kSTGetbridgevines_3w, false, 0, 0},
 	{kVTie_3w,   kNThem_3w, kSTMorespecific_3w,   false, 0, 0},
-	{0,       0,      0,                 false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t bridge2_desc_3w[] = {						// At the bridge
 	{kVLook_3w,  0, kSTLookbridge2_3w, true,  0, 0},
 	{kVSwing_3w, 0, kSTSwingbridge_3w, false, 0, 0},
-	{0,       0, 0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t stream_desc_3w[] = {						// stream with vines crossing
 	{kVLook_3w,  0, kSTLookstream1_3w,  true,  0, 0},
 	{kVSwing_3w, 0, kSTMorespecific_3w, false, 0, 0},
 	{kVCross_3w, 0, kSTStep1_3w,        false, 0, 0},
-	{0,       0, 0,               false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t stream2_desc_3w[] = {						// Stream with elephant sitting in it
-	{kVLook_3w,  0,          kSTLookstream2_3w, true,  0, 0},
-	{kVSwing_3w, 0,          kSTCantswing_3w,   false, 0, 0},
+	{kVLook_3w,  0,             kSTLookstream2_3w, true,  0, 0},
+	{kVSwing_3w, 0,             kSTCantswing_3w,   false, 0, 0},
 	{kVLook_3w,  kNElephant_3w, kSTLookele2_3w,    false, 0, 0},
-	{0,       0,          0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t village_desc_3w[] = {						// Long shot of village
-	{kVLook_3w, 0,      kSTLookvillage_3w, true,  0, 0},
+	{kVLook_3w, 0,         kSTLookvillage_3w, true,  0, 0},
 	{kVTake_3w, kNFood_3w, kSTTakething_3w,   false, 0, 0},
 	{kVLook_3w, kNFood_3w, kSTTakething_3w,   false, 0, 0},
-	{0,      0,      0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t hut_out_desc_3w[] = {						// Outside witch doctor's hut
-	{kVLook_3w,   0,         kSTLookhut_out_3w, false, 0, 0},
+	{kVLook_3w,   0,            kSTLookhut_out_3w, false, 0, 0},
 	{kVLook_3w,   kNDocbits_3w, kSTLookdocbits_3w, false, 0, 0},
 	{kVTake_3w,   kNDocbits_3w, kSTTakedocbits_3w, false, 0, 0},
 	{kVLook_3w,   kNFire_3w,    kSTLookdocbits_3w, false, 0, 0},
@@ -3130,15 +3130,15 @@
 	{kVSearch_3w, kNWindow_3w,  kSTLookinhut_3w,   false, 0, 0},
 	{kVLook_3w,   kNWindow_3w,  kSTLookinhut_3w,   false, 0, 0},
 	{kVSearch_3w, kNHut_3w,     kSTLookinhut_3w,   false, 0, 0},
-	{0,        0,         0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t hut_in_desc_3w[] = {						// Inside hut
 // States: 0 imprisoned, 1 doctor incapacitated
-	{kVLook_3w,    0,           kSTLookhut_in_3w,     true,  0,         0},
-	{kVLook_3w,    0,           kSTLookhut_in2_3w,    true,  1,         0},
+	{kVLook_3w,    0,              kSTLookhut_in_3w,     true,  0,         0},
+	{kVLook_3w,    0,              kSTLookhut_in2_3w,    true,  1,         0},
 	{kVLook_3w,    kNDoctor_3w,    kSTLookhut_in2_3w,    false, 1,         0},
-	{kVTake_3w,    0,           kSTTakeincage_3w,     false, 0,         0},
+	{kVTake_3w,    0,              kSTTakeincage_3w,     false, 0,         0},
 	{kVTake_3w,    kNDoctor_3w,    kSTTakedoctor0_3w,    false, 0,         0},
 	{kVTake_3w,    kNDoctor_3w,    kSTTakedoctor1_3w,    false, 1,         0},
 	{kVLook_3w,    kNDocbits_3w,   kSTLookdocbits_3w,    false, DONT_CARE, 0},
@@ -3156,7 +3156,7 @@
 	{kVLook_3w,    kNBottles_3w,   kSTLookshelfbits2_3w, false, 1,         0},
 	{kVTake_3w,    kNBottles_3w,   kSTTakeshelfbits_3w,  false, 1,         0},
 	{kVDrink_3w,   kNBottles_3w,   kSTTakeshelfbits_3w,  false, 1,         0},
-	{kVSearch_3w,  0,           kSTCantlookin_3w,     false, 0,         0},
+	{kVSearch_3w,  0,              kSTCantlookin_3w,     false, 0,         0},
 	{kVInto_3w,    kNFire_3w,      kSTGetinpot_3w,       false, 1,         0},
 	{kVSearch_3w,  kNFire_3w,      kSTLookinfire_3w,     false, 1,         0},
 	{kVLook_3w,    kNFire_3w,      kSTLookfire_3w,       false, DONT_CARE, 0},
@@ -3173,35 +3173,35 @@
 	{kVBlow_3w,    kNDoctor_3w,    kSTMissed_3w,         false, DONT_CARE, 0},
 	{kVUse_3w,     kNPipe_3w,      kSTMissed_3w,         false, DONT_CARE, 0},
 	{kVClose_3w,   kNCdoor_3w,     kSTNotclose_3w,       false, DONT_CARE, 0},
-	{0,         0,           0,                 false, 0,         0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t garden_desc_3w[] = {						// The secret garden
-	{kVLook_3w,  0,        kSTLookgarden_3w,  true,  0, 0},
+	{kVLook_3w,  0,           kSTLookgarden_3w,  true,  0, 0},
 	{kVLook_3w,  kNOrchid_3w, kSTLookorchid_3w,  false, 0, 0},
 	{kVTake_3w,  kNOrchid_3w, kSTTakeorchid_3w,  false, 0, 0},
-	{kVCross_3w, 0,        kSTCrossgarden_3w, false, 0, 0},
+	{kVCross_3w, 0,           kSTCrossgarden_3w, false, 0, 0},
 	{kVLook_3w,  kNWater_3w,  kSTLookgarden_3w,  false, 0, 0},
-	{0,       0,        0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t clifftop_desc_3w[] = {					// Top of cliff path
 	{kVLook_3w, 0, kSTLookclifftop_3w, true,  0, 0},
-	{0,      0, 0,               false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t oldman_desc_3w[] = {						// Old man inside cave
 	{kVLook_3w, 0, kSTLookoldman_3w, true,  0, 0},
-	{0,      0, 0,             false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t cliff_desc_3w[] = {						// Lower cliff path
 	{kVLook_3w, 0, kSTLookcliff_3w, true,  0, 0},
-	{0,      0, 0,            false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t camp_desc_3w[] = {						// Camp scene in village
-	{kVLook_3w,   0,          kSTLookcamp_3w,    true,  0, 0},
+	{kVLook_3w,   0,             kSTLookcamp_3w,    true,  0, 0},
 	{kVLook_3w,   kNFire_3w,     kSTLookhyena_3w,   false, 0, 0},
 	{kVLook_3w,   kNPole_3w,     kSTLookpole_3w,    false, 0, 0},
 	{kVBehind_3w, kNHut_3w,      kSTBehindhut_3w,   false, 0, 0},// Must come before look hut
@@ -3209,48 +3209,48 @@
 	{kVSearch_3w, kNHut_3w,      kSTLookintohut_3w, false, 0, 0},
 	{kVLook_3w,   kNHut_3w,      kSTLookhut_3w,     false, 0, 0},
 	{kVLook_3w,   kNWindow_3w,   kSTLookintohut_3w, false, 0, 0},
-	{kVEat_3w,    0,          kSTEatroast_3w,    false, 0, 0},
+	{kVEat_3w,    0,             kSTEatroast_3w,    false, 0, 0},
 	{kVTake_3w,   kNFood_3w,     kSTEatroast_3w,    false, 0, 0},
 	{kVInto_3w,   kNFire_3w,     kSTIntofire_3w,    false, 0, 0},
 	{kVTake_3w,   kNFire_3w,     kSTIntofire_3w,    false, 0, 0},
 	{kVTake_3w,   kNNative_3w,   kSTTakenative_3w,  false, 0, 0},
 	{kVTake_3w,   kNPipe_3w,     kSTMakeoffer_3w,   false, 0, 0},
 	{kVGive_3w,   kNBouillon_3w, kSTNonecarried_3w, false, 0, 0},
-	{0,        0,          0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t turn_desc_3w[] = {						// Turnaround path
-	{kVLook_3w,  0,      kSTLookturn_3w,  true,  DONT_CARE, 0},
+	{kVLook_3w,  0,         kSTLookturn_3w,  true,  DONT_CARE, 0},
 	{kVUnder_3w, kNRock_3w, kSTUnderrock_3w, false, 0,         0},
 	{kVLook_3w,  kNRock_3w, kSTLookrock_3w,  false, 0,         0},
 	{kVRide_3w,  kNRock_3w, kSTOntorock_3w,  false, 0,         0},
 	{kVClimb_3w, kNRock_3w, kSTOntorock_3w,  false, 0,         0},
-	{0,       0,      0,            false, 0,         0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t slope_desc_3w[] = {						// Slope between cliff and stream
 	{kVLook_3w, 0, kSTLookslope_3w, true,  0, 0},
-	{0,      0, 0,            false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t path_desc_3w[] = {						// Path containing elephant
 // States: 0 Elephant present, 1 - Elephant not present
-	{kVLook_3w, 0,          kSTLookpath2_1_3w,  true,  0, 0},
-	{kVLook_3w, 0,          kSTLookpath2_2_3w,  true,  1, 0},
+	{kVLook_3w, 0,             kSTLookpath2_1_3w,  true,  0, 0},
+	{kVLook_3w, 0,             kSTLookpath2_2_3w,  true,  1, 0},
 	{kVRide_3w, kNElephant_3w, kSTRideelephant_3w, false, 0, 0},
 	{kVTake_3w, kNElephant_3w, kSTGetelephant_3w,  false, 0, 0},
 	{kVShow_3w, kNMouse_3w,    kSTShowmouse_3w,    false, 0, 0},
-	{0,      0,          0,               false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t cave_desc_3w[] = {						// Cave mouth
-	{kVLook_3w,   0,       kSTLookcave1_3w,   true,  0, 0},
-	{kVLook_3w,   0,       kSTLookcave2_3w,   true,  1, 0},
+	{kVLook_3w,   0,          kSTLookcave1_3w,   true,  0, 0},
+	{kVLook_3w,   0,          kSTLookcave2_3w,   true,  1, 0},
 	{kVAttack_3w, kNGhost_3w, kSTAttackghost_3w, false, 0, 0},
 	{kVBreak_3w,  kNGhost_3w, kSTAttackghost_3w, false, 0, 0},
 	{kVShoot_3w,  kNGhost_3w, kSTAttackghost_3w, false, 0, 0},
 	{kVTake_3w,   kNGhost_3w, kSTTakeghost_3w,   false, 0, 0},
-	{0,        0,       0,              false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t bgDummy[] = {
@@ -3268,208 +3268,208 @@
 };
 
 background_t catchall_1d[] = { // Generally applicable phrases
-	{kVJump_1d,   0,            kSTnojump_1d, false, 0, 0},
-	{kVGo_1d,     0,            kSTtrywalk_1d, false, 0, 0},
-	{kVEnter_1d,  0,            kSTtrywalk_1d, false, 0, 0},
-	{kVClimb_1d,  0,            kSTnoclimb_1d, false, 0, 0},
-	{kVShout_1d,  0,            kSTnothing_1d, false, 0, 0},
-	{kVTalk_1d,   0,            kSTnotalk_1d, false, 0, 0},
-	{kVSwitch_1d, 0,            kSTnopurps_1d, false, 0, 0},
-	{kVThrow_1d,  0,            kSTnopurps_1d, false, 0, 0},
+	{kVJump_1d,   0,            kSTnojump_1d,   false, 0, 0},
+	{kVGo_1d,     0,            kSTtrywalk_1d,  false, 0, 0},
+	{kVEnter_1d,  0,            kSTtrywalk_1d,  false, 0, 0},
+	{kVClimb_1d,  0,            kSTnoclimb_1d,  false, 0, 0},
+	{kVShout_1d,  0,            kSTnothing_1d,  false, 0, 0},
+	{kVTalk_1d,   0,            kSTnotalk_1d,   false, 0, 0},
+	{kVSwitch_1d, 0,            kSTnopurps_1d,  false, 0, 0},
+	{kVThrow_1d,  0,            kSTnopurps_1d,  false, 0, 0},
 	{kVAttack_1d, 0,            kSTnoattack_1d, false, 0, 0},
-	{kVBreak_1d,  0,            kSTnobreak_1d, false, 0, 0},
+	{kVBreak_1d,  0,            kSTnobreak_1d,  false, 0, 0},
 	{kVListen_1d, 0,            kSTnolisten_1d, false, 0, 0},
-	{kVSmell_1d,  0,            kSTnosmell_1d, false, 0, 0},
-	{kVQuery_1d,  0,            kSTnoidea_1d, false, 0, 0},
-	{kVLook_1d,   kNSky_1d,     kSTnolook_1d, false, 0, 0},
-	{kVLook_1d,   kNWall_1d,    kSTdull_1d, false, 0, 0},
-	{kVLook_1d,   kNGround_1d,  kSTdull_1d, false, 0, 0},
-	{kVHelp_1d,   0,            kSTnohelp_1d, false, 0, 0},
-	{kVMagic_1d,  0,            kSTnomagic_1d, false, 0, 0},
-	{kVDig_1d,    0,            kSTnodig_1d, false, 0, 0},
-	{kVRude_1d,   0,            kSTnorude_1d, false, 0, 0},
-	{kVKnock_1d,  0,            kSTnoknock_1d, false, 0, 0},
-	{kVTake_1d,   kNPicture_1d, kSTnopurps_1d, false, 0, 0},
+	{kVSmell_1d,  0,            kSTnosmell_1d,  false, 0, 0},
+	{kVQuery_1d,  0,            kSTnoidea_1d,   false, 0, 0},
+	{kVLook_1d,   kNSky_1d,     kSTnolook_1d,   false, 0, 0},
+	{kVLook_1d,   kNWall_1d,    kSTdull_1d,     false, 0, 0},
+	{kVLook_1d,   kNGround_1d,  kSTdull_1d,     false, 0, 0},
+	{kVHelp_1d,   0,            kSTnohelp_1d,   false, 0, 0},
+	{kVMagic_1d,  0,            kSTnomagic_1d,  false, 0, 0},
+	{kVDig_1d,    0,            kSTnodig_1d,    false, 0, 0},
+	{kVRude_1d,   0,            kSTnorude_1d,   false, 0, 0},
+	{kVKnock_1d,  0,            kSTnoknock_1d,  false, 0, 0},
+	{kVTake_1d,   kNPicture_1d, kSTnopurps_1d,  false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen0_desc_1d[] = {      // Outside house
-	{kVLook_1d,  kNTree_1d,   kSTlooks0tree_1d, false, 0, 0},
-	{kVLook_1d,  kNFence_1d,  kSTlooks0fence_1d, false, 0, 0},
-	{kVLook_1d,  kNHouse_1d,  kSTlooks0house_1d, false, 0, 0},
-	{kVLook_1d,  kNWindow_1d, kSTlooks0window_1d, false, 0, 0},
-	{kVLook_1d,  kNRoof_1d,   kSTdull_1d, false, 0, 0},
-	{kVLook_1d,  kNLight_1d,  kSTdull_1d, false, 0, 0},
-	{kVLook_1d,  kNMoon_1d,   kSTlooks0moon_1d, false, 0, 0},
-	{kVEat_1d,   kNPkin_1d,   kSTeats0pkin_1d, false, 0, 0},
+	{kVLook_1d,  kNTree_1d,   kSTlooks0tree_1d,    false, 0, 0},
+	{kVLook_1d,  kNFence_1d,  kSTlooks0fence_1d,   false, 0, 0},
+	{kVLook_1d,  kNHouse_1d,  kSTlooks0house_1d,   false, 0, 0},
+	{kVLook_1d,  kNWindow_1d, kSTlooks0window_1d,  false, 0, 0},
+	{kVLook_1d,  kNRoof_1d,   kSTdull_1d,          false, 0, 0},
+	{kVLook_1d,  kNLight_1d,  kSTdull_1d,          false, 0, 0},
+	{kVLook_1d,  kNMoon_1d,   kSTlooks0moon_1d,    false, 0, 0},
+	{kVEat_1d,   kNPkin_1d,   kSTeats0pkin_1d,     false, 0, 0},
 	{kVUnder_1d, kNCarpet_1d, kSTunders0carpet_1d, false, 0, 0},
-	{kVLook_1d,  0,        kSTlooks0_1d, false, 0, 0},
+	{kVLook_1d,  0,           kSTlooks0_1d,        false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen1_desc_1d[] = {      // Hall
-	{kVLook_1d,   kNBat_1d,     kSTlooks1bat_1d, false, 0, 0},
+	{kVLook_1d,   kNBat_1d,     kSTlooks1bat_1d,     false, 0, 0},
 	{kVLook_1d,   kNPicture_1d, kSTlooks1picture_1d, false, 0, 0},
-	{kVLook_1d,   kNTable_1d,   kSTlooks1table_1d, false, 0, 0},
-	{kVLook_1d,   kNCarpet_1d,  kSTdull_1d, false, 0, 0},
-	{kVLook_1d,   kNStairs_1d,  kSTlooks1stairs_1d, false, 0, 0},
-	{kVLook_1d,   kNLight_1d,   kSTlooks1light_1d, false, 0, 0},
-	{kVLook_1d,   0,         kSTlooks1_1d, false, 0, 0},
-	{kVListen_1d, 0,         kSTlistens1_1d, false, 0, 0},
+	{kVLook_1d,   kNTable_1d,   kSTlooks1table_1d,   false, 0, 0},
+	{kVLook_1d,   kNCarpet_1d,  kSTdull_1d,          false, 0, 0},
+	{kVLook_1d,   kNStairs_1d,  kSTlooks1stairs_1d,  false, 0, 0},
+	{kVLook_1d,   kNLight_1d,   kSTlooks1light_1d,   false, 0, 0},
+	{kVLook_1d,   0,            kSTlooks1_1d,        false, 0, 0},
+	{kVListen_1d, 0,            kSTlistens1_1d,      false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen2_desc_1d[] = {      // Bedroom 1
-	{kVLook_1d,  kNBed_1d,    kSTlooks2bed_1d, false, 0, 0},
-	{kVUnder_1d, kNBed_1d,    kSTlooks2bed_1d, false, 0, 0},
-	{kVRide_1d,  kNBed_1d,    kSTrides2bed_1d, false, 0, 0},
-	{kVInto_1d,  kNBed_1d,    kSTrides2bed_1d, false, 0, 0},
-	{kVLook_1d,  kNWard_1d,   kSTlooks2ward_1d, false, 0, 0},
-	{kVLook_1d,  kNCupb_1d,   kSTlooks2cupb_1d, false, 0, 0},
+	{kVLook_1d,  kNBed_1d,    kSTlooks2bed_1d,    false, 0, 0},
+	{kVUnder_1d, kNBed_1d,    kSTlooks2bed_1d,    false, 0, 0},
+	{kVRide_1d,  kNBed_1d,    kSTrides2bed_1d,    false, 0, 0},
+	{kVInto_1d,  kNBed_1d,    kSTrides2bed_1d,    false, 0, 0},
+	{kVLook_1d,  kNWard_1d,   kSTlooks2ward_1d,   false, 0, 0},
+	{kVLook_1d,  kNCupb_1d,   kSTlooks2cupb_1d,   false, 0, 0},
 	{kVLook_1d,  kNWindow_1d, kSTlooks2window_1d, false, 0, 0},
-	{kVLook_1d,  kNLight_1d,  kSTdull_1d, false, 0, 0},
-	{kVLook_1d,  kNFace_1d,   kSTlooks2face_1d, false, 0, 0},
-	{kVLook_1d,  0,        kSTlooks2_1d, false, 0, 0},
+	{kVLook_1d,  kNLight_1d,  kSTdull_1d,         false, 0, 0},
+	{kVLook_1d,  kNFace_1d,   kSTlooks2face_1d,   false, 0, 0},
+	{kVLook_1d,  0,           kSTlooks2_1d,       false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen3_desc_1d[] = {      // Dining room
-	{kVLook_1d,   kNTable_1d,   kSTlooks3table_1d, false, 0, 0},
+	{kVLook_1d,   kNTable_1d,   kSTlooks3table_1d,  false, 0, 0},
 	{kVLook_1d,   kNButler_1d,  kSTlooks3butler_1d, false, 0, 0},
-	{kVLook_1d,   kNPlant_1d,   kSTlooks3plant_1d, false, 0, 0},
-	{kVLook_1d,   kNPicture_1d, kSTlooks3witch_1d, false, 0, 0},
-	{kVLook_1d,   kNWitch_1d,   kSTlooks3witch_1d, false, 0, 0},
+	{kVLook_1d,   kNPlant_1d,   kSTlooks3plant_1d,  false, 0, 0},
+	{kVLook_1d,   kNPicture_1d, kSTlooks3witch_1d,  false, 0, 0},
+	{kVLook_1d,   kNWitch_1d,   kSTlooks3witch_1d,  false, 0, 0},
 	{kVLook_1d,   kNWindow_1d,  kSTlooks3window_1d, false, 0, 0},
-	{kVLook_1d,   kNFood_1d,    kSTlooks3food_1d, false, 0, 0},
-	{kVLook_1d,   kNMan_1d,     kSTlooks3man_1d, false, 0, 0},
-	{kVLook_1d,   kNCupb_1d,    kSTdull_1d, false, 0, 0},
-	{kVLook_1d,   kNWoman_1d,   kSTlooks3woman_1d, false, 0, 0},
-	{kVLook_1d,   0,         kSTlooks3_1d, false, 0, 0},
-	{kVSit_1d,    0,         kSTsits3_1d, false, 0, 0},
-	{kVTake_1d,   kNFood_1d,    kSTtakes3food_1d, false, 0, 0},
-	{kVEat_1d,    0,         kSTtakes3food_1d, false, 0, 0},
-	{kVTalk_1d,   kNMan_1d,     kSTtalks3man_1d, false, 0, 0},
-	{kVTalk_1d,   kNWoman_1d,   kSTtalks3woman_1d, false, 0, 0},
+	{kVLook_1d,   kNFood_1d,    kSTlooks3food_1d,   false, 0, 0},
+	{kVLook_1d,   kNMan_1d,     kSTlooks3man_1d,    false, 0, 0},
+	{kVLook_1d,   kNCupb_1d,    kSTdull_1d,         false, 0, 0},
+	{kVLook_1d,   kNWoman_1d,   kSTlooks3woman_1d,  false, 0, 0},
+	{kVLook_1d,   0,            kSTlooks3_1d,       false, 0, 0},
+	{kVSit_1d,    0,            kSTsits3_1d,        false, 0, 0},
+	{kVTake_1d,   kNFood_1d,    kSTtakes3food_1d,   false, 0, 0},
+	{kVEat_1d,    0,            kSTtakes3food_1d,   false, 0, 0},
+	{kVTalk_1d,   kNMan_1d,     kSTtalks3man_1d,    false, 0, 0},
+	{kVTalk_1d,   kNWoman_1d,   kSTtalks3woman_1d,  false, 0, 0},
 	{kVTalk_1d,   kNButler_1d,  kSTtalkS3butler_1d, false, 0, 0},
-	{kVKiss_1d,   0,         kSTkisss3_1d, false, 0, 0},
-	{kVListen_1d, 0,         kSTlistens3_1d, false, 0, 0},
-	{kVDrink_1d,  0,         kSTdrinks3_1d, false, 0, 0},
+	{kVKiss_1d,   0,            kSTkisss3_1d,       false, 0, 0},
+	{kVListen_1d, 0,            kSTlistens3_1d,     false, 0, 0},
+	{kVDrink_1d,  0,            kSTdrinks3_1d,      false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen4_desc_1d[] = {      // Bathroom
 	{kVLook_1d, kNWindow_1d, kSTlooks2window_1d, false, 0, 0},
-	{kVLook_1d, kNLight_1d,  kSTdull_1d, false, 0, 0},
+	{kVLook_1d, kNLight_1d,  kSTdull_1d,         false, 0, 0},
 	{kVLook_1d, kNMirror_1d, kSTlooks4mirror_1d, false, 0, 0},
 	{kVLook_1d, kNToilet_1d, kSTlooks4toilet_1d, false, 0, 0},
-	{kVLook_1d, kNBath_1d,   kSTdull_1d, false, 0, 0},
-	{kVLook_1d, kNSink_1d,   kSTdull_1d, false, 0, 0},
-	{kVLook_1d, 0,        kSTlooks4_1d, false, 0, 0},
-	{kVCrap_1d, 0,        kSTcraps4_1d, false, 0, 0},
-	{kVSit_1d,  0,        kSTsits4_1d, false, 0, 0},
-	{kVWash_1d, kNHands_1d,  kSTwashs4hands_1d, false, 0, 0},
+	{kVLook_1d, kNBath_1d,   kSTdull_1d,         false, 0, 0},
+	{kVLook_1d, kNSink_1d,   kSTdull_1d,         false, 0, 0},
+	{kVLook_1d, 0,           kSTlooks4_1d,       false, 0, 0},
+	{kVCrap_1d, 0,           kSTcraps4_1d,       false, 0, 0},
+	{kVSit_1d,  0,           kSTsits4_1d,        false, 0, 0},
+	{kVWash_1d, kNHands_1d,  kSTwashs4hands_1d,  false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen5_desc_1d[] = {      // Kitchen
-	{kVLook_1d,   kNLight_1d,  kSTdull_1d, false, 0, 0},
-	{kVLook_1d,   kNUnits_1d,  kSTlooks5units_1d, false, 0, 0},
-	{kVOpen_1d,   kNUnits_1d,  kSTempty_1d, false, 0, 0},
+	{kVLook_1d,   kNLight_1d,  kSTdull_1d,         false, 0, 0},
+	{kVLook_1d,   kNUnits_1d,  kSTlooks5units_1d,  false, 0, 0},
+	{kVOpen_1d,   kNUnits_1d,  kSTempty_1d,        false, 0, 0},
 	{kVLook_1d,   kNWindow_1d, kSTlooks5window_1d, false, 0, 0},
-	{kVLook_1d,   kNBroom_1d,  kSTlooks5broom_1d, false, 0, 0},
-	{kVTake_1d,   kNBroom_1d,  kSTtakes5broom_1d, false, 0, 0},
-	{kVRide_1d,   kNBroom_1d,  kSTrides5broom_1d, false, 0, 0},
-	{kVLook_1d,   0,        kSTlooks5_1d, false, 0, 0},
-	{kVSweep_1d,  0,        kSTsweeps5_1d, false, 0, 0},
-	{kVListen_1d, 0,        kSTlistens1_1d, false, 0, 0},
+	{kVLook_1d,   kNBroom_1d,  kSTlooks5broom_1d,  false, 0, 0},
+	{kVTake_1d,   kNBroom_1d,  kSTtakes5broom_1d,  false, 0, 0},
+	{kVRide_1d,   kNBroom_1d,  kSTrides5broom_1d,  false, 0, 0},
+	{kVLook_1d,   0,           kSTlooks5_1d,       false, 0, 0},
+	{kVSweep_1d,  0,           kSTsweeps5_1d,      false, 0, 0},
+	{kVListen_1d, 0,           kSTlistens1_1d,     false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen6_desc_1d[] = {      // Garden
-	{kVLook_1d,  kNShed_1d,       kSTlooks6sched_1d, false, 0, 0},
-	{kVLook_1d,  kNMoon_1d,       kSTdull_1d, false, 0, 0},
-	{kVLook_1d,  kNTree_1d,       kSTlooks0tree_1d, false, 0, 0},
-	{kVClimb_1d, kNTree_1d,       kSTclimbs6tree_1d, false, 0, 0},
+	{kVLook_1d,  kNShed_1d,       kSTlooks6sched_1d,      false, 0, 0},
+	{kVLook_1d,  kNMoon_1d,       kSTdull_1d,             false, 0, 0},
+	{kVLook_1d,  kNTree_1d,       kSTlooks0tree_1d,       false, 0, 0},
+	{kVClimb_1d, kNTree_1d,       kSTclimbs6tree_1d,      false, 0, 0},
 	{kVLook_1d,  kNGardenbits_1d, kSTlooks6gardenbits_1d, false, 0, 0},
-	{kVLook_1d,  0,            kSTlooks6_1d, false, 0, 0},
+	{kVLook_1d,  0,               kSTlooks6_1d,           false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen7_desc_1d[] = {      // Store room
-	{kVLook_1d,   kNCarpet_1d,    kSTdull_1d, false, 0, 0},
-	{kVLook_1d,   kNLight_1d,     kSTdull_1d, false, 0, 0},
-	{kVUnbolt_1d, kNTrap_1d,      kSTunbolts7trap_1d, false, 0, 0},
+	{kVLook_1d,   kNCarpet_1d,    kSTdull_1d,            false, 0, 0},
+	{kVLook_1d,   kNLight_1d,     kSTdull_1d,            false, 0, 0},
+	{kVUnbolt_1d, kNTrap_1d,      kSTunbolts7trap_1d,    false, 0, 0},
 	{kVLook_1d,   kNMousehole_1d, kSTlooks7mousehole_1d, false, 0, 0},
 	{kVTake_1d,   kNDroppings_1d, kSTtakes7droppings_1d, false, 0, 0},
-	{kVGive_1d,   kNChop_1d,      kSTchop1_1d, false, 0, 0},
-	{kVFeed_1d,   kNDog_1d,       kSTchop1_1d, false, 0, 0},
-	{kVLook_1d,   0,           kSTlooks7_1d, false, 0, 0},
+	{kVGive_1d,   kNChop_1d,      kSTchop1_1d,           false, 0, 0},
+	{kVFeed_1d,   kNDog_1d,       kSTchop1_1d,           false, 0, 0},
+	{kVLook_1d,   0,              kSTlooks7_1d,          false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen8_desc_1d[] = {      // Basement
-	{kVLook_1d,   kNLight_1d,    kSTdull_1d, false, 0, 0},
-	{kVLook_1d,   kNDoor_1d,     kSTlooks8door_1d, false, 0, 0},
-	{kVOil_1d,    kNDoor_1d,     kSToils8door_1d, false, 0, 0},
-	{kVPush_1d,   kNDoor_1d,     kSTpushs8door_1d, false, 0, 0},
-	{kVLook_1d,   kNRock_1d,     kSTlooks8rock_1d, false, 0, 0},
-	{kVPush_1d,   kNRock_1d,     kSTnowayhose_1d, false, 0, 0},
-	{kVLift_1d,   kNRock_1d,     kSTnowayhose_1d, false, 0, 0},
-	{kVMove_1d,   kNRock_1d,     kSTnowayhose_1d, false, 0, 0},
-	{kVUnder_1d,  kNRock_1d,     kSTnounder_1d, false, 0, 0},
-	{kVAttack_1d, kNDoor_1d,     kSTbreaks8door_1d, false, 0, 0},
-	{kVBreak_1d,  kNDoor_1d,     kSTbreaks8door_1d, false, 0, 0},
-	{kVOpen_1d,   kNDoor_1d,     kSTopens8door_1d, false, 0, 0},
-	{kVUnlock_1d, kNDoor_1d,     kSTunlocks8door_1d, false, 0, 0},
-	{kVKnock_1d,  kNDoor_1d,     kSTknocks8door_1d, false, 0, 0},
+	{kVLook_1d,   kNLight_1d,    kSTdull_1d,           false, 0, 0},
+	{kVLook_1d,   kNDoor_1d,     kSTlooks8door_1d,     false, 0, 0},
+	{kVOil_1d,    kNDoor_1d,     kSToils8door_1d,      false, 0, 0},
+	{kVPush_1d,   kNDoor_1d,     kSTpushs8door_1d,     false, 0, 0},
+	{kVLook_1d,   kNRock_1d,     kSTlooks8rock_1d,     false, 0, 0},
+	{kVPush_1d,   kNRock_1d,     kSTnowayhose_1d,      false, 0, 0},
+	{kVLift_1d,   kNRock_1d,     kSTnowayhose_1d,      false, 0, 0},
+	{kVMove_1d,   kNRock_1d,     kSTnowayhose_1d,      false, 0, 0},
+	{kVUnder_1d,  kNRock_1d,     kSTnounder_1d,        false, 0, 0},
+	{kVAttack_1d, kNDoor_1d,     kSTbreaks8door_1d,    false, 0, 0},
+	{kVBreak_1d,  kNDoor_1d,     kSTbreaks8door_1d,    false, 0, 0},
+	{kVOpen_1d,   kNDoor_1d,     kSTopens8door_1d,     false, 0, 0},
+	{kVUnlock_1d, kNDoor_1d,     kSTunlocks8door_1d,   false, 0, 0},
+	{kVKnock_1d,  kNDoor_1d,     kSTknocks8door_1d,    false, 0, 0},
 	{kVTalk_1d,   kNPenelope_1d, kSTtalks8penelope_1d, false, 0, 0},
 	{kVShout_1d,  kNPenelope_1d, kSTtalks8penelope_1d, false, 0, 0},
-	{kVListen_1d, 0,          kSTlistens8_1d, false, 0, 0},
-	{kVLook_1d,   0,          kSTlooks8_1d, false, 0, 0},
+	{kVListen_1d, 0,             kSTlistens8_1d,       false, 0, 0},
+	{kVLook_1d,   0,             kSTlooks8_1d,         false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen9_desc_1d[] = {      // Bat cave
-	{kVLook_1d,  0,      kSTlooks9_1d, false, 0, 0},
+	{kVLook_1d,  0,         kSTlooks9_1d,     false, 0, 0},
 	{kVLook_1d,  kNRock_1d, kSTlooks9rock_1d, false, 0, 0},
-	{kVPush_1d,  kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVLift_1d,  kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVMove_1d,  kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVUnder_1d, kNRock_1d, kSTnounder_1d, false, 0, 0},
+	{kVPush_1d,  kNRock_1d, kSTnowayhose_1d,  false, 0, 0},
+	{kVLift_1d,  kNRock_1d, kSTnowayhose_1d,  false, 0, 0},
+	{kVMove_1d,  kNRock_1d, kSTnowayhose_1d,  false, 0, 0},
+	{kVUnder_1d, kNRock_1d, kSTnounder_1d,    false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen10_desc_1d[] = {     // Mummy room
-	{kVLook_1d,  0,      kSTlooks10_1d, false, 0, 0},
-	{kVLook_1d,  kNRock_1d, kSTlooks9rock_1d, false, 0, 0},
-	{kVPush_1d,  kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVLift_1d,  kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVMove_1d,  kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVUnder_1d, kNRock_1d, kSTnounder_1d, false, 0, 0},
+	{kVLook_1d,  0,         kSTlooks10_1d,     false, 0, 0},
+	{kVLook_1d,  kNRock_1d, kSTlooks9rock_1d,  false, 0, 0},
+	{kVPush_1d,  kNRock_1d, kSTnowayhose_1d,   false, 0, 0},
+	{kVLift_1d,  kNRock_1d, kSTnowayhose_1d,   false, 0, 0},
+	{kVMove_1d,  kNRock_1d, kSTnowayhose_1d,   false, 0, 0},
+	{kVUnder_1d, kNRock_1d, kSTnounder_1d,     false, 0, 0},
 	{kVLook_1d,  kNTomb_1d, kSTlooks10tomb_1d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen11_desc_1d[] = {     // Lake room
-	{kVLook_1d,      kNRock_1d, kSTlooks9rock_1d, false, 0, 0},
-	{kVPush_1d,      kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVLift_1d,      kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVMove_1d,      kNRock_1d, kSTnowayhose_1d, false, 0, 0},
-	{kVUnder_1d,     kNRock_1d, kSTnounder_1d, false, 0, 0},
-	{kVLook_1d,      0,      kSTlooks11_1d, false, 0, 0},
-	{kVLakeverbs_1d, 0,      kSTlakeverbss11_1d, false, 0, 0},
-	{kVDrink_1d,     0,      kSTdrinks3_1d, false, 0, 0},
-	{kVPlug_1d,      0,      kSTplugs11_1d, false, 0, 0},
+	{kVLook_1d,      kNRock_1d, kSTlooks9rock_1d,   false, 0, 0},
+	{kVPush_1d,      kNRock_1d, kSTnowayhose_1d,    false, 0, 0},
+	{kVLift_1d,      kNRock_1d, kSTnowayhose_1d,    false, 0, 0},
+	{kVMove_1d,      kNRock_1d, kSTnowayhose_1d,    false, 0, 0},
+	{kVUnder_1d,     kNRock_1d, kSTnounder_1d,      false, 0, 0},
+	{kVLook_1d,      0,         kSTlooks11_1d,      false, 0, 0},
+	{kVLakeverbs_1d, 0,         kSTlakeverbss11_1d, false, 0, 0},
+	{kVDrink_1d,     0,         kSTdrinks3_1d,      false, 0, 0},
+	{kVPlug_1d,      0,         kSTplugs11_1d,      false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen12_desc_1d[] = {     // Dead end
-	{kVLook_1d,  kNRock_1d,  kSTlooks9rock_1d, false, 0, 0},
-	{kVPush_1d,  kNRock_1d,  kSTnowayhose_1d, false, 0, 0},
-	{kVLift_1d,  kNRock_1d,  kSTnowayhose_1d, false, 0, 0},
-	{kVMove_1d,  kNRock_1d,  kSTnowayhose_1d, false, 0, 0},
-	{kVUnder_1d, kNRock_1d,  kSTnounder_1d, false, 0, 0},
-	{kVLook_1d,  0,       kSTlooks12_1d, false, 0, 0},
+	{kVLook_1d,  kNRock_1d,  kSTlooks9rock_1d,   false, 0, 0},
+	{kVPush_1d,  kNRock_1d,  kSTnowayhose_1d,    false, 0, 0},
+	{kVLift_1d,  kNRock_1d,  kSTnowayhose_1d,    false, 0, 0},
+	{kVMove_1d,  kNRock_1d,  kSTnowayhose_1d,    false, 0, 0},
+	{kVUnder_1d, kNRock_1d,  kSTnounder_1d,      false, 0, 0},
+	{kVLook_1d,  0,          kSTlooks12_1d,      false, 0, 0},
 	{kVTalk_1d,  kNGuard_1d, kSTtalks12guard_1d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
@@ -3483,15 +3483,15 @@
 };
 
 background_t screen15_desc_1d[] = {     // Laboratory
-	{kVLook_1d,  0,             kSTlooks15_1d, false, 0, 0},
-	{kVTalk_1d,  kNIgor_1d,        kSTtalks15igor_1d, false, 0, 0},
-	{kVTalk_1d,  kNProf_1d,        kSTtalks15prof_1d, false, 0, 0},
+	{kVLook_1d,  0,                kSTlooks15_1d,            false, 0, 0},
+	{kVTalk_1d,  kNIgor_1d,        kSTtalks15igor_1d,        false, 0, 0},
+	{kVTalk_1d,  kNProf_1d,        kSTtalks15prof_1d,        false, 0, 0},
 	{kVLook_1d,  kNMachinebits_1d, kSTlooks15machinebits_1d, false, 0, 0},
 	{kVPush_1d,  kNMachinebits_1d, kSTpushs15machinebits_1d, false, 0, 0},
-	{kVLook_1d,  kNTable_1d,       kSTlooks15table_1d, false, 0, 0},
-	{kVClose_1d, kNDoor_1d,        kSTopens15door_1d, false, 0, 0},
-	{kVOpen_1d,  kNDoor_1d,        kSTopens15door_1d, false, 0, 0},
-	{kVLook_1d,  kNLight_1d,       kSTlooks15light_1d, false, 0, 0},
+	{kVLook_1d,  kNTable_1d,       kSTlooks15table_1d,       false, 0, 0},
+	{kVClose_1d, kNDoor_1d,        kSTopens15door_1d,        false, 0, 0},
+	{kVOpen_1d,  kNDoor_1d,        kSTopens15door_1d,        false, 0, 0},
+	{kVLook_1d,  kNLight_1d,       kSTlooks15light_1d,       false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
@@ -3514,46 +3514,46 @@
 	{kVLook_2d,    kNPicture_2d,    kSTSpicture_2d,     false, DONT_CARE, 0},
 	{kVLook_2d,    kNMirror_2d,     kSTDull_2d,         false, DONT_CARE, 0},
 	{kVLook_2d,    kNTable_2d,      kSTNo_on_2d,        false, DONT_CARE, 0},
-	{kVJump_2d,    0,            kSTSjump_2d,        false, DONT_CARE, 0},
-	{kVGo_2d,      0,            kSTTrywalk_2d,      false, DONT_CARE, 0},
-	{kVInto_2d,    0,            kSTTrywalk_2d,      false, DONT_CARE, 0},
-	{kVClimb_2d,   0,            kSTSclimb_2d,       false, DONT_CARE, 0},
-	{kVShout_2d,   0,            kSTNothing_2d,      false, DONT_CARE, 0},
-	{kVTalk_2d,    0,            kSTStalk_2d,        false, DONT_CARE, 0},
-	{kVSwitch_2d,  0,            kSTMorespecific_2d, false, DONT_CARE, 0},
-	{kVThrow_2d,   0,            kSTNopurps_2d,      false, DONT_CARE, 0},
-	{kVAttack_2d,  0,            kSTSattack_2d,      false, DONT_CARE, 0},
-	{kVBreak_2d,   0,            kSTSbreak_2d,       false, DONT_CARE, 0},
-	{kVListen_2d,  0,            kSTQuiet_2d,        false, DONT_CARE, 0},
-	{kVSmell_2d,   0,            kSTAroma_2d,        false, DONT_CARE, 0},
-	{kVQuery_2d,   0,            kSTNoidea_2d,       false, DONT_CARE, 0},
+	{kVJump_2d,    0,               kSTSjump_2d,        false, DONT_CARE, 0},
+	{kVGo_2d,      0,               kSTTrywalk_2d,      false, DONT_CARE, 0},
+	{kVInto_2d,    0,               kSTTrywalk_2d,      false, DONT_CARE, 0},
+	{kVClimb_2d,   0,               kSTSclimb_2d,       false, DONT_CARE, 0},
+	{kVShout_2d,   0,               kSTNothing_2d,      false, DONT_CARE, 0},
+	{kVTalk_2d,    0,               kSTStalk_2d,        false, DONT_CARE, 0},
+	{kVSwitch_2d,  0,               kSTMorespecific_2d, false, DONT_CARE, 0},
+	{kVThrow_2d,   0,               kSTNopurps_2d,      false, DONT_CARE, 0},
+	{kVAttack_2d,  0,               kSTSattack_2d,      false, DONT_CARE, 0},
+	{kVBreak_2d,   0,               kSTSbreak_2d,       false, DONT_CARE, 0},
+	{kVListen_2d,  0,               kSTQuiet_2d,        false, DONT_CARE, 0},
+	{kVSmell_2d,   0,               kSTAroma_2d,        false, DONT_CARE, 0},
+	{kVQuery_2d,   0,               kSTNoidea_2d,       false, DONT_CARE, 0},
 	{kVLook_2d,    kNSky_2d,        kSTFalling_2d,      false, DONT_CARE, 0},
 	{kVLook_2d,    kNWall_2d,       kSTDull_2d,         false, DONT_CARE, 0},
 	{kVLook_2d,    kNGround_2d,     kSTDull_2d,         false, DONT_CARE, 0},
-	{kVHelp_2d,    0,            kSTShelp_2d,        false, DONT_CARE, 0},
-	{kVMagic_2d,   0,            kSTSmagic_2d,       false, DONT_CARE, 0},
-	{kVWish_2d,    0,            kSTSmagic_2d,       false, DONT_CARE, 0},
-	{kVDig_2d,     0,            kSTSdig_2d,         false, DONT_CARE, 0},
-	{kVRude_2d,    0,            kSTSrude_2d,        false, DONT_CARE, 0},
-	{kVKnock_2d,   0,            kSTNoanswer_2d,     false, DONT_CARE, 0},
+	{kVHelp_2d,    0,               kSTShelp_2d,        false, DONT_CARE, 0},
+	{kVMagic_2d,   0,               kSTSmagic_2d,       false, DONT_CARE, 0},
+	{kVWish_2d,    0,               kSTSmagic_2d,       false, DONT_CARE, 0},
+	{kVDig_2d,     0,               kSTSdig_2d,         false, DONT_CARE, 0},
+	{kVRude_2d,    0,               kSTSrude_2d,        false, DONT_CARE, 0},
+	{kVKnock_2d,   0,               kSTNoanswer_2d,     false, DONT_CARE, 0},
 	{kVOpen_2d,    kNDoor_2d,       kSTWontopen_2d,     false, DONT_CARE, 0},
 	{kVUnlock_2d,  kNDoor_2d,       kSTCantunlock_2d,   false, DONT_CARE, 0},
 	{kVLook_2d,    kNDoor_2d,       kSTDull_2d,         false, DONT_CARE, 0},
 	{kVLook_2d,    kNLight_2d,      kSTDull_2d,         false, DONT_CARE, 0},
-	{kVHello_2d,   0,            kSTHi_2d,           false, DONT_CARE, 0},
+	{kVHello_2d,   0,               kSTHi_2d,           false, DONT_CARE, 0},
 	{kVLook_2d,    kNFence_2d,      kSTLookover_2d,     false, DONT_CARE, 0},
 	{kVLook_2d,    kNWall_2d,       kSTLookover_2d,     false, DONT_CARE, 0},
 	{kVLook_2d,    kNGardenbits_2d, kSTDull_2d,         false, DONT_CARE, 0},
-	{kVGive_2d,    0,            kSTNothanks_2d,     false, DONT_CARE, 0},
+	{kVGive_2d,    0,               kSTNothanks_2d,     false, DONT_CARE, 0},
 	{kVLook_2d,    kNTree_2d,       kSTDull2_2d,        false, DONT_CARE, 0},
-	{kVFire_2d,    0,            kSTFire2_2d,        false, DONT_CARE, 0},
-	{kVShout_2d,   0,            kSTNoanswer_2d,     false, DONT_CARE, 0},
-	{kVHerring_2d, 0,            kSTSherring_2d,     false, DONT_CARE, 0},
-	{kVUndress_2d, 0,            kSTSundress_2d,     false, DONT_CARE, 0},
-	{kVSit_2d,     0,            kSTStired_2d,       false, DONT_CARE, 0},
-	{kVFeed_2d,    0,            kSTNothanks_2d,     false, DONT_CARE, 0},
+	{kVFire_2d,    0,               kSTFire2_2d,        false, DONT_CARE, 0},
+	{kVShout_2d,   0,               kSTNoanswer_2d,     false, DONT_CARE, 0},
+	{kVHerring_2d, 0,               kSTSherring_2d,     false, DONT_CARE, 0},
+	{kVUndress_2d, 0,               kSTSundress_2d,     false, DONT_CARE, 0},
+	{kVSit_2d,     0,               kSTStired_2d,       false, DONT_CARE, 0},
+	{kVFeed_2d,    0,               kSTNothanks_2d,     false, DONT_CARE, 0},
 	{kVRub_2d,     kNCatnip_2d,     kSTRubcatnip1_2d,   false, DONT_CARE, 0},
-	{0,         0,            0,               false, 0, 0}
+	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen0_desc_2d[] = {       // Outside house
@@ -3562,57 +3562,57 @@
 };
 
 background_t screen1_desc_2d[] = {       // Hall
-	{kVLook_2d,   0,       kSTLookhall_2d,  true, 0, 0},
-	{kVLook_2d,   kNMaid_2d,  kSTTmaid_2d, false, 0, 0},
+	{kVLook_2d,   0,          kSTLookhall_2d,  true,  0, 0},
+	{kVLook_2d,   kNMaid_2d,  kSTTmaid_2d,     false, 0, 0},
 	{kVTalk_2d,   kNMaid_2d,  kSTChatmaid1_2d, false, 0, 0},
 	{kVTalk_2d,   kNPenny_2d, kSTChatmaid2_2d, false, 0, 0},
 	{kVKiss_2d,   kNMaid_2d,  kSTChatmaid3_2d, false, 0, 0},
-	{kVRude_2d,   kNMaid_2d,  kSTRudemaid_2d, false, 0, 0},
+	{kVRude_2d,   kNMaid_2d,  kSTRudemaid_2d,  false, 0, 0},
 	{kVOpen_2d,   kNDoor_2d,  kSTTmaiddoor_2d, false, 0, 0},
 	{kVUnlock_2d, kNDoor_2d,  kSTTmaiddoor_2d, false, 0, 0},
-	{kVLook_2d,   kNDoor_2d,  kSTSdoor_2d, false, 0, 0},
+	{kVLook_2d,   kNDoor_2d,  kSTSdoor_2d,     false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen2_desc_2d[] = {       // Bed1
-	{kVLook_2d,  0,       kSTLookbed1_2d, true,  DONT_CARE, 0},
+	{kVLook_2d,  0,          kSTLookbed1_2d, true,  DONT_CARE, 0},
 	{kVLook_2d,  kNBed_2d,   kSTLookbed_2d,  false, DONT_CARE, 0},
-	{kVInto_2d,  kNBed_2d,   kSTS2bed_2d, false, 0, 0},
-	{kVRide_2d,  kNBed_2d,   kSTS2bed_2d, false, 0, 0},
-	{kVRest_2d,  kNBed_2d,   kSTS2bed_2d, false, 0, 0},
-	{kVRide_2d,  kNPenny_2d, kSTS2bed_2d, false, 0, 0},
-	{kVTalk_2d,  kNPenny_2d, kSTZzzz_2d, false, 0, 0},
-	{kVInto_2d,  kNBed_2d,   kSTNopurps_2d,  false, 1, 0},
-	{kVRide_2d,  kNBed_2d,   kSTNopurps_2d,  false, 1, 0},
-	{kVRest_2d,  kNBed_2d,   kSTNopurps_2d,  false, 1, 0},
+	{kVInto_2d,  kNBed_2d,   kSTS2bed_2d,    false, 0,         0},
+	{kVRide_2d,  kNBed_2d,   kSTS2bed_2d,    false, 0,         0},
+	{kVRest_2d,  kNBed_2d,   kSTS2bed_2d,    false, 0,         0},
+	{kVRide_2d,  kNPenny_2d, kSTS2bed_2d,    false, 0,         0},
+	{kVTalk_2d,  kNPenny_2d, kSTZzzz_2d,     false, 0,         0},
+	{kVInto_2d,  kNBed_2d,   kSTNopurps_2d,  false, 1,         0},
+	{kVRide_2d,  kNBed_2d,   kSTNopurps_2d,  false, 1,         0},
+	{kVRest_2d,  kNBed_2d,   kSTNopurps_2d,  false, 1,         0},
 	{kVUnder_2d, kNBed_2d,   kSTSsearch_2d,  false, DONT_CARE, 0},
 	{kVRead_2d,  kNBook_2d,  kSTNocarry_2d,  false, DONT_CARE, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen3_desc_2d[] = {       // Bed2
-	{kVLook_2d,  0,        kSTLookbed2_2d,   true, 0, 0},
-	{kVLook_2d,  kNBird_2d,   kSTParrot_2d, false, 0, 0},
-	{kVLook_2d,  kNCage_2d,   kSTDull_2d, false, 0, 0},
-	{kVLook_2d,  kNPencil_2d, kSTDull_2d, false, 0, 0},
-	{kVLook_2d,  kNPhone_2d,  kSTDull_2d, false, 0, 0},
-	{kVLook_2d,  kNPaper_2d,  kSTBlotter_2d, false, 0, 0},
-	{kVRead_2d,  kNPaper_2d,  kSTBlotter_2d, false, 0, 0},
-	{kVLook_2d,  kNChair_2d,  kSTDull_2d, false, 0, 0},
-	{kVTake_2d,  kNPencil_2d, kSTNouse_2d, false, 0, 0},
-	{kVTake_2d,  kNPaper_2d,  kSTNouse_2d, false, 0, 0},
-	{kVLook_2d,  kNHole_2d,   kSTDull_2d, false, 0, 0},
+	{kVLook_2d,  0,           kSTLookbed2_2d,   true,  0, 0},
+	{kVLook_2d,  kNBird_2d,   kSTParrot_2d,     false, 0, 0},
+	{kVLook_2d,  kNCage_2d,   kSTDull_2d,       false, 0, 0},
+	{kVLook_2d,  kNPencil_2d, kSTDull_2d,       false, 0, 0},
+	{kVLook_2d,  kNPhone_2d,  kSTDull_2d,       false, 0, 0},
+	{kVLook_2d,  kNPaper_2d,  kSTBlotter_2d,    false, 0, 0},
+	{kVRead_2d,  kNPaper_2d,  kSTBlotter_2d,    false, 0, 0},
+	{kVLook_2d,  kNChair_2d,  kSTDull_2d,       false, 0, 0},
+	{kVTake_2d,  kNPencil_2d, kSTNouse_2d,      false, 0, 0},
+	{kVTake_2d,  kNPaper_2d,  kSTNouse_2d,      false, 0, 0},
+	{kVLook_2d,  kNHole_2d,   kSTDull_2d,       false, 0, 0},
 	{kVLook_2d,  kNWall_2d,   kSTDumbwaiter_2d, false, 0, 0},
-	{kVLook_2d,  kNButton_2d, kSTSbutton_2d, false, 0, 0},
-	{kVPush_2d,  kNButton_2d, kSTS3dumb_2d, false, 0, 0},
-	{kVDial_2d,  0,        kSTS3phone_2d,    false, 0, 4},
+	{kVLook_2d,  kNButton_2d, kSTSbutton_2d,    false, 0, 0},
+	{kVPush_2d,  kNButton_2d, kSTS3dumb_2d,     false, 0, 0},
+	{kVDial_2d,  0,           kSTS3phone_2d,    false, 0, 4},
 	{kVTake_2d,  kNPhone_2d,  kSTS3phone_2d,    false, 0, 4},
 	{kVUse_2d,   kNPhone_2d,  kSTS3phone_2d,    false, 0, 4},
 	{kVLift_2d,  kNPhone_2d,  kSTS3phone_2d,    false, 0, 4},
 	{kVTalk_2d,  kNBird_2d,   kSTS3bird_2d,     false, 0, 5},
-	{kVInto_2d,  0,        kSTSinto_2d,      true, 0, 0},
-	{kVUnder_2d, kNCupb_2d,   kSTSsearch_2d, false, 0, 0},
-	{kVFeed_2d,  kNBird_2d,   kSTBirdfull_2d, false, 0, 0},
+	{kVInto_2d,  0,           kSTSinto_2d,      true,  0, 0},
+	{kVUnder_2d, kNCupb_2d,   kSTSsearch_2d,    false, 0, 0},
+	{kVFeed_2d,  kNBird_2d,   kSTBirdfull_2d,   false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
@@ -3623,241 +3623,241 @@
 };
 
 background_t screen5_desc_2d[] = {       // Bed3
-	{kVLook_2d,  0,        kSTLookbed3_2d,     true, 0, 0},
-	{kVBlock_2d, 0,        kSTSblock_2d, false, 0, 0},
+	{kVLook_2d,  0,           kSTLookbed3_2d,     true,  0, 0},
+	{kVBlock_2d, 0,           kSTSblock_2d,       false, 0, 0},
 	{kVInto_2d,  kNCage_2d,   kSTStoobigtofit_2d, false, 0, 0},
-	{kVLook_2d,  kNWindow_2d, kSTS6garden_2d, false, 0, 0},
+	{kVLook_2d,  kNWindow_2d, kSTS6garden_2d,     false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen6_desc_2d[] = {       // Kitchen
-	{kVLook_2d,   0,        kSTLookkitchen_2d,   true,  DONT_CARE, 0},
+	{kVLook_2d,   0,           kSTLookkitchen_2d,   true,  DONT_CARE, 0},
 	{kVLook_2d,   kNButton_2d, kSTSbutton_2d,       false, DONT_CARE, 0},
 	{kVPush_2d,   kNButton_2d, kSTS3dumb_2d,        false, DONT_CARE, 0},
 	{kVLook_2d,   kNWindow_2d, kSTS6garden_2d,      false, DONT_CARE, 0},
 	{kVLook_2d,   kNUnits_2d,  kSTS6dull_2d,        false, DONT_CARE, 0},
 	{kVOpen_2d,   kNUnits_2d,  kSTS6dull_2d,        false, DONT_CARE, 0},
-	{kVInto_2d,   0,        kSTSinto_2d,         true,  DONT_CARE, 0},
+	{kVInto_2d,   0,           kSTSinto_2d,         true,  DONT_CARE, 0},
 	{kVOpen_2d,   kNDoor_2d,   kSTMorespecific_2d,  false, DONT_CARE, 0},
 	{kVLook_2d,   kNDoor_2d,   kSTMorespecific_2d,  false, DONT_CARE, 0},
-	{kVTalk_2d,   kNCook_2d,   kSTTalkcook_2d,      false, 1, 0},
-	{kVLook_2d,   kNCook_2d,   kSTLookcook_2d,      false, 1, 0},
-	{kVLook_2d,   kNKnife_2d,  kSTLookknife_2d,     false, 1, 0},
-	{kVTake_2d,   kNKnife_2d,  kSTTakeknife_2d,     false, 1, 0},
-	{kVListen_2d, 0,        kSTListenkitchen_2d, false, 1, 0},
+	{kVTalk_2d,   kNCook_2d,   kSTTalkcook_2d,      false, 1,         0},
+	{kVLook_2d,   kNCook_2d,   kSTLookcook_2d,      false, 1,         0},
+	{kVLook_2d,   kNKnife_2d,  kSTLookknife_2d,     false, 1,         0},
+	{kVTake_2d,   kNKnife_2d,  kSTTakeknife_2d,     false, 1,         0},
+	{kVListen_2d, 0,           kSTListenkitchen_2d, false, 1,         0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen7_desc_2d[] = {       // Backdoor
-	{kVLook_2d, 0,        kSTLookback_2d, true, 0, 0},
+	{kVLook_2d, 0,           kSTLookback_2d, true,  0, 0},
 	{kVLook_2d, kNWindow_2d, kSTLookwin_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen8_desc_2d[] = {       // Shed
-	{kVLook_2d, 0,        kSTLookshed_2d,   true, 0, 0},
-	{kVLook_2d, kNWindow_2d, kSTLookwin_2d, false, 0, 0},
+	{kVLook_2d, 0,           kSTLookshed_2d,   true,  0, 0},
+	{kVLook_2d, kNWindow_2d, kSTLookwin_2d,    false, 0, 0},
 	{kVLook_2d, kNShed_2d,   kSTLookatshed_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen9_desc_2d[] = {       // In shed
-	{kVLook_2d,  0,         kSTLookinshed_2d, true, 0, 0},
-	{kVLook_2d,  kNWall_2d,    kSTS9tools1_2d, false, 0, 0},
-	{kVLook_2d,  kNTools_2d,   kSTS9tools1_2d, false, 0, 0},
-	{kVTake_2d,  kNTools_2d,   kSTS9tools2_2d, false, 0, 0},
-	{kVLook_2d,  kNBroom_2d,   kSTDull_2d, false, 0, 0},
-	{kVTake_2d,  kNBroom_2d,   kSTNouse_2d, false, 0, 0},
+	{kVLook_2d,  0,            kSTLookinshed_2d,  true,  0, 0},
+	{kVLook_2d,  kNWall_2d,    kSTS9tools1_2d,    false, 0, 0},
+	{kVLook_2d,  kNTools_2d,   kSTS9tools1_2d,    false, 0, 0},
+	{kVTake_2d,  kNTools_2d,   kSTS9tools2_2d,    false, 0, 0},
+	{kVLook_2d,  kNBroom_2d,   kSTDull_2d,        false, 0, 0},
+	{kVTake_2d,  kNBroom_2d,   kSTNouse_2d,       false, 0, 0},
 	{kVLook_2d,  kNTable_2d,   kSTSomebuttons_2d, false, 0, 0},
-	{kVKiss_2d,  kNGardner_2d, kSTMore_2d, false, 0, 0},
-	{kVRude_2d,  kNGardner_2d, kSTRudeshed_2d, false, 0, 0},
-	{kVTalk_2d,  kNGardner_2d, kSTIgnore_2d, false, 0, 0},
-	{kVClose_2d, kNDoor_2d,    kSTShedclose_2d, false, 0, 0},
+	{kVKiss_2d,  kNGardner_2d, kSTMore_2d,        false, 0, 0},
+	{kVRude_2d,  kNGardner_2d, kSTRudeshed_2d,    false, 0, 0},
+	{kVTalk_2d,  kNGardner_2d, kSTIgnore_2d,      false, 0, 0},
+	{kVClose_2d, kNDoor_2d,    kSTShedclose_2d,   false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen10_desc_2d[] = {      // Venus fly traps
-	{kVLook_2d, 0,        kSTLookvenus_2d, true, 0, 0},
+	{kVLook_2d, 0,           kSTLookvenus_2d, true,  0, 0},
 	{kVTake_2d, kNMirror_2d, kSTNotmirror_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen11_desc_2d[] = {      // Gates kVOpen_2d,
-	{kVLook_2d,  0,      kSTS11look_2d, true, 0, 0},
+	{kVLook_2d,  0,         kSTS11look_2d, true,  0, 0},
 	{kVClose_2d, kNDoor_2d, kSTNopurps_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen12_desc_2d[] = {      // Gates closed
-	{kVLook_2d,   0,      kSTS12look_2d, true, 0, 0},
-	{kVOpen_2d,   kNDoor_2d, kSTGates1_2d, false, 0, 0},
-	{kVBreak_2d,  kNDoor_2d, kSTGates2_2d, false, 0, 0},
-	{kVAttack_2d, kNDoor_2d, kSTGates2_2d, false, 0, 0},
-	{kVUnlock_2d, kNDoor_2d, kSTGates3_2d, false, 0, 0},
+	{kVLook_2d,   0,         kSTS12look_2d, true,  0, 0},
+	{kVOpen_2d,   kNDoor_2d, kSTGates1_2d,  false, 0, 0},
+	{kVBreak_2d,  kNDoor_2d, kSTGates2_2d,  false, 0, 0},
+	{kVAttack_2d, kNDoor_2d, kSTGates2_2d,  false, 0, 0},
+	{kVUnlock_2d, kNDoor_2d, kSTGates3_2d,  false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen13_desc_2d[] = {      // Stream
-	{kVLook_2d,  0,         kSTS13look_2d,    true, 0, 0},
-	{kVLook_2d,  kNBridge_2d,  kSTNospecial_2d, false, 0, 0},
-	{kVUnder_2d, kNBridge_2d,  kSTSsearch_2d, false, 0, 0},
-	{kVLook_2d,  kNWater_2d,   kSTDull_2d, false, 0, 0},
+	{kVLook_2d,  0,            kSTS13look_2d,    true,  0, 0},
+	{kVLook_2d,  kNBridge_2d,  kSTNospecial_2d,  false, 0, 0},
+	{kVUnder_2d, kNBridge_2d,  kSTSsearch_2d,    false, 0, 0},
+	{kVLook_2d,  kNWater_2d,   kSTDull_2d,       false, 0, 0},
 	{kVThrow_2d, kNMatches_2d, kSTThrowmatch_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen14_desc_2d[] = {      // Zapper
-	{kVLook_2d,   0,        kSTS14look_2d,  true, 0, 0},
+	{kVLook_2d,   0,           kSTS14look_2d,  true,  0, 0},
 	{kVSwitch_2d, kNZapper_2d, kSTNoswitch_2d, false, 0, 0},
 	{kVWind_2d,   kNZapper_2d, kSTNoswitch_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen15_desc_2d[] = {      // Mushroom
-	{kVLook_2d,   0,      kSTS15look_2d,  true, 0, 0},
-	{kVTalk_2d,   kNMan_2d,  kSTNoreply_2d, false, 0, 0},
+	{kVLook_2d,   0,         kSTS15look_2d,  true,  0, 0},
+	{kVTalk_2d,   kNMan_2d,  kSTNoreply_2d,  false, 0, 0},
 	{kVLook_2d,   kNWand_2d, kSTS15wand1_2d, false, 0, 0},
 	{kVTake_2d,   kNWand_2d, kSTS15wand2_2d, false, 0, 0},
-	{kVSearch_2d, kNMan_2d,  kSTSsearch_2d, false, 0, 0},
+	{kVSearch_2d, kNMan_2d,  kSTSsearch_2d,  false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen16_desc_2d[] = {      // Well
-	{kVLook_2d,  0,        kSTS16look_2d,     true, 0, 0},
-	{kVClimb_2d, 0,        kSTTryrope_2d, false, 0, 0},
-	{kVGo_2d,    kNWell_2d,   kSTTryrope_2d, false, 0, 0},
-	{kVWind_2d,  kNRope_2d,   kSTWindwell_2d, false, 0, 0},
-	{kVTie_2d,   kNRope_2d,   kSTNopurps_2d, false, 0, 0},
-	{kVTake_2d,  kNBucket_2d, kSTNosee_2d, false, 0, 0},
-	{kVLook_2d,  kNBucket_2d, kSTNosee_2d, false, 0, 0},
-	{kVWind_2d,  kNBucket_2d, kSTWindwell_2d, false, 0, 0},
-	{kVTake_2d,  kNWater_2d,  kSTNosee_2d, false, 0, 0},
-	{kVWind_2d,  kNHandle_2d, kSTWindwell_2d, false, 0, 0},
-	{kVInto_2d,  kNBucket_2d, kSTNosee_2d, false, 0, 0},
-	{kVInto_2d,  kNWell_2d,   kSTIntowell_2d, false, 0, 0},
-	{kVWish_2d,  0,        kSTGetonwithit_2d, false, 0, 0},
+	{kVLook_2d,  0,           kSTS16look_2d,     true,  0, 0},
+	{kVClimb_2d, 0,           kSTTryrope_2d,     false, 0, 0},
+	{kVGo_2d,    kNWell_2d,   kSTTryrope_2d,     false, 0, 0},
+	{kVWind_2d,  kNRope_2d,   kSTWindwell_2d,    false, 0, 0},
+	{kVTie_2d,   kNRope_2d,   kSTNopurps_2d,     false, 0, 0},
+	{kVTake_2d,  kNBucket_2d, kSTNosee_2d,       false, 0, 0},
+	{kVLook_2d,  kNBucket_2d, kSTNosee_2d,       false, 0, 0},
+	{kVWind_2d,  kNBucket_2d, kSTWindwell_2d,    false, 0, 0},
+	{kVTake_2d,  kNWater_2d,  kSTNosee_2d,       false, 0, 0},
+	{kVWind_2d,  kNHandle_2d, kSTWindwell_2d,    false, 0, 0},
+	{kVInto_2d,  kNBucket_2d, kSTNosee_2d,       false, 0, 0},
+	{kVInto_2d,  kNWell_2d,   kSTIntowell_2d,    false, 0, 0},
+	{kVWish_2d,  0,           kSTGetonwithit_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen17_desc_2d[] = {      // Snakepit
-	{kVLook_2d,   0,       kSTS17look_2d, true, 0, 0},
+	{kVLook_2d,   0,          kSTS17look_2d, true,  0, 0},
 	{kVAttack_2d, kNSnake_2d, kSTS17kill_2d, false, 0, 0},
 	{kVBreak_2d,  kNSnake_2d, kSTS17kill_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen18_desc_2d[] = {      // Phonebox
-	{kVLook_2d, 0,       kSTS18look_2d, true, 0, 0},
+	{kVLook_2d, 0,          kSTS18look_2d, true,  0, 0},
 	{kVLook_2d, kNPhone_2d, kSTS18look_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 
 background_t screen19_desc_2d[] = {      // Street
-	{kVLook_2d, 0,      kSTS19look_2d, true, 0, 0},
-	{kVLook_2d, kNWall_2d, kSTSgraf_2d, false, 0, 0},
-	{kVRead_2d, kNWall_2d, kSTSgraf_2d, false, 0, 0},
-	{kVLook_2d, kNGraf_2d, kSTSgraf_2d, false, 0, 0},
-	{kVRead_2d, kNGraf_2d, kSTSgraf_2d, false, 0, 0},
+	{kVLook_2d, 0,         kSTS19look_2d, true,  0, 0},
+	{kVLook_2d, kNWall_2d, kSTSgraf_2d,   false, 0, 0},
+	{kVRead_2d, kNWall_2d, kSTSgraf_2d,   false, 0, 0},
+	{kVLook_2d, kNGraf_2d, kSTSgraf_2d,   false, 0, 0},
+	{kVRead_2d, kNGraf_2d, kSTSgraf_2d,   false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen20_desc_2d[] = {      // Kennel
-	{kVLook_2d,   0,        kSTS20look_2d,      true, 0, 0},
+	{kVLook_2d,   0,           kSTS20look_2d,      true,  0, 0},
 	{kVLook_2d,   kNWindow_2d, kSTMorespecific_2d, false, 0, 0},
-	{kVThrow_2d,  kNStick_2d,  kSTDonthaveone_2d, false, 0, 0},
-	{kVStroke_2d, kNDog_2d,    kSTStrokedog_2d, false, 0, 0},
-	{kVTalk_2d,   kNDog_2d,    kSTStrokedog_2d, false, 0, 0},
-	{kVInto_2d,   0,        kSTStoobigtofit_2d, false, 0, 0},
+	{kVThrow_2d,  kNStick_2d,  kSTDonthaveone_2d,  false, 0, 0},
+	{kVStroke_2d, kNDog_2d,    kSTStrokedog_2d,    false, 0, 0},
+	{kVTalk_2d,   kNDog_2d,    kSTStrokedog_2d,    false, 0, 0},
+	{kVInto_2d,   0,           kSTStoobigtofit_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen21_desc_2d[] = {      // Rockroom
-	{kVLook_2d,  0,      kSTS21look_2d,   true, 0, 0},
-	{kVClimb_2d, kNRope_2d, kSTNotclose_2d, false, 0, 0},
-	{kVUnder_2d, kNRock_2d, kSTNounder_2d, false, 0, 0},
-	{kVMove_2d,  kNRock_2d, kSTTooheavy_2d, false, 0, 0},
+	{kVLook_2d,  0,         kSTS21look_2d,   true,  0, 0},
+	{kVClimb_2d, kNRope_2d, kSTNotclose_2d,  false, 0, 0},
+	{kVUnder_2d, kNRock_2d, kSTNounder_2d,   false, 0, 0},
+	{kVMove_2d,  kNRock_2d, kSTTooheavy_2d,  false, 0, 0},
 	{kVLift_2d,  kNRock_2d, kSTNowayhose_2d, false, 0, 0},
-	{kVLook_2d,  kNRock_2d, kSTDull_2d, false, 0, 0},
+	{kVLook_2d,  kNRock_2d, kSTDull_2d,      false, 0, 0},
 	{kVTake_2d,  kNRock_2d, kSTNowayhose_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen22_desc_2d[] = {      // Rockgone
-	{kVLook_2d,  0,      kSTS22look_2d,  true, 0, 0},
+	{kVLook_2d,  0,         kSTS22look_2d,  true,  0, 0},
 	{kVClimb_2d, kNRope_2d, kSTNotclose_2d, false, 0, 0},
-	{kVLift_2d,  kNRock_2d, kSTNopurps_2d, false, 0, 0},
-	{kVLook_2d,  kNRock_2d, kSTDull_2d, false, 0, 0},
-	{kVTake_2d,  kNRock_2d, kSTNopurps_2d, false, 0, 0},
-	{kVUnder_2d, kNRock_2d, kSTSsearch_2d, false, 0, 0},
+	{kVLift_2d,  kNRock_2d, kSTNopurps_2d,  false, 0, 0},
+	{kVLook_2d,  kNRock_2d, kSTDull_2d,     false, 0, 0},
+	{kVTake_2d,  kNRock_2d, kSTNopurps_2d,  false, 0, 0},
+	{kVUnder_2d, kNRock_2d, kSTSsearch_2d,  false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen23_desc_2d[] = {      // Threeway
-	{kVLook_2d,  0,      kSTS23look_2d,  true, 0, 0},
+	{kVLook_2d,  0,         kSTS23look_2d, true,  0, 0},
 	{kVLift_2d,  kNRock_2d, kSTNopurps_2d, false, 0, 0},
-	{kVLook_2d,  kNRock_2d, kSTDull_2d, false, 0, 0},
-	{kVUnder_2d, kNRock_2d, kSTDull2_2d, false, 0, 0},
+	{kVLook_2d,  kNRock_2d, kSTDull_2d,    false, 0, 0},
+	{kVUnder_2d, kNRock_2d, kSTDull2_2d,   false, 0, 0},
 	{kVTake_2d,  kNRock_2d, kSTNopurps_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 
 background_t screen24_desc_2d[] = {      // Lampcave
-	{kVLook_2d,  0,      kSTS24look_2d,   true, 0, 0},
-	{kVLift_2d,  kNRock_2d, kSTSsearch_2d, false, 0, 0},
+	{kVLook_2d,  0,         kSTS24look_2d,   true,  0, 0},
+	{kVLift_2d,  kNRock_2d, kSTSsearch_2d,   false, 0, 0},
 	{kVLook_2d,  kNRock_2d, kSTNospecial_2d, false, 0, 0},
-	{kVUnder_2d, kNRock_2d, kSTDull2_2d, false, 0, 0},
-	{kVTake_2d,  kNRock_2d, kSTNopurps_2d, false, 0, 0},
+	{kVUnder_2d, kNRock_2d, kSTDull2_2d,     false, 0, 0},
+	{kVTake_2d,  kNRock_2d, kSTNopurps_2d,   false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen25_desc_2d[] = {      // Chasm
-	{kVLook_2d,  0,      kSTS25look_2d, true, 0, 0},
+	{kVLook_2d,  0,         kSTS25look_2d, true,  0, 0},
 	{kVUnder_2d, kNRock_2d, kSTSsearch_2d, false, 0, 0},
 	{kVLift_2d,  kNRock_2d, kSTSsearch_2d, false, 0, 0},
-	{kVLook_2d,  kNRock_2d, kSTDull_2d, false, 0, 0},
+	{kVLook_2d,  kNRock_2d, kSTDull_2d,    false, 0, 0},
 	{kVTake_2d,  kNRock_2d, kSTNopurps_2d, false, 0, 0},
-	{kVJump_2d,  0,      kSTSnojump_2d, false, 0, 0},
+	{kVJump_2d,  0,         kSTSnojump_2d, false, 0, 0},
 	{0, 0, 0, false, 0, 0}
 };
 
 background_t screen26_desc_2d[] = {      // Passage
-	{kVLook_2d,  0,      kSTS26look_2d, true, 0, 0},
+	{kVLook_2d,  0,         kSTS26look_2d, true,  0, 0},
 	{kVUnder_2d, kNRock_2d, kSTSsearch_2d, false, 0, 0},
 	{kVLift_2d,  kNRock_2d, kSTSsearch_2d, false, 0, 0},
-	{kVLook_2d,  kNRock_2d, kSTDull_2d, false, 0, 0},
+	{kVLook_2d,  kNRock_2d, kSTDull_2d,    false, 0, 0},
 	{kVTake_2d,  kNRock_2d, kSTNopurps_2d, false, 0, 0},
 	{0, 0, 0, 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