[Scummvm-cvs-logs] SF.net SVN: scummvm:[54831] scummvm/trunk
strangerke at users.sourceforge.net
strangerke at users.sourceforge.net
Wed Dec 8 08:18:39 CET 2010
Revision: 54831
http://scummvm.svn.sourceforge.net/scummvm/?rev=54831&view=rev
Author: strangerke
Date: 2010-12-08 07:18:38 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
TOOLS: Fix the "Mouse text" crash in Hugo
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-12-08 01:53:20 UTC (rev 54830)
+++ scummvm/trunk/engines/hugo/hugo.h 2010-12-08 07:18:38 UTC (rev 54831)
@@ -35,7 +35,7 @@
#include "hugo/file.h"
#define HUGO_DAT_VER_MAJ 0 // 1 byte
-#define HUGO_DAT_VER_MIN 31 // 1 byte
+#define HUGO_DAT_VER_MIN 32 // 1 byte
#define DATAALIGNMENT 4
#define EDGE 10 // Closest object can get to edge of screen
#define EDGE2 (EDGE * 2) // Push object further back on edge collision
Modified: scummvm/trunk/tools/create_hugo/create_hugo.h
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.h 2010-12-08 01:53:20 UTC (rev 54830)
+++ scummvm/trunk/tools/create_hugo/create_hugo.h 2010-12-08 07:18:38 UTC (rev 54831)
@@ -31,7 +31,7 @@
#define DATAALIGNMENT 4
#define HUGO_DAT_VER_MAJ 0 // 1 byte
-#define HUGO_DAT_VER_MIN 31 // 1 byte
+#define HUGO_DAT_VER_MIN 32 // 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-12-08 01:53:20 UTC (rev 54830)
+++ scummvm/trunk/tools/create_hugo/staticdata.h 2010-12-08 07:18:38 UTC (rev 54831)
@@ -843,7 +843,7 @@
// Ambiguous ones (multi-version)
const char *nBell_2w[] = {"bell", "a bell", "bell", ""};
const char *nBell_3w[] = {"bell", "a golden bell", "bell", ""};
-const char *nBlock_3w[] = {"block", ""};
+const char *nBlock_3w[] = {"block", "~"};
const char *nBook_2w[] = {"book", "book", "book", ""};
const char *nBook_3w[] = {"book", "a spell book", "book", "spell", ""};
const char *nCage_3w[] = {"cage", "a little cage", "cage", "door", ""};
@@ -857,14 +857,14 @@
const char *nDog_2w[] = {"dog", "dog", "dog", ""};
const char *nDoor_1w[] = {"door", "~", "door", ""};
const char *nDoor_2w[] = {"door", "gate", "door", ""};
-const char *nDoor_3w[] = {"door", ""};
+const char *nDoor_3w[] = {"door", "~", ""};
const char *nHero_1w[] = {"hero", "self", "Hugo", "hugo", ""};
const char *nHero_2w[] = {"hero", "self", "Hugo", ""};
const char *nKey_1w[] = {"xkey", "a door key", " key", ""};
const char *nKey_2w[] = {"key", "key", "key", ""};
const char *nKnife_1w[] = {"knife", "a penknife", "penknife", ""};
const char *nKnife_2w[] = {"knife", "knife", "knife", ""};
-const char *nLips_1w[] = {"lips", ""};
+const char *nLips_1w[] = {"lips", "~", ""};
const char *nOldman_1w[] = {"oldman", "old", "Old man", "man", ""};
const char *nOldman_2w[] = {"oldman", "old", "man", ""};
const char *nPenny_2w[] = {"penelope", "woman", "Penelope", "girl", "lady", ""};
@@ -872,11 +872,11 @@
const char *nRope_1w[] = {"rope", "some rope", "rope", "string", ""};
const char *nRope_2w[] = {"rope", "string", "rope", ""};
const char *nShed_1w[] = {"shed", "~", "shed", ""};
-const char *nShed_2w[] = {"shed", ""};
+const char *nShed_2w[] = {"shed", "~", ""};
const char *nSnake_2w[] = {"snake", "snake", "snake", ""};
-const char *nSnake_3w[] = {"snake", ""};
+const char *nSnake_3w[] = {"snake", "~", ""};
const char *nTrap_1w[] = {"trap", "~", "trapdoor", ""};
-const char *nTrap_2w[] = {"trap", ""};
+const char *nTrap_2w[] = {"trap", "~", ""};
const char *nWard_1w[] = {"wardrobe", "cabinet", "closet", "door", ""};
const char *nWard_2w[] = {"wardrobe", "cabinet", "closet", ""};
const char *nWhero_1w[] = {"whero", "~", "Hugo", ""};
@@ -885,11 +885,11 @@
const char *nBed_2w[] = {"bed", "bed", "bed", ""};
const char *nBlock_2w[] = {"block", "brick", "blocks", ""};
const char *nBridge_2w[] = {"bridge", "~", "bridge", ""};
-const char *nBridge_3w[] = {"bridge", ""};
+const char *nBridge_3w[] = {"bridge", "~", ""};
const char *nBroom_1w[] = {"broom", "~", "broom", ""};
const char *nBroom_2w[] = {"broom", "brush", ""};
const char *nCage_2w[] = {"cage", "pen", "playpen", ""};
-const char *nDroppings_1w[] = {"droppings", ""};
+const char *nDroppings_1w[] = {"droppings", "~", ""};
const char *nFence_1w[] = {"fence", "~", "fence", ""};
const char *nFence_2w[] = {"fence", "hedge", "bush", ""};
const char *nFood_1w[] = {"food", "plate", "food", ""};
@@ -897,12 +897,12 @@
const char *nFood_3w[] = {"food", "meat", "hyena", ""};
const char *nGardenbits_1w[] = {"grass", "fence", "Branch", "path", ""};
const char *nGround_1w[] = {"ground", "floor", ""};
-const char *nHouse_1w[] = {"house", ""};
+const char *nHouse_1w[] = {"house", "~", ""};
const char *nLight_1w[] = {"light", "lamp", ""};
const char *nMan_1w[] = {"man", "dracula", "monster", "frank", "alien", "guest", "vampire", ""};
-const char *nMan_2w[] = {"man", ""};
+const char *nMan_2w[] = {"man", "~", ""};
const char *nMirror_1w[] = {"mirror", "~", "mirror", ""};
-const char *nMoon_1w[] = {"moon", ""};
+const char *nMoon_1w[] = {"moon", "~", ""};
const char *nMouse_2w[] = {"mouse", "rat", "rodent", "animal", "furry", ""};
const char *nMouse_3w[] = {"mouse", "rat", "mouse", "rodent", "animal", "furry", ""};
const char *nMousehole_1w[] = {"hole", "~", "mousehole", ""};
@@ -914,18 +914,18 @@
const char *nRock_2w[] = {"rock", "boulder", "rockfall", "stone", ""};
const char *nRock_3w[] = {"rock", "stone", "boulder", ""};
const char *nRoof_1w[] = {"roof", "chimney", ""};
-const char *nSink_1w[] = {"sink", ""};
+const char *nSink_1w[] = {"sink", "~", ""};
const char *nSky_1w[] = {"sky", "ceiling", ""};
const char *nStairs_1w[] = {"stairs", "landing", ""};
const char *nStairs_2w[] = {"stair", "landing", "ladder", ""};
const char *nTable_1w[] = {"table", "~", "table", ""};
const char *nTable_2w[] = {"table", "bench", ""};
const char *nTree_1w[] = {"tree", "~", "tree", ""};
-const char *nTree_2w[] = {"tree", ""};
+const char *nTree_2w[] = {"tree", "~", ""};
const char *nUnits_1w[] = {"Unit", "oven", "cupboard", "sink", "cupb", "drawer", "pantry", "cabinet", "range", "counter", ""};
const char *nUnits_2w[] = {"Unit", "oven", "sink", "cupb", "drawer", "pantry", "cabinet", "range", "counter", "cooker", ""};
-const char *nWall_1w[] = {"wall", ""};
-const char *nWater_2w[] = {"water", ""};
+const char *nWall_1w[] = {"wall", "~", ""};
+const char *nWater_2w[] = {"water", "~", ""};
const char *nWater_3w[] = {"water", "stream", "river", "pool", "lake", ""};
const char *nWindow_1w[] = {"window", "outside", "window", "inside", ""};
const char *nWindow_3w[] = {"window", "~", "window", ""};
@@ -941,13 +941,13 @@
const char *nBatpic_1w[] = {"bat", "~", "picture", ""};
const char *nPkin_1w[] = {"pumpkin", "a pumpkin", "pumpkin", "punkin", ""};
const char *nWhistle_1w[] = {"whistle", "a whistle", "whistle", ""};
-const char *nWdoorl_1w[] = {"wdoorl", ""};
-const char *nWdoorr_1w[] = {"wdoorr", ""};
+const char *nWdoorl_1w[] = {"wdoorl", "~", ""};
+const char *nWdoorr_1w[] = {"wdoorr", "~", ""};
const char *nMask_1w[] = {"mask", "a mask", "mask", ""};
const char *nButler_1w[] = {"butler", "waiter", "butler", "servant", ""};
const char *nChop_1w[] = {"chop", "a juicy chop", "chop", "meat", "steak", ""};
-const char *nRedeyes_1w[] = {"redeyes", ""};
-const char *nArm_1w[] = {"arm", ""};
+const char *nRedeyes_1w[] = {"redeyes", "~", ""};
+const char *nArm_1w[] = {"arm", "~", ""};
const char *nHdlshero_1w[] = {"hdlshero", "~", "Hugo", ""};
const char *nMonkey_1w[] = {"monkee", "~", "Hugo", ""};
const char *nCarpet_1w[] = {"carpet", "mat", "rug", ""};
@@ -965,7 +965,7 @@
const char *nGdoor_1w[] = {"glasdoor", "~", "door", ""};
const char *nSpachero_1w[] = {"spachero", "~", "Hugo", ""};
const char *nFuzyhero_1w[] = {"fuzyhero", "~", "Hugo", ""};
-const char *nSpark_1w[] = {"arc", ""};
+const char *nSpark_1w[] = {"arc", "~", ""};
const char *nFrank_1w[] = {"frank", "monster", "Frankie", "man", ""};
const char *nDracula_1w[] = {"drac", "monster", "Dracula", "man", ""};
const char *nGwen_1w[] = {"gwen", "monster", "Gwendolin", "lady", ""};
@@ -973,17 +973,17 @@
const char *nSlime_1w[] = {"slime", "monster", "Slime", "man", ""};
const char *nPeahead_1w[] = {"pea", "monster", "Pea Head", "man", ""};
const char *nFace_1w[] = {"face", "head", ""};
-const char *nWitch_1w[] = {"witch", ""};
+const char *nWitch_1w[] = {"witch", "~", ""};
const char *nToilet_1w[] = {"toilet", "~", "toilet", ""};
const char *nBath_1w[] = {"bath", "~", "tub", ""};
-const char *nPenelope_1w[] = {"penelope", ""};
+const char *nPenelope_1w[] = {"penelope", "~", ""};
const char *nTomb_1w[] = {"tomb", "coffin", "tomb", "box", "sarcop", ""};
const char *nBooth_1w[] = {"booth", "box", "cubicle", ""};
const char *nMachinebits_1w[] = {"machine", "control", "button", "dial", "knob", "computer", ""};
const char *nMachine_1w[] = {"machine", "~", "machine", ""};
-const char *nHands_1w[] = {"hands", ""};
-const char *nCut_1w[] = {"cut", ""};
-const char *nOil_1w[] = {"oil ", ""};
+const char *nHands_1w[] = {"hands", "~", ""};
+const char *nCut_1w[] = {"cut", "~", ""};
+const char *nOil_1w[] = {"oil ", "~", ""};
const char **arrayNouns_1w[] = {
nDummy, nHero_1w, nTrap_1w, nWard_1w, nDoor_1w,
@@ -1015,7 +1015,7 @@
const char *nHallgo_2w[] = {"hallgo", "~", "~", ""};
const char *nBookcase_2w[] = {"bookcase", "bookcase", "bookcase", ""};
const char *nKeyhole_2w[] = {"hole", "hole", "keyhole", ""};
-const char *nPanel_2w[] = {"panel", ""};
+const char *nPanel_2w[] = {"panel", "~", ""};
const char *nMatches_2w[] = {"matches", "a box of matches", "matches", "match", ""};
const char *nCrate_2w[] = {"crate", "box", "box", ""};
const char *nDumb_2w[] = {"dumb", "waiter", "dumb waiter", "box", ""};
@@ -1047,7 +1047,7 @@
const char *nLetter_2w[] = {"letter", "envelope", "letter", "card", ""};
const char *nRobot_2w[] = {"alek", "monster", "robot", ""};
const char *nCook_2w[] = {"cook", "woman", "cook", "girl", "lady", ""};
-const char *nCookb_2w[] = {"cookb", ""};
+const char *nCookb_2w[] = {"cookb", "~", ""};
const char *nCop_2w[] = {"cop", "man", "Officer Higgins", ""};
const char *nHorace_2w[] = {"horace", "man", "Horace", ""};
const char *nCatnip_2w[] = {"catnip", "some catnip", "catnip", ""};
@@ -1070,7 +1070,7 @@
const char *nChair_2w[] = {"chair", "seat", "couch", "settee", ""};
const char *nTools_2w[] = {"tools", "hammer", "tools", "pliers", "screw", "knife", "saw", ""};
const char *nBucket_2w[] = {"bucket", "container", ""};
-const char *nWand_2w[] = {"wand", ""};
+const char *nWand_2w[] = {"wand", "~", ""};
const char *nHole_2w[] = {"hole", "~", "chasm", ""};
const char *nHandle_2w[] = {"handle", "lever", ""};
const char *nChute_2w[] = {"chute", "~", "chute", ""};
@@ -1117,7 +1117,7 @@
const char *nSwinger_3w[] = {"swinger", "~", "Hugo", ""};
const char *nSteps_3w[] = {"step", "step", "stones", ""};
const char *nClay_3w[] = {"clay", "some clay", "modelling clay", "plasticine", "model", "effigy", "voodoo", "doll", ""};
-const char *nDoorlock_3w[] = {"lock", ""};
+const char *nDoorlock_3w[] = {"lock", "~", ""};
const char *nNeedles_3w[] = {"needle", "some pins", "needles", "pin", ""};
const char *nNative_3w[] = {"native", "man", "native", "lady", ""};
const char *nNat1_3w[] = {"nat1", "man", "native", ""};
@@ -1125,22 +1125,22 @@
const char *nNat3_3w[] = {"nat3", "man", "native", ""};
const char *nNatb_3w[] = {"natb", "man", "native", ""};
const char *nNatg_3w[] = {"natg", "man", "native girl", "girl", ""};
-const char *nBottles_3w[] = {"bottles", ""};
+const char *nBottles_3w[] = {"bottles", "~", ""};
const char *nFlask_3w[] = {"flask", "a water flask", "flask", "water", "remedy", "antidote", ""};
const char *nPipe_3w[] = {"blowpipe", "blowpipe and darts", "blowpipe", "dart", ""};
const char *nElephant_3w[] = {"elephant", "animal", "elephant", ""};
-const char *nE_eyes_3w[] = {"e_eyes", ""};
+const char *nE_eyes_3w[] = {"e_eyes", "~", ""};
const char *nBouillon_3w[] = {"bouillon", "bouillon cubes", "bouillon cubes", "bouil", "boull", "boulion", "cube", "season", "oxo", "knorr", ""};
-const char *nMoushole_3w[] = {"moushole", ""};
+const char *nMoushole_3w[] = {"moushole", "~", ""};
const char *nDoclie_3w[] = {"doclie", ".", "witch doctor", ""};
const char *nCheese_3w[] = {"cheese", "a sandwich", "sandwich", ""};
const char *nSpider_3w[] = {"spider", "insect", "spider", "tarantula", ""};
const char *nFire_3w[] = {"fire", "flame", "pot", ""};
const char *nDocbits_3w[] = {"skull", "shield", "torch", "spear", "bone", ""};
-const char *nFire_1_3w[] = {"fire_1", ""};
-const char *nFire_2_3w[] = {"fire_2", ""};
-const char *nFire_3_3w[] = {"fire_3", ""};
-const char *nFroth_3w[] = {"froth", ""};
+const char *nFire_1_3w[] = {"fire_1", "~", ""};
+const char *nFire_2_3w[] = {"fire_2", "~", ""};
+const char *nFire_3_3w[] = {"fire_3", "~", ""};
+const char *nFroth_3w[] = {"froth", "~", ""};
const char *nScroll_3w[] = {"scroll", "an old scroll", "scroll", "writing", ""};
const char *nCrystal_3w[] = {"crystal", "a crystal ball", "crystal ball", "ball", ""};
const char *nGhost_3w[] = {"ghost", "ghoul", "ghost", "spirit", ""};
@@ -1153,17 +1153,17 @@
const char *nOrchid_3w[] = {"orchid", "flower", "plant", ""};
const char *nPole_3w[] = {"pole", "stick", "wood", ""};
const char *nHut_3w[] = {"hut", "house", "hut", "shed", ""};
-const char *nAircraft_3w[] = {"aircraft", ""};
-const char *nPlant1_3w[] = {"plant1", ""};
-const char *nPlant2_3w[] = {"plant2", ""};
-const char *nPlant3_3w[] = {"plant3", ""};
-const char *nPlant4_3w[] = {"plant4", ""};
-const char *nPlant5_3w[] = {"plant5", ""};
-const char *nWeb_3w[] = {"web", ""};
-const char *nO_eye_3w[] = {"o_eye", ""};
-const char *nFire_4_3w[] = {"fire_4", ""};
-const char *nMouth_3w[] = {"mouth", ""};
-const char *nThem_3w[] = {"them", ""};
+const char *nAircraft_3w[] = {"aircraft", "~", ""};
+const char *nPlant1_3w[] = {"plant1", "~", ""};
+const char *nPlant2_3w[] = {"plant2", "~", ""};
+const char *nPlant3_3w[] = {"plant3", "~", ""};
+const char *nPlant4_3w[] = {"plant4", "~", ""};
+const char *nPlant5_3w[] = {"plant5", "~", ""};
+const char *nWeb_3w[] = {"web", "~", ""};
+const char *nO_eye_3w[] = {"o_eye", "~", ""};
+const char *nFire_4_3w[] = {"fire_4", "~", ""};
+const char *nMouth_3w[] = {"mouth", "~", ""};
+const char *nThem_3w[] = {"them", "~", ""};
const char **arrayNouns_3w[] = {
nDummy, nHero_2w, nWhero_1w, nHero_old_3w, nPenny_2w,
@@ -1188,7 +1188,7 @@
// Hugo 1 Dos
//***************************************************************************
-const char *nArc_1d[] = {"arc", ""};
+const char *nArc_1d[] = {"arc", "~", ""};
const char *nHero_1d[] = {"hero", "self", "Hugo", ""};
const char *nKey_1d[] = {"key", "a door key", " key", ""};
const char *nMonkey_1d[] = {"monkey", "~", "Hugo", ""};
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