X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/micropolis/blobdiff_plain/6a5fa4e03967ab980cdc7ef96a42400bc29b4414..refs/heads/legacy:/src/sim/w_update.c

diff --git a/src/sim/w_update.c b/src/sim/w_update.c
index 168d626..63c8ce0 100644
--- a/src/sim/w_update.c
+++ b/src/sim/w_update.c
@@ -70,13 +70,21 @@ QUAD LastCityMonth;
 QUAD LastFunds;
 QUAD LastR, LastC, LastI;
 
+void UpdateOptionsMenu(int options);
+void updateOptions(void);
+void SetDemand(double r, double c, double i);
+void drawValve(void);
+void showValves(void);
+void updateDate(void);
+void ReallyUpdateFunds(void);
+
 char *dateStr[12] = {
   "Jan", "Feb", "Mar", "Apr", "May", "Jun", 
   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
 
 
-void DoUpdateHeads()
+void DoUpdateHeads(void)
 {
   showValves();
   doTimeStuff();
@@ -85,38 +93,39 @@ void DoUpdateHeads()
 }
 
 
-void UpdateEditors()
+void UpdateEditors(void)
 {
   InvalidateEditors();
   DoUpdateHeads();
 }
 
 
-void UpdateMaps()
+void UpdateMaps(void)
 {
   InvalidateMaps();
 }
 
 
-void UpdateGraphs()
+void UpdateGraphs(void)
 {
   ChangeCensus();
 }
 
 
-void UpdateEvaluation()
+void UpdateEvaluation(void)
 {
   ChangeEval();
 }
 
 
-void UpdateHeads()
+void UpdateHeads(void)
 {
   MustUpdateFunds = ValveFlag = 1;
   LastCityTime = LastCityYear = LastCityMonth = LastFunds = LastR = -999999;
   DoUpdateHeads();
 }
 
+void
 UpdateFunds(void)
 {
   MustUpdateFunds = 1;
@@ -124,6 +133,7 @@ UpdateFunds(void)
 }
 
 
+void
 ReallyUpdateFunds(void)
 {
   char localStr[256], dollarStr[256], buf[256];
@@ -136,7 +146,7 @@ ReallyUpdateFunds(void)
 
   if (TotalFunds != LastFunds) {
     LastFunds = TotalFunds;
-    sprintf(localStr, "%d", TotalFunds);
+    sprintf(localStr, "%ld", TotalFunds);
     makeDollarDecimalStr(localStr, dollarStr);
 
     sprintf(localStr, "Funds: %s", dollarStr);
@@ -147,7 +157,8 @@ ReallyUpdateFunds(void)
 }
 
 
-doTimeStuff(void) 
+void
+doTimeStuff(void)
 {
 //  if ((CityTime >> 2) != LastCityTime) {
     updateDate();
@@ -155,6 +166,7 @@ doTimeStuff(void)
 }
 
 
+void
 updateDate(void)
 {	
   int y;
@@ -183,14 +195,21 @@ 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);
   }
 }
 
 
+void
 showValves(void)
 {
   if (ValveFlag) {
@@ -200,6 +219,7 @@ showValves(void)
 }
 
 
+void
 drawValve(void)
 {
   double r, c, i;
@@ -227,6 +247,7 @@ drawValve(void)
 }
 
 
+void
 SetDemand(double r, double c, double i)
 {
   char buf[256];
@@ -237,7 +258,8 @@ SetDemand(double r, double c, double i)
 }
 
 
-updateOptions()
+void
+updateOptions(void)
 {
   int options;
 
@@ -258,14 +280,22 @@ updateOptions()
 }
 
 
+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);
 }