[Scummvm-cvs-logs] SF.net SVN: scummvm:[52590] scummvm/trunk
strangerke at users.sourceforge.net
strangerke at users.sourceforge.net
Mon Sep 6 14:09:11 CEST 2010
Revision: 52590
http://scummvm.svn.sourceforge.net/scummvm/?rev=52590&view=rev
Author: strangerke
Date: 2010-09-06 12:09:11 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
HUGO: Add hints in DOS versions
In DOS versions, display hints when mouse is over a
hotspot. This behavior is based on the one of Hugo Win
versions.
Modified Paths:
--------------
scummvm/trunk/dists/engine-data/hugo.dat
scummvm/trunk/engines/hugo/hugo.h
scummvm/trunk/tools/create_hugo/create_hugo.h
scummvm/trunk/tools/create_hugo/staticdata.h
Modified: scummvm/trunk/dists/engine-data/hugo.dat
===================================================================
(Binary files differ)
Modified: scummvm/trunk/engines/hugo/hugo.h
===================================================================
--- scummvm/trunk/engines/hugo/hugo.h 2010-09-06 12:04:30 UTC (rev 52589)
+++ scummvm/trunk/engines/hugo/hugo.h 2010-09-06 12:09:11 UTC (rev 52590)
@@ -33,7 +33,7 @@
#include "hugo/game.h"
#define HUGO_DAT_VER_MAJ 0 // 1 byte
-#define HUGO_DAT_VER_MIN 19 // 1 byte
+#define HUGO_DAT_VER_MIN 20 // 1 byte
#define DATAALIGNMENT 4
namespace Common {
Modified: scummvm/trunk/tools/create_hugo/create_hugo.h
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.h 2010-09-06 12:04:30 UTC (rev 52589)
+++ scummvm/trunk/tools/create_hugo/create_hugo.h 2010-09-06 12:09:11 UTC (rev 52590)
@@ -31,7 +31,7 @@
#define DATAALIGNMENT 4
#define HUGO_DAT_VER_MAJ 0 // 1 byte
-#define HUGO_DAT_VER_MIN 19 // 1 byte
+#define HUGO_DAT_VER_MIN 20 // 1 byte
typedef unsigned char uint8;
typedef unsigned char byte;
Modified: scummvm/trunk/tools/create_hugo/staticdata.h
===================================================================
--- scummvm/trunk/tools/create_hugo/staticdata.h 2010-09-06 12:04:30 UTC (rev 52589)
+++ scummvm/trunk/tools/create_hugo/staticdata.h 2010-09-06 12:09:11 UTC (rev 52590)
@@ -1169,66 +1169,66 @@
// Hugo 1 Dos
//***************************************************************************
-const char *nHero_1d[] = {"hero", "self", ""};
-const char *nTrap_1d[] = {"trap", ""};
-const char *nWard_1d[] = {"wardrobe", "closet", "cabinet", ""};
-const char *nDoor_1d[] = {"door", ""};
-const char *nBat_1d[] = {"bat", ""};
-const char *nEyes_1d[] = {"eyes", ""};
-const char *nPkin_1d[] = {"pumpkin", ""};
-const char *nCandle_1d[] = {"candle", ""};
-const char *nRope_1d[] = {"rope", "string", ""};
-const char *nCupb_1d[] = {"cupboard", "cabinet", "dresser", "hutch", "sideboard", "bureau", ""};
-const char *nKnife_1d[] = {"knife", "penknife", ""};
-const char *nWhistle_1d[] = {"whistle", ""};
+const char *nArc_1d[] = {"arc", ""};
+const char *nArm_1d[] = {"arm", ""};
+const char *nBat_1d[] = {"bat", "~", "bat", ""};
+const char *nBoat_1d[] = {"boat", "~", "boat", ""};
+const char *nBolt_1d[] = {"bolt", "~", "bolt", ""};
+const char *nBung_1d[] = {"bung", "~", "bung", ""};
+const char *nButler_1d[] = {"butler", "waiter", "butler", "servant", ""};
+const char *nCandle_1d[] = {"candle", "a candle", "candle", ""};
+const char *nCarpet_1d[] = {"carpet", "mat", "rug", ""};
+const char *nChop_1d[] = {"chop", "a juicy chop", "chop", "meat", "steak", ""};
+const char *nCupb_1d[] = {"cupboard", "cabinet", "cupboard", "dresser", "hutch", "sideboard", "bureau", ""};
+const char *nDog_1d[] = {"dog", "~", "dog", ""};
+const char *nDoor_1d[] = {"door", "~", "door", ""};
+const char *nEyes_1d[] = {"eyes", "~", "eyes", ""};
+const char *nFuzyhero_1d[] = {"fuzyhero", "~", "Hugo", ""};
+const char *nGdoor_1d[] = {"glasdoor", "~", "door", ""};
+const char *nGold_1d[] = {"gold", "a bag of gold", "gold", "money", "treasure", "bag", "jewels", ""};
+const char *nGuard_1d[] = {"guard", "man", "Guard", ""};
+const char *nHdlshero_1d[] = {"hdlshero", "~", "Hugo", ""};
+const char *nHero_1d[] = {"hero", "self", "Hugo", ""};
+const char *nHerodead_1d[] = {"herodead", "~", "Hugo", ""};
+const char *nIgor_1d[] = {"igor", "man", "Igor", ""};
+const char *nKey_1d[] = {"key", "a door key", " key", ""};
+const char *nKnife_1d[] = {"knife", "a penknife", "penknife", ""};
+const char *nLips_1d[] = {"lips", ""};
+const char *nMask_1d[] = {"mask", "a mask", "mask", ""};
+const char *nMdoor_1d[] = {"mdoor", "~", "tomb", ""};
+const char *nMonkey_1d[] = {"monkey", "~", "Hugo", ""};
+const char *nMummy_1d[] = {"mummy", "monster", "Mummy", ""};
+const char *nOilcan_1d[] = {" oil", "an oilcan", "oilcan", ""};
+const char *nOldman_1d[] = {"oldman", "old", "old man", "man", ""};
+const char *nPkin_1d[] = {"pumpkin", "a pumpkin", "pumpkin", ""};
+const char *nProf_1d[] = {"prof", "~", "Professor", ""};
+const char *nRedeyes_1d[] = {"redeyes", ""};
+const char *nRope_1d[] = {"rope", "some rope", "rope", "string", ""};
+const char *nSpachero_1d[] = {"spachero", "~", "Hugo", ""};
+const char *nTrap_1d[] = {"trap", "~", "trapdoor", ""};
+const char *nWard_1d[] = {"wardrobe", "cabinet", "closet", ""};
const char *nWdoorl_1d[] = {"wdoorl", ""};
const char *nWdoorr_1d[] = {"wdoorr", ""};
-const char *nMask_1d[] = {"mask", ""};
-const char *nButler_1d[] = {"butler", "waiter", "servant", ""};
-const char *nChop_1d[] = {"chop", "meat", "steak", ""};
-const char *nRedeyes_1d[] = {"redeyes", ""};
-const char *nLips_1d[] = {"lips", ""};
-const char *nArm_1d[] = {"arm", ""};
-const char *nHdlshero_1d[] = {"hdlshero", ""};
-const char *nMonkey_1d[] = {"monkey", ""};
-const char *nKey_1d[] = {"key", ""};
-const char *nDog_1d[] = {"dog", ""};
-const char *nCarpet_1d[] = {"carpet", "rug", "mat", ""};
-const char *nBolt_1d[] = {"bolt", ""};
-const char *nHerodead_1d[] = {"herodead", ""};
-const char *nOilcan_1d[] = {" oil", ""};
-const char *nMummy_1d[] = {"mummy", ""};
-const char *nMdoor_1d[] = {"mdoor", ""};
-const char *nGold_1d[] = {"gold", "money", "treasure", "bag", "jewels", ""};
-const char *nBoat_1d[] = {"boat", ""};
-const char *nWhero_1d[] = {"whero", ""};
-const char *nOldman_1d[] = {"oldman", "old", "man", ""};
-const char *nGuard_1d[] = {"guard", "man", ""};
-const char *nProf_1d[] = {"prof", ""};
-const char *nIgor_1d[] = {"igor", "man", ""};
-const char *nBung_1d[] = {"bung", ""};
-const char *nGdoor_1d[] = {"glasdoor", "door", ""};
-const char *nSpachero_1d[] = {"spachero", ""};
-const char *nFuzyhero_1d[] = {"fuzyhero", ""};
-const char *nArc_1d[] = {"arc", ""};
+const char *nWhero_1d[] = {"whero", "~", "Hugo", ""};
+const char *nWhistle_1d[] = {"whistle", "a whistle", "whistle", ""};
-const char *nTree_1d[] = {"tree", ""};
-const char *nFence_1d[] = {"fence", ""};
-const char *nPicture_1d[] = {"picture", "painting", ""};
-const char *nTable_1d[] = {"table", ""};
-const char *nBed_1d[] = {"bed", ""};
-const char *nPlant_1d[] = {"plant", "flower", "vase", ""};
-const char *nFood_1d[] = {"food", "plate", ""};
-const char *nMan_1d[] = {"man", "monster", "dracula", "frankenstein", "alien", "guest", "vampire", ""};
-const char *nMirror_1d[] = {"mirror", ""};
-const char *nToilet_1d[] = {"toilet", ""};
-const char *nBath_1d[] = {"bath", "tub", ""};
-const char *nUnits_1d[] = {"Unit", "oven", "sink", "cupb", "drawer", "pantry", "cabinet", "range", "counter", ""};
-const char *nBroom_1d[] = {"broom", ""};
-const char *nMousehole_1d[] = {"hole", ""};
-const char *nRock_1d[] = {"rock", "boulder", "stone", ""};
-const char *nTomb_1d[] = {"tomb", "coffin", "box", "sarcop", ""};
-const char *nWindow_1d[] = {"window", "outside", "inside", ""};
+const char *nBath_1d[] = {"bath", "~", "tub", ""};
+const char *nBed_1d[] = {"bed", "~", "bed", ""};
+const char *nBroom_1d[] = {"broom", "~", "broom", ""};
+const char *nFence_1d[] = {"fence", "~", "fence", ""};
+const char *nFood_1d[] = {"food", "plate", "food", ""};
+const char *nMan_1d[] = {"man", "dracula", "monster", "frankenstein", "alien", "guest", "vampire", ""};
+const char *nMirror_1d[] = {"mirror", "~", "mirror", ""};
+const char *nMousehole_1d[] = {"hole", "~", "mousehole"""};
+const char *nPicture_1d[] = {"picture", "painting", "picture", ""};
+const char *nPlant_1d[] = {"plant", "flower", "plant", "vase", ""};
+const char *nRock_1d[] = {"rock", "boulder", "rock", "stone", ""};
+const char *nTable_1d[] = {"table", "~", "table", ""};
+const char *nToilet_1d[] = {"toilet", "~", "toilet", ""};
+const char *nTomb_1d[] = {"tomb", "coffin", "tomb", "box", "sarcop", ""};
+const char *nTree_1d[] = {"tree", "~", "tree", ""};
+const char *nUnits_1d[] = {"Unit", "oven", "cupboard", "sink", "cupb", "drawer", "pantry", "cabinet", "range", "counter", ""};
+const char *nWindow_1d[] = {"window", "outside", "window", "inside", ""};
const char **arrayNouns_1d[] = {
nDummy, nHero_1d, nTrap_1d, nWard_1d, nDoor_1d,
@@ -1252,117 +1252,117 @@
//***************************************************************************
// Hugo 2 Dos
//***************************************************************************
-const char *nHero_2d[] = {"hero", "self", ""};
-const char *nPenny_2d[] = {"penelope", "woman", "girl", "lady", ""};
-const char *nPennylie_2d[] = {"pennylie", ""};
-const char *nPenfall_2d[] = {"penfall", ""};
-const char *nSmoke_2d[] = {"smoke", ""};
+const char *nAlbum_2d[] = {"album", "photo", "album", ""};
+const char *nBalloon_2d[] = {"balloon", "balloon", "balloon", ""};
+const char *nBanana_2d[] = {"banana", "a moldy banana", "banana", ""};
+const char *nBell_2d[] = {"bell", "a bell", "bell", ""};
+const char *nBlue_2d[] = {"blue", "blue", "blue button", ""};
+const char *nBook_2d[] = {"book", "book", "book", ""};
+const char *nBookcase_2d[] = {"bookcase", "bookcase", "bookcase", ""};
+const char *nBottle_2d[] = {"bottle", "a bottle", "serum", ""};
+const char *nBug_2d[] = {"bug", "bee", "bug zapper", "insect", "wasp", ""};
+const char *nButton_2d[] = {"button", "switch", "button", "knob", ""};
+const char *nCat_2d[] = {"cat", "puss", "cat", ""};
+const char *nCatnip_2d[] = {"catnip", "some catnip", "catnip", ""};
+const char *nCook_2d[] = {"cook", "woman", "cook", "girl", "lady", ""};
+const char *nCookb_2d[] = {"cookb", ""};
+const char *nCop_2d[] = {"cop", "man", "Officer Higgins", ""};
+const char *nCrate_2d[] = {"crate", "box", "box", ""};
+const char *nCupb_2d[] = {"cupboard", "cabinet", "dresser", "hutch", "sideboard", "bureau", "desk", "drawer", ""};
+const char *nDalek_2d[] = {"alek", "monster", "robot", ""};
+const char *nDoctor_2d[] = {"doctor", "man", "Strange man", ""};
+const char *nDog_2d[] = {"dog", "dog", "dog", ""};
+const char *nDoor_2d[] = {"door", "gate", ""};
+const char *nDumb_2d[] = {"dumb", "waiter", "dumb waiter", "box", ""};
+const char *nDynamite_2d[] = {"dynamite", "a stick of dynamite", "dynamite", "fuze", "fuse", ""};
+const char *nFly_2d[] = {"fly", "~", "fly", ""};
+const char *nGardner_2d[] = {"gard", "man", "gardener", ""};
+const char *nGarlic_2d[] = {"garlic", "some garlic", "garlic", "clove", ""};
+const char *nGatelight_2d[] = {"glight", "~", "lantern", ""};
+const char *nGenie_2d[] = {"genie", "man", "Genie", ""};
+const char *nGreen_2d[] = {"green", "green", "green button", ""};
+const char *nGun_2d[] = {"gun", "a gun", "pistol", "revolver", "weapon", ""};
+const char *nHarry_2d[] = {"harry", "man", "Harry", ""};
+const char *nHero_2d[] = {"hero", "self", "Hugo", ""};
+const char *nHester_2d[] = {"hester", "woman", "Hester", "girl", "lady", ""};
+const char *nHorace_2d[] = {"horace", "man", "Horace", ""};
+const char *nKennel_2d[] = {"kennel", "house", "dog house", ""};
+const char *nKey_2d[] = {"key", "key", "key", ""};
+const char *nKeyhole_2d[] = {"hole", "hole", "keyhole", ""};
+const char *nKnife_2d[] = {"knife", "knife", "knife", ""};
+const char *nLamp_2d[] = {"lamp", "an old dusty oil lamp", "oil lamp", ""};
+const char *nLeaf_2d[] = {"leaf", "~", "venus fly trap", ""};
+const char *nLetter_2d[] = {"letter", "envelope", "letter", "card", ""};
const char *nLips_2d[] = {"lips", ""};
-const char *nMaid_2d[] = {"maid", "waitress", "woman", "girl", "lady", ""};
-const char *nBookcase_2d[] = {"bookcase", ""};
-const char *nBook_2d[] = {"book", ""};
-const char *nKeyhole_2d[] = {"hole", ""};
+const char *nMagnify_2d[] = {"magnifier", "a magnifying glass", "magnifying glass", "magnify", "glass", ""};
+const char *nMaid_2d[] = {"maid", "waitress", "maid", "woman", "girl", "lady", ""};
+const char *nMatches_2d[] = {"matches", "a box of matches", "matches", "match", ""};
+const char *nMurder_2d[] = {"murder", "~", "~", ""};
+const char *nOldman_2d[] = {"oldman", "old", "man", ""};
const char *nPanel_2d[] = {"panel", ""};
-const char *nMatches_2d[] = {"matches", "a box of matches", "match", ""};
-const char *nCrate_2d[] = {"crate", "box", ""};
-const char *nDumb_2d[] = {"dumb", "waiter", "box", ""};
-const char *nMurder_2d[] = {"murder", ""};
+const char *nPaper_2d[] = {"paper", "a newspaper", "newspaper", "notepad", " pad", "blotter", ""};
+const char *nPencil_2d[] = {"pencil", "a pencil", "pencil", " pen", ""};
+const char *nPenfall_2d[] = {"penfall", "woman", "Penelope", ""};
+const char *nPenny_2d[] = {"penelope", "woman", "Penelope", "girl", "lady", ""};
+const char *nPennylie_2d[] = {"pennylie", "woman", "Penelope", ""};
+const char *nRed_2d[] = {"red", "red", "red button", ""};
+const char *nRope_2d[] = {"rope", "string", ""};
+const char *nSafe_2d[] = {"safe", "safe", "safe", ""};
+const char *nScrew_2d[] = {"screwdriver", "sonic", "screwdriver", ""};
+const char *nShed_2d[] = {"shed", ""};
+const char *nShedlight_2d[] = {"slight", "~", "light bulb", ""};
+const char *nSmoke_2d[] = {"smoke", "~", "~", ""};
+const char *nSnake_2d[] = {"snake", "snake", "snake", ""};
+const char *nStick_2d[] = {"stick", "a pile of sticks", "stick", "twig", ""};
+const char *nTardis_2d[] = {"tardis", "phone", "phone booth", ""};
const char *nTrap_2d[] = {"trap", ""};
-const char *nWard_2d[] = {"wardrobe", "closet", "cabinet", ""};
-const char *nDoor_2d[] = {"door", "gate", ""};
-const char *nRope_2d[] = {"rope", "string", ""};
-const char *nCupb_2d[] = {"cupboard", "cabinet", "dresser", "hutch", "sideboard", "bureau", "desk", "drawer", ""};
-const char *nGarlic_2d[] = {"garlic", "some garlic", "clove", ""};
-const char *nGardner_2d[] = {"gard", "man", ""};
-const char *nButton_2d[] = {"button", "switch", "knob", ""};
-const char *nRed_2d[] = {"red", ""};
-const char *nYellow_2d[] = {"yellow", ""};
-const char *nGreen_2d[] = {"green", ""};
-const char *nBlue_2d[] = {"blue", ""};
-const char *nFly_2d[] = {"fly", ""};
-const char *nLeaf_2d[] = {"leaf", ""};
-const char *nShedlight_2d[] = {"slight", ""};
-const char *nGatelight_2d[] = {"glight", ""};
+const char *nWard_2d[] = {"wardrobe", "cabinet", "closet", ""};
+const char *nWell_2d[] = {"well", "rope", "well", ""};
+const char *nWill_2d[] = {"will", "print", "Horace's will", ""};
+const char *nYellow_2d[] = {"yellow", "yellow", "yellow button", ""};
const char *nZapper_2d[] = {"zapper", "lamp", "light", "lantern", ""};
-const char *nBug_2d[] = {"bug", "bee", "insect", "wasp", ""};
-const char *nKnife_2d[] = {"knife", ""};
-const char *nShed_2d[] = {"shed", ""};
-const char *nOldman_2d[] = {"oldman", "old", "man", ""};
-const char *nSnake_2d[] = {"snake", ""};
-const char *nStick_2d[] = {"stick", "a pile of sticks", "twig", ""};
-const char *nDynamite_2d[] = {"dynamite", "a stick of dynamite", "fuze", "fuse", ""};
-const char *nKennel_2d[] = {"kennel", "house", ""};
-const char *nDog_2d[] = {"dog", ""};
-const char *nWell_2d[] = {"well", "rope", ""};
-const char *nBanana_2d[] = {"banana", "a moldy banana", ""};
-const char *nLamp_2d[] = {"lamp", "an old dusty oil lamp", ""};
-const char *nGenie_2d[] = {"genie", "man", ""};
-const char *nTardis_2d[] = {"tardis", "phone", ""};
-const char *nHarry_2d[] = {"harry", "man", ""};
-const char *nHester_2d[] = {"hester", "woman", "girl", "lady", ""};
-const char *nLetter_2d[] = {"letter", "envelope", "card", ""};
-const char *nDoctor_2d[] = {"doctor", "man", ""};
-const char *nDalek_2d[] = {"alek", "robot", "monster", ""};
-const char *nCook_2d[] = {"cook", "woman", "girl", "lady", ""};
-const char *nCookb_2d[] = {"cookb", ""};
-const char *nCop_2d[] = {"cop", "man", ""};
-const char *nHorace_2d[] = {"horace", "man", ""};
-const char *nBell_2d[] = {"bell", "a bell", ""};
-const char *nCatnip_2d[] = {"catnip", "some catnip", ""};
-const char *nCat_2d[] = {"cat", "puss", ""};
-const char *nGun_2d[] = {"gun", "a gun", "revolver", "pistol", "weapon", ""};
-const char *nPaper_2d[] = {"paper", "a newspaper", "notepad", " pad", "blotter", ""};
-const char *nPencil_2d[] = {"pencil", "a pencil", " pen", ""};
-const char *nKey_2d[] = {"key", ""};
-const char *nMagnify_2d[] = {"magnifier", "a magnifying glass", "magnify", "glass", ""};
-const char *nSafe_2d[] = {"safe", ""};
-const char *nScrew_2d[] = {"screwdriver", "sonic", ""};
-const char *nWill_2d[] = {"will", "print", ""};
-const char *nAlbum_2d[] = {"album", "photo", ""};
-const char *nBottle_2d[] = {"bottle", "a bottle", "serum", ""};
-const char *nBalloon_2d[] = {"balloon", ""};
-const char *nSky_2d[] = {"sky", "ceiling", ""};
-const char *nWall_2d[] = {"wall", ""};
+const char *nBed_2d[] = {"bed", "bed", "bed", ""};
+const char *nBird_2d[] = {"bird", "budgie", "parrot", ""};
+const char *nBridge_2d[] = {"bridge", "~", "bridge", ""};
+const char *nBroom_2d[] = {"broom", "brush", ""};
+const char *nBucket_2d[] = {"bucket", "container", ""};
+const char *nCage_2d[] = {"cage", "pen", "playpen", ""};
+const char *nChair_2d[] = {"chair", "seat", "couch", "settee", ""};
+const char *nChute_2d[] = {"chute", "~", "chute", ""};
+const char *nDroppings_2d[] = {"droppings", ""};
+const char *nFence_2d[] = {"fence", "hedge", "bush", ""};
+const char *nFood_2d[] = {"food", "plate", ""};
+const char *nGardenbits_2d[] = {"grass", "fence", "Branch", "path", ""};
+const char *nGraf_2d[] = {"graffiti", "graf", "graffiti", "writing", ""};
const char *nGround_2d[] = {"ground", "floor", ""};
-const char *nTree_2d[] = {"tree", ""};
-const char *nFence_2d[] = {"fence", "hedge", "bush", ""};
+const char *nHandle_2d[] = {"handle", "lever", ""};
+const char *nHole_2d[] = {"hole", "~", "chasm", ""};
const char *nHouse_2d[] = {"house", ""};
-const char *nRoof_2d[] = {"roof", "chimney", ""};
const char *nLight_2d[] = {"light", "lamp", ""};
+const char *nMan_2d[] = {"man", ""};
+const char *nMirror_2d[] = {"mirror", "~", "mirror", ""};
const char *nMoon_2d[] = {"moon", ""};
-const char *nPicture_2d[] = {"picture", "painting", ""};
+const char *nMouse_2d[] = {"mouse", "rat", "rodent", "animal", "furry", ""};
+const char *nOrgan_2d[] = {"organ", "piano", "organ", "pipe", ""};
+const char *nPhone_2d[] = {"phone", "phone", "phone", ""};
+const char *nPicture_2d[] = {"picture", "painting", "picture", ""};
+const char *nPlant_2d[] = {"plant", "flower", "plant", "vase", ""};
+const char *nPost_2d[] = {"post", "pole", "scratching post", ""};
+const char *nRock_2d[] = {"rock", "boulder", "rockfall", "stone", ""};
+const char *nRoof_2d[] = {"roof", "chimney", ""};
+const char *nSink_2d[] = {"sink", ""};
+const char *nSky_2d[] = {"sky", "ceiling", ""};
+const char *nStairs_2d[] = {"stair", "landing", "ladder", ""};
const char *nTable_2d[] = {"table", "bench", ""};
-const char *nStairs_2d[] = {"stair", "landing", "ladder", ""};
-const char *nBed_2d[] = {"bed", ""};
-const char *nPlant_2d[] = {"plant", "flower", "vase", ""};
-const char *nFood_2d[] = {"food", "plate", ""};
-const char *nWoman_2d[] = {"woman", "girl", "lady", ""};
-const char *nMan_2d[] = {"man", ""};
-const char *nMirror_2d[] = {"mirror", ""};
-const char *nSink_2d[] = {"sink", ""};
+const char *nTools_2d[] = {"tools", "hammer", "tools", "pliers", "screw", "knife", "saw", ""};
+const char *nTree_2d[] = {"tree", ""};
const char *nUnits_2d[] = {"Unit", "oven", "sink", "cupb", "drawer", "pantry", "cabinet", "range", "counter", "cooker", ""};
-const char *nBroom_2d[] = {"broom", "brush", ""};
-const char *nGardenbits_2d[] = {"grass", "fence", "Branch", "path", ""};
-const char *nRock_2d[] = {"rock", "boulder", "stone", ""};
-const char *nDroppings_2d[] = {"droppings", ""};
-const char *nWindow_2d[] = {"window", "outside", "inside", ""};
-const char *nBird_2d[] = {"bird", "parrot", "budgie", ""};
-const char *nCage_2d[] = {"cage", "pen", ""};
-const char *nPhone_2d[] = {"phone", ""};
-const char *nChair_2d[] = {"chair", "seat", "couch", "settee", ""};
-const char *nTools_2d[] = {"tools", "hammer", "pliers", "screw", "knife", "saw", ""};
-const char *nBridge_2d[] = {"bridge", ""};
+const char *nWall_2d[] = {"wall", ""};
+const char *nWand_2d[] = {"wand", ""};
const char *nWater_2d[] = {"water", ""};
-const char *nBucket_2d[] = {"bucket", "container", ""};
-const char *nMouse_2d[] = {"mouse", "rat", "rodent", "animal", "furry", ""};
-const char *nWand_2d[] = {"wand", ""};
-const char *nHole_2d[] = {"hole", ""};
-const char *nHandle_2d[] = {"handle", "lever", ""};
-const char *nChute_2d[] = {"chute", ""};
-const char *nOrgan_2d[] = {"organ", "piano", "pipe", ""};
-const char *nPost_2d[] = {"post", "pole", ""};
-const char *nGraf_2d[] = {"graffiti", "graf", "writing", ""};
+const char *nWindow_2d[] = {"window", "outside", "window", "inside", ""};
+const char *nWoman_2d[] = {"woman", "girl", "lady", ""};
const char **arrayNouns_2d[] = {
nDummy, nHero_2d, nPenny_2d, nPennylie_2d, nPenfall_2d,
@@ -1390,80 +1390,80 @@
nGraf_2d
};
-const char *nHero_3d[] = {"hero", "self", ""};
-const char *nWhero_3d[] = {"whero", ""};
-const char *nHero_old_3d[] = {"hero_old", ""};
-const char *nWheroold_3d[] = {"wheroold", ""};
-const char *nPenny_3d[] = {"penelope", "woman", "girl", "lady", ""};
-const char *nPennylie_3d[] = {"pennylie", ""};
-const char *nLips_3d[] = {"lips", ""};
-const char *nPlane_3d[] = {"plane", "craft", "cabin", "cockpit", ""};
-const char *nDoor_3d[] = {"door", ""};
-const char *nCdoor_3d[] = {"door", "cage", "gate", ""};
+const char *nBell_3d[] = {"bell", "a golden bell", "bell", ""};
const char *nBlock_3d[] = {"block", ""};
-const char *nVine_3d[] = {"vine", "rope", ""};
-const char *nSwinger_3d[] = {"swinger", ""};
-const char *nDoctor_3d[] = {"doctor", "witch", "native", "man", ""};
-const char *nClay_3d[] = {"clay", "some clay", "plasticine", "model", "effigy", "voodoo", "doll", ""};
-const char *nDoorlock_3d[] = {"lock", ""};
-const char *nNeedles_3d[] = {"needle", "some pins", "pin", ""};
-const char *nNative_3d[] = {"native", "man", "lady", ""};
-const char *nNat1_3d[] = {"nat1", "native", "man", ""};
-const char *nNat2_3d[] = {"nat2", "native", "man", ""};
-const char *nNat3_3d[] = {"nat3", "native", "man", ""};
-const char *nNatb_3d[] = {"natb", "native", "man", ""};
-const char *nNatg_3d[] = {"natg", "native", "man", "girl", ""};
+const char *nBook_3d[] = {"book", "a spell book", "book", "spell", ""};
const char *nBottles_3d[] = {"bottles", ""};
-const char *nFlask_3d[] = {"flask", "a water flask", "water", "remedy", "antidote", ""};
-const char *nCage_3d[] = {"cage", "a little cage", "door", ""};
-const char *nPipe_3d[] = {"blowpipe", "blowpipe & darts", "dart", ""};
-const char *nElephant_3d[] = {"elephant", "animal", ""};
-const char *nE_eyes_3d[] = {"e_eyes", ""};
-const char *nBouillon_3d[] = {"bouillon", "bouillon cubes", "bouil", "boull", "boulion", "cube", "season", "oxo", "knorr", ""};
-const char *nMoushole_3d[] = {"moushole", ""};
-const char *nDoclie_3d[] = {"doclie", ""};
+const char *nBouillon_3d[] = {"bouillon", "bouillon cubes", "bouillon cubes", "bouil", "boull", "boulion", "cube", "season", "oxo", "knorr", ""};
+const char *nCage_3d[] = {"cage", "a little cage", "cage", "door", ""};
+const char *nCandle_3d[] = {"candle", "a golden candle", "candle", ""};
+const char *nCdoor_3d[] = {"door", "cage", "door", "gate", ""};
const char *nCheese_3d[] = {"cheese", "a sandwich", "sandwich", ""};
-const char *nSpider_3d[] = {"spider", "insect", "tarantula", ""};
-const char *nSnake_3d[] = {"snake", ""};
-const char *nFire_3d[] = {"fire", "flame", "pot", ""};
+const char *nClay_3d[] = {"clay", "some clay", "modelling clay", "plasticine", "model", "effigy", "voodoo", "doll", ""};
+const char *nCrystal_3d[] = {"crystal", "a crystal ball", "crystal ball", "ball", ""};
const char *nDocbits_3d[] = {"skull", "shield", "torch", "fire", "flame", "spear", "bone", ""};
+const char *nDoclie_3d[] = {"doclie", ".", "witch doctor", ""};
+const char *nDoctor_3d[] = {"doctor", "witch", "Witch Doctor", "native", "man", ""};
+const char *nDoor_3d[] = {"door", ""};
+const char *nDoorlock_3d[] = {"lock", ""};
+const char *nE_eyes_3d[] = {"e_eyes", ""};
+const char *nElephant_3d[] = {"elephant", "animal", "elephant", ""};
const char *nFire_1_3d[] = {"fire_1", ""};
const char *nFire_2_3d[] = {"fire_2", ""};
const char *nFire_3_3d[] = {"fire_3", ""};
+const char *nFire_3d[] = {"fire", "flame", "pot", ""};
+const char *nFlask_3d[] = {"flask", "a water flask", "flask", "water", "remedy", "antidote", ""};
const char *nFroth_3d[] = {"froth", ""};
-const char *nScroll_3d[] = {"scroll", "an old scroll", "writing", ""};
-const char *nCrystal_3d[] = {"crystal", "a crystal ball", "ball", ""};
-const char *nGhost_3d[] = {"ghost", "ghoul", "spirit", ""};
-const char *nBell_3d[] = {"bell", "a golden bell", ""};
-const char *nBook_3d[] = {"book", "a spell book", "spell", ""};
-const char *nCandle_3d[] = {"candle", "a golden candle", ""};
+const char *nGhost_3d[] = {"ghost", "ghoul", "ghost", "spirit", ""};
+const char *nHero_3d[] = {"hero", "self", "Hugo", ""};
+const char *nHero_old_3d[] = {"hero_old", "~", "Hugo", ""};
+const char *nLips_3d[] = {"lips", ""};
+const char *nMoushole_3d[] = {"moushole", ""};
+const char *nNat1_3d[] = {"nat1", "man", "native", ""};
+const char *nNat2_3d[] = {"nat2", "man", "native", ""};
+const char *nNat3_3d[] = {"nat3", "man", "native", ""};
+const char *nNatb_3d[] = {"natb", "man", "native", ""};
+const char *nNatg_3d[] = {"natg", "man", "native girl", "girl", ""};
+const char *nNative_3d[] = {"native", "man", "native", "lady", ""};
+const char *nNeedles_3d[] = {"needle", "some pins", "needles", "pin", ""};
+const char *nPenny_3d[] = {"penelope", "woman", "Penelope", "girl", "lady", ""};
+const char *nPennylie_3d[] = {"pennylie", "woman", "Penelope", ""};
+const char *nPipe_3d[] = {"blowpipe", "blowpipe & darts", "blowpipe", "dart", ""};
+const char *nPlane_3d[] = {"plane", "craft", "cabin", "cockpit", ""};
+const char *nScroll_3d[] = {"scroll", "an old scroll", "scroll", "writing", ""};
+const char *nSnake_3d[] = {"snake", ""};
+const char *nSpider_3d[] = {"spider", "insect", "spider", "tarantula", ""};
+const char *nSwinger_3d[] = {"swinger", ""};
+const char *nVine_3d[] = {"vine", "rope", "vine", ""};
+const char *nWhero_3d[] = {"whero", "~", "Hugo", ""};
+const char *nWheroold_3d[] = {"wheroold", "~", "Hugo", ""};
-const char *nSky_3d[] = {"sky", "ceiling", ""};
-const char *nWall_3d[] = {"wall", ""};
+const char *nAircraft_3d[] = {"aircraft", ""};
+const char *nBridge_3d[] = {"bridge", ""};
+const char *nFence_3d[] = {"fence", "hedge", "bush", ""};
+const char *nFire_4_3d[] = {"fire_4", ""};
+const char *nFood_3d[] = {"food", "meat", "hyena", ""};
const char *nGround_3d[] = {"ground", "floor", ""};
-const char *nFence_3d[] = {"fence", "hedge", "bush", ""};
-const char *nBridge_3d[] = {"bridge", ""};
-const char *nWater_3d[] = {"water", "stream", "river", "pool", "lake", ""};
-const char *nMouse_3d[] = {"mouse", "rat", "rodent", "animal", "furry", ""};
-const char *nWindow_3d[] = {"window", ""};
-const char *nShelfbits_3d[]= {"shelf", "bottle", "jar", "medicine", "label", ""};
+const char *nHut_3d[] = {"hut", "house", "hut", "shed", ""};
const char *nJungle_3d[] = {"tree", "vine", "flower", "fern", "frond", "plant", "jungle", "undergrowth", ""};
+const char *nMouse_3d[] = {"mouse", "rat", "mouse", "rodent", "animal", "furry", ""};
+const char *nMouth_3d[] = {"mouth", ""};
+const char *nO_eye_3d[] = {"o_eye", ""};
const char *nOrchid_3d[] = {"orchid", "flower", "plant", ""};
-const char *nPole_3d[] = {"pole", "stick", "wood", ""};
-const char *nHut_3d[] = {"hut", "house", "shed", ""};
-const char *nRock_3d[] = {"rock", "boulder", "stone", ""};
-const char *nAircraft_3d[] = {"aircraft", ""};
const char *nPlant1_3d[] = {"plant1", ""};
const char *nPlant2_3d[] = {"plant2", ""};
const char *nPlant3_3d[] = {"plant3", ""};
const char *nPlant4_3d[] = {"plant4", ""};
const char *nPlant5_3d[] = {"plant5", ""};
+const char *nPole_3d[] = {"pole", "stick", "wood", ""};
+const char *nRock_3d[] = {"rock", "stone", "boulder", ""};
+const char *nShelfbits_3d[]= {"shelf", "bottle", "jar", "medicine", "label", ""};
+const char *nSky_3d[] = {"sky", "ceiling", ""};
+const char *nThem_3d[] = {"them", ""};
+const char *nWall_3d[] = {"wall", ""};
+const char *nWater_3d[] = {"water", "stream", "river", "pool", "lake", ""};
const char *nWeb_3d[] = {"web", ""};
-const char *nO_eye_3d[] = {"o_eye", ""};
-const char *nFire_4_3d[] = {"fire_4", ""};
-const char *nMouth_3d[] = {"mouth", ""};
-const char *nFood_3d[] = {"food", "meat", "hyena", ""};
-const char *nThem_3d[] = {"them", ""};
+const char *nWindow_3d[] = {"window", "~", "window", ""};
const char **arrayNouns_3d[] = {
nDummy, nHero_3d, nWhero_3d, nHero_old_3d, nWheroold_3d,
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