src/tclx/ucbsrc/makefile: Micropolis build fixes for recent macOS

[micropolis] / src / sim / sim.c

diff --git a/src/sim/sim.c b/src/sim/sim.c
index 79a7817903ecc907a10208e5ecf3e015edbf99ca..5ae477042bf204906992cb995dc5546b3083b69e 100644 (file)
--- a/src/sim/sim.c
+++ b/src/sim/sim.c
@@ -61,6 +61,12 @@
  */
 #include "sim.h"
 
  */
 #include "sim.h"
 

+void signal_init();
+void sim_update_evaluations(void);
+void sim_update_editors(void);
+void sim_update_budgets(void);
+void sim_update_graphs(void);
+void sim_update_maps(void);

 
 /* Sim City */
 
 
 /* Sim City */
 


@@ -97,6 +103,7 @@ char *FirstDisplay = NULL;
 int ExitReturn = 0;
 
 
 int ExitReturn = 0;
 
 

+void

 sim_exit(int val)
 {
   tkMustExit = 1;
 sim_exit(int val)
 {
   tkMustExit = 1;


@@ -104,7 +111,7 @@ sim_exit(int val)
 }
 
 
 }
 
 

-sim_really_exit(int val)
+void sim_really_exit(int val)

 {
   DoStopMicropolis();
 
 {
   DoStopMicropolis();
 


@@ -236,6 +243,7 @@ SignalExitHandler()
 }
 
 
 }
 
 

+void

 signal_init()
 {
   signal(SIGHUP, (void (*)())SignalExitHandler);
 signal_init()
 {
   signal(SIGHUP, (void (*)())SignalExitHandler);


@@ -246,7 +254,7 @@ signal_init()
 
 
 void
 
 
 void

-sim_update()
+sim_update(void)

 {
   gettimeofday(&now_time, NULL);
 
 {
   gettimeofday(&now_time, NULL);
 


@@ -267,6 +275,7 @@ sim_update()
 }
 
 
 }
 
 

+void

 sim_update_editors(void)
 {
   SimView *view;
 sim_update_editors(void)
 {
   SimView *view;


@@ -285,6 +294,7 @@ sim_update_editors(void)
 }
 
 
 }
 
 

+void

 sim_update_maps(void)
 {
   SimView *view;
 sim_update_maps(void)
 {
   SimView *view;


@@ -319,12 +329,14 @@ sim_update_maps(void)
 }
 
 
 }
 
 

+void

 sim_update_graphs(void)
 {
   graphDoer();
 }
 
 
 sim_update_graphs(void)
 {
   graphDoer();
 }
 
 

+void

 sim_update_budgets(void)
 {
   if ((sim_skips != 0) &&
 sim_update_budgets(void)
 {
   if ((sim_skips != 0) &&


@@ -336,6 +348,7 @@ sim_update_budgets(void)
 }
 
 
 }
 
 

+void

 sim_update_evaluations(void)
 {
   if ((sim_skips != 0) &&
 sim_update_evaluations(void)
 {
   if ((sim_skips != 0) &&


@@ -409,7 +422,7 @@ short *CellDst = NULL;
 void
 sim_heat(void)
 {
 void
 sim_heat(void)
 {

-  int x, y, l, r, u, d;
+  int x, y;

   static int a = 0;
   short *src, *dst;
   register int fl = heat_flow;
   static int a = 0;
   short *src, *dst;
   register int fl = heat_flow;


@@ -546,7 +559,6 @@ sim_heat(void)
   }
 }
 
   }
 }
 

-

 void
 sim_timeout_loop(short doSim)
 {
 void
 sim_timeout_loop(short doSim)
 {


@@ -557,6 +569,7 @@ sim_timeout_loop(short doSim)
 }
 
 
 }
 
 

+void

 sim_loop(int doSim)
 {
 #ifdef CAM
 sim_loop(int doSim)
 {
 #ifdef CAM


@@ -619,6 +632,7 @@ main(int argc, char *argv[])
   printf("Welcome to X11 Multi Player Micropolis version %s by Will Wright, Don Hopkins.\n",
         MicropolisVersion);
   printf("Copyright (C) 2002 by Electronic Arts, Maxis. All rights reserved.\n");
   printf("Welcome to X11 Multi Player Micropolis version %s by Will Wright, Don Hopkins.\n",
         MicropolisVersion);
   printf("Copyright (C) 2002 by Electronic Arts, Maxis. All rights reserved.\n");

+  printf("Support for newer Unix systems and new bugs added by Michael Gernoth.\n");

 
   while (!errflg && 
         !tkMustExit &&
 
   while (!errflg && 
         !tkMustExit &&