From 18ac67f907c82a74ef4a48f310e2d5a2001ebd61 Mon Sep 17 00:00:00 2001 From: Joseph-Eugene Winzer Date: Thu, 15 Jun 2017 22:45:31 +0200 Subject: SUPERNOVA: Substitutes magic numbers in Object ctor --- engines/supernova/rooms.h | 292 +++++++++++++++++++++++----------------------- 1 file changed, 146 insertions(+), 146 deletions(-) (limited to 'engines/supernova') diff --git a/engines/supernova/rooms.h b/engines/supernova/rooms.h index 8ef8cd3f2b..efbe5b1b9e 100644 --- a/engines/supernova/rooms.h +++ b/engines/supernova/rooms.h @@ -26,12 +26,12 @@ public: virtual bool interact(Action verb, Object &obj1, Object &obj2) { return false; } - + protected: int _filenumber; bool _shown[kMaxSection]; Object _objectState[kMaxObject]; - + private: bool _seen; }; @@ -41,21 +41,21 @@ class StartingItems : public Room { public: StartingItems() { _filenumber = -1; - + _shown[0] = false; - - _objectState[0] = - Object("Keycard", "Die Keycard fuer deine Schraenke.", KEYCARD, - TAKE | CARRIED | COMBINABLE, 255, 255, 0, NULLROOM, 0); - _objectState[1] = - Object("Taschenmesser", "Es ist nicht mehr das sch�rfste.", KNIFE, - TAKE | CARRIED | COMBINABLE, 255, 255, 0, NULLROOM, 0); - _objectState[2] = - Object("Armbanduhr", Object::defaultDescription, WATCH, - TAKE | COMBINABLE | CARRIED, 255, 255, 8, NULLROOM, 0); - _objectState[3] = - Object("Discman", "Es ist eine \"Mad Monkeys\"-CD darin.", DISCMAN, - TAKE | COMBINABLE, 255, 255, 0, NULLROOM, 0); + + _objectState[0] = + Object("Keycard", "Die Keycard fuer deine Schraenke.", KEYCARD, + TAKE | CARRIED | COMBINABLE, 255, 255, 0, NULLROOM, 0); + _objectState[1] = + Object("Taschenmesser", "Es ist nicht mehr das sch�rfste.", KNIFE, + TAKE | CARRIED | COMBINABLE, 255, 255, 0, NULLROOM, 0); + _objectState[2] = + Object("Armbanduhr", Object::defaultDescription, WATCH, + TAKE | COMBINABLE | CARRIED, 255, 255, 8, NULLROOM, 0); + _objectState[3] = + Object("Discman", "Es ist eine \"Mad Monkeys\"-CD darin.", DISCMAN, + TAKE | COMBINABLE, 255, 255, 0, NULLROOM, 0); } }; @@ -69,7 +69,7 @@ public: _shown[2] = false; _shown[3] = false; _shown[4] = true; - + _objectState[0] = Object("Luke", Object::defaultDescription, HATCH1, OPEN | EXIT, 0, 6, 1, CABIN_L1, 15); _objectState[1] = Object("Luke", Object::defaultDescription, NULLOBJECT, OPEN | EXIT, 1, 7, 2, CABIN_L2, 10); _objectState[2] = Object("Luke", Object::defaultDescription, NULLOBJECT, OPEN | EXIT, 2, 8, 3, CABIN_L3, 5); @@ -90,7 +90,7 @@ public: ShipHall() { _filenumber = 15; _shown[0] = true; - + _objectState[0] = Object("Luke", "Sie f�hrt ins Cockpit.", NULLOBJECT, OPEN | EXIT, 4, 5, 1, COCKPIT, 10); _objectState[1] = Object("Luke", "Sie f�hrt zur K�che.", KITCHEN_HATCH, OPEN | EXIT, 0, 0, 0, NULLROOM, 1); _objectState[2] = Object("Luke", "Sie f�hrt zu den Tiefschlafkammern.", NULLOBJECT, OPEN | CLOSED | EXIT, 1, 1, 2, SLEEP, 8); @@ -98,7 +98,7 @@ public: _objectState[4] = Object("Leiter", Object::defaultDescription, NULLOBJECT, NULLTYPE, 3, SLEEP, 0, NULLROOM, 0); _objectState[5] = Object("Gang", Object::defaultDescription, NULLOBJECT, EXIT, 6, 6, 0, CORRIDOR, 1); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); }; @@ -107,13 +107,13 @@ public: ShipSleepCabin() { _filenumber = 33; _shown[0] = true; - + _objectState[0] = Object("Luke", "Dies ist eine der Tiefschlafkammern.", CABINS, NULLTYPE, 0, 0, 0, NULLROOM, 0); _objectState[1] = Object("Luke", "Dies ist eine der Tiefschlafkammern.", CABIN, NULLTYPE, 1, 1, 0, NULLROOM, 0); _objectState[2] = Object("Computer", Object::defaultDescription, COMPUTER, NULLTYPE, 2, 2, 0, NULLROOM, 0); _objectState[3] = Object("Ausgang", Object::defaultDescription, NULLOBJECT, EXIT, 255, 255, 0, HALL, 2); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); virtual void animation(); virtual void onEntrance(); @@ -124,7 +124,7 @@ public: ShipCockpit() { _filenumber = 9; _shown[0] = true; - + _objectState[0] = Object("Instrumente", "Hmm, sieht ziemlich kompliziert aus.", INSTRUMENTS, NULLTYPE, 2, 2, 0, NULLROOM, 0); _objectState[1] = Object("Monitor", Object::defaultDescription, MONITOR, NULLTYPE, 0, 0, 0, NULLROOM, 0); _objectState[2] = Object("Monitor", "Dieser Monitor sagt dir nichts.", NULLOBJECT, TAKE, 1, 0, 0, NULLROOM, 0); @@ -146,19 +146,19 @@ public: _shown[3] = true; _shown[4] = true; _shown[5] = true; - + _objectState[0] = Object("Bild", "Herb!", NULLOBJECT, UNNECESSARY, 5, 5, 0, NULLROOM, 0); _objectState[1] = Object("Bild", "Toll!", NULLOBJECT, UNNECESSARY, 6, 6, 0, NULLROOM, 0); _objectState[2] = Object("Bild", "Genial!", NULLOBJECT, UNNECESSARY, 7, 7, 0, NULLROOM, 0); _objectState[3] = Object("Magnete", "Damit werden Sachen auf|dem Tisch festgehalten.", NULLOBJECT, UNNECESSARY, 8, 8, 0, NULLROOM, 0); - _objectState[4] = Object("Bild", "Es scheint noch nicht fertig zu sein.", 0, UNNECESSARY, 9, 9, 0); + _objectState[4] = Object("Bild", "Es scheint noch nicht fertig zu sein.", NULLOBJECT, UNNECESSARY, 9, 9, 0); _objectState[5] = Object("Stift", "Ein Kugelschreiber.", PEN, TAKE | COMBINABLE, 10, 10, 5 | 128); - _objectState[6] = Object("Luke", &description, 0, OPEN | OPENED | EXIT, 3, 3, 24 | 128, CORRIDOR, 9); - _objectState[7] = Object("Schlitz", "Es ist ein Keycard-Leser.", 0, COMBINABLE, 0, 0, 0); - _objectState[8] = Object("Schrank", &description, 0, OPEN | CLOSED, 1, 1, 0); - _objectState[9] = Object("Fach", &description, 0, OPEN | CLOSED, 2, 2, 0); - _objectState[10] = Object("Steckdose", &description, SOCKET, COMBINABLE, 4, 4, 0); - _objectState[11] = Object("Toilette", &description, BATHROOM_DOOR, EXIT, 255, 255, 0, BATHROOM, 2); + _objectState[6] = Object("Luke", Object::defaultDescription, NULLOBJECT, OPEN | OPENED | EXIT, 3, 3, 24 | 128, CORRIDOR, 9); + _objectState[7] = Object("Schlitz", "Es ist ein Keycard-Leser.", NULLOBJECT, COMBINABLE, 0, 0, 0); + _objectState[8] = Object("Schrank", Object::defaultDescription, NULLOBJECT, OPEN | CLOSED, 1, 1, 0); + _objectState[9] = Object("Fach", Object::defaultDescription, NULLOBJECT, OPEN | CLOSED, 2, 2, 0); + _objectState[10] = Object("Steckdose", Object::defaultDescription, SOCKET, COMBINABLE, 4, 4, 0); + _objectState[11] = Object("Toilette", Object::defaultDescription, BATHROOM_DOOR, EXIT, 255, 255, 0, BATHROOM, 2); } }; @@ -183,34 +183,34 @@ public: _shown[14] = false; _shown[15] = false; _shown[16] = true; - + _objectState[0] = Object("Schlitz","Es ist ein Keycard-Leser.",SLOT_KL1,COMBINABLE,31,31,0); _objectState[1] = Object("Schlitz","Es ist ein Keycard-Leser.",SLOT_KL2,COMBINABLE,32,32,0); _objectState[2] = Object("Schlitz","Es ist ein Keycard-Leser.",SLOT_KL3,COMBINABLE,33,33,0); _objectState[3] = Object("Schlitz","Es ist ein Keycard-Leser.",SLOT_KL4,COMBINABLE,45,45,0); - _objectState[4] = Object("Schrank",&description,SHELF_L1,OPEN | CLOSED,25,26,17); + _objectState[4] = Object("Schrank",Object::defaultDescription,SHELF_L1,OPEN | CLOSED,25,26,17); _objectState[5] = Object("Pistole","Es ist keine Munition drin.",PISTOL,TAKE,39,39,20); - _objectState[6] = Object("Fach",&description,SHELF_L2,OPEN | CLOSED,27,28,18); - _objectState[7] = Object("B�cher","Lauter wissenschaftliche B�cher.",0,UNNECESSARY,40,40,0); - _objectState[8] = Object("Fach",&description,SHELF_L3,OPEN | CLOSED,29,30,19); + _objectState[6] = Object("Fach",Object::defaultDescription,SHELF_L2,OPEN | CLOSED,27,28,18); + _objectState[7] = Object("B�cher","Lauter wissenschaftliche B�cher.",NULLOBJECT,UNNECESSARY,40,40,0); + _objectState[8] = Object("Fach",Object::defaultDescription,SHELF_L3,OPEN | CLOSED,29,30,19); _objectState[9] = Object("Kabelrolle","Da sind mindestens zwanzig Meter drauf.", SPOOL,TAKE | COMBINABLE,41,41,21); - _objectState[10] = Object("Fach",&description,SHELF_L4,OPEN | CLOSED,43,44,22); - _objectState[11] = Object("Buch",&description,BOOK2,TAKE,46,46,23); - _objectState[12] = Object("Unterw�sche","Ich habe keine Lust, in|der Unterw�sche des|Commanders rumzuw�hlen.", 0,UNNECESSARY,34,34,0); - _objectState[13] = Object("Unterw�sche","Ich habe keine Lust, in|der Unterw�sche des|Commanders rumzuw�hlen.", 0,UNNECESSARY,35,35,0); - _objectState[14] = Object("Kleider",&description,0,UNNECESSARY,36,36,0); - _objectState[15] = Object("Krimskram","Es ist nichts brauchbares dabei.",0,UNNECESSARY,37,37,0); - _objectState[16] = Object("Krimskram","Es ist nichts brauchbares dabei.",0,UNNECESSARY,38,38,0); - _objectState[17] = Object("Magnete","Damit werden Sachen auf|dem Tisch festgehalten.",0, UNNECESSARY,23,23,0); - _objectState[18] = Object("Toilette",&description,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,22); - _objectState[19] = Object("Luke",&description,0,OPEN | OPENED | EXIT,3,3,24 | 128,CORRIDOR,9); - _objectState[20] = Object("Schlitz","Es ist ein Keycard-Leser.",0,COMBINABLE,0,0,0); - _objectState[21] = Object("Schrank",&description,0,OPEN | CLOSED,1,1,0); - _objectState[22] = Object("Fach",&description,0,OPEN | CLOSED,2,2,0); - _objectState[23] = Object("Steckdose",&description,SOCKET,COMBINABLE,4,4,0); - _objectState[24] = Object("Ordner","Darauf steht \"Dienstanweisungen|zur Mission Supernova\".|Es steht nichts wichtiges drin.", 0,UNNECESSARY,49,49,); + _objectState[10] = Object("Fach",Object::defaultDescription,SHELF_L4,OPEN | CLOSED,43,44,22); + _objectState[11] = Object("Buch",Object::defaultDescription,BOOK2,TAKE,46,46,23); + _objectState[12] = Object("Unterw�sche","Ich habe keine Lust, in|der Unterw�sche des|Commanders rumzuw�hlen.",NULLOBJECT,UNNECESSARY,34,34,0); + _objectState[13] = Object("Unterw�sche","Ich habe keine Lust, in|der Unterw�sche des|Commanders rumzuw�hlen.",NULLOBJECT,UNNECESSARY,35,35,0); + _objectState[14] = Object("Kleider",Object::defaultDescription,NULLOBJECT,UNNECESSARY,36,36,0); + _objectState[15] = Object("Krimskram","Es ist nichts brauchbares dabei.",NULLOBJECT,UNNECESSARY,37,37,0); + _objectState[16] = Object("Krimskram","Es ist nichts brauchbares dabei.",NULLOBJECT,UNNECESSARY,38,38,0); + _objectState[17] = Object("Magnete","Damit werden Sachen auf|dem Tisch festgehalten.",NULLOBJECT,UNNECESSARY,23,23,0); + _objectState[18] = Object("Toilette",Object::defaultDescription,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,22); + _objectState[19] = Object("Luke",Object::defaultDescription,NULLOBJECT,OPEN | OPENED | EXIT,3,3,24 | 128,CORRIDOR,9); + _objectState[20] = Object("Schlitz","Es ist ein Keycard-Leser.",NULLOBJECT,COMBINABLE,0,0,0); + _objectState[21] = Object("Schrank",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,1,1,0); + _objectState[22] = Object("Fach",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,2,2,0); + _objectState[23] = Object("Steckdose",Object::defaultDescription,SOCKET,COMBINABLE,4,4,0); + _objectState[24] = Object("Ordner","Darauf steht \"Dienstanweisungen|zur Mission Supernova\".|Es steht nichts wichtiges drin.",NULLOBJECT,UNNECESSARY,49,49,0); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); }; @@ -231,26 +231,26 @@ public: _shown[10] = false; _shown[11] = false; _shown[12] = true; - - _objectState[0] = Object("Poster","Ein Poster von \"Big Boss\".",0,UNNECESSARY,11,11,0); - _objectState[1] = Object("Poster","Ein Poster von \"Rock Desaster\".",0,UNNECESSARY,12,12,0); - _objectState[2] = Object("Box",&description,0,0,13,13,0); - _objectState[3] = Object("Magnete","Damit werden Sachen auf|dem Tisch festgehalten.",0,UNNECESSARY,14,14,0); + + _objectState[0] = Object("Poster","Ein Poster von \"Big Boss\".",NULLOBJECT,UNNECESSARY,11,11,0); + _objectState[1] = Object("Poster","Ein Poster von \"Rock Desaster\".",NULLOBJECT,UNNECESSARY,12,12,0); + _objectState[2] = Object("Box",Object::defaultDescription,NULLOBJECT,NULLTYPE,13,13,0); + _objectState[3] = Object("Magnete","Damit werden Sachen auf|dem Tisch festgehalten.",NULLOBJECT,UNNECESSARY,14,14,0); _objectState[4] = Object("Schallplatte","Die Platte ist von \"Big Boss\".",RECORD,TAKE | COMBINABLE,15,15,8 | 128); - _objectState[5] = Object("Schallplattenst�nder","Du hast jetzt keine Zeit, in|der Plattensammlung rumzust�bern.",0,UNNECESSARY,16,16,0); - _objectState[6] = Object("Knopf",&description,TURNTABLE_BUTTON,PRESS,22,22,0); + _objectState[5] = Object("Schallplattenst�nder","Du hast jetzt keine Zeit, in|der Plattensammlung rumzust�bern.",NULLOBJECT,UNNECESSARY,16,16,0); + _objectState[6] = Object("Knopf",Object::defaultDescription,TURNTABLE_BUTTON,PRESS,22,22,0); _objectState[7] = Object("Plattenspieler","Sieht aus, als k�me|er aus dem Museum.",TURNTABLE,UNNECESSARY | COMBINABLE,17,17,0); - _objectState[8] = Object("Leitung",&description,WIRE,COMBINABLE,18,18,0); - _objectState[9] = Object("Leitung",&description,WIRE2,COMBINABLE,19,19,0); - _objectState[10] = Object("Stecker",&description,PLUG,COMBINABLE,20,20,0); - _objectState[11] = Object("Luke",&description,0,OPEN | OPENED | EXIT,3,3,24 | 128,CORRIDOR,9); - _objectState[12] = Object("Schlitz","Es ist ein Keycard-Leser.",0,COMBINABLE,0,0,0); - _objectState[13] = Object("Schrank",&description,0,OPEN | CLOSED,1,1,0); - _objectState[14] = Object("Fach",&description,0,OPEN | CLOSED,2,2,0); - _objectState[15] = Object("Steckdose",&description,SOCKET,COMBINABLE,4,4,0); - _objectState[16] = Object("Toilette",&description,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); + _objectState[8] = Object("Leitung",Object::defaultDescription,WIRE,COMBINABLE,18,18,0); + _objectState[9] = Object("Leitung",Object::defaultDescription,WIRE2,COMBINABLE,19,19,0); + _objectState[10] = Object("Stecker",Object::defaultDescription,PLUG,COMBINABLE,20,20,0); + _objectState[11] = Object("Luke",Object::defaultDescription,NULLOBJECT,OPEN | OPENED | EXIT,3,3,24 | 128,CORRIDOR,9); + _objectState[12] = Object("Schlitz","Es ist ein Keycard-Leser.",NULLOBJECT,COMBINABLE,0,0,0); + _objectState[13] = Object("Schrank",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,1,1,0); + _objectState[14] = Object("Fach",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,2,2,0); + _objectState[15] = Object("Steckdose",Object::defaultDescription,SOCKET,COMBINABLE,4,4,0); + _objectState[16] = Object("Toilette",Object::defaultDescription,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); }; @@ -261,16 +261,16 @@ public: _shown[0] = true; _shown[1] = true; _shown[2] = true; - - _objectState[0] = Object("Bild","Manche Leute haben schon|einen komischen Geschmack.",0,UNNECESSARY,5,5,0); - _objectState[1] = Object("Zeichenger�te","Auf dem Zettel sind lauter|unverst�ndliche Skizzen und Berechnungen.|(Jedenfalls f�r dich unverst�ndlich.)",0,UNNECESSARY,6,6,0); - _objectState[2] = Object("Magnete","Damit werden Sachen auf|dem Tisch festgehalten.",0,UNNECESSARY,7,7,0); - _objectState[3] = Object("Luke",&description,0,OPEN | OPENED | EXIT,3,3,15 | 128,CORRIDOR,5); - _objectState[4] = Object("Schlitz","Es ist ein Keycard-Leser.",0,COMBINABLE,0,0,0); - _objectState[5] = Object("Schrank",&description,0,OPEN | CLOSED,1,1,0); - _objectState[6] = Object("Fach",&description,0,OPEN | CLOSED,2,2,0); - _objectState[7] = Object("Steckdose",&description,SOCKET,COMBINABLE,4,4,0); - _objectState[8] = Object("Toilette",&description,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); + + _objectState[0] = Object("Bild","Manche Leute haben schon|einen komischen Geschmack.",NULLOBJECT,UNNECESSARY,5,5,0); + _objectState[1] = Object("Zeichenger�te","Auf dem Zettel sind lauter|unverst�ndliche Skizzen und Berechnungen.|(Jedenfalls f�r dich unverst�ndlich.)",NULLOBJECT,UNNECESSARY,6,6,0); + _objectState[2] = Object("Magnete","Damit werden Sachen auf|dem Tisch festgehalten.",NULLOBJECT,UNNECESSARY,7,7,0); + _objectState[3] = Object("Luke",Object::defaultDescription,NULLOBJECT,OPEN | OPENED | EXIT,3,3,15 | 128,CORRIDOR,5); + _objectState[4] = Object("Schlitz","Es ist ein Keycard-Leser.",NULLOBJECT,COMBINABLE,0,0,0); + _objectState[5] = Object("Schrank",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,1,1,0); + _objectState[6] = Object("Fach",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,2,2,0); + _objectState[7] = Object("Steckdose",Object::defaultDescription,SOCKET,COMBINABLE,4,4,0); + _objectState[8] = Object("Toilette",Object::defaultDescription,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); } }; @@ -284,16 +284,16 @@ public: _shown[3] = true; _shown[4] = true; _shown[5] = true; - - _objectState[0] = Object("Schachspiel","Es macht wohl Spa�, an|der Decke Schach zu spielen.",0,UNNECESSARY,11,11,0); - _objectState[1] = Object("Tennisschl�ger","Fliegt Boris Becker auch mit?",0,UNNECESSARY,8,8,0); - _objectState[2] = Object("Tennisball","Toll!",0,UNNECESSARY,9,9,0); - _objectState[3] = Object("Luke",&description,0,OPEN | OPENED | EXIT,3,3,15 | 128,CORRIDOR,5); - _objectState[4] = Object("Schlitz","Es ist ein Keycard-Leser.",0,COMBINABLE,0,0,0); - _objectState[5] = Object("Schrank",&description,0,OPEN | CLOSED,1,1,0); - _objectState[6] = Object("Fach",&description,0,OPEN | CLOSED,2,2,0); - _objectState[7] = Object("Steckdose",&description,SOCKET,COMBINABLE,4,4,0); - _objectState[8] = Object("Toilette",&description,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); + + _objectState[0] = Object("Schachspiel","Es macht wohl Spa�, an|der Decke Schach zu spielen.",NULLOBJECT,UNNECESSARY,11,11,0); + _objectState[1] = Object("Tennisschl�ger","Fliegt Boris Becker auch mit?",NULLOBJECT,UNNECESSARY,8,8,0); + _objectState[2] = Object("Tennisball","Toll!",NULLOBJECT,UNNECESSARY,9,9,0); + _objectState[3] = Object("Luke",Object::defaultDescription,NULLOBJECT,OPEN | OPENED | EXIT,3,3,15 | 128,CORRIDOR,5); + _objectState[4] = Object("Schlitz","Es ist ein Keycard-Leser.",NULLOBJECT,COMBINABLE,0,0,0); + _objectState[5] = Object("Schrank",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,1,1,0); + _objectState[6] = Object("Fach",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,2,2,0); + _objectState[7] = Object("Steckdose",Object::defaultDescription,SOCKET,COMBINABLE,4,4,0); + _objectState[8] = Object("Toilette",Object::defaultDescription,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); } }; @@ -317,33 +317,33 @@ public: _shown[13] = false; _shown[14] = false; _shown[15] = true; - + _objectState[0] = Object("Schachspiel","Dein Magnetschachspiel. Schach war|schon immer deine Leidenschaft.",CHESS,TAKE | COMBINABLE,12,12,7 | 128); - _objectState[1] = Object("Bett","Das ist dein Bett. Toll, nicht wahr?",0,0,13,13,0); + _objectState[1] = Object("Bett","Das ist dein Bett. Toll, nicht wahr?",NULLOBJECT,NULLTYPE,13,13,0); _objectState[2] = Object("Schlitz","Es ist ein Keycard-Leser.",SLOT_K1,COMBINABLE,27,27,0); _objectState[3] = Object("Schlitz","Es ist ein Keycard-Leser.",SLOT_K2,COMBINABLE,28,28,0); _objectState[4] = Object("Schlitz","Es ist ein Keycard-Leser.",SLOT_K3,COMBINABLE,29,29,0); _objectState[5] = Object("Schlitz","Es ist ein Keycard-Leser.",SLOT_K4,COMBINABLE,30,30,0); _objectState[6] = Object("Fach","Das ist eins deiner drei F�cher.",SHELF1,OPEN | CLOSED,14,18,9); - _objectState[7] = Object("Alben","Deine Briefmarkensammlung.",0,UNNECESSARY,14,14,0); + _objectState[7] = Object("Alben","Deine Briefmarkensammlung.",NULLOBJECT,UNNECESSARY,14,14,0); _objectState[8] = Object("Fach","Das ist eins deiner drei F�cher.",SHELF2,OPEN | CLOSED,15,19,10); _objectState[9] = Object("Seil","Es ist ungef�hr 10 m lang und 4 cm dick.",ROPE,TAKE | COMBINABLE,15,15,12); _objectState[10] = Object("Schrank","Das ist dein Schrank.",SHELF3,OPEN | CLOSED,16,17,11); - _objectState[11] = Object("Krimskram","Es ist nichts brauchbares dabei.",0,UNNECESSARY,20,20,0); - _objectState[12] = Object("Kleider","Es sind Standard-Weltraum-Klamotten.",0,UNNECESSARY,21,21,0); - _objectState[13] = Object("Unterw�sche",&description,0,UNNECESSARY,22,22,0); - _objectState[14] = Object("Str�mpfe",&description,0,UNNECESSARY,23,23,0); + _objectState[11] = Object("Krimskram","Es ist nichts brauchbares dabei.",NULLOBJECT,UNNECESSARY,20,20,0); + _objectState[12] = Object("Kleider","Es sind Standard-Weltraum-Klamotten.",NULLOBJECT,UNNECESSARY,21,21,0); + _objectState[13] = Object("Unterw�sche",Object::defaultDescription,NULLOBJECT,UNNECESSARY,22,22,0); + _objectState[14] = Object("Str�mpfe",Object::defaultDescription,NULLOBJECT,UNNECESSARY,23,23,0); _objectState[15] = Object("Fach","Das ist eins deiner drei F�cher.",SHELF4,OPEN | CLOSED,24,25,13); _objectState[16] = Object("Buch","Es ist|\"Per Anhalter durch die Galaxis\"|von Douglas Adams.",BOOK,TAKE,26,26,14); _objectState[17] = Object("Discman","Es ist eine \"Mad Monkeys\"-CD darin.",DISCMAN,TAKE | COMBINABLE,33,33,16); - _objectState[18] = Object("Luke",&description,0,OPEN | EXIT,3,3,15 | 128,CORRIDOR,5); - _objectState[19] = Object("Schlitz","Es ist ein Keycard-Leser.",0,COMBINABLE,0,0,0); - _objectState[20] = Object("Schrank",&description,0,OPEN | CLOSED,1,1,0); - _objectState[21] = Object("Fach",&description,0,OPEN | CLOSED,2,2,0); - _objectState[22] = Object("Steckdose",&description,SOCKET,COMBINABLE,4,4,0); - _objectState[23] = Object("Toilette",&description,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); + _objectState[18] = Object("Luke",Object::defaultDescription,NULLOBJECT,OPEN | EXIT,3,3,15 | 128,CORRIDOR,5); + _objectState[19] = Object("Schlitz","Es ist ein Keycard-Leser.",NULLOBJECT,COMBINABLE,0,0,0); + _objectState[20] = Object("Schrank",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,1,1,0); + _objectState[21] = Object("Fach",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,2,2,0); + _objectState[22] = Object("Steckdose",Object::defaultDescription,SOCKET,COMBINABLE,4,4,0); + _objectState[23] = Object("Toilette",Object::defaultDescription,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); }; @@ -352,10 +352,10 @@ public: ShipCabinBathroom() { _filenumber = 23; _shown[0] = true; - - _objectState[0] = Object("Klo","Ein Klo mit Saugmechanismus.",TOILET,0,0,0,0); - _objectState[1] = Object("Dusche",&description,SHOWER,0,1,1,0); - _objectState[2] = Object("Ausgang",&description,BATHROOM_EXIT,EXIT,255,255,0,0,2); + + _objectState[0] = Object("Klo","Ein Klo mit Saugmechanismus.",TOILET,NULLTYPE,0,0,0); + _objectState[1] = Object("Dusche",Object::defaultDescription,SHOWER,NULLTYPE,1,1,0); + _objectState[2] = Object("Ausgang",Object::defaultDescription,BATHROOM_EXIT,EXIT,255,255,0,NULLROOM,2); } }; @@ -370,16 +370,16 @@ public: _shown[4] = false; _shown[5] = false; _shown[6] = true; - - _objectState[0] = Object("Luke","Das ist eine Luke !!!",0,EXIT | OPEN | OPENED | CLOSED,0,0,0,CORRIDOR,10); - _objectState[1] = Object("Luke","Dies ist eine Luke !!!",0,EXIT | OPEN | CLOSED,1,1,0,HOLD,14); - _objectState[2] = Object("Knopf",&description,BUTTON1,PRESS,2,2,0); - _objectState[3] = Object("Knopf",&description,BUTTON2,PRESS,3,3,0); + + _objectState[0] = Object("Luke","Das ist eine Luke !!!",NULLOBJECT,EXIT | OPEN | OPENED | CLOSED,0,0,0,CORRIDOR,10); + _objectState[1] = Object("Luke","Dies ist eine Luke !!!",NULLOBJECT,EXIT | OPEN | CLOSED,1,1,0,HOLD,14); + _objectState[2] = Object("Knopf",Object::defaultDescription,BUTTON1,PRESS,2,2,0); + _objectState[3] = Object("Knopf",Object::defaultDescription,BUTTON2,PRESS,3,3,0); _objectState[4] = Object("Helm","Es ist der Helm zum Raumanzug.",HELMET,TAKE,4,4,7); _objectState[5] = Object("Raumanzug","Der einzige Raumanzug, den die|anderen hiergelassen haben ...",SUIT,TAKE,5,5,8); _objectState[6] = Object("Versorgung","Es ist der Versorgungsteil zum Raumanzug.",LIFESUPPORT,TAKE,6,6,9); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); virtual void onEntrance(); }; @@ -389,21 +389,21 @@ public: ShipHold() { _filenumber = 24; _shown[0] = true; - - _objectState[0] = Object("",&description,HOLD_WIRE,COMBINABLE,255,255,0); - _objectState[1] = Object("Schrott","Da ist eine L�sterklemme dran, die|noch ganz brauchbar aussieht.|Ich nehme sie mit.",SCRAP_LK,0,4,4,0); - _objectState[2] = Object("L�sterklemme",&description,TERMINALSTRIP,COMBINABLE,255,255,0); - _objectState[3] = Object("Schrott","Junge, Junge! Die Explosion hat ein|ganz sch�nes Durcheinander angerichtet.",0,0,5,5,0); - _objectState[4] = Object("Reaktor","Das war einmal der Reaktor.",0,0,6,6,0); - _objectState[5] = Object("D�se",&description,0,0,7,7,0); - _objectState[6] = Object("blauer K�rbis","Keine Ahnung, was das ist.",0,0,8,8,0); - _objectState[7] = Object("Luke",&description,LANDINGMOD_OUTERHATCH,EXIT | OPEN,1,2,2,LANDINGMODULE,6); - _objectState[8] = Object("Landef�hre","Sie war eigentlich f�r Bodenuntersuchungen|auf Arsano 3 gedacht.",0,0,0,0,0); - _objectState[9] = Object("Ausgang",&description,0,EXIT,255,255,0,AIRLOCK,22); + + _objectState[0] = Object("",Object::defaultDescription,HOLD_WIRE,COMBINABLE,255,255,0); + _objectState[1] = Object("Schrott","Da ist eine L�sterklemme dran, die|noch ganz brauchbar aussieht.|Ich nehme sie mit.",SCRAP_LK,NULLTYPE,4,4,0); + _objectState[2] = Object("L�sterklemme",Object::defaultDescription,TERMINALSTRIP,COMBINABLE,255,255,0); + _objectState[3] = Object("Schrott","Junge, Junge! Die Explosion hat ein|ganz sch�nes Durcheinander angerichtet.",NULLOBJECT,NULLTYPE,5,5,0); + _objectState[4] = Object("Reaktor","Das war einmal der Reaktor.",NULLOBJECT,NULLTYPE,6,6,0); + _objectState[5] = Object("D�se",Object::defaultDescription,NULLOBJECT,NULLTYPE,7,7,0); + _objectState[6] = Object("blauer K�rbis","Keine Ahnung, was das ist.",NULLOBJECT,NULLTYPE,8,8,0); + _objectState[7] = Object("Luke",Object::defaultDescription,LANDINGMOD_OUTERHATCH,EXIT | OPEN,1,2,2,LANDINGMODULE,6); + _objectState[8] = Object("Landef�hre","Sie war eigentlich f�r Bodenuntersuchungen|auf Arsano 3 gedacht.",NULLOBJECT,NULLTYPE,0,0,0); + _objectState[9] = Object("Ausgang",Object::defaultDescription,NULLOBJECT,EXIT,255,255,0,AIRLOCK,22); _objectState[10] = Object("Luke","Sie f�hrt nach drau�en.",OUTERHATCH_TOP,EXIT | OPEN | OPENED,3,3,0,GENERATOR,8); _objectState[11] = Object("Generator","Er versorgt das Raumschiff mit Strom.",GENERATOR_TOP,EXIT,12,12,0,GENERATOR,8); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); virtual void onEntrance(); }; @@ -413,15 +413,15 @@ public: ShipLandingModule() { _filenumber = 25; _shown[0] = true; - - _objectState[0] = Object("Steckdose",&description,LANDINGMOD_SOCKET,COMBINABLE,1,1,0); + + _objectState[0] = Object("Steckdose",Object::defaultDescription,LANDINGMOD_SOCKET,COMBINABLE,1,1,0); _objectState[1] = Object("Knopf","Es ist ein Sicherheitsknopf.|Er kann nur mit einem spitzen|Gegenstand gedr�ckt werden.",LANDINGMOD_BUTTON,PRESS | COMBINABLE,2,2,0); - _objectState[2] = Object("Monitor",&description,LANDINGMOD_MONITOR,0,3,3,0); - _objectState[3] = Object("Tastatur",&description,KEYBOARD,0,4,4,0); - _objectState[4] = Object("",&description,LANDINGMOD_WIRE,COMBINABLE,255,255,0); - _objectState[5] = Object("Luke",&description,LANDINGMOD_HATCH,EXIT | OPEN | OPENED | COMBINABLE, 0,0,1 | 128,HOLD,10); + _objectState[2] = Object("Monitor",Object::defaultDescription,LANDINGMOD_MONITOR,NULLTYPE,3,3,0); + _objectState[3] = Object("Tastatur",Object::defaultDescription,KEYBOARD,NULLTYPE,4,4,0); + _objectState[4] = Object("",Object::defaultDescription,LANDINGMOD_WIRE,COMBINABLE,255,255,0); + _objectState[5] = Object("Luke",Object::defaultDescription,LANDINGMOD_HATCH,EXIT | OPEN | OPENED | COMBINABLE, 0,0,1 | 128,HOLD,10); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); }; @@ -435,22 +435,22 @@ public: _shown[3] = false; _shown[4] = false; _shown[5] = true; - - _objectState[0] = Object("langes Kabel mit Stecker",&description,GENERATOR_WIRE,COMBINABLE,255,255,0); - _objectState[1] = Object("leere Kabelrolle",&description,0,UNNECESSARY,255,255,0); + + _objectState[0] = Object("langes Kabel mit Stecker",Object::defaultDescription,GENERATOR_WIRE,COMBINABLE,255,255,0); + _objectState[1] = Object("leere Kabelrolle",Object::defaultDescription,NULLOBJECT,UNNECESSARY,255,255,0); _objectState[2] = Object("Keycard","Hey, das ist die Keycard des Commanders!|Er mu� sie bei dem �berst�rzten|Aufbruch verloren haben.",KEYCARD2,COMBINABLE | TAKE,12,12,5 | 128); - _objectState[3] = Object("Seil",&description,GENERATOR_ROPE,COMBINABLE,255,255,0); + _objectState[3] = Object("Seil",Object::defaultDescription,GENERATOR_ROPE,COMBINABLE,255,255,0); _objectState[4] = Object("Luke","Sie f�hrt nach drau�en.",OUTERHATCH,EXIT | OPEN,1,2,1,OUTSIDE,22); - _objectState[5] = Object("Luke",&description,0,OPEN | CLOSED,3,3,0); - _objectState[6] = Object("Schlitz","Es ist ein Keycard-Leser.",0,COMBINABLE,4,4,0); - _objectState[7] = Object("Klappe",&description,TRAP,OPEN,5,6,2); - _objectState[8] = Object("Leitung",&description,0,0,7,7,0); - _objectState[9] = Object("Spannungmessger�t",&description,VOLTMETER,0,9,9,0); - _objectState[10] = Object("Klemme",&description,CLIP,COMBINABLE,8,8,0); + _objectState[5] = Object("Luke",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,3,3,0); + _objectState[6] = Object("Schlitz","Es ist ein Keycard-Leser.",NULLOBJECT,COMBINABLE,4,4,0); + _objectState[7] = Object("Klappe",Object::defaultDescription,TRAP,OPEN,5,6,2); + _objectState[8] = Object("Leitung",Object::defaultDescription,NULLOBJECT,NULLTYPE,7,7,0); + _objectState[9] = Object("Spannungmessger�t",Object::defaultDescription,VOLTMETER,NULLTYPE,9,9,0,NULLROOM,0); + _objectState[10] = Object("Klemme",Object::defaultDescription,CLIP,COMBINABLE,8,8,0); _objectState[11] = Object("Leitung","Sie f�hrt vom Generator zum Spannungmessger�t.",SHORT_WIRE,COMBINABLE,10,10,0); - _objectState[12] = Object("Leiter",&description,LADDER,EXIT,0,0,0,HOLD,1); + _objectState[12] = Object("Leiter",Object::defaultDescription,LADDER,EXIT,0,0,0,HOLD,1); } - + virtual bool interact(Action verb, Object &obj1, Object &obj2); }; @@ -459,9 +459,9 @@ public: ShipOuterSpace() { _filenumber = 4; _shown[0] = true; - - _objectState[0] = Object("Luke",&description,0,EXIT,0,0,0,GENERATOR,3); - _objectState[1] = Object("Seil",&description,0,UNNECESSARY,255,255,0); + + _objectState[0] = Object("Luke",Object::defaultDescription,NULLOBJECT,EXIT,0,0,0,GENERATOR,3); + _objectState[1] = Object("Seil",Object::defaultDescription,NULLOBJECT,UNNECESSARY,255,255,0); } }; -- cgit v1.2.3