Add legacy mode inspired by the work of virtuallyfun/tenox7

Autodetect simcity.tcl in res/ and switch to legacy mode if
it is found. Working with Simcity 2.17 ressources from for
example Solaris.
Sound is not yet working.

diff --git a/Makefile b/Makefile
index d502fdd766e156e71cfca3a4a911bd24e65e5945..1d1a8b978ea44a9edd469dc8c684571945cee004 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,19 +33,19 @@ res/sim: src/sim/sim
        cp src/sim/sim $@
        strip $@
 
-src/sim/sim: tcl tk tclx sim
+src/sim/sim: sim
        @#
 
 tcl:
        cd src/tcl && $(MAKE) MAKEFLAGS=
 
-tk:
+tk: tcl
        cd src/tk && $(MAKE) MAKEFLAGS=
 
-tclx:
+tclx: tk
        cd src/tclx && $(MAKE) MAKEFLAGS=
 
-sim:
+sim: tclx
        cd src/sim && $(MAKE) MAKEFLAGS=
 
 clean: 

diff --git a/src/sim/headers/sim.h b/src/sim/headers/sim.h
index f0919778b2f0a935be68629d24a754a68902f18e..9277b42c3f3ed20398fd605ebf81f09167e2a2e0 100644 (file)
--- a/src/sim/headers/sim.h
+++ b/src/sim/headers/sim.h
@@ -617,6 +617,7 @@ extern Sim *sim;
 extern int WireMode;
 extern int MultiPlayerMode;
 extern int SugarMode;
+extern int LegacyMode;
 extern int sim_delay;
 extern int sim_skips;
 extern int sim_skip;

diff --git a/src/sim/sim.c b/src/sim/sim.c
index 21e4b41f0bc74cb6eabb27ea199dc84841e8426e..60fef681f2ed155ff1ee1a73fe21366bd9d2732f 100644 (file)
--- a/src/sim/sim.c
+++ b/src/sim/sim.c
@@ -94,6 +94,7 @@ char *StartupName = NULL;
 int WireMode = 0;
 int MultiPlayerMode = 0;
 int SugarMode = 0;
+int LegacyMode = 0;
 int TilesAnimated = 0;
 int DoAnimation = 1;
 int DoMessages = 1;

diff --git a/src/sim/w_tk.c b/src/sim/w_tk.c
index 991a2018a06c4f586de81e63702a78fd531e6923..686c7e80d620f68e35bc2ba336330140acacbded 100644 (file)
--- a/src/sim/w_tk.c
+++ b/src/sim/w_tk.c
@@ -793,7 +793,19 @@ void tk_main(void)
 
   sim = MakeNewSim();
 
