cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guard against empty OTHER_OFFSET

Browse Source
This commit is contained in:
cidoku 2026-04-15 22:31:35 -04:00
parent 679a8688ce
commit 6bcf9eda0c
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gameview.py
View File

@ -1,7 +1,3 @@
# This is the main file where everything happens. Honestly, it sucks and the
# thing is so complex and unsafe that I'm surprised it even works. I wish for
# a simpler client. ~ cidoku
import thread, time, os, urllib, random, platform, subprocess
from os.path import exists, basename
from collections import OrderedDict
@ -985,6 +981,13 @@ class GUI(QtGui.QWidget):
self.slideBgAnimation.valueChanged.connect(self.slideChanged)
self.slideBg.hide()
self.onscreenTimerLabels = []
self.onscreenTimerTimes = [0, 0, 0, 0, 0]
self.onscreenTimerPaused = [True, True, True, True, True]
self.onscreenTimer = QtCore.QTimer(self)
self.onscreenTimer.timeout.connect(self.updateOnscreenTimers)
self.onscreenTimerTick = 1000
self.zoom = ZoomLines(self.viewport)
self.char = AOCharMovie(self.viewport, self)
@ -1052,13 +1055,6 @@ class GUI(QtGui.QWidget):
self.screenshake.timeout.connect(self.screenShakeTick)
self.shakesRemaining = 0
self.onscreenTimerLabels = []
self.onscreenTimerTimes = [0, 0, 0, 0, 0]
self.onscreenTimerPaused = [True, True, True, True, True]
self.onscreenTimer = QtCore.QTimer(self)
self.onscreenTimer.timeout.connect(self.updateOnscreenTimers)
self.onscreenTimerTick = 1000
for i in range(len(self.onscreenTimerTimes)):
label = QtGui.QLabel(self.viewport)
label.hide()
@ -3710,12 +3706,13 @@ class GUI(QtGui.QWidget):
boxPairOrder = -1
hor2_offset = vert2_offset = 0
if self.mChatMessage[OTHER_OFFSET]:
if "y_offset" in self.features: # AO 2.9
keyword = "<and>" if "<and>" in self.mChatMessage[OTHER_OFFSET] else "&" # i don't think it's hdf's fault but this is still ridiculous
hor2_offset = int(self.mChatMessage[OTHER_OFFSET].split(keyword)[0])
vert2_offset = int(self.mChatMessage[OTHER_OFFSET].split(keyword)[1]) if len(self.mChatMessage[OTHER_OFFSET].split(keyword)) > 1 else 0
else:
hor2_offset = int(self.mChatMessage[OTHER_OFFSET])
hor2_offset = int(self.mChatMessage[OTHER_OFFSET]) if self.mChatMessage[OTHER_OFFSET] else 0
if side == "def":
if hor2_offset > 0: