Merge branch 'master' into 2.4_Lite

Author: NovaRain

scripts_src/ncr/scduppo.ssl

@@ -139,8 +139,8 @@ procedure map_enter_p_proc begin
 
    //added by killap
    if (new_run and repeatable_brahmin_drive and not(cattle_drive(HAL_DEAD))) then begin
-   	if (cattle_drive(CATTLE_FINISHED) or cattle_drive(CATTLE_MISSED)) then begin
-        set_global_var(GVAR_NCR_CATTLE_DRIVE,0);
+      if (cattle_drive(CATTLE_FINISHED) or cattle_drive(CATTLE_MISSED)) then begin
+         set_global_var(GVAR_NCR_CATTLE_DRIVE,0);
       end
    end
    //added by killap
@@ -215,8 +215,8 @@ procedure talk_p_proc begin
    set_local_var(LVAR_Herebefore, 1);
 
    move_obj_inven_to_obj(self_obj, i_duppo_table);
-   self_caps_adjust(item_caps_total(i_duppo_table));
-   item_caps_adjust(i_duppo_table, -self_caps);
+   //self_caps_adjust(item_caps_total(i_duppo_table)); -comment out by NovaRain (expansion)
+   //item_caps_adjust(i_duppo_table, -self_caps); -comment out by NovaRain (expansion)
 end
 
 /* This procedure gets called only on the death of this NPC. Special things like

scripts_src/sanfran/fcgunmer.ssl

@@ -193,12 +193,12 @@ procedure talk_p_proc begin
    GetReaction;
 
    //set_local_var(LVAR_Money, self_caps); -comment out by killap (expansion)
-   //item_caps_adjust(self_obj, -local_var(LVAR_Money)); -comment out by killap (expansion)
+   //self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap (expansion)
 
    move_obj_inven_to_obj(self_obj, swap_obj);
    move_obj_inven_to_obj(i_table_swap, self_obj);
 
-   //item_caps_adjust(self_obj, local_var(LVAR_Money)); -comment out by killap (expansion)
+   //self_caps_adjust(local_var(LVAR_Money)); -comment out by killap (expansion)
    //set_local_var(LVAR_Money, 0); -comment out by killap (expansion)
 
    if (san_fran_flag(SF_SHI_ENEMY)) then begin
@@ -230,7 +230,7 @@ procedure talk_p_proc begin
    end
 
    //set_local_var(LVAR_Money, self_caps); -comment out by killap (expansion)
-   //item_caps_adjust(self_obj, -local_var(LVAR_Money)); -comment out by killap (expansion)
+   //self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap (expansion)
 
    move_obj_inven_to_obj(self_obj, i_table_swap);
    move_obj_inven_to_obj(swap_obj, self_obj);