Updated to 9.4f (tutorial)

system.cpp

@@ -141,6 +141,9 @@ void initgame() {
   
   yendor::init(3);
   multi::revive_queue.clear();
+#ifdef TOUR
+  if(tour::on) tour::presentation(5);
+#endif
   
   if(multi::players > 1 && !shmup::on) {
     for(int i=0; i<numplayers(); i++) 
@@ -170,6 +173,9 @@ void initgame() {
       if(firstland != (princess::challenge ? laPalace : laIce)) cheater++;
       }
     if(tactic::trailer) ;
+#ifdef TOUR
+    else if(tour::on) ; // displayed by tour
+#endif
     else if(princess::challenge) {
       kills[moVizier] = 1;
       princess::forceMouse = true;
@@ -617,6 +623,9 @@ void saveStats(bool emergency = false) {
   DEBB(DF_INIT, (debugfile,"saveStats [%s]\n", scorefile));
 
   if(autocheat) return;
+  #ifdef TOUR
+  if(tour::on) return;
+  #endif
   if(randomPatternsMode) return;
   
   remove_emergency_save();
@@ -738,6 +747,10 @@ void saveStats(bool emergency = false) {
 
 // load the save
 void loadsave() {
+  if(autocheat) return;
+#ifdef TOUR
+  if(tour::on) return;
+#endif
   DEBB(DF_INIT, (debugfile,"loadSave\n"));
 
   for(int xc=0; xc<MODECODES; xc++)
@@ -851,6 +864,7 @@ namespace gamestack {
     heptspin viewctr;
     transmatrix View;
     eGeometry geometry;
+    bool hepta;
     };
 
   vector<gamedata> gd;
@@ -868,6 +882,7 @@ namespace gamestack {
     gdn.viewctr = viewctr;
     gdn.View = View;
     gdn.geometry = geometry;
+    gdn.hepta = purehepta;
     gd.push_back(gdn);
     }
     
@@ -878,6 +893,7 @@ namespace gamestack {
     viewctr = gdn.viewctr;
     View = gdn.View;
     geometry = gdn.geometry;
+    purehepta = gdn.hepta;
     resetGeometry();
     gd.pop_back();
     bfs();
@@ -928,6 +944,16 @@ void restartGame(char switchWhat, bool push) {
     resetGeometry();
     chaosmode = !chaosmode;
     }
+#ifdef TOUR
+  if(switchWhat == 'T') {
+    geometry = gNormal;
+    yendor::on = tactic::on = princess::challenge = false;
+    chaosmode = purehepta = randomPatternsMode = false;
+    shmup::on = false;
+    resetGeometry();    
+    tour::on = !tour::on;
+    }
+#endif
   if(switchWhat == '7') {
     if(euclid) geometry = gNormal;
     purehepta = !purehepta;