SUPERNOVA2: Add partialy finished kiosk room

2 files changed, 30 insertions, 6 deletions

diff --git a/engines/supernova2/ms2_def.h b/engines/supernova2/ms2_def.h
index ecebb37716..e23a3a2c8e 100644
--- a/engines/supernova2/ms2_def.h
+++ b/engines/supernova2/ms2_def.h
@@ -160,7 +160,7 @@ kString150, kString151, kString152, kString153, kString154,
 kString155, kString156, kString157, kString158, kString159,
 kString160, kString161, kString162, kStringSlot, kString164,
 kString165, kString166, kString167, kString168, kStringExit,
-kString170, kString171, kString172, kString173, kString174,
+kString170, kStringToothbrush, kString172, kString173, kString174,
 kString175, kString176, kString177, kStringDefaultDescription, kStringLooksMetal,
 kStringTaxiArrives, kStringNothingHappens, kStringEmpty, kStringWalletOpen, kStringAttachMagnet,
 kStringPoleMagnet, kStringCunning, kStringMustBuyFirst, kStringInsertChip, kStringTransferCD,
@@ -189,10 +189,10 @@ kStringBusinessStreet, kStringBusinessStreetDescription, kStringRod, kStringPost
 kStringPoster, kStringPosterDescription, kStringCabin, kStringCabinFree, kStringCabinOccupied,
 kStringFeet, kStringFeetDescription, kStringHood, kStringHoodDescription, kString400Xa,
 kString10Xa, kStringSlotDescription1, kStringSlotDescription2, kStringChair, kStringChairDescription,
-kStringScribble, kStringFace, kStringFaceDescription, kString318, kString319,
-kString320, kString321, kString322, kString323, kString324,
-kString325, kString326, kString327, kString328, kString329,
-kString330, kString331, kString332, kString333, kString334,
+kStringScribble, kStringFace, kStringFaceDescription, kStringBooks, kStringDictionary,
+kStringPlant, kStringMask, kStringSnake, kStringCup, kStringJoystick,
+kStringToothbrushDescription, kStringMusic, kStringMusicDescription, kStringBottle, kStringBottleDescription,
+kStringBox, kStringSeller, kString332, kString333, kString334,
 kString335, kString336, kString337, kString338, kString339,
 kString340, kString341, kString342, kString343, kString344,
 kString345, kString346, kString347, kString348, kString349,
diff --git a/engines/supernova2/rooms.cpp b/engines/supernova2/rooms.cpp
index f15c03f3db..f46ee56512 100644
--- a/engines/supernova2/rooms.cpp
+++ b/engines/supernova2/rooms.cpp
@@ -834,9 +834,33 @@ Kiosk::Kiosk(Supernova2Engine *vm, GameManager *gm) {
 	_vm = vm;
 	_gm = gm;
 
-	_fileNumber = 6;
+	_fileNumber = 19;
 	_id = KIOSK;
 	_shown[0] = kShownTrue;
+	_shown[1] = kShownFalse;
+	_shown[2] = kShownTrue;
+	_shown[3] = kShownTrue;
+	_shown[4] = kShownTrue;
+	_shown[5] = kShownTrue;
+
+	_objectState[0] = Object(_id, kStringExit, kStringDefaultDescription, NULLOBJECT, EXIT, 255, 255, 0, STREET, 22);
+	_objectState[1] = Object(_id, kStringBooks, kStringDefaultDescription, BOOKS, UNNECESSARY, 0, 0, 0);
+	_objectState[2] = Object(_id, kStringDictionary, kStringDefaultDescription, LEXICON, UNNECESSARY, 1, 1, 0);
+	_objectState[3] = Object(_id, kStringPlant, kStringDefaultDescription, PLANT, UNNECESSARY, 2, 2, 0);
+	_objectState[4] = Object(_id, kStringMask, kStringDefaultDescription, BMASK, UNNECESSARY, 4, 4, 2 + 128);
+	_objectState[5] = Object(_id, kStringSnake, kStringDefaultDescription, SNAKE, UNNECESSARY, 3, 3, 0);
+	_objectState[6] = Object(_id, kStringCup, kStringDefaultDescription, CUP, UNNECESSARY, 5, 5, 0);
+	_objectState[7] = Object(_id, kStringJoystick, kStringDefaultDescription, JOYSTICK, UNNECESSARY, 6, 6, 0);
+	_objectState[8] = Object(_id, kStringToothbrush, kStringToothbrushDescription, TOOTHBRUSH, TAKE, 7, 7, 5 + 128);
+	_objectState[9] = Object(_id, kStringMusic, kStringMusicDescription, PLAYER, TAKE | COMBINABLE, 8, 8, 4 + 128);
+	_objectState[10] = Object(_id, kStringBottle, kStringBottleDescription, BOTTLE, TAKE, 9, 9, 3 + 128);
+	_objectState[11] = Object(_id, kStringBottle, kStringDefaultDescription, BOTTLE1, UNNECESSARY, 10, 10, 0);
+	_objectState[12] = Object(_id, kStringBottle, kStringDefaultDescription, BOTTLE2, UNNECESSARY, 11, 11, 0);
+	_objectState[13] = Object(_id, kStringBottle, kStringDefaultDescription, BOTTLE3, UNNECESSARY, 12, 12, 0);
+	_objectState[14] = Object(_id, kStringBottle, kStringDefaultDescription, BOTTLE4, UNNECESSARY, 13, 13, 0);
+	_objectState[15] = Object(_id, kStringBox, kStringDefaultDescription, BOX, UNNECESSARY, 14, 14, 0);
+	_objectState[16] = Object(_id, kStringFace, kStringDefaultDescription, FACES, UNNECESSARY, 15, 15, 0);
+	_objectState[17] = Object(_id, kStringSeller, kStringDefaultDescription, SELLER, TALK, 16, 16, 0);
 }
 
 void Kiosk::onEntrance() {