ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.356 by root, Sat Apr 3 02:27:24 2010 UTC vs.
Revision 1.369 by root, Wed Apr 14 02:31:24 2010 UTC

… …
230 do_destroy (); 230 do_destroy ();
231 sever_self (); 231 sever_self ();
232} 232}
233 233
234void 234void
235attachable::do_delete ()
236{
237 delete this;
238}
239
240void
235attachable::check_mortals () 241attachable::check_mortals ()
236{ 242{
237 static int i = 0; 243 static int i = 0;
238 244
239 for (;;) 245 for (;;)
… …
252 258
253 if (0) 259 if (0)
254 { 260 {
255 for (int j = 0; j < mortals.size (); ++j)//D 261 for (int j = 0; j < mortals.size (); ++j)//D
256 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 262 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
263
257 fprintf (stderr, "\n");//D 264 fprintf (stderr, "\n");//D
258 } 265 }
259 } 266 }
260 } 267 }
261 268
… …
281 } 288 }
282 else 289 else
283 { 290 {
284 mortals.erase (i); 291 mortals.erase (i);
285 obj->sever_self (); 292 obj->sever_self ();
286 delete obj; 293 obj->do_delete ();
287 } 294 }
288 } 295 }
289} 296}
290 297
291void 298void
… …
1132 1139
1133 return retval; 1140 return retval;
1134} 1141}
1135 1142
1136maptile * 1143maptile *
1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty) 1144find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1138{ 1145{
1139 CALL_BEGIN (3); 1146 CALL_BEGIN (4);
1140 CALL_ARG (dirname); 1147 CALL_ARG (dirname);
1141 CALL_ARG (stylename); 1148 CALL_ARG (stylename);
1142 CALL_ARG (difficulty); 1149 CALL_ARG (difficulty);
1150 CALL_ARG (recurse);
1143 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1151 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1144 1152
1145 maptile *retval = 0; 1153 maptile *retval = 0;
1146 if (count) sv_to (POPs, retval); 1154 if (count) sv_to (POPs, retval);
1147 1155
… …
1224object::ref () const 1232object::ref () const
1225{ 1233{
1226 if (type == PLAYER) 1234 if (type == PLAYER)
1227 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1235 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1228 else 1236 else
1237 // TODO: should be able to save references within the same map, at least
1229 return 0; 1238 return 0;
1230} 1239}
1231 1240
1232object * 1241object *
1233object::deref (const_utf8_string ref) 1242object::deref (const_utf8_string ref)
… …
1419 static const struct { 1428 static const struct {
1420 const char *name; 1429 const char *name;
1421 IV iv; 1430 IV iv;
1422 } *civ, const_iv[] = { 1431 } *civ, const_iv[] = {
1423# define const_iv(name) { # name, (IV)name }, 1432# define const_iv(name) { # name, (IV)name },
1433# include "const_iv.h"
1434# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1435# include "attackinc.h"
1436# undef def
1437# define def(uc, flags) const_iv (SK_ ## uc)
1438# include "skillinc.h"
1439# undef def
1440
1424 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1441 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1425 const_iv (logBacktrace) 1442 const_iv (logBacktrace)
1426 1443
1427 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1444 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1428 1445
1429 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1446 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1430 1447
1431 const_iv (MAX_TIME) 1448 const_iv (MAX_TIME)
1432 const_iv (MAXSOCKBUF) 1449 const_iv (MAXSOCKBUF)
1433 1450
1434 const_iv (NUM_BODY_LOCATIONS)
1435 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1436 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1437 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1438 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1439 const_iv (body_wrist) const_iv (body_waist)
1440
1441 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1442 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1443 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1444 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1445 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1446 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1447 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1448 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1449 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1450 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1451 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1452 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1453 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1454 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1455 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1456 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1457 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1458 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1459 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1460 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1461 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1462 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1463 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1464 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1465 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1466 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1467 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1468 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1469 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND) const_iv (VEIN)
1470
1471 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1472
1473 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1474 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1475
1476 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1477 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1478 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1479 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1480 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1481 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1482 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1483
1484 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1485 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1486 const_iv (WEAP_BLUD)
1487
1488 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1489 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1490 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1491 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1492 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1493 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1494 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1495 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1496 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1497 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1498 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1499 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1500 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1501 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1502 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1503 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1504 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1505 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1506 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1507 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1508 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1509 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1510 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1511 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1512 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1513 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1514
1515 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1516 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1517 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1518 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1519 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1520 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1521
1522 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1451 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1523 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1452 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1524 1453
1525 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL) 1454 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1526
1527 const_iv (SP_RAISE_DEAD)
1528 const_iv (SP_RUNE)
1529 const_iv (SP_MAKE_MARK)
1530 const_iv (SP_BOLT)
1531 const_iv (SP_BULLET)
1532 const_iv (SP_EXPLOSION)
1533 const_iv (SP_CONE)
1534 const_iv (SP_BOMB)
1535 const_iv (SP_WONDER)
1536 const_iv (SP_SMITE)
1537 const_iv (SP_MAGIC_MISSILE)
1538 const_iv (SP_SUMMON_GOLEM)
1539 const_iv (SP_DIMENSION_DOOR)
1540 const_iv (SP_MAGIC_MAPPING)
1541 const_iv (SP_MAGIC_WALL)
1542 const_iv (SP_DESTRUCTION)
1543 const_iv (SP_PERCEIVE_SELF)
1544 const_iv (SP_WORD_OF_RECALL)
1545 const_iv (SP_INVISIBLE)
1546 const_iv (SP_PROBE)
1547 const_iv (SP_HEALING)
1548 const_iv (SP_CREATE_FOOD)
1549 const_iv (SP_EARTH_TO_DUST)
1550 const_iv (SP_CHANGE_ABILITY)
1551 const_iv (SP_BLESS)
1552 const_iv (SP_CURSE)
1553 const_iv (SP_SUMMON_MONSTER)
1554 const_iv (SP_CHARGING)
1555 const_iv (SP_POLYMORPH)
1556 const_iv (SP_ALCHEMY)
1557 const_iv (SP_REMOVE_CURSE)
1558 const_iv (SP_IDENTIFY)
1559 const_iv (SP_DETECTION)
1560 const_iv (SP_MOOD_CHANGE)
1561 const_iv (SP_MOVING_BALL)
1562 const_iv (SP_SWARM)
1563 const_iv (SP_CHANGE_MANA)
1564 const_iv (SP_DISPEL_RUNE)
1565 const_iv (SP_CREATE_MISSILE)
1566 const_iv (SP_CONSECRATE)
1567 const_iv (SP_ANIMATE_WEAPON)
1568 const_iv (SP_LIGHT)
1569 const_iv (SP_CHANGE_MAP_LIGHT)
1570 const_iv (SP_FAERY_FIRE)
1571 const_iv (SP_CAUSE_DISEASE)
1572 const_iv (SP_AURA)
1573 const_iv (SP_TOWN_PORTAL)
1574 const_iv (SP_PARTY_SPELL)
1575 1455
1576 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1456 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1577 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1457 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1578 const_iv (F_LOCKED) 1458 const_iv (F_LOCKED)
1579 1459
1580 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1581
1582 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1460 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1583 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1461 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1584 1462
1585 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1586
1587 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1588 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1589
1590 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1591 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1592
1593 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1463 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1594
1595 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1596 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1597 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1598 const_iv (M_ICE) const_iv (M_SPECIAL)
1599 1464
1600 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1465 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1601 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1466 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1602 1467
1603 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1604 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1605 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1606 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1607 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1608 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1609 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1610 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1611 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1612 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1613 const_iv (SK_POISON_NAIL) const_iv (SK_MINING) const_iv (SK_FISHING)
1614
1615 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1616 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1617 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1618 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1619 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1620 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1621
1622 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1623
1624 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1625 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1626 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1627 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1628 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1629 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1630 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1631
1632 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1468 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1633 const_iv (MAP_INACTIVE) 1469 const_iv (MAP_INACTIVE)
1634 1470
1635 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1471 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1636 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1472 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1637 1473
1638 const_iv (VERSION_CS) const_iv (VERSION_SC)
1639
1640 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1474 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1641 1475
1642 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1643
1644 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1476 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1645
1646 // random map generator
1647 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1648 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1649
1650 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1651 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1652 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1653
1654 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1655 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1656
1657 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1658 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1659
1660 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1661 const_iv (FT_RSRC) const_iv (FT_NUM)
1662 }; 1477 };
1663 1478
1664 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1665 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1480 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1666 1481
… …
1782 CODE: 1597 CODE:
1783 UUID::init (); 1598 UUID::init ();
1784 1599
1785void init_signals () 1600void init_signals ()
1786 1601
1787void init_commands ()
1788
1789void init_skills () 1602void init_skills ()
1790 1603
1791void init_beforeplay () 1604void init_beforeplay ()
1792 1605
1793void evthread_start (int aiofd) 1606void evthread_start (int aiofd)
… …
1852 switch (items) 1665 switch (items)
1853 { 1666 {
1854 case 0: RETVAL = gen (); break; 1667 case 0: RETVAL = gen (); break;
1855 case 1: RETVAL = gen (SvUV (ST (0))); break; 1668 case 1: RETVAL = gen (SvUV (ST (0))); break;
1856 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1669 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1857 default: croak ("cf::rndm requires none, one or two parameters."); break; 1670 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1858 } 1671 }
1859} 1672}
1860 OUTPUT: 1673 OUTPUT:
1861 RETVAL 1674 RETVAL
1862 1675
… …
1869NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1682NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1870 CODE: 1683 CODE:
1871 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1684 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1872 OUTPUT: 1685 OUTPUT:
1873 RETVAL 1686 RETVAL
1687
1688const char *ordinal (int i)
1874 1689
1875void weaken (...) 1690void weaken (...)
1876 PROTOTYPE: @ 1691 PROTOTYPE: @
1877 CODE: 1692 CODE:
1878 while (items > 0) 1693 while (items > 0)
1879 sv_rvweaken (ST (--items)); 1694 sv_rvweaken (ST (--items));
1880 1695
1881void 1696void log_suspend ()
1697
1698void log_resume ()
1699
1882log_backtrace (utf8_string msg) 1700void log_backtrace (utf8_string msg)
1883 1701
1884void
1885LOG (int flags, utf8_string msg) 1702void LOG (int flags, utf8_string msg)
1886 PROTOTYPE: $$ 1703 PROTOTYPE: $$
1887 C_ARGS: flags, "%s", msg 1704 C_ARGS: flags, "%s", msg
1888 1705
1889octet_string path_combine (octet_string base, octet_string path) 1706octet_string path_combine (octet_string base, octet_string path)
1890 PROTOTYPE: $$ 1707 PROTOTYPE: $$
… …
2095#object *mortals (U32 index) 1912#object *mortals (U32 index)
2096# CODE: 1913# CODE:
2097# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1914# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
2098# OUTPUT: RETVAL 1915# OUTPUT: RETVAL
2099 1916
2100INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1917INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
2101 1918
2102MODULE = cf PACKAGE = cf::global 1919MODULE = cf PACKAGE = cf::global
2103 1920
2104int invoke (SV *klass, int event, ...) 1921int invoke (SV *klass, int event, ...)
2105 CODE: 1922 CODE:
… …
2109 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1926 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
2110 OUTPUT: RETVAL 1927 OUTPUT: RETVAL
2111 1928
2112MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1929MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
2113 1930
2114INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1931INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
2115 1932
2116int invoke (object *op, int event, ...) 1933int invoke (object *op, int event, ...)
2117 CODE: 1934 CODE:
2118 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1935 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
2119 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1936 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2350 PROTOTYPE: $$;$ 2167 PROTOTYPE: $$;$
2351 PPCODE: 2168 PPCODE:
2352{ 2169{
2353 rv_vector rv; 2170 rv_vector rv;
2354 2171
2355 PUTBACK;
2356 get_rangevector (ob, other, &rv, flags); 2172 get_rangevector (ob, other, &rv, flags);
2357 SPAGAIN;
2358 2173
2359 EXTEND (SP, 5); 2174 EXTEND (SP, 5);
2360 PUSHs (newSVuv (rv.distance)); 2175 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2361 PUSHs (newSViv (rv.distance_x)); 2176 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2362 PUSHs (newSViv (rv.distance_y)); 2177 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2363 PUSHs (newSViv (rv.direction)); 2178 PUSHs (sv_2mortal (newSViv (rv.direction)));
2364 PUSHs (to_sv (rv.part)); 2179 PUSHs (sv_2mortal (to_sv (rv.part)));
2365} 2180}
2366 2181
2367bool on_same_map_as (object *ob, object *other) 2182bool on_same_map_as (object *ob, object *other)
2368 CODE: 2183 CODE:
2369 RETVAL = on_same_map (ob, other); 2184 RETVAL = on_same_map (ob, other);
… …
2410int command_arrest (object *op, utf8_string params) 2225int command_arrest (object *op, utf8_string params)
2411 2226
2412 2227
2413MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2228MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2414 2229
2415INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2230INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2416 2231
2417int invoke (player *pl, int event, ...) 2232int invoke (player *pl, int event, ...)
2418 CODE: 2233 CODE:
2419 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2234 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2420 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2235 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2512 if (op->tag) 2327 if (op->tag)
2513 XPUSHs (sv_2mortal (to_sv (op))); 2328 XPUSHs (sv_2mortal (to_sv (op)));
2514 } 2329 }
2515} 2330}
2516 2331
2517INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2332INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2518 2333
2519void 2334void
2520adjust_daylight () 2335adjust_daylight ()
2521 CODE: 2336 CODE:
2522 maptile::adjust_daylight (); 2337 maptile::adjust_daylight ();
… …
2841 OUTPUT: 2656 OUTPUT:
2842 RETVAL 2657 RETVAL
2843 2658
2844MODULE = cf PACKAGE = cf::mapspace 2659MODULE = cf PACKAGE = cf::mapspace
2845 2660
2846INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2661INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2847 2662
2848MODULE = cf PACKAGE = cf::arch 2663MODULE = cf PACKAGE = cf::arch
2849 2664
2850int archetypes_size () 2665int archetypes_size ()
2851 CODE: 2666 CODE:
… …
2855archetype *archetypes (U32 index) 2670archetype *archetypes (U32 index)
2856 CODE: 2671 CODE:
2857 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2672 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2858 OUTPUT: RETVAL 2673 OUTPUT: RETVAL
2859 2674
2860INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2675INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2861 2676
2862MODULE = cf PACKAGE = cf::party 2677MODULE = cf PACKAGE = cf::party
2863 2678
2864partylist *first () 2679partylist *first ()
2865 PROTOTYPE: 2680 PROTOTYPE:
2866 CODE: 2681 CODE:
2867 RETVAL = get_firstparty (); 2682 RETVAL = get_firstparty ();
2868 OUTPUT: RETVAL 2683 OUTPUT: RETVAL
2869 2684
2870INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2685INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2871 2686
2872MODULE = cf PACKAGE = cf::region 2687MODULE = cf PACKAGE = cf::region
2873 2688
2874void 2689void
2875list () 2690list ()
… …
2888 RETVAL = 0; 2703 RETVAL = 0;
2889 while (rgn = rgn->parent) 2704 while (rgn = rgn->parent)
2890 RETVAL++; 2705 RETVAL++;
2891 OUTPUT: RETVAL 2706 OUTPUT: RETVAL
2892 2707
2893INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2708INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2894 2709
2895MODULE = cf PACKAGE = cf::living 2710MODULE = cf PACKAGE = cf::living
2896 2711
2897INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2712INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2898 2713
2899MODULE = cf PACKAGE = cf::settings 2714MODULE = cf PACKAGE = cf::settings
2900 2715
2901INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2716INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2902 2717
2903MODULE = cf PACKAGE = cf::client 2718MODULE = cf PACKAGE = cf::client
2904 2719
2905INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2720INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2906 2721
2907int invoke (client *ns, int event, ...) 2722int invoke (client *ns, int event, ...)
2908 CODE: 2723 CODE:
2909 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2724 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2910 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2725 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2976 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2791 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2977 old_sound_index [idx] = face; 2792 old_sound_index [idx] = face;
2978 2793
2979MODULE = cf PACKAGE = cf::face PREFIX = face_ 2794MODULE = cf PACKAGE = cf::face PREFIX = face_
2980 2795
2981#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2796#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2982 2797
2983faceidx face_find (utf8_string name, faceidx defidx = 0) 2798faceidx face_find (utf8_string name, faceidx defidx = 0)
2984 2799
2985faceidx alloc (utf8_string name) 2800faceidx alloc (utf8_string name)
2986 CODE: 2801 CODE:
… …
2993 while (!RETVAL); // crude way to leave index 0 2808 while (!RETVAL); // crude way to leave index 0
2994 2809
2995 faces [RETVAL].name = name; 2810 faces [RETVAL].name = name;
2996 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2811 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2997 2812
2998 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2813 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2999 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2814 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2815 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
3000} 2816}
3001 OUTPUT: RETVAL 2817 OUTPUT: RETVAL
3002 2818
3003void set_type (faceidx idx, int value) 2819void set_type (faceidx idx, int value)
3004 ALIAS: 2820 ALIAS:
… …
3085 ns->force_newmap = true; 2901 ns->force_newmap = true;
3086 } 2902 }
3087 2903
3088MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2904MODULE = cf PACKAGE = cf::anim PREFIX = anim_
3089 2905
3090#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2906#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
3091 2907
3092animidx anim_find (utf8_string name) 2908animidx anim_find (utf8_string name)
3093 CODE: 2909 CODE:
3094 RETVAL = animation::find (name).number; 2910 RETVAL = animation::find (name).number;
3095 OUTPUT: RETVAL 2911 OUTPUT: RETVAL
… …
3121 for_all_clients (ns) 2937 for_all_clients (ns)
3122 ns->anims_sent.reset (); 2938 ns->anims_sent.reset ();
3123 2939
3124MODULE = cf PACKAGE = cf::object::freezer 2940MODULE = cf PACKAGE = cf::object::freezer
3125 2941
3126INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2942INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
3127 2943
3128SV * 2944SV *
3129new (char *klass) 2945new (char *klass)
3130 CODE: 2946 CODE:
3131 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2947 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
3138 sv_to (sv, self); 2954 sv_to (sv, self);
3139 delete self; 2955 delete self;
3140 2956
3141MODULE = cf PACKAGE = cf::object::thawer 2957MODULE = cf PACKAGE = cf::object::thawer
3142 2958
3143INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2959INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h |
3144 2960
3145SV * 2961SV *
3146new_from_file (char *klass, octet_string path) 2962new_from_file (char *klass, octet_string path)
3147 CODE: 2963 CODE:
3148 object_thawer *f = new object_thawer (path); 2964 object_thawer *f = new object_thawer (path);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines