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.358 by root, Sun Apr 4 04:58:46 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)
… …
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 },
1424# include "const_iv.h" 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
1425 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)
1426 const_iv (logBacktrace) 1442 const_iv (logBacktrace)
1427 1443
1428 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1444 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1429 1445
1430 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1446 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1431 1447
1432 const_iv (MAX_TIME) 1448 const_iv (MAX_TIME)
1433 const_iv (MAXSOCKBUF) 1449 const_iv (MAXSOCKBUF)
1434 1450
1435 const_iv (NUM_BODY_LOCATIONS)
1436 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1437 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1438 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1439 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1440 const_iv (body_wrist) const_iv (body_waist)
1441
1442 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1443
1444 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1445 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1446 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1447 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1448 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1449 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1450 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1451
1452 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)
1453 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)
1454 1453
1455 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)
1456
1457 const_iv (SP_RAISE_DEAD)
1458 const_iv (SP_RUNE)
1459 const_iv (SP_MAKE_MARK)
1460 const_iv (SP_BOLT)
1461 const_iv (SP_BULLET)
1462 const_iv (SP_EXPLOSION)
1463 const_iv (SP_CONE)
1464 const_iv (SP_BOMB)
1465 const_iv (SP_WONDER)
1466 const_iv (SP_SMITE)
1467 const_iv (SP_MAGIC_MISSILE)
1468 const_iv (SP_SUMMON_GOLEM)
1469 const_iv (SP_DIMENSION_DOOR)
1470 const_iv (SP_MAGIC_MAPPING)
1471 const_iv (SP_MAGIC_WALL)
1472 const_iv (SP_DESTRUCTION)
1473 const_iv (SP_PERCEIVE_SELF)
1474 const_iv (SP_WORD_OF_RECALL)
1475 const_iv (SP_INVISIBLE)
1476 const_iv (SP_PROBE)
1477 const_iv (SP_HEALING)
1478 const_iv (SP_CREATE_FOOD)
1479 const_iv (SP_EARTH_TO_DUST)
1480 const_iv (SP_CHANGE_ABILITY)
1481 const_iv (SP_BLESS)
1482 const_iv (SP_CURSE)
1483 const_iv (SP_SUMMON_MONSTER)
1484 const_iv (SP_CHARGING)
1485 const_iv (SP_POLYMORPH)
1486 const_iv (SP_ALCHEMY)
1487 const_iv (SP_REMOVE_CURSE)
1488 const_iv (SP_IDENTIFY)
1489 const_iv (SP_DETECTION)
1490 const_iv (SP_MOOD_CHANGE)
1491 const_iv (SP_MOVING_BALL)
1492 const_iv (SP_SWARM)
1493 const_iv (SP_CHANGE_MANA)
1494 const_iv (SP_DISPEL_RUNE)
1495 const_iv (SP_CREATE_MISSILE)
1496 const_iv (SP_CONSECRATE)
1497 const_iv (SP_ANIMATE_WEAPON)
1498 const_iv (SP_LIGHT)
1499 const_iv (SP_CHANGE_MAP_LIGHT)
1500 const_iv (SP_FAERY_FIRE)
1501 const_iv (SP_CAUSE_DISEASE)
1502 const_iv (SP_AURA)
1503 const_iv (SP_TOWN_PORTAL)
1504 const_iv (SP_PARTY_SPELL)
1505
1506 const_iv (AP_TOGGLE) const_iv (AP_APPLY) const_iv (AP_UNAPPLY) const_iv (AP_MODE)
1507 const_iv (AP_NO_MERGE) const_iv (AP_NO_SLOT) const_iv (AP_PRINT) const_iv (AP_IGNORE_CURSE)
1508 1455
1509 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)
1510 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)
1511 const_iv (F_LOCKED) 1458 const_iv (F_LOCKED)
1512 1459
1513 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)
1514 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)
1515 1462
1516 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1517
1518 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1519 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1520
1521 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1522 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1523
1524 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1463 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1525
1526 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1527 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1528 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1529 const_iv (M_ICE) const_iv (M_SPECIAL)
1530 1464
1531 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)
1532 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)
1533 1467
1534 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1535 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1536 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1537 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1538 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1539 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1540 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1541 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1542 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1543 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1544 const_iv (SK_POISON_NAIL) const_iv (SK_MINING) const_iv (SK_FISHING)
1545
1546 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1547 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1548 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1549 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1550 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1551 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1552
1553 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1554 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1555 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1556 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1557 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1558 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1559 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1560
1561 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)
1562 const_iv (MAP_INACTIVE) 1469 const_iv (MAP_INACTIVE)
1563 1470
1564 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)
1565 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)
1566 1473
1567 const_iv (VERSION_CS) const_iv (VERSION_SC)
1568
1569 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)
1570 1475
1571 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1572
1573 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)
1574
1575 // random map generator
1576 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1577 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1578
1579 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1580 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1581 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1582
1583 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1584 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1585
1586 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1587 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1588
1589 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1590 const_iv (FT_RSRC) const_iv (FT_NUM)
1591 }; 1477 };
1592 1478
1593 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; )
1594 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1480 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1595 1481
… …
1711 CODE: 1597 CODE:
1712 UUID::init (); 1598 UUID::init ();
1713 1599
1714void init_signals () 1600void init_signals ()
1715 1601
1716void init_commands ()
1717
1718void init_skills () 1602void init_skills ()
1719 1603
1720void init_beforeplay () 1604void init_beforeplay ()
1721 1605
1722void evthread_start (int aiofd) 1606void evthread_start (int aiofd)
… …
1781 switch (items) 1665 switch (items)
1782 { 1666 {
1783 case 0: RETVAL = gen (); break; 1667 case 0: RETVAL = gen (); break;
1784 case 1: RETVAL = gen (SvUV (ST (0))); break; 1668 case 1: RETVAL = gen (SvUV (ST (0))); break;
1785 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1669 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1786 default: croak ("cf::rndm requires none, one or two parameters."); break; 1670 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1787 } 1671 }
1788} 1672}
1789 OUTPUT: 1673 OUTPUT:
1790 RETVAL 1674 RETVAL
1791 1675
… …
1798NV 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)
1799 CODE: 1683 CODE:
1800 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1684 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1801 OUTPUT: 1685 OUTPUT:
1802 RETVAL 1686 RETVAL
1687
1688const char *ordinal (int i)
1803 1689
1804void weaken (...) 1690void weaken (...)
1805 PROTOTYPE: @ 1691 PROTOTYPE: @
1806 CODE: 1692 CODE:
1807 while (items > 0) 1693 while (items > 0)
1808 sv_rvweaken (ST (--items)); 1694 sv_rvweaken (ST (--items));
1809 1695
1810void 1696void log_suspend ()
1697
1698void log_resume ()
1699
1811log_backtrace (utf8_string msg) 1700void log_backtrace (utf8_string msg)
1812 1701
1813void
1814LOG (int flags, utf8_string msg) 1702void LOG (int flags, utf8_string msg)
1815 PROTOTYPE: $$ 1703 PROTOTYPE: $$
1816 C_ARGS: flags, "%s", msg 1704 C_ARGS: flags, "%s", msg
1817 1705
1818octet_string path_combine (octet_string base, octet_string path) 1706octet_string path_combine (octet_string base, octet_string path)
1819 PROTOTYPE: $$ 1707 PROTOTYPE: $$
… …
2279 PROTOTYPE: $$;$ 2167 PROTOTYPE: $$;$
2280 PPCODE: 2168 PPCODE:
2281{ 2169{
2282 rv_vector rv; 2170 rv_vector rv;
2283 2171
2284 PUTBACK;
2285 get_rangevector (ob, other, &rv, flags); 2172 get_rangevector (ob, other, &rv, flags);
2286 SPAGAIN;
2287 2173
2288 EXTEND (SP, 5); 2174 EXTEND (SP, 5);
2289 PUSHs (newSVuv (rv.distance)); 2175 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2290 PUSHs (newSViv (rv.distance_x)); 2176 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2291 PUSHs (newSViv (rv.distance_y)); 2177 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2292 PUSHs (newSViv (rv.direction)); 2178 PUSHs (sv_2mortal (newSViv (rv.direction)));
2293 PUSHs (to_sv (rv.part)); 2179 PUSHs (sv_2mortal (to_sv (rv.part)));
2294} 2180}
2295 2181
2296bool on_same_map_as (object *ob, object *other) 2182bool on_same_map_as (object *ob, object *other)
2297 CODE: 2183 CODE:
2298 RETVAL = on_same_map (ob, other); 2184 RETVAL = on_same_map (ob, other);
… …
2922 while (!RETVAL); // crude way to leave index 0 2808 while (!RETVAL); // crude way to leave index 0
2923 2809
2924 faces [RETVAL].name = name; 2810 faces [RETVAL].name = name;
2925 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2811 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2926 2812
2927 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2813 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2928 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;
2929} 2816}
2930 OUTPUT: RETVAL 2817 OUTPUT: RETVAL
2931 2818
2932void set_type (faceidx idx, int value) 2819void set_type (faceidx idx, int value)
2933 ALIAS: 2820 ALIAS:

Diff Legend

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