[btech-checkins] CVS: btechmux/src/hcode glue.c,1.6,1.7 glue.scode.c,1.5,1.6 .depend,1.1.1.1,NONE Ma
Brought to you by:
twouters
From: Thomas W. <two...@us...> - 2003-09-30 01:02:05
|
Update of /cvsroot/btech/btechmux/src/hcode In directory sc8-pr-cvs1:/tmp/cvs-serv28449/src/hcode Modified Files: glue.c glue.scode.c Removed Files: .depend Makefile Log Message: Massive sync with the 'development' repository at http://btechmux.bkbits.net/btechmux. Among other things, this redoes the build system to be less... convoluted, and adds Cord's MechWarrior 3rd Edition skill system as well as a fairly large set of bugfixes and minor new features. Index: glue.c =================================================================== RCS file: /cvsroot/btech/btechmux/src/hcode/glue.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** glue.c 3 Apr 2002 11:30:18 -0000 1.6 --- glue.c 30 Sep 2003 01:01:31 -0000 1.7 *************** *** 642,646 **** notify(player, "Valid XTYPEs include: MECH, MECHREP, MAP, DEBUG, " ! "CHARGEN, AUTOPILOT, TURRET, CUSTOM, SCEN, SSIDE, SSOBJ, " "SSINS, SSEXT"); notify(player, "Resetting hardcode flag."); --- 642,646 ---- notify(player, "Valid XTYPEs include: MECH, MECHREP, MAP, DEBUG, " ! "AUTOPILOT, TURRET, CUSTOM, SCEN, SSIDE, SSOBJ, " "SSINS, SSEXT"); notify(player, "Resetting hardcode flag."); *************** *** 663,667 **** notify(player, "Valid XTYPEs include: MECH, MECHREP, MAP, DEBUG, " ! "CHARGEN, AUTOPILOT, TURRET, CUSTOM, SCEN, SSIDE, SSOBJ, " "SSINS, SSEXT"); notify(player, "Resetting HARDCODE flag."); --- 663,667 ---- notify(player, "Valid XTYPEs include: MECH, MECHREP, MAP, DEBUG, " ! "AUTOPILOT, TURRET, CUSTOM, SCEN, SSIDE, SSOBJ, " "SSINS, SSEXT"); notify(player, "Resetting HARDCODE flag."); Index: glue.scode.c =================================================================== RCS file: /cvsroot/btech/btechmux/src/hcode/glue.scode.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** glue.scode.c 31 Jul 2002 14:53:04 -0000 1.5 --- glue.scode.c 30 Sep 2003 01:01:31 -0000 1.6 *************** *** 19,22 **** --- 19,23 ---- #include "mech.h" + #include "mech.events.h" #include "glue.h" #include "extern.h" *************** *** 41,44 **** --- 42,47 ---- #include "p.mech.move.h" #include "p.mech.los.h" + #include "p.event.h" + #include "p.mech.restrict.h" extern SpecialObjectStruct SpecialObjects[]; *************** *** 1102,1106 **** } ! FUNCTION(fun_btthreshhold) { /* --- 1105,1109 ---- } ! FUNCTION(fun_btBaseXPMod) { /* *************** *** 1110,1114 **** FUNCHECK(!WizR(player), "#-1 PERMISSION DENIED"); ! xpth = btthreshhold_func(fargs[0]); safe_tprintf_str(buff, bufc, xpth < 0 ? "#%d ERROR" : "%d", xpth); } --- 1113,1117 ---- FUNCHECK(!WizR(player), "#-1 PERMISSION DENIED"); ! xpth = btBaseXPMod_func(fargs[0]); safe_tprintf_str(buff, bufc, xpth < 0 ? "#%d ERROR" : "%d", xpth); } *************** *** 1331,1334 **** --- 1334,1421 ---- safe_tprintf_str(buff, bufc, "0"); } + + FUNCTION(fun_btaddparts) + { + /* fargs[0] = mech/map + fargs[1] = partname + fargs[2] = quantity + */ + int loc; + int index = -1, id = 0, brand = 0, count; + + FUNCHECK(!WizR(player), "#-1 PERMISSION DENIED"); + loc = match_thing(player, fargs[0]); + FUNCHECK(!Good_obj(loc), "#-1 INVALID TARGET"); + FUNCHECK(strlen(fargs[1]) >= MBUF_SIZE, "#-1 PARTNAME TOO LONG"); + FUNCHECK(!fargs[1], "#-1 NEED PARTNAME"); + count = atoi(fargs[2]); + FUNCHECK(!count, "1"); + FUNCHECK(!find_matching_short_part(fargs[1], &index, &id, &brand) && + !find_matching_vlong_part(fargs[1], &index, &id, &brand) && + !find_matching_long_part(fargs[1], &index, &id, &brand), "0"); + found: + econ_change_items(loc, id, brand, count); + SendEcon(tprintf("#%d added %d %s to #%d", player, count, + get_parts_vlong_name(id, brand), loc)); + safe_tprintf_str(buff, bufc, "1"); + } + + extern int xlate(char *); + + FUNCTION(fun_btloadmap) + { + /* fargs[0] = mapobject + fargs[1] = mapname + fargs[2] = clear or not to clear + */ + int mapdbref; + MAP * map; + + FUNCHECK(nfargs < 2 || nfargs > 3, + "#-1 BTLOADMAP TAKES 2 OR 3 ARGUMENTS"); + FUNCHECK(!WizR(player), "#-1 PERMISSION DENIED"); + mapdbref = match_thing(player, fargs[0]); + FUNCHECK(!Good_obj(mapdbref), "#-1 INVALID TARGET"); + map = getMap(mapdbref); + FUNCHECK(!map, "#-1 INVALID TARGET"); + switch (map_load(map, fargs[1])) { + case -1: + safe_str("#-1 MAP NOT FOUND", buff, bufc); + return; + case -2: + safe_str("#-1 INVALID MAP", buff, bufc); + return; + case 0: + break; + default: + safe_str("#-1 UNKNOWN ERROR", buff, bufc); + return; + } + if (nfargs > 2 && xlate(fargs[2])) + map_clearmechs(player, (void *)map, ""); + safe_str("1", buff, bufc); + } + + FUNCTION(fun_btloadmech) + { + /* fargs[0] = mechobject + fargs[1] = mechref + */ + int mechdbref; + MECH *mech; + + FUNCHECK(!WizR(player), "#-1 PERMISSION DENIED"); + mechdbref = match_thing(player, fargs[0]); + FUNCHECK(!Good_obj(mechdbref), "#-1 INVALID TARGET"); + mech = getMech(mechdbref); + FUNCHECK(!mech, "#-1 INVALID TARGET"); + if (mech_loadnew(player, mech, fargs[1]) == 1) { + event_remove_data((void *)mech); + clear_mech_from_LOS(mech); + safe_str("1", buff, bufc); + } else { + safe_str("#-1 UNABLE TO LOAD TEMPLATE", buff, bufc); + } + } #endif --- .depend DELETED --- --- Makefile DELETED --- |