empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(main) [_WIN32]: remove WIN32 flags for the getpid functions and

Browse source 
standardize the code.

(nullify_objects): Remove unneccesary carriage returns.
This commit is contained in:
Ron Koenderink 2004-12-07 18:48:27 +00:00
parent 098f7202b1
commit e9047070c7
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/server/main.c
View file

@ -48,6 +48,7 @@
#if defined(_WIN32) #if defined(_WIN32)
#include <winsock.h> #include <winsock.h>
#include <process.h>
#endif #endif
#include "misc.h" #include "misc.h"
@ -75,9 +76,7 @@ static void loc_NTInit(void);
static void loc_NTTerm(void); static void loc_NTTerm(void);
#endif #endif
#if !defined(_WIN32)
static int mainpid = 0; static int mainpid = 0;
#endif
/* /*
* Debugging? * Debugging?
@ -101,8 +100,8 @@ main(int argc, char **argv)
loginit("server"); loginit("server");
#if !defined(_WIN32)
mainpid = getpid(); mainpid = getpid();
#if !defined(_WIN32)
while ((op = getopt(argc, argv, "D:de:psh")) != EOF) { while ((op = getopt(argc, argv, "D:de:psh")) != EOF) {
switch (op) { switch (op) {
@ -134,11 +133,7 @@ main(int argc, char **argv)
} }
logerror("------------------------------------------------------"); logerror("------------------------------------------------------");
#if !defined(_WIN32)
logerror("Empire server (pid %d) started", getpid()); logerror("Empire server (pid %d) started", getpid());
#else
logerror("Empire server started");
#endif /* _WIN32 */
#if defined(_WIN32) #if defined(_WIN32)
loc_NTInit(); loc_NTInit();
@ -397,13 +392,13 @@ nullify_objects(void)
dchr[SCT_CAPIT].d_hcms = bigcity_dchr.d_hcms; dchr[SCT_CAPIT].d_hcms = bigcity_dchr.d_hcms;
dchr[SCT_CAPIT].d_name = bigcity_dchr.d_name; dchr[SCT_CAPIT].d_name = bigcity_dchr.d_name;
} }
if (opt_NO_LCMS) if (opt_NO_LCMS)
dchr[SCT_LIGHT].d_cost = -1; dchr[SCT_LIGHT].d_cost = -1;
if (opt_NO_HCMS) if (opt_NO_HCMS)
dchr[SCT_HEAVY].d_cost = -1; dchr[SCT_HEAVY].d_cost = -1;
if (opt_NO_OIL) { if (opt_NO_OIL) {
dchr[SCT_OIL].d_cost = -1; dchr[SCT_OIL].d_cost = -1;
dchr[SCT_REFINE].d_cost = -1; dchr[SCT_REFINE].d_cost = -1;
} }
for (i = 0; i < pln_maxno; i++) { for (i = 0; i < pln_maxno; i++) {
if (opt_NO_HCMS) if (opt_NO_HCMS)