Minor cleanup: replaced VOID with void.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@772 4a71c877-e1ca-e34f-864e-861f7616d084

lib/script/stack.c

@@ -230,7 +230,7 @@ BOOL stackPopParams(SDWORD numParams, ...)
 	va_list		args;
 	SDWORD		i;
 	INTERP_TYPE	type;
-	VOID		*pData;
+	void		*pData;
 	INTERP_VAL	*psVal;
 	UDWORD		index, params;
 	STACK_CHUNK	*psCurr;
@@ -282,7 +282,7 @@ BOOL stackPopParams(SDWORD numParams, ...)
 	for (i=0; i< numParams; i++)
 	{
 		type = va_arg(args, int);
-		pData = va_arg(args, VOID *);
+		pData = va_arg(args, void *);
 
 		psVal = psCurr->aVals + index;
 
@@ -308,9 +308,7 @@ BOOL stackPopParams(SDWORD numParams, ...)
 				tempstr = (char*)MALLOC(MAXSTRLEN);
 				sprintf(tempstr, "%d", psVal->v.ival);
 
-				*((STRING**)pData) = tempstr; // FIXME UDWORD = STRING* is not sane! (eps. on 64bit)
-
-				//itoa(psVal->v.ival,tmpstr,10);
+				*((STRING**)pData) = tempstr;
 			}
 		}
 

src/multigifts.c

@@ -1082,7 +1082,7 @@ BOOL foundDMatchDroid(UDWORD player,UDWORD x,UDWORD y)
 /*
 // ///////////////////////////////////////////////////////////////
 // check for respawn or win situations.
-BOOL deathmatchCheck(VOID)
+BOOL deathmatchCheck(void)
 {
 	UDWORD			pl,maxScP;
 	SDWORD			maxSc;

src/multigifts.h

@@ -27,7 +27,7 @@ extern void	giftPower						(UDWORD from,UDWORD to,BOOL send);
 extern void giftRadar							(UDWORD from, UDWORD to,BOOL send);
 //extern BOOL	addDMatchDroid					(UDWORD count);
 //extern BOOL	foundDMatchDroid				(UDWORD player,UDWORD x,UDWORD y);
-//extern BOOL deathmatchCheck					(VOID);
+//extern BOOL deathmatchCheck					(void);
 
 //extern BOOL	dMatchWinner					(UDWORD winplayer,BOOL bcast);
 //extern BOOL	recvdMatchWinner				(NETMSG *pMsg);

src/multiint.c

@@ -3492,7 +3492,7 @@ BOOL startForceSelect(void)
 	sFormInit.width			= 100;
 	sFormInit.height		= 100;
 	sFormInit.pDisplay		= displayForceDroid;
-//	sFormInit.pUserData		= (VOID*)Force->pTempl;
+//	sFormInit.pUserData		= (void*)Force->pTempl;
 	widgAddForm(psWScreen, &sFormInit);
 
 // name/techlevel/powerrequired/powerleft

src/multijoin.c

@@ -65,7 +65,7 @@ BOOL MultiPlayerJoin	(DPID dp);								// remote player has just joined.
 void setupNewPlayer		(DPID dpid,UDWORD player);				// stuff to do when player joins.
 //BOOL multiPlayerRequest	(NETMSG *pMsg);							// remote player has requested info
 //BOOL UpdateClient		(DPID dest, UDWORD playerToSend);		// send information to a remote player
-//BOOL ProcessDroidOrders	(VOID);									// ince setup, this player issues each droid order.
+//BOOL ProcessDroidOrders	(void);									// ince setup, this player issues each droid order.
 //BOOL SendFeatures		(FEATURE *pFeature, DPID player);
 //BOOL recvFeatures		(NETMSG *pMsg);
 void resetMultiVisibility(UDWORD player);
@@ -559,7 +559,7 @@ BOOL recvFeatures(NETMSG *pMsg)
 
 // ////////////////////////////////////////////////////////////////////////////
 // Process the droids we previously recevied, issuing the orders..
-BOOL ProcessDroidOrders(VOID)
+BOOL ProcessDroidOrders(void)
 {
 	UDWORD		i;
 	DROID		*pD;

src/multijoin.h

@@ -15,7 +15,7 @@ extern BOOL MultiPlayerJoin				(DPID dp);						// A Player has joined the game.
 extern void setupNewPlayer				(DPID dpid,UDWORD player);		// stuff to do when player joins.
 //extern BOOL UpdateClient				(DPID dest, UDWORD playerToSend);// send info about another player
 extern void clearPlayer					(UDWORD player,BOOL quietly,BOOL removeOil);// wipe a player off the face of the earth.
-//extern BOOL ProcessDroidOrders			(VOID);
+//extern BOOL ProcessDroidOrders			(void);
 //extern BOOL recvFeatures				(NETMSG *pMsg);
 //extern UDWORD							arenaPlayersReceived;
 

src/multimenu.h

@@ -24,7 +24,7 @@ extern BOOL		intAddMultiMenu			(void);
 extern BOOL		MultiMenuUp;
 extern BOOL		ClosingMultiMenu;
 
-//extern VOID		intDisplayMiniMultiMenu		(VOID);
+//extern void		intDisplayMiniMultiMenu		(void);
 
 #define MULTIMENU			10600
 #define MULTIMENU_FORM		MULTIMENU

src/multiopt.c

@@ -55,7 +55,7 @@ extern char	buildTime[8];
 
 void		sendOptions			(DPID dest,UDWORD player);
 void		recvOptions			(NETMSG *pMsg);
-//static BOOL dMatchInit			(VOID);
+//static BOOL dMatchInit			(void);
 static BOOL campInit			(void);
 BOOL		hostCampaign		(STRING *sGame,		STRING *sPlayer);
 BOOL		joinCampaign		(UDWORD gameNumber, STRING *playername);

src/multistat.c

@@ -182,7 +182,7 @@ BOOL removeFromForce(UDWORD number)
 
 /*
 // find a place for the force
-VOID chooseForceLoc(UDWORD *pX,UDWORD *pY)
+void chooseForceLoc(UDWORD *pX,UDWORD *pY)
 {
 	FEATURE			*pFeat;
 	UDWORD			x,y,chose,tcount=0;