Adding level by level in a more principled way

Author: flend

src/brogue/Architect.c

@@ -1027,7 +1027,7 @@ boolean buildAMachine(enum machineTypes bp,
     machineInfo *tempMachineInfo = createMachineInfo(0, 0, 0);
     if (buildAMachineOrChildMachine(bp, originX, originY, requiredMachineFlags, NULL, NULL, NULL, tempMachineInfo)) {
         // Transfer the valid machineInfo into the main chain and delete the head node
-        addMachineInfoToChain(tempMachineInfo->nextMachineInfo, allMachineInfo);
+        addMachineInfoToChain(tempMachineInfo->nextMachineInfo, levelMachineInfo);
         tempMachineInfo->nextMachineInfo = NULL;
         deleteMachineInfo(tempMachineInfo);
         return true;

src/brogue/GlobalsBase.c

@@ -50,6 +50,7 @@ item *floorItems;
 item *packItems;
 item *monsterItemsHopper;
 machineInfo *allMachineInfo;
+machineInfo *levelMachineInfo;
 
 char displayedMessage[MESSAGE_LINES][COLS*2];
 short messagesUnconfirmed;

src/brogue/GlobalsBase.h

@@ -66,6 +66,7 @@ extern item *floorItems;
 extern item *packItems;
 extern item *monsterItemsHopper;
 extern machineInfo *allMachineInfo;
+extern machineInfo *levelMachineInfo;
 extern short numberOfWaypoints;
 
 extern char displayedMessage[MESSAGE_LINES][COLS*2];

src/brogue/RogueMain.c

@@ -539,6 +539,51 @@ static void updateColors() {
     }
 }
 
+static machineInfo *reverseAllMachineInfo2() {
+    machineInfo *prev = NULL;
+    machineInfo *current = allMachineInfo;
+    machineInfo *next = NULL;
+
+    while (current != NULL) {
+        next = current->nextMachineInfo;
+        current->nextMachineInfo = prev;
+        prev = current;
+        current = next;
+    }
+    return prev;
+}
+
+static void deleteMachineInfo2(machineInfo *machineInfo) {
+    free(machineInfo);
+}
+
+static void deleteAllMachineInfo2(machineInfo *theChain) {
+    machineInfo *thisMachineInfo, *thisMachineInfo2;
+    for (thisMachineInfo = theChain; thisMachineInfo != NULL; thisMachineInfo = thisMachineInfo2) {
+        thisMachineInfo2 = thisMachineInfo->nextMachineInfo;
+        deleteAllMachineInfo2(thisMachineInfo->childMachineInfo);
+        deleteMachineInfo2(thisMachineInfo);
+    }
+}
+
+static void addMachineInfoToChain2(machineInfo *theInfo, machineInfo *theChain) {
+    theInfo->nextMachineInfo = theChain->nextMachineInfo;
+    theChain->nextMachineInfo = theInfo;
+}
+
+static void addMachineInfoAndChainToChain(machineInfo *theInfo, machineInfo *theChain) {
+    //find last machineInfo nextMachineInfo from theInfo
+
+    machineInfo *lastMachineInfo = theInfo;
+    while (lastMachineInfo->nextMachineInfo != NULL) {
+        lastMachineInfo = lastMachineInfo->nextMachineInfo;
+    }
+
+    lastMachineInfo->nextMachineInfo = theChain->nextMachineInfo;
+    theChain->nextMachineInfo = theInfo;
+}
+
+
 void startLevel(short oldLevelNumber, short stairDirection) {
     uint64_t oldSeed;
     item *theItem;
@@ -686,6 +731,9 @@ void startLevel(short oldLevelNumber, short stairDirection) {
 
         levels[rogue.depthLevel-1].items = NULL;
 
+        // Initialize a chain for the level only
+        levelMachineInfo = createMachineInfo(0, 0, 0);
+
         pos upStairLocation;
         int failsafe;
         for (failsafe = 50; failsafe; failsafe--) {
@@ -729,6 +777,13 @@ void startLevel(short oldLevelNumber, short stairDirection) {
             }
         }
 
+        machineInfo *firstRealNode = levelMachineInfo->nextMachineInfo;
+        levelMachineInfo->nextMachineInfo = NULL;
+        deleteAllMachineInfo2(levelMachineInfo);
+
+        //machineInfo *reversed = reverseAllMachineInfo2(firstRealNode);
+        addMachineInfoAndChainToChain(firstRealNode, allMachineInfo);
+
         // re-seed the RNG
         seedRandomGenerator(oldSeed);
 

src/brogue/SeedCatalog.c

@@ -362,7 +362,7 @@ int printSeedCatalog(uint64_t startingSeed, uint64_t numberOfSeedsToScan, unsign
             printSeedCatalogMonsterItems(isCsvFormat);
             printSeedCatalogMonsters(isCsvFormat, false); // captives and allies only
             if (includeVaults) {
-                reverseAllMachineInfo();
+                //reverseAllMachineInfo();
                 printSeedCatalogMachines(isCsvFormat, allMachineInfo, 0);
             } else {
                 printSeedCatalogAltars(isCsvFormat);