-  sprintf(initCmd, "source %s/micropolis.tcl", ResourceDir);
+  sprintf(initCmd, "%s/simcity.tcl", ResourceDir);
+  if (access(initCmd, R_OK) == 0) {
+    printf("Found %s, entering legacy mode.\n", initCmd);
+    LegacyMode = 1;
+    SugarMode = 0;
+    Eval("winfo-setlegacy");
+  }
+
+  if (!LegacyMode) {
+    sprintf(initCmd, "source %s/micropolis.tcl", ResourceDir);
+  } else {
+    sprintf(initCmd, "source %s/simcity.tcl", ResourceDir);
+  }
   filename2UNIX(initCmd);
   if (Eval(initCmd)) {
     sim_exit(1); // Just sets tkMustExit and ExitReturn
@@ -810,8 +822,13 @@ void tk_main(void)
 
   { char buf[1024];
 
-    sprintf(buf, "UIStartMicropolis {%s} {%s} {%s}",
-           HomeDir, ResourceDir, HostName);
+    if (!LegacyMode) {
+      sprintf(buf, "UIStartMicropolis {%s} {%s} {%s}",
+             HomeDir, ResourceDir, HostName);
+    } else {
+      sprintf(buf, "UIStartSimCity {%s} {%s} {} {%s}",
+             HomeDir, ResourceDir, HostName);
+    }
     filename2UNIX(buf);
     if (Eval(buf) != TCL_OK) {
       sim_exit(1); // Just sets tkMustExit and ExitReturn

diff --git a/src/sim/w_update.c b/src/sim/w_update.c
index 248a31110313767e8f20e1208e594b7f5bdf5590..63c8ce0e6b7e2a28abd9a7686e2a50876605c218 100644 (file)
--- a/src/sim/w_update.c
+++ b/src/sim/w_update.c
@@ -195,9 +195,15 @@ updateDate(void)
 
     sprintf(str, "%s %d", dateStr[m], y);
 
-    sprintf(buf,
-           "UISetDate {%s} %d %d",
-           str, m, y);
+    if (!LegacyMode) {
+      sprintf(buf,
+             "UISetDate {%s} %d %d",
+             str, m, y);
+    } else {
+      sprintf(buf,
+             "UISetDate {%s}",
+             str);
+    }
     Eval(buf);
   }
 }
@@ -278,11 +284,18 @@ void
 UpdateOptionsMenu(int options)
 {
   char buf[256];
-  sprintf(buf, "UISetOptions %d %d %d %d %d %d %d %d",
-         (options&1)?1:0, (options&2)?1:0,
-         (options&4)?1:0, (options&8)?1:0,
-         (options&16)?1:0, (options&32)?1:0,
-         (options&64)?1:0, (options&128)?1:0);
+  if (!LegacyMode) {
+    sprintf(buf, "UISetOptions %d %d %d %d %d %d %d %d",
+           (options&1)?1:0, (options&2)?1:0,
+           (options&4)?1:0, (options&8)?1:0,
+           (options&16)?1:0, (options&32)?1:0,
+           (options&64)?1:0, (options&128)?1:0);
+  } else {
+    sprintf(buf, "UISetOptions %d %d %d %d %d %d",
+           (options&1)?1:0, (options&2)?1:0,
+           (options&4)?1:0, (options&8)?1:0,
+           (options&16)?1:0, (options&32)?1:0);
+  }
   Eval(buf);
 }
 

diff --git a/src/tclx/makefile b/src/tclx/makefile
index fae1059e473c9c15874e1000d81562202fe63fa0..cf90bb714ca4be5a430e14d2d01b8858e6cdad2e 100644 (file)
--- a/src/tclx/makefile
+++ b/src/tclx/makefile
@@ -65,7 +65,7 @@ libtcl.a: $(TCL_UCB_DIR)/libtcl.a
 
 wish: TKX_MAKES runwish
 
-TKX_MAKES: libtk.a
+TKX_MAKES: libtk.a tcl
        cd tkucbsrc; $(MAKE) -$(MAKEFLAGS) all
        cd tksrc;    $(MAKE) -$(MAKEFLAGS) all
 
@@ -83,7 +83,7 @@ libtk.a: $(TCL_TK_DIR)/libtk.a
 # Also generate a script to point the TCLDEFAULT environment variable
 # at this file for testing Tcl before its installed.
 
-tcldef:
+tcldef: tcl
        @echo " -       Generating temporary TCLDEFAULT file.     -"
        @echo " - Use runtcl script to test Tcl before installing -"
        @echo " - Use runwish script to test Tk before installing -"
@@ -91,7 +91,7 @@ tcldef:
        @echo "set TCLPATH `pwd`/tcllib"                  >>tcldef
        @echo "set TCLINIT `pwd`/tcllib/tclinit.tcl"      >>tcldef
 
-runtcl:
+runtcl: tcldef
        @echo ':'                                              >runtcl
        @echo '# script for testing Tcl before installation'  >>runtcl
        @echo "TCLDEFAULT=`pwd`/tcldef"                       >>runtcl

diff --git a/src/tk/tk.h b/src/tk/tk.h
index b70afb83312e5c5c3bc855fa91aac986d2d0aa73..a102a6d02a83ea0548e018acd326e71079006e67 100644 (file)
--- a/src/tk/tk.h
+++ b/src/tk/tk.h
@@ -729,6 +729,8 @@ extern int          Tk_UpdateCmd _ANSI_ARGS_((ClientData clientData,
                            Tcl_Interp *interp, int argc, char **argv));
 extern int             Tk_WinfoCmd _ANSI_ARGS_((ClientData clientData,
                            Tcl_Interp *interp, int argc, char **argv));
+extern int             Tk_WinfoCmdSetLegacy _ANSI_ARGS_((ClientData clientData,
+                           Tcl_Interp *interp, int argc, char **argv));
 extern int             Tk_WmCmd _ANSI_ARGS_((ClientData clientData,
                            Tcl_Interp *interp, int argc, char **argv));
 extern int             Tcp_AcceptCmd _ANSI_ARGS_((ClientData clientData,

diff --git a/src/tk/tkcmds.c b/src/tk/tkcmds.c
index 14207ad94618463ba7070d04bdb379f811a51a84..de8394939f9a913fc1511f3f3e977230d3cefaa2 100644 (file)
--- a/src/tk/tkcmds.c
+++ b/src/tk/tkcmds.c
@@ -500,6 +500,22 @@ WaitWindowProc (
     }
 }
 \f
+static int LegacyMode = 0;
+
+int
+Tk_WinfoCmdSetLegacy (
+    ClientData clientData,     /* Main window associated with
+                                * interpreter. */
+    Tcl_Interp *interp,                /* Current interpreter. */
+    int argc,                  /* Number of arguments. */
+    char **argv                /* Argument strings. */
+)
+{
+    LegacyMode = 1;
+
+    return TCL_OK;
+}
+
 /*
  *----------------------------------------------------------------------
  *
@@ -750,7 +766,7 @@ Tk_WinfoCmd (
            case PseudoColor:   interp->result = "pseudocolor"; break;
            case GrayScale:     interp->result = "grayscale"; break;
            case DirectColor:   interp->result = "directcolor"; break;
-           case TrueColor:     interp->result = "truecolor"; break;
+           case TrueColor:     interp->result = LegacyMode?"pseudocolor":"truecolor"; break;
            case StaticColor:   interp->result = "staticcolor"; break;
            case StaticGray:    interp->result = "staticgray"; break;
            default:            interp->result = "unknown"; break;

diff --git a/src/tk/tkwindow.c b/src/tk/tkwindow.c
index c7a7ed24fd77d15b77825c1b484927a1cbb031ae..5f568e2aeac99867921484544c9b528612de6a02 100644 (file)
--- a/src/tk/tkwindow.c
+++ b/src/tk/tkwindow.c
@@ -134,6 +134,7 @@ TkCmd commands[] = {
     {"tkwait",         Tk_TkwaitCmd},
     {"update",         Tk_UpdateCmd},
     {"winfo",          Tk_WinfoCmd},
+    {"winfo-setlegacy",        Tk_WinfoCmdSetLegacy},
     {"wm",             Tk_WmCmd},
     {"accept",         Tcp_AcceptCmd},
     {"shutdown",       Tcp_ShutdownCmd},