From: Jason S. Ninneman <jsn@mbar.us>
Date: Sun, 11 Jun 2017 18:58:12 +0000 (-0700)
Subject: More retrofitting.
X-Git-Tag: 1.1~415
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=15ff262d17355e14ada3202776646bdfeddda313;p=open-adventure.git

More retrofitting.
---

diff --git a/init.c b/init.c
index aae7704..cabe574 100644
--- a/init.c
+++ b/init.c
@@ -5,6 +5,7 @@
 
 #include "advent.h"
 #include "database.h"
+#include "newdb.h"
 
 /*
  * Initialisation
@@ -183,7 +184,7 @@ void initialise(void)
 
     for (i=1; i<=LOCSIZ; i++) {
 	game.abbrev[i]=0;
-	if (!(LTEXT[i] == 0 || KEY[i] == 0)) {
+	if (!(long_location_descriptions[i] == 0 || KEY[i] == 0)) {
 	    k=KEY[i];
 	    if(MOD(labs(TRAVEL[k]),1000) == 1)COND[i]=2;
 	}
@@ -218,7 +219,7 @@ void initialise(void)
      *  not yet found, so we know when to close the cave. */
     game.tally=0;
     for (i=MINTRS; i<=MAXTRS; i++) {
-	if(PTEXT[i] != 0)
+	if(object_descriptions[i].inventory != 0)
 	    game.prop[i]= -1;
 	game.tally=game.tally-game.prop[i];
     }
diff --git a/score.c b/score.c
index b1e0d7a..cc482ff 100644
--- a/score.c
+++ b/score.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "advent.h"
 #include "database.h"
+#include "newdb.h"
 
 /*
  * scoring and wrap-up
@@ -33,7 +34,7 @@ void score(long mode)
     /*  First tally up the treasures.  Must be in building and not broken.
      *  Give the poor guy 2 points just for finding each treasure. */
     for (i=MINTRS; i<=MAXTRS; i++) {
-	if(PTEXT[i] != 0) {
+	if(object_descriptions[i].inventory != 0) {
 	    k=12;
 	    if(i == CHEST)k=14;
 	    if(i > CHEST)k=16;
@@ -109,7 +110,7 @@ void score(long mode)
     RSPEAK(262);
     for (i=1; i<=CLSSES; i++) {
 	if(CVAL[i] >= score) {
-	    SPEAK(CTEXT[i]);
+	    newspeak(class_messages[i]);
 	    i=CVAL[i]+1-score;
 	    SETPRM(1,i,i);
 	    RSPEAK(263);