whatever cont.

debug.cpp

@@ -679,17 +679,16 @@ int read_cheat_args() {
     PHASE(3); start_game();
     viewall();
     }
-  else if(argis("-we")) {    
+  else if(argis("-wef")) {
     PHASEFROM(2);
-    shift_arg_formula(whatever, delayed_geo_reset);
+    shift(); int index = argi(); 
+    shift_arg_formula(whatever[index], delayed_geo_reset);
     }
   else if(argis("-wei")) {    
     PHASEFROM(2);
-    shift(); whateveri = argi(); delayed_geo_reset();
-    }
-  else if(argis("-wei2")) {
-    PHASEFROM(2);
-    shift(); whateveri2 = argi(); delayed_geo_reset();
+    shift(); int index = argi();
+    shift(); whateveri[index] = argi();
+    delayed_geo_reset();
     }
   else if(argis("-W3")) {
     shift(); top_land = readland(args()); cheat();

hyper.h

@@ -2432,7 +2432,8 @@ void optimizeview();
 extern bool noGUI;
 extern bool dronemode;
 
-extern ld whatever;
+extern ld whatever[16];
+extern int whateveri[16];
 
 namespace sm {
   static const int NORMAL = 1;
@@ -3526,8 +3527,6 @@ ld wall_radar(cell *c, transmatrix T);
 extern string bitruncnames[5];
 extern bool need_mouseh;
 
-extern int whateveri, whateveri2;
-
 void clear_euland(eLand first);
 
 extern eMonster passive_switch;

menus.cpp

@@ -7,7 +7,8 @@
 #define REDDISH 0x400000
 
 namespace hr {
-ld whatever = 0;
+ld whatever[16];
+int whateveri[16];
 
 int PREC(ld x) {
   ld sh = shiftmul;

pattern2.cpp

@@ -344,7 +344,7 @@ int zebra3(cell *c) {
 namespace fieldpattern {
 
 pair<int, bool> fieldval(cell *c) {
-  if(ctof(c)) return make_pair(c->master->fieldval, false);
+  if(ctof(c)) return make_pair(int(c->master->fieldval), false);
   else return make_pair(btspin(c->master->fieldval, c->c.spin(0)), true);
   }
 

util.cpp

@@ -130,8 +130,6 @@ void profile_info() {
 #define profile_info()
 #endif
 
-int whateveri, whateveri2;
-
 purehookset hooks_tests;
 
 string simplify(const string& s) {