Browse Source

[fixed] a bug in npc_set_preference which prevented the entire system from working.... WOOPS...
Removed unneeded killvars for loop labels.

anjuna krokus 6 months ago
parent
commit
4f0e69f19a

+ 1 - 7
locations/npc_set_preference.qsrc

@@ -56,12 +56,7 @@ if isnum(mid($ARGS[0], 2)):
 		end
 	end
 
-	killvar 'check_preferences_loop'
-	killvar 'skip_check_preferences_loop'
-	killvar 'check_preference_loop_start'
-
-
-	if pref_trait_value ! 0:
+	if temp_set_preference_trait_value ! 0:
 		if arrsize('$npc_pref_traits') = 0:
 			!!replace(..., '	', '') is there to remove the tabs from the string.
 			$npc_preferences[$ARGS[0]] = replace({killvar '$npc_pref_traits'
@@ -140,7 +135,6 @@ if $ARGS[0] = 'rebuild_preferences':
 
 	killvar '$temp_npc_pref_traits'
 	killvar '$temp_npc_trait_values'
-	killvar 'rebuild_preferences_loop'
 	killvar 'rebuild_preferences_index'
 end
 

+ 0 - 1
locations/saveupdater.qsrc

@@ -2103,7 +2103,6 @@ if temp_current_save_version < 00090003:
 	if pref_update_index <= 263: jump 'update_standard_preferences_loop'
 
 	killvar 'pref_update_index'
-	killvar 'update_standard_preferences_loop'
 
 	!! policeQW
 	!! policeQW_courtletter_dates[]

+ 0 - 1
locations/set_npc_attraction.qsrc

@@ -38,7 +38,6 @@ end
 
 killvar '$npc_pref_traits'
 killvar 'npc_trait_values'
-killvar 'preferences_loop_start'
 
 
 if npc_attraction[$ARGS[0]] <= 40:

+ 0 - 2
locations/shortgs.qsrc

@@ -1126,8 +1126,6 @@ if $ARGS[0] = 'hex_str_to_int':
 		result = result * 16 + func('shortgs', 'hex_str_to_int2', mid($ARGS[1], shortgs_i, 1))
 		shortgs_i += 1
 	if shortgs_i <= len($ARGS[1]): jump 'hex_to_int_loop'
-
-	killvar 'shortgs_i'
 end
 
 !! SECONDARY FUNCTION, YOURE NOT SUPPOSED TO CALL IT IN YOUR CODE

+ 0 - 1
locations/sleep.qsrc

@@ -152,7 +152,6 @@ if $ARGS[0] = 'sleep_loop':
 
 	if sleepVars['minutes_to_wakeup'] > 0: jump 'sleep_loop_loop'
 
-	killvar 'sleep_loop_loop'
 	xgt 'sleep', 'post_sleep'
 end
 

+ 0 - 1
locations/sleep_simple.qsrc

@@ -33,7 +33,6 @@ if $ARGS[0] = 'simple':
 
 		gs 'sleep_simple', 'mod_sleeptriggers'
 	if sleepVars['minutes_to_wakeup'] > 0: jump 'sleep_simple_loop'
-	killvar 'sleep_simple_loop'
 
 	sleepVars['time_now'] = daystart * 1440 + hour * 60 + minut
 	InSleep = 0