linux wtf is ^M?

This commit is contained in:
Headshotnoby 2021-06-14 21:27:12 -04:00
parent fa275a8136
commit 70ed38477b
10 changed files with 423 additions and 420 deletions

View File

@ -1643,6 +1643,9 @@ class gui(QtGui.QWidget):
setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg.scaled(256, 192, transformMode=QtCore.Qt.SmoothTransformation))) setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg.scaled(256, 192, transformMode=QtCore.Qt.SmoothTransformation)))
else: else:
setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg)) setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg))
else:
setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg))
def netmsg_hp(self, type, health): def netmsg_hp(self, type, health):
if type == 1: if type == 1:

View File

@ -92,7 +92,7 @@ except ImportError:
pip_install("Pillow==5.3.0") pip_install("Pillow==5.3.0")
print "installing pyinstaller, six, appdirs, packaging" print "installing pyinstaller, six, appdirs, packaging"
pip_install('pyinstaller==2.1' if platform.system() == "Darwin" else 'pyinstaller==3.6' + 'six appdirs packaging') pip_install('six appdirs packaging ' + 'pyinstaller==2.1' if platform.system() == "Darwin" else 'pyinstaller==3.6')
if platform.system() == "Windows": if platform.system() == "Windows":
print "downloading pyqt4" print "downloading pyqt4"