Skip to content

Commit 63ddfeb

Browse files
committed
1 parent 1a38e2f commit 63ddfeb

File tree

6 files changed

+1
-66
lines changed

6 files changed

+1
-66
lines changed

scripts_src/maps/ncr1.ssl

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ procedure start;
6767
procedure map_enter_p_proc;
6868
procedure map_update_p_proc;
6969

70-
procedure Initial_Inven;
71-
7270
variable inited := 0;
7371

7472
procedure start begin
@@ -94,13 +92,9 @@ end
9492

9593
procedure map_enter_p_proc begin
9694
variable critter;
97-
// override_map_start_hex(14095,0,2);
98-
if (map_first_run) then begin
99-
end
10095
if (global_var(GVAR_LOAD_MAP_INDEX) == 5) then begin
10196
fadein(1);
102-
//set_global_var(global_var(GVAR_LOAD_MAP_INDEX), 0);
103-
set_global_var(GVAR_LOAD_MAP_INDEX, 0); //edit by killap
97+
set_global_var(GVAR_LOAD_MAP_INDEX, 0);
10498
override_map_start_hex(ROPE_LOAD_POS, 0, 2);
10599
end
106100

@@ -118,7 +112,3 @@ end
118112
procedure map_update_p_proc begin
119113
Lighting;
120114
end
121-
122-
123-
procedure Initial_Inven begin
124-
end

scripts_src/maps/sfchina.ssl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ procedure start;
4040
procedure map_enter_p_proc;
4141
procedure map_update_p_proc;
4242

43-
procedure Initial_Inven;
44-
4543
export variable i_table_swap := 0;
4644
export variable i_gun_table_1 := 0;
4745
export variable i_gun_table_2 := 0;
@@ -70,7 +68,6 @@ end
7068

7169

7270
procedure map_enter_p_proc begin
73-
// override_map_start_hex(14095,0,2);
7471

7572
//added by killap - prevent car from disappearing if the car runs out of gas while on the town circle
7673
if ((car_current_town == AREA_CAR_OUTTA_GAS) and (cur_map_index != MAP_CAR_DESERT) and (car_out_of_fuel)) then begin
@@ -83,8 +80,6 @@ procedure map_enter_p_proc begin
8380
Check_Create_Car(CAR_SAN_FRANCISCO_HEX, CAR_SAN_FRANCISCO_ELEV)
8481
//end added
8582

86-
//Check_Create_Car(CAR_SAN_FRANCISCO_HEX, CAR_SAN_FRANCISCO_ELEV)
87-
8883
//added by killap
8984
if (map_first_run) then begin
9085
display_msg(mstr(100));
@@ -97,7 +92,3 @@ end
9792
procedure map_update_p_proc begin
9893
Lighting;
9994
end
100-
101-
102-
procedure Initial_Inven begin
103-
end

scripts_src/ncr/scduppo.ssl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ procedure talk_p_proc begin
225225
set_local_var(LVAR_Herebefore, 1);
226226

227227
move_obj_inven_to_obj(self_obj, i_duppo_table);
228-
//self_caps_adjust(item_caps_total(i_duppo_table)); -comment out by NovaRain
229-
//item_caps_adjust(i_duppo_table, -self_caps); -comment out by NovaRain
230228
end
231229

232230
/* This procedure gets called only on the death of this NPC. Special things like
@@ -523,5 +521,3 @@ procedure Node013 begin
523521
Reply(146);
524522
NOption(147, Node999, 4);
525523
end
526-
527-
//xxxxxxxxxxxxxxxxxxxx

scripts_src/ncr/sidtbl.ssl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,3 @@ procedure map_enter_p_proc begin
210210
end
211211
end
212212
end
213-
214-
/***************************************************************************
215-
This procedure is used should the player try to pry the door open using a
216-
crowbar or some similar instrument.
217-
***************************************************************************/
218-

scripts_src/sanfran/fcgunmer.ssl

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,6 @@ procedure talk_p_proc begin
195195

196196
GetReaction;
197197

198-
//set_local_var(LVAR_Money, self_caps); -comment out by killap
199-
//self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap
200-
201198
move_obj_inven_to_obj(self_obj, swap_obj);
202199
move_obj_inven_to_obj(i_table_swap, self_obj);
203200

@@ -210,9 +207,6 @@ procedure talk_p_proc begin
210207
self_caps_adjust(caps);
211208
item_caps_adjust(obj, -caps);
212209

213-
//self_caps_adjust(local_var(LVAR_Money)); -comment out by killap
214-
//set_local_var(LVAR_Money, 0); -comment out by killap
215-
216210
if (san_fran_flag(SF_SHI_ENEMY)) then begin
217211
start_gdialog(NAME,self_obj,4,-1,-1);
218212
gSay_Start;
@@ -241,20 +235,8 @@ procedure talk_p_proc begin
241235
end_dialogue;
242236
end
243237

244-
//set_local_var(LVAR_Money, self_caps); -comment out by killap
245-
//self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap
246-
247238
move_obj_inven_to_obj(self_obj, i_table_swap);
248239
move_obj_inven_to_obj(swap_obj, self_obj);
249-
/*if () then begin
250-
start_gdialog(NAME,self_obj,4,-1,-1);
251-
gSay_Start;
252-
call Node001;
253-
gSay_End;
254-
end_dialogue;
255-
end*/
256-
//self_caps_adjust(local_var(LVAR_Money)); -comment out by killap
257-
//set_local_var(LVAR_Money, 0); -comment out by killap
258240
end
259241

260242
/* This procedure gets called only on the death of this NPC. Special things like
@@ -419,6 +401,3 @@ procedure Node014 begin
419401
Reply(151);
420402
NOption(152, Node998, 4);
421403
end
422-
423-
424-
//xxxxxxxxxxxxxxxxxxxx

scripts_src/sanfran/fclaocho.ssl

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,6 @@ procedure talk_p_proc begin
251251

252252
GetReaction;
253253

254-
//set_local_var(LVAR_Money, self_caps); -comment out by killap
255-
//self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap
256-
257254
move_obj_inven_to_obj(self_obj, swap_obj);
258255
move_obj_inven_to_obj(i_lao_table_swap, self_obj);
259256

@@ -266,9 +263,6 @@ procedure talk_p_proc begin
266263
self_caps_adjust(caps);
267264
item_caps_adjust(obj, -caps);
268265

269-
//self_caps_adjust(local_var(LVAR_Money)); -comment out by killap
270-
//set_local_var(LVAR_Money, 0); -comment out by killap
271-
272266
if (san_fran_flag(SF_SHI_ENEMY)) then begin
273267
call Node020;
274268
end else if (struggle_flag(STRUG_OZ9DEAD)) then begin
@@ -285,14 +279,8 @@ procedure talk_p_proc begin
285279
end_dialogue;
286280
end
287281

288-
//set_local_var(LVAR_Money, self_caps); -comment out by killap
289-
//self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap
290-
291282
move_obj_inven_to_obj(self_obj, i_lao_table_swap);
292283
move_obj_inven_to_obj(swap_obj, self_obj);
293-
294-
//self_caps_adjust(local_var(LVAR_Money)); -comment out by killap
295-
//set_local_var(LVAR_Money, 0); -comment out by killap
296284
end
297285

298286
/* This procedure gets called only on the death of this NPC. Special things like
@@ -743,6 +731,3 @@ procedure Node902 begin
743731
else
744732
call Node050;
745733
end
746-
//end added
747-
748-
//xxxxxxxxxxxxxxxxxxxx

0 commit comments

Comments
 (0)