forked from github/server
- Diverses
This commit is contained in:
parent
14c9130391
commit
3b886bb875
4 changed files with 5 additions and 5 deletions
|
@ -3001,7 +3001,7 @@ setdefaults (void)
|
||||||
case K_WORK:
|
case K_WORK:
|
||||||
case K_DRIVE:
|
case K_DRIVE:
|
||||||
case K_MOVE:
|
case K_MOVE:
|
||||||
if(fval(u, FL_HUNGER)) {
|
if(!global.disabled[K_WORK] && fval(u, FL_HUNGER)) {
|
||||||
set_string(&u->thisorder, locale_string(u->faction->locale, "defaultorder"));
|
set_string(&u->thisorder, locale_string(u->faction->locale, "defaultorder"));
|
||||||
} else {
|
} else {
|
||||||
set_string(&u->thisorder, S->s);
|
set_string(&u->thisorder, S->s);
|
||||||
|
|
|
@ -18,4 +18,4 @@
|
||||||
#define NEW_RESOURCEGROWTH 1
|
#define NEW_RESOURCEGROWTH 1
|
||||||
#define LARGE_CASTLES 1
|
#define LARGE_CASTLES 1
|
||||||
#define GROWING_TREES 1
|
#define GROWING_TREES 1
|
||||||
#define REMOVENMRNEWBIE 1
|
#define REMOVENMRNEWBIE
|
||||||
|
|
|
@ -18,4 +18,4 @@
|
||||||
#define NEW_RESOURCEGROWTH 0
|
#define NEW_RESOURCEGROWTH 0
|
||||||
#define LARGE_CASTLES 0
|
#define LARGE_CASTLES 0
|
||||||
#define GROWING_TREES 0
|
#define GROWING_TREES 0
|
||||||
#define REMOVENMRNEWBIE 0
|
#undef REMOVENMRNEWBIE
|
||||||
|
|
|
@ -11,11 +11,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Contains defines for the "free" game (Eressea) .
|
* Contains defines for the "modern" vinyambar game.
|
||||||
* Include this file from settings.h to make eressea work.
|
* Include this file from settings.h to make eressea work.
|
||||||
*/
|
*/
|
||||||
#define RESOURCE_CONVERSION 1
|
#define RESOURCE_CONVERSION 1
|
||||||
#define NEW_RESOURCEGROWTH 1
|
#define NEW_RESOURCEGROWTH 1
|
||||||
#define LARGE_CASTLES 1
|
#define LARGE_CASTLES 1
|
||||||
#define GROWING_TREES 1
|
#define GROWING_TREES 1
|
||||||
#define REMOVENMRNEWBIE 0
|
#undef REMOVENMRNEWBIE
|
||||||
|
|
Loading…
Reference in a new issue