From f6fd61bbbf3fc9f6d89800261c7f5df2c72ff5d0 Mon Sep 17 00:00:00 2001 From: Headshotnoby Date: Mon, 21 Jun 2021 21:50:51 -0400 Subject: [PATCH] add game_version.py --- game_version.py | 1 + mainmenu.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 game_version.py diff --git a/game_version.py b/game_version.py new file mode 100644 index 0000000..f872331 --- /dev/null +++ b/game_version.py @@ -0,0 +1 @@ +GAME_VERSION = "v1.6" \ No newline at end of file diff --git a/mainmenu.py b/mainmenu.py index 626a561..ff49eb5 100644 --- a/mainmenu.py +++ b/mainmenu.py @@ -1,8 +1,12 @@ # -*- coding: utf-8 -*- -from PyQt4 import QtGui, QtCore -import socket, thread, time, random, traceback, hardware +import socket, thread, time, random, traceback from os.path import exists +from PyQt4 import QtGui, QtCore + +import hardware +from game_version import * + AOpath = "base/" AO2XPpath = "AO2XPbase/" #AOpath = "I:/aovanilla1.7.5/client/base/" @@ -59,7 +63,7 @@ class lobby(QtGui.QWidget): self.connectingimg.hide() self.clientver = QtGui.QLabel(self) - self.clientver.setText('AO2XP 1.5 by Headshot') + self.clientver.setText('AO2XP %s by Headshot' % GAME_VERSION) self.clientver.resize(self.clientver.sizeHint()) self.clientver.move(self.pix_lobby.size().width() - self.clientver.size().width(), 0) @@ -379,7 +383,7 @@ class MasterServer(QtCore.QThread): header = network[0] if header == "servercheok": - self.ms_tcp.send("HI#AO2XP %s#%%ID#AO2XP by Headshot#1.5#%%" % hardware.get_hdid()) + self.ms_tcp.send("HI#AO2XP %s#%%ID#AO2XP by Headshot#%s#%%" % (hardware.get_hdid(), GAME_VERSION[1:])) self.ms_tcp.send("ALL#%") elif header == 'DOOM': @@ -504,7 +508,7 @@ class AOServerInfo(QtCore.QThread): self.tcp.send("HI#AO2XP %s#%%" % hardware.get_hdid()) elif header == "ID": - self.tcp.send("ID#AO2XP#1.5#%") # need to send this to tsuserver3 servers in order to get feature list (FL) + self.tcp.send("ID#AO2XP#%s#%" % GAME_VERSION[1:]) # need to send this to tsuserver3 servers in order to get feature list (FL) elif header == "FL": features = network[1:]