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

Merge pull request #38 from badgerman/master 

Testing pull request builds with Travis
This commit is contained in:
Enno Rehling 2014-10-15 20:12:43 +02:00
parent 352d947770 8d6a25d15a
commit 1d20e35292
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/laws.c
View File

@ -693,7 +693,6 @@ void demographics(void)
for (r = regions; r; r = r->next) { for (r = regions; r; r = r->next) {
++r->age; /* also oceans. no idea why we didn't always do that */ ++r->age; /* also oceans. no idea why we didn't always do that */
live(r); live(r);
/* check_split_dragons(); */
if (!fval(r->terrain, SEA_REGION)) { if (!fval(r->terrain, SEA_REGION)) {
/* die Nachfrage nach Produkten steigt. */ /* die Nachfrage nach Produkten steigt. */

2
src/laws.h
View File

@ -23,8 +23,6 @@ extern "C" {
#endif #endif
extern int writepasswd(void); extern int writepasswd(void);
int getoption(void);
int wanderoff(struct region *r, int p);
void demographics(void); void demographics(void);
void last_orders(void); void last_orders(void);
void find_address(void); void find_address(void);