Enable warnings and fix them, all of them

[micropolis] / src / sim / s_disast.c

diff --git a/src/sim/s_disast.c b/src/sim/s_disast.c
index 691e4f3be05d7916564211d168e57ac79ddc71c7..65b914dfbe6d86ff4762340bdba6686dcd3317b6 100644 (file)
--- a/src/sim/s_disast.c
+++ b/src/sim/s_disast.c
@@ -69,8 +69,12 @@ short ShakeNow;
 short FloodCnt;
 short FloodX, FloodY;
 
+void SetFire(void);
+int Vunerable(int tem);
+void ScenarioDisaster(void);
 
 /* comefrom: Simulate */
+void
 DoDisasters(void)
 { 
   /* Chance of disasters at lev 0 1 2 */
@@ -97,6 +101,7 @@ DoDisasters(void)
       MakeFlood();
       break;
     case 4:
+      MakeAirCrash();
       break;
     case 5:
       MakeTornado();
@@ -114,10 +119,9 @@ DoDisasters(void)
 
 
 /* comefrom: DoDisasters */
+void
 ScenarioDisaster(void)
 {
-  int x, y;
-
   switch (DisasterEvent) {
     case 1:                    /* Dullsville */
       break;
@@ -147,6 +151,7 @@ ScenarioDisaster(void)
 
 
 /* comefrom: ScenarioDisaster */
+void
 MakeMeltdown(void)
 {
   short x, y;
@@ -163,7 +168,8 @@ MakeMeltdown(void)
 }
 
 
-FireBomb()
+void
+FireBomb(void)
 {
   CrashX = Rand(WORLD_X - 1);
   CrashY = Rand(WORLD_Y - 1);
@@ -174,6 +180,7 @@ FireBomb()
 
 
 /* comefrom: DoDisasters ScenarioDisaster */
+void
 MakeEarthquake(void)
 {
   register short x, y, z;
@@ -201,6 +208,7 @@ MakeEarthquake(void)
 
 
 /* comefrom: DoDisasters */
+void
 SetFire(void)
 {
   register short x, y, z;
@@ -221,6 +229,7 @@ SetFire(void)
 
 
 /* comefrom: DoDisasters */
+void
 MakeFire(void)
 {
   short t, x, y, z;
@@ -242,6 +251,7 @@ MakeFire(void)
 
 
 /* comefrom: MakeEarthquake */
+int
 Vunerable(int tem)
 {
   register int tem2;
@@ -256,6 +266,7 @@ Vunerable(int tem)
 
 
 /* comefrom: DoDisasters ScenarioDisaster */
+void
 MakeFlood(void)
 {
   static short Dx[4] = { 0, 1, 0,-1};
@@ -289,6 +300,7 @@ MakeFlood(void)
 
 
 /* comefrom: MapScan */
+void
 DoFlood(void)
 {
   static short Dx[4] = { 0, 1, 0,-1};