diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index ced171ce8..28989c151 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -1114,12 +1114,12 @@ recruit_archetype(unit * u, order * ord) } else switch(n) { case ENOMATERIALS: ADDMSG(&u->faction->msgs, msg_materials_required(u, ord, arch->ctype)); - return 0; + break; case ELOWSKILL: case ENEEDSKILL: /* no skill, or not enough skill points to build */ cmistake(u, ord, 50, MSG_PRODUCE); - return 0; + break; default: assert(!"unhandled return value from build() in recruit_archetype"); } diff --git a/src/res/rts.xml b/src/res/rts.xml index ca1eb072a..b11cbeb34 100644 --- a/src/res/rts.xml +++ b/src/res/rts.xml @@ -13,8 +13,9 @@ - + + diff --git a/src/res/rts/calendar.xml b/src/res/rts/calendar.xml new file mode 100644 index 000000000..6a1730726 --- /dev/null +++ b/src/res/rts/calendar.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/res/rts/equipment.xml b/src/res/rts/equipment.xml index 8d5ff71be..10ae844fc 100644 --- a/src/res/rts/equipment.xml +++ b/src/res/rts/equipment.xml @@ -20,7 +20,16 @@ - + + + + + + + + + + diff --git a/src/scripts/rts-run.lua b/src/scripts/rts-run.lua index 53504538d..6c4c666bb 100644 --- a/src/scripts/rts-run.lua +++ b/src/scripts/rts-run.lua @@ -34,11 +34,6 @@ function run_scripts() end function process(orders) - -- initialize starting equipment for new players - equipment_setitem("new_faction", "log", "30"); - equipment_setitem("new_faction", "stone", "30"); - equipment_setitem("new_faction", "money", "4200"); - file = "" .. get_turn() if read_game(file)~=0 then print("could not read game")