fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated headers and function document from 4.x

Browse Source
This commit is contained in:
NovaRain
2023-06-05 11:03:51 +08:00
parent 378bc8a126
commit 4e3f065453
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/headers/command_extra.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef COMMAND_EXTRA_H
#define COMMAND_EXTRA_H
#define ammo_caliber(ammoPid) get_proto_data(ammoPid, PROTO_AM_CALIBER)
#define obj_name_safe(obj) (obj_name(obj) if obj else "(null)")
#define get_active_weapon(critter) critter_inven_obj(critter, (2 - active_hand) if critter == dude_obj else INVEN_TYPE_RIGHT_HAND)
#endif
artifacts/scripting/headers/command_lite.h
+18
View File
@@ -31,6 +31,10 @@
#define dude_is_armed critter_is_armed(dude_obj)
#define dude_wearing_armor critter_wearing_armor(dude_obj)
#define get_armor(cr) critter_inven_obj(cr,INVEN_TYPE_WORN)
#define dude_armor get_armor(dude_obj)
#define self_armor get_armor(self_obj)
#define dude_has_power_armor (((obj_is_carrying_obj_pid(dude_obj, PID_POWERED_ARMOR)) + \
(obj_is_carrying_obj_pid(dude_obj, PID_ADVANCED_POWER_ARMOR)) + \
(obj_is_carrying_obj_pid(dude_obj, PID_ADVANCED_POWER_ARMOR_MK2)) + \
@@ -125,8 +129,22 @@
#define self_agility (get_critter_stat(self_obj,STAT_ag))
#define self_luck (get_critter_stat(self_obj,STAT_lu))
// more stats
#define get_strength(cr) get_critter_stat(cr,STAT_st)
#define get_perception(cr) get_critter_stat(cr,STAT_pe)
#define get_endurance(cr) get_critter_stat(cr,STAT_en)
#define get_charisma(cr) get_critter_stat(cr,STAT_ch)
#define get_iq(cr) get_critter_stat(cr,STAT_iq)
#define get_agility(cr) get_critter_stat(cr,STAT_ag)
#define get_luck(cr) get_critter_stat(cr,STAT_lu)
// gender
#define get_gender(cr) get_critter_stat(cr,STAT_gender)
#define is_male(cr) (get_gender(cr) == GENDER_MALE)
#define is_female(cr) (get_gender(cr) == GENDER_FEMALE)
#define self_is_male (self_gender == GENDER_MALE)
#define self_is_female (self_gender == GENDER_FEMALE)
#define self_is_armed critter_is_armed(self_obj)
#define self_wearing_armor critter_wearing_armor(self_obj)
artifacts/scripting/headers/lib.strings.h
+2 -2
View File
@@ -9,8 +9,8 @@
#ifndef LIB_STRINGS_H
#define LIB_STRINGS_H
#define is_in_string(str, substr) (string_pos(str, substr) != -1)
#define string_starts_with(str, substr) (string_pos(str, substr) == 0)
#define is_in_string(str, sub) (string_pos(str, sub) != -1)
#define string_starts_with(str, sub) (substr(str, 0, strlen(sub)) == sub)
/**
* Returns position of first occurance of substr in str, or -1 if not found