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

Header fixes

Browse Source 
- Fix conflict with RPU command_extra.h
- Fix undefined debug_array_str error
This commit is contained in:
phobos2077
2023-07-24 00:56:01 +02:00
parent cb1a3dd764
commit 5c3c1ca4db
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/headers/command_lite.h
+1
View File
@@ -93,6 +93,7 @@
#define dude_elevation (elevation(dude_obj)) #define dude_elevation (elevation(dude_obj))
#define tile_behind_obj(who) (tile_num_in_direction(tile_num(who),((has_trait(TRAIT_OBJECT,who,OBJECT_CUR_ROT) + 3) % 6), 1)) #define tile_behind_obj(who) (tile_num_in_direction(tile_num(who),((has_trait(TRAIT_OBJECT,who,OBJECT_CUR_ROT) + 3) % 6), 1))
#define tile_behind_obj_rng(who, rng) (tile_num_in_direction(tile_num(who),((has_trait(TRAIT_OBJECT,who,OBJECT_CUR_ROT) + 3) % 6), rng))
#define dude_cur_hits (get_critter_stat(dude_obj,STAT_current_hp)) #define dude_cur_hits (get_critter_stat(dude_obj,STAT_current_hp))
#define dude_max_hits (get_critter_stat(dude_obj,STAT_max_hp)) #define dude_max_hits (get_critter_stat(dude_obj,STAT_max_hp))
artifacts/scripting/headers/lib.arrays.h
+1 -3
View File
@@ -131,7 +131,7 @@ procedure remove_array_block(variable arr, variable blocksize, variable index);
/** /**
* Converts any array to string for debugging purposes * Converts any array to string for debugging purposes
*/ */
procedure debug_array_str(variable arr); #define debug_array_str(arr) debug_array_str_deep(arr, 1)
#define display_array(arr) display_msg(debug_array_str(arr)) #define display_array(arr) display_msg(debug_array_str(arr))
@@ -618,8 +618,6 @@ end
Different utility functions... Different utility functions...
*/ */
#define debug_array_str(arr) debug_array_str_deep(arr, 1)
procedure debug_array_str_deep(variable arr, variable levels) begin procedure debug_array_str_deep(variable arr, variable levels) begin
#define _newline if (levels > 1) then s += "\n"; #define _newline if (levels > 1) then s += "\n";
#define _indent ii := 0; while (ii < levels - 1) do begin s += " "; ii++; end #define _indent ii := 0; while (ii < levels - 1) do begin s += " "; ii++; end
artifacts/scripting/headers/command_extra.h → artifacts/scripting/headers/lib.obj.h
+3 -4
View File
@@ -1,12 +1,11 @@
#ifndef COMMAND_EXTRA_H #ifndef LIB_OBJ_H
#define COMMAND_EXTRA_H #define LIB_OBJ_H
#include "define_lite.h" #include "define_lite.h"
#include "define_extra.h" #include "define_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 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) #define get_active_weapon(critter) critter_inven_obj(critter, (2 - active_hand) if critter == dude_obj else INVEN_TYPE_RIGHT_HAND)
#define obj_can_hear_and_shoot_obj(critter,target) (obj_can_hear_obj(critter, target) and obj_blocking_line(critter, tile_num(target), BLOCKING_TYPE_SHOOT) == target)
#endif #endif