Enable warnings and fix them, all of them

[micropolis] / src / sim / s_msg.c

diff --git a/src/sim/s_msg.c b/src/sim/s_msg.c
index d82060706a9787a74ac49789eb6b0fdee7ecd8db..075949b979fd5fb6237aee12813399dcd3deca24 100644 (file)
--- a/src/sim/s_msg.c
+++ b/src/sim/s_msg.c
@@ -68,13 +68,20 @@ short LastPicNum;
 short autoGo;
 short HaveLastMessage = 0;
 char LastMessage[256];
 short autoGo;
 short HaveLastMessage = 0;
 char LastMessage[256];

-int DoAutoGoto(short x, short y, char *msg);
-int DoShowPicture(short id);
+
+void DoAutoGoto(short x, short y, char *msg);
+void DoShowPicture(short id);
+void DoLoseGame(void);
+void SetMessageField(char *str);
+void DoScenarioScore(int type);
+void CheckGrowth(void);
+

 
 /* comefrom: Simulate */
 
 /* comefrom: Simulate */

+void

 SendMessages(void)
 {
 SendMessages(void)
 {

-  register z;
+  register int z;

   short PowerPop;
   float TM;
 
   short PowerPop;
   float TM;
 


@@ -186,6 +193,7 @@ SendMessages(void)
 
 
 /* comefrom: SendMessages */
 
 
 /* comefrom: SendMessages */

+void

 CheckGrowth(void)
 {
   QUAD ThisCityPop;
 CheckGrowth(void)
 {
   QUAD ThisCityPop;


@@ -212,6 +220,7 @@ CheckGrowth(void)
 
 
 /* comefrom: SendMessages */
 
 
 /* comefrom: SendMessages */

+void

 DoScenarioScore(int type)
 {
   short z;
 DoScenarioScore(int type)
 {
   short z;


@@ -251,6 +260,7 @@ DoScenarioScore(int type)
 }
 
 
 }
 
 

+void

 ClearMes(void)
 {
   MessagePort = 0;
 ClearMes(void)
 {
   MessagePort = 0;


@@ -262,6 +272,7 @@ ClearMes(void)
 
 /* comefrom: MakeEarthquake MakeFire MakeFire MakeFlood SendMessages 
             CheckGrowth DoScenarioScore DoPowerScan */
 
 /* comefrom: MakeEarthquake MakeFire MakeFire MakeFlood SendMessages 
             CheckGrowth DoScenarioScore DoPowerScan */

+int

 SendMes(int Mnum)
 {
   if (Mnum < 0) {
 SendMes(int Mnum)
 {
   if (Mnum < 0) {


@@ -294,6 +305,7 @@ void SendMesAt(short Mnum, short x, short y)
 }
 
 
 }
 
 

+void

 doMessage(void) 
 {
   char messageStr[256];
 doMessage(void) 
 {
   char messageStr[256];


@@ -401,6 +413,7 @@ doMessage(void)
 }
 
 
 }
 
 

+void

 DoAutoGoto(short x, short y, char *msg)
 {
   char buf[256];
 DoAutoGoto(short x, short y, char *msg)
 {
   char buf[256];


@@ -411,6 +424,7 @@ DoAutoGoto(short x, short y, char *msg)
 }
 
 
 }
 
 

+void

 SetMessageField(char *str)
 {
   char buf[256];
 SetMessageField(char *str)
 {
   char buf[256];


@@ -425,6 +439,7 @@ SetMessageField(char *str)
 }
 
 
 }
 
 

+void

 DoShowPicture(short id)
 {
   char buf[256];
 DoShowPicture(short id)
 {
   char buf[256];


@@ -434,13 +449,15 @@ DoShowPicture(short id)
 }
 
 
 }
 
 

-DoLoseGame()
+void
+DoLoseGame(void)

 {
   Eval("UILoseGame");
 }
 
 
 {
   Eval("UILoseGame");
 }
 
 

-DoWinGame()
+void
+DoWinGame(void)

 {
   Eval("UIWinGame");
 }
 {
   Eval("UIWinGame");
 }