Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Plane-Id wieder in der Zugvorlage

This commit is contained in:
Christian Schlittchen 2001-02-11 19:55:00 +00:00
parent 189bcb5ac3
commit 34a83b6d20
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile.include
View File

@ -15,7 +15,7 @@ INSTALL = @cp
#INSTALL = install #INSTALL = install
ARFLAGS = cr ARFLAGS = crs
CTAGSFLAGS = --langmap=c:.c.h --c-types=-m CTAGSFLAGS = --langmap=c:.c.h --c-types=-m
CFLAGS = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \ CFLAGS = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \
-Wpointer-arith -Werror-implicit-function-declaration \ -Wpointer-arith -Werror-implicit-function-declaration \
@ -68,8 +68,8 @@ endif
ifeq ($(CONFIG), debug) ifeq ($(CONFIG), debug)
BUILD_DIR = Debug-$(ARCHITECTURE) BUILD_DIR = Debug-$(ARCHITECTURE)
CFLAGS += -g CFLAGS += -ggdb
LDFLAGS += -g LDFLAGS += -ggdb
endif endif
ifeq ($(CONFIG), release) ifeq ($(CONFIG), release)
@ -80,14 +80,14 @@ endif
ifeq ($(CONFIG), profile) ifeq ($(CONFIG), profile)
BUILD_DIR = Profile-$(ARCHITECTURE) BUILD_DIR = Profile-$(ARCHITECTURE)
CFLAGS += -g -pg -O4 -funroll-loops CFLAGS += -ggdb -pg -O4 -funroll-loops
LDFLAGS += -g -pg LDFLAGS += -ggdb -pg
endif endif
ifeq ($(CONFIG), dmalloc) ifeq ($(CONFIG), dmalloc)
BUILD_DIR = Dmalloc-$(ARCHITECTURE) BUILD_DIR = Dmalloc-$(ARCHITECTURE)
CFLAGS += -g -DDMALLOC CFLAGS += -ggdb -DDMALLOC
LDFLAGS += -g LDFLAGS += -ggdb
LIBS += -ldmalloc LIBS += -ldmalloc
endif endif

7
src/common/gamecode/report.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: report.c,v 1.13 2001/02/10 13:20:33 corwin Exp $ * $Id: report.c,v 1.14 2001/02/11 19:55:00 corwin Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -1319,10 +1319,15 @@ order_template(FILE * F, faction * f)
pl = getplane(r); pl = getplane(r);
if (pl && fval(pl, PFL_NOCOORDS)) { if (pl && fval(pl, PFL_NOCOORDS)) {
sprintf(buf, "REGION; %s", rname(r, f->locale)); sprintf(buf, "REGION; %s", rname(r, f->locale));
} else {
if(pl->id != 0) {
sprintf(buf, "REGION %d,%d,%d ; %s", region_x(r,f),
region_y(r,f), rname(r, f->locale), pl->id);
} else { } else {
sprintf(buf, "REGION %d,%d ; %s", region_x(r,f), sprintf(buf, "REGION %d,%d ; %s", region_x(r,f),
region_y(r,f), rname(r, f->locale)); region_y(r,f), rname(r, f->locale));
} }
}
rps_nowrap(F, buf); rps_nowrap(F, buf);
rnl(F); rnl(F);
sprintf(buf,"; ECheck Lohn %d", fwage(r,f,true)); sprintf(buf,"; ECheck Lohn %d", fwage(r,f,true));

3
src/corwin.mk
View File

@ -4,10 +4,9 @@ ifndef ERESSEA
endif endif
# Hier definieren, damit nicht '@gcc' # Hier definieren, damit nicht '@gcc'
CC = gcc CC = colorgcc
AR = ar AR = ar
CTAGS = ctags CTAGS = ctags
CC = gcc
LD = gcc LD = gcc
INSTALL = cp INSTALL = cp

8
src/eressea/main.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: main.c,v 1.13 2001/02/10 22:02:10 enno Exp $ * $Id: main.c,v 1.14 2001/02/11 19:55:00 corwin Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -533,12 +533,6 @@ main(int argc, char *argv[])
kernel_init(); kernel_init();
game_init(); game_init();
{
FILE * F = fopen("c:\\messagetypes.txt", "wt");
debug_messagetypes(F);
fclose(F);
}
if ((i=readgame(false))!=0) return i; if ((i=readgame(false))!=0) return i;
if ((i=processturn(orders))!=0) return i; if ((i=processturn(orders))!=0) return i;