Merge branch 'master' of https://git.catrenelle.com/KeyMasterOfGozer/glife

locations/cleanHTML.qsrc

@@ -10,19 +10,16 @@
 !		*pl func('cleanHTML', $HTMLString)
 
 $HTMLString = $ARGS[0]
-Limiter4Loop = 0
 :cleanHTMLloop
-$BadStr = STRFIND($HTMLString, '\>\s+\<', 0)
-if $BadStr ! "" and Limiter4Loop < 10:
-	$HTMLString = REPLACE( $HTMLString , $BadStr , "><" )
-	Limiter4Loop += 1
-	jump 'cleanHTMLloop'
-end
+!$BadStr = STRFIND($HTMLString, '\>\s+\<', 0)
+!if $BadStr ! "":
+!	$HTMLString = REPLACE( $HTMLString , $BadStr , "><" )
+!	jump 'cleanHTMLloop'
+!end
 
 $result = $HTMLString
 
 killvar '$HTMLString'
 killvar '$BadStr'
-killvar 'Limiter4Loop'
 
 --- cleanHTML ---------------------------------

locations/stat_display.qsrc

@@ -174,37 +174,29 @@ else
 	$journalIcon = 'journal_norm.png'
 end
 if menu_off = 0:
-	$menuBarTab += '<table>
-	<tr>
-		<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''description''"><img src="images/system/menu icons/icon_character.png"></a></td>
-		<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''face''"><img src="images/system/menu icons/icon_lookself.png"></a></td>'
+	$menuBarTab = '<table><tr>'
+	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''description''"><img src="images/system/menu icons/icon_character.png"></a></td>'
+	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''face''"><img src="images/system/menu icons/icon_lookself.png"></a></td>'
 	if bag > 0:
-		$menuBarTab += '
-		<td><a href="exec:gs ''din_bad'', ''d_bag''"><img src="images/system/menu icons/icon_purse.png"></a></td>'
+		$menuBarTab += '<td><a href="exec:gs ''din_bad'', ''d_bag''"><img src="images/system/menu icons/icon_purse.png"></a></td>'
 	end
-	$menuBarTab += '
-		<td><a href="exec:gs ''telefon'',''Phone_menu''"><img src="images/system/menu icons/icon_phone.png"></a></td>
-		<td><a href="exec:gs ''obj_din'', ''records''"><img src="images/system/menu icons/<<$journalIcon>>"></a></td>
-		<td><a href="exec:killvar ''menu_page'' & gs''$menu_setting''"><img src="images/system/menu icons/icon_menu.png"></a></td>
-	</tr>
-</table>'
+	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img src="images/system/menu icons/icon_phone.png"></a></td>'
+	$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''records''"><img src="images/system/menu icons/<<$journalIcon>>"></a></td>'
+	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs''$menu_setting''"><img src="images/system/menu icons/icon_menu.png"></a></td>'
+	$menuBarTab += '</tr></table>'
 	$stat_msg += func('cleanHTML',$menuBarTab)
 	killvar '$menuBarTab'
 elseif menu_off = 1:
-	$menuBarTab += '<table>
-	<tr>
-		<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_character.png"></a></td>
-		<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_lookself.png"></a></td>'
+	$menuBarTab = '<table><tr>'
+	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_character.png"></a></td>'
+	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_lookself.png"></a></td>'
 	if bag > 0:
-		$menuBarTab += '
-		<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_purse.png"></a></td>'
+		$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_purse.png"></a></td>'
 	end
-	$menuBarTab += '
-		<td><a href="exec:gs ''telefon'',''Phone_menu''"><img src="images/system/menu icons/icon_phone.png"></a></td>
-		<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/<<$journalIcon>>"></a></td>
-		<td><a href="exec:killvar ''menu_page'' & gs''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_menu.png"></a></td>
-	</tr>
-</table>'
+	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img src="images/system/menu icons/icon_phone.png"></a></td>'
+	$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/<<$journalIcon>>"></a></td>'
+	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_menu.png"></a></td>'
+	$menuBarTab += '</tr></table>'
 	$stat_msg += func('cleanHTML',$menuBarTab)
 	killvar '$menuBarTab'
 end