server.cpp statt main.cpp, um namen von .o files unique zu halten

This commit is contained in:
Enno Rehling 2003-12-16 01:05:16 +00:00
parent 50e24a43e6
commit fba338b256
4 changed files with 6 additions and 8 deletions

View File

@ -24,7 +24,7 @@ if $(HAVE_LUA) {
<lua>region.cpp <lua>region.cpp
<lua>ship.cpp <lua>ship.cpp
<lua>unit.cpp <lua>unit.cpp
main.cpp server.cpp
; ;
LINKLIBS on $(BINARY) += -llua50 -llualib50 ; LINKLIBS on $(BINARY) += -llua50 -llualib50 ;

View File

@ -2813,14 +2813,14 @@ give_cammo(void)
#ifdef WDW_PHOENIX #ifdef WDW_PHOENIX
static region * static region *
random_region(void) random_land_region(void)
{ {
region *r; region *r;
int c = 0; int c = 0;
/* count the available regions */ /* count the available regions */
for(r=regions; r; r=r->next) { for(r=regions; r; r=r->next) {
if(rplane(r) == NULL && landregion(r)) c++; if (r->land && rplane(r)==NULL) ++c;
} }
/* choose one */ /* choose one */
@ -2828,9 +2828,7 @@ random_region(void)
/* this is a bit obfuscated, but should be correct */ /* this is a bit obfuscated, but should be correct */
for(r=regions; c > 0; r=r->next) { for(r=regions; c > 0; r=r->next) {
if(rplane(r) == NULL && landregion(r)) { if (r->land && rplane(r)==NULL) --c;
--c;
}
} }
return(r); return(r);

View File

@ -706,8 +706,8 @@ main(int argc, char *argv[])
return 0; return 0;
#endif #endif
sprintf(buf, "%d", turn);
if ((i=readgame(false))!=0) return i; if ((i=readgame(buf, false))!=0) return i;
#ifdef NEW_STARTEQUIPMENT #ifdef NEW_STARTEQUIPMENT
add_equipment(it_find("conquesttoken"), 1); add_equipment(it_find("conquesttoken"), 1);