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

(nullify_objects): Simply use all of bigcity_dchr. Using only parts

Browse source 
is confusing.
(bigcity_dchr): Fix initializer for d_maxpop.

(dchr): The previous revision accidentally changed maximum population
of sanctuaries, plains, sea and wasteland.  Revert the former two.
The latter are not used, but the new max population of zero makes more
sense, so keep it.
This commit is contained in:
Markus Armbruster 2005-02-21 19:52:25 +00:00
parent 6e9a69241e
commit 552467dc08
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/global/sect.c
View file

@ -42,7 +42,7 @@
#include "product.h" #include "product.h"
struct dchrstr bigcity_dchr = { struct dchrstr bigcity_dchr = {
'c', 0, 2, NAV_02, UPKG, 1.0, 2.0, 30, 0, 10, 1, 2, 9999, "city" 'c', 0, 2, NAV_02, UPKG, 1.0, 2.0, 30, 0, 10, 1, 2, 999, "city"
}; };
struct dchrstr dchr[SCT_MAXDEF + 2] = { struct dchrstr dchr[SCT_MAXDEF + 2] = {
@ -50,7 +50,7 @@ struct dchrstr dchr[SCT_MAXDEF + 2] = {
mnem prd mcst flg pkg ostr dstr value $ bld lcm hcm maxpop name */ mnem prd mcst flg pkg ostr dstr value $ bld lcm hcm maxpop name */
{'.', 0, 0, NAVOK, NPKG, 0.0, 0.0, 0, -1, 0, 0, 0, 0, "sea"}, {'.', 0, 0, NAVOK, NPKG, 0.0, 0.0, 0, -1, 0, 0, 0, 0, "sea"},
{'^', P_MDUST, 25, 0, NPKG, 1.0, 4.0, 5, -1, 1, 0, 0, 99, "mountain"}, {'^', P_MDUST, 25, 0, NPKG, 1.0, 4.0, 5, -1, 1, 0, 0, 99, "mountain"},
{'s', 0, 0, 0, NPKG, 0.0, 99.0, 127, -1, 0, 0, 0, 9999, "sanctuary"}, {'s', 0, 0, 0, NPKG, 0.0, 99.0, 127, -1, 0, 0, 0, 999, "sanctuary"},
{'\\', 0, 0, 0, NPKG, 0.0, 99.0, 0, -1, 0, 0, 0, 0, "wasteland"}, {'\\', 0, 0, 0, NPKG, 0.0, 99.0, 0, -1, 0, 0, 0, 0, "wasteland"},
{'-', 0, 3, 0, NPKG, 1.0, 2.0, 1, 0, 0, 0, 0, 999, "wilderness"}, {'-', 0, 3, 0, NPKG, 1.0, 2.0, 1, 0, 0, 0, 0, 999, "wilderness"},
{'c', 0, 2, 0, NPKG, 1.0, 2.0, 30, 0, 1, 0, 0, 999, "capital"}, {'c', 0, 2, 0, NPKG, 1.0, 2.0, 30, 0, 1, 0, 0, 999, "capital"},
@ -80,7 +80,7 @@ struct dchrstr dchr[SCT_MAXDEF + 2] = {
{'b', P_BAR, 2, 0, BPKG, 1.0, 2.25, 10, 0, 1, 0, 0, 999, "bank"}, {'b', P_BAR, 2, 0, BPKG, 1.0, 2.25, 10, 0, 1, 0, 0, 999, "bank"},
{'%', P_PETROL, 2, 0, NPKG, 1.0, 1.5, 2, 0, 1, 0, 0, 999, "refinery"}, {'%', P_PETROL, 2, 0, NPKG, 1.0, 1.5, 2, 0, 1, 0, 0, 999, "refinery"},
{'e', 0, 2, 0, NPKG, 1.0, 2.0, 7, 0, 1, 0, 0, 999, "enlistment center"}, {'e', 0, 2, 0, NPKG, 1.0, 2.0, 7, 0, 1, 0, 0, 999, "enlistment center"},
{'~', 0, 2, 0, NPKG, 1.0, 1.5, 1, -1, 1, 0, 0, 50, "plains"}, {'~', 0, 2, 0, NPKG, 1.0, 1.5, 1, -1, 1, 0, 0, 49, "plains"},
{'@', 0, 1, 0, NPKG, 1.0, 1.5, 4, -1, 1, 0, 0, 999, "bridge tower"}, {'@', 0, 1, 0, NPKG, 1.0, 1.5, 4, -1, 1, 0, 0, 999, "bridge tower"},
{0, 0, 0, 0, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL}, {0, 0, 0, 0, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL},
{0, 0, 0, 0, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL} {0, 0, 0, 0, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL}

10
src/server/main.c
View file

@ -484,14 +484,8 @@ nullify_objects(void)
{ {
int i, j; int i, j;
if (opt_BIG_CITY) { if (opt_BIG_CITY)
dchr[SCT_CAPIT].d_flg = bigcity_dchr.d_flg; dchr[SCT_CAPIT] = bigcity_dchr;
dchr[SCT_CAPIT].d_pkg = bigcity_dchr.d_pkg;
dchr[SCT_CAPIT].d_build = bigcity_dchr.d_build;
dchr[SCT_CAPIT].d_lcms = bigcity_dchr.d_lcms;
dchr[SCT_CAPIT].d_hcms = bigcity_dchr.d_hcms;
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)