Sun, 14 Nov 2021 21:45:45 +0200
Clean unnecessary code
13
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
1 | /* |
30
6b82f6a3ad53
renamed the project to ZCinema
Teemu Piippo <crimsondusk64@gmail.com>
parents:
26
diff
changeset
|
2 | * ZCinema: Zandronum demo launcher |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
3 | * Copyright (C) 2013-2015 Teemu Piippo |
13
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
4 | * |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
5 | * This program is free software: you can redistribute it and/or modify |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
6 | * it under the terms of the GNU General Public License as published by |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
7 | * the Free Software Foundation, either version 3 of the License, or |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
8 | * (at your option) any later version. |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
9 | * |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
10 | * This program is distributed in the hope that it will be useful, |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
13 | * GNU General Public License for more details. |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
14 | * |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
15 | * You should have received a copy of the GNU General Public License |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
17 | */ |
9bdddd2ccde6
now with 3691% extra legalese!
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
18 | |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
19 | #include <QFile> |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
20 | #include <QDataStream> |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
21 | #include <QMessageBox> |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
22 | #include <QProcess> |
48 | 23 | #include <errno.h> |
51
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
24 | #include <assert.h> |
46
07578e081ae8
Renamed the src* directories into commonlib/, config/ and launcher/
Teemu Piippo <crimsondusk64@gmail.com>
parents:
45
diff
changeset
|
25 | #include <commonlib/misc.h> |
07578e081ae8
Renamed the src* directories into commonlib/, config/ and launcher/
Teemu Piippo <crimsondusk64@gmail.com>
parents:
45
diff
changeset
|
26 | #include <commonlib/config.h> |
07578e081ae8
Renamed the src* directories into commonlib/, config/ and launcher/
Teemu Piippo <crimsondusk64@gmail.com>
parents:
45
diff
changeset
|
27 | #include <commonlib/version.h> |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
28 | #include "demo.h" |
46
07578e081ae8
Renamed the src* directories into commonlib/, config/ and launcher/
Teemu Piippo <crimsondusk64@gmail.com>
parents:
45
diff
changeset
|
29 | #include "prompts.h" |
8
e8f645d9f28f
Added a prompt for demo information
Teemu Piippo <crimsondusk64@gmail.com>
parents:
6
diff
changeset
|
30 | #include "ui_demoprompt.h" |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
31 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
32 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
33 | // ------------------------------------------------------------------------------------------------- |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
34 | // |
20
a5457405cc9b
Use the cfg:: namespace system I made up a while ago instead of using QSettings directly, it's unsafe
Teemu Piippo <crimsondusk64@gmail.com>
parents:
18
diff
changeset
|
35 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
36 | QString uncolorize (const QString& in) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
37 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
38 | // TODO: Handle long-form colors like \c[Red] |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
39 | QString out; |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
40 | int skip = 0; |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
41 | |
48 | 42 | for (int i = 0; i < in.length(); ++i) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
43 | { |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
44 | if (skip-- > 0) |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
45 | continue; |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
46 | |
48 | 47 | QChar ch = in[i]; |
48 | ||
49 | if (ch == QChar ('\034')) | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
50 | { |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
51 | skip = 1; |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
52 | continue; |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
53 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
54 | |
48 | 55 | out += ch; |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
56 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
57 | |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
58 | return out; |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
59 | } |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
60 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
61 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
62 | // ------------------------------------------------------------------------------------------------- |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
63 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
64 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
65 | static QString tr (const char* msg) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
66 | { |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
67 | return QObject::tr (msg); |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
68 | } |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
69 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
70 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
71 | // ------------------------------------------------------------------------------------------------- |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
72 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
73 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
74 | static void error (QString msg) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
75 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
76 | QMessageBox::critical (NULL, "Error", msg); |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
77 | } |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
78 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
79 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
80 | // ------------------------------------------------------------------------------------------------- |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
81 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
82 | |
38 | 83 | static ZandronumVersion findVersion (QString versionName) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
84 | { |
39
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
85 | QList<QVariant> versions = Config::get ("versions").toList(); |
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
86 | |
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
87 | for (int i = 0; i < versions.size(); ++i) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
88 | { |
39
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
89 | if (not versions[i].canConvert<ZandronumVersion>()) |
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
90 | continue; |
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
91 | |
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
92 | ZandronumVersion version = versions[i].value<ZandronumVersion>(); |
38 | 93 | |
94 | if (version.name == versionName | |
95 | or version.name + "M" == versionName | |
96 | or version.name == versionName + "M") | |
97 | { | |
98 | return version; | |
99 | } | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
100 | } |
39
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
101 | |
38 | 102 | return ZandronumVersion(); |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
103 | } |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
104 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
105 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
106 | // ------------------------------------------------------------------------------------------------- |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
107 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
108 | |
56
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
109 | static QString findWad (QString name) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
110 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
111 | QStringList wadpaths = Config::get ("wadpaths").toStringList(); |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
112 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
113 | for (int i = 0; i < wadpaths.size(); ++i) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
114 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
115 | QString fullpath = QString ("%1/%2").arg (wadpaths[i]).arg (name); |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
116 | QFile f (fullpath); |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
117 | |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
118 | if (f.exists()) |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
119 | return fullpath; |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
120 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
121 | |
56
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
122 | // WAD names are case-sensitive under non-Windows and they can appear in uppercase |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
123 | // so we need to test that too. |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
124 | if (name != name.toUpper()) |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
125 | return findWad (name.toUpper()); |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
126 | |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
127 | return ""; |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
128 | } |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
129 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
130 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
131 | // ------------------------------------------------------------------------------------------------- |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
132 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
133 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
134 | QString readString (QDataStream& stream) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
135 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
136 | QString out; |
63 | 137 | quint8 ch; |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
138 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
139 | for (stream >> ch; ch != 0; stream >> ch) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
140 | out += QChar (ch); |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
141 | |
22
2fe0b7e0da7b
For some God-knows-why reason, adding operator>> overloads to QDataStream leads into crashes with QFileDialog. Fixed by removing these overloads.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
21
diff
changeset
|
142 | return out; |
18
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
143 | } |
15
3d3e5f0fc4cc
made it compile on windows/qt5
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
144 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
145 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
146 | // ------------------------------------------------------------------------------------------------- |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
147 | // |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
148 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
149 | struct UserInfo |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
150 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
151 | QString netname; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
152 | QString skin; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
153 | QString className; |
63 | 154 | quint32 color; |
155 | quint32 aimdist; | |
156 | quint32 railcolor; | |
157 | quint8 gender; | |
158 | quint8 handicap; | |
159 | quint8 unlagged; | |
160 | quint8 respawnOnFire; | |
161 | quint8 ticsPerUpdate; | |
162 | quint8 connectionType; | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
163 | }; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
164 | |
51
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
165 | // |
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
166 | // ------------------------------------------------------------------------------------------------- |
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
167 | // |
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
168 | |
38 | 169 | struct DemoHeaders |
170 | { | |
63 | 171 | quint8 length; |
172 | quint8 version; | |
173 | quint8 userInfo; | |
174 | quint8 bodyStart; | |
175 | quint8 wads; | |
38 | 176 | }; |
177 | ||
51
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
178 | // |
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
179 | // ------------------------------------------------------------------------------------------------- |
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
180 | // |
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
181 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
182 | int launchDemo (QString path) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
183 | { |
18
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
184 | QFile f (path); |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
185 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
186 | if (not f.open (QIODevice::ReadOnly)) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
187 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
188 | error (tr ("Couldn't open '%1' for reading: %2").arg (path).arg (strerror (errno))); |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
189 | return 1; |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
190 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
191 | |
18
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
192 | QDataStream stream (&f); |
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
193 | stream.setByteOrder (QDataStream::LittleEndian); |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
194 | |
38 | 195 | DemoHeaders headers; |
63 | 196 | quint32 length; |
197 | quint16 zanversionID, numWads; | |
198 | quint32 longSink; | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
199 | QString zanversion; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
200 | QStringList wads; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
201 | UserInfo userinfo; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
202 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
203 | // Assume a release build if the build ID not supplied. The demo only got the "ZCLD" signature |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
204 | // in the 1.1 release build, 1.1.1 had no testing binaries and the build ID is included in 1.2 |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
205 | // onward. |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
206 | BuildType buildID = ReleaseBuild; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
207 | |
18
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
208 | bool ready = false; |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
209 | |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
210 | // Check signature |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
211 | { |
63 | 212 | quint32 demosignature; |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
213 | stream >> demosignature; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
214 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
215 | if (demosignature != makeByteID ('Z', 'C', 'L', 'D')) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
216 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
217 | error (tr ("'%1' is not a valid Zandronum demo file!").arg (path)); |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
218 | return 1; |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
219 | } |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
220 | } |
38 | 221 | |
39
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
222 | stream >> headers.length; |
2c368cf5cc19
Finally done with the new Zandronum version handling
Teemu Piippo <crimsondusk64@gmail.com>
parents:
38
diff
changeset
|
223 | stream >> length; |
38 | 224 | |
225 | // The remaining headers are variable and relative to the length header. | |
226 | headers.version = headers.length + 1; | |
227 | headers.userInfo = headers.length + 3, | |
228 | headers.bodyStart = headers.length + 4; | |
229 | headers.wads = headers.length + 10; | |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
230 | |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
231 | // Read the demo header and get data |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
232 | for (;;) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
233 | { |
63 | 234 | quint8 header; |
18
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
235 | stream >> header; |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
236 | |
38 | 237 | if (header == headers.bodyStart) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
238 | { |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
239 | ready = true; |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
240 | break; |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
241 | } |
38 | 242 | else if (header == headers.version) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
243 | { |
22
2fe0b7e0da7b
For some God-knows-why reason, adding operator>> overloads to QDataStream leads into crashes with QFileDialog. Fixed by removing these overloads.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
21
diff
changeset
|
244 | stream >> zanversionID; |
2fe0b7e0da7b
For some God-knows-why reason, adding operator>> overloads to QDataStream leads into crashes with QFileDialog. Fixed by removing these overloads.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
21
diff
changeset
|
245 | zanversion = readString (stream); |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
246 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
247 | if (not zanversion.startsWith ("1.1-") and not zanversion.startsWith ("1.1.1-")) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
248 | { |
63 | 249 | quint8 a; |
22
2fe0b7e0da7b
For some God-knows-why reason, adding operator>> overloads to QDataStream leads into crashes with QFileDialog. Fixed by removing these overloads.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
21
diff
changeset
|
250 | stream >> a; |
2fe0b7e0da7b
For some God-knows-why reason, adding operator>> overloads to QDataStream leads into crashes with QFileDialog. Fixed by removing these overloads.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
21
diff
changeset
|
251 | buildID = (BuildType) a; |
18
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
252 | } |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
253 | |
38 | 254 | // The demo wads header accidentally changed in 1.3. :( |
255 | if (zanversion.left(1).toInt() >= 2 or zanversion.startsWith ("1.3")) | |
256 | headers.wads = headers.length + 8; | |
257 | ||
18
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
258 | stream >> longSink; // rng seed - we don't need it |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
259 | } |
38 | 260 | else if (header == headers.userInfo) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
261 | { |
22
2fe0b7e0da7b
For some God-knows-why reason, adding operator>> overloads to QDataStream leads into crashes with QFileDialog. Fixed by removing these overloads.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
21
diff
changeset
|
262 | userinfo.netname = readString (stream); |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
263 | stream >> userinfo.gender; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
264 | stream >> userinfo.color; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
265 | stream >> userinfo.aimdist; |
22
2fe0b7e0da7b
For some God-knows-why reason, adding operator>> overloads to QDataStream leads into crashes with QFileDialog. Fixed by removing these overloads.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
21
diff
changeset
|
266 | userinfo.skin = readString (stream); |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
267 | stream >> userinfo.railcolor; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
268 | stream >> userinfo.handicap; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
269 | stream >> userinfo.unlagged; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
270 | stream >> userinfo.respawnOnFire; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
271 | stream >> userinfo.ticsPerUpdate; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
272 | stream >> userinfo.connectionType; |
22
2fe0b7e0da7b
For some God-knows-why reason, adding operator>> overloads to QDataStream leads into crashes with QFileDialog. Fixed by removing these overloads.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
21
diff
changeset
|
273 | userinfo.className = readString (stream); |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
274 | } |
38 | 275 | else if (header == headers.wads) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
276 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
277 | QString sink; |
18
6bf57b4f42cd
Replaced the Bytestream class with QDataStream
Teemu Piippo <crimsondusk64@gmail.com>
parents:
17
diff
changeset
|
278 | stream >> numWads; |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
279 | |
63 | 280 | for (quint8 i = 0; i < numWads; ++i) |
38 | 281 | { |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
282 | QString wad = readString (stream); |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
283 | wads << wad; |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
284 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
285 | |
38 | 286 | // The demo has two checksum strings. We're not interested in them, though. |
287 | (sink = readString (stream)) = readString (stream); | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
288 | } |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
289 | else |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
290 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
291 | error (tr ("Unknown header %1!\n").arg (int (header))); |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
292 | return 1; |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
293 | } |
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
294 | } |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
295 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
296 | if (not ready) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
297 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
298 | error (tr ("Incomplete demo header in '%s'!").arg (path)); |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
299 | return 1; |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
300 | } |
38 | 301 | |
302 | ZandronumVersion version = findVersion (zanversion); | |
303 | ||
304 | if (version.name.isNull()) | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
305 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
306 | QDialog* prompt = new UnknownVersionPrompt (path, zanversion, (buildID == ReleaseBuild)); |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
307 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
308 | if (not prompt->exec()) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
309 | return 1; |
51
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
310 | |
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
311 | version = findVersion (zanversion); |
5e4bd3b212ce
Fixed the demo not loading properly when the user is prompted for the binary path
Teemu Piippo <tsapii@utu.fi>
parents:
48
diff
changeset
|
312 | assert (not version.name.isNull()); |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
313 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
314 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
315 | QString iwadpath; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
316 | QStringList pwadpaths; |
56
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
317 | bool doneAssimilation = false; |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
318 | |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
319 | // Find the WADs |
48 | 320 | for (int i = 0; i < wads.size(); ++i) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
321 | { |
48 | 322 | const QString& wad = wads[i]; |
56
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
323 | QString path = findWad (wad); |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
324 | |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
325 | if (path.isEmpty() and not doneAssimilation and Config::get ("autoassimilate").toBool()) |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
326 | { |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
327 | QStringList wadpaths = Config::get ("wadpaths").toStringList(); |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
328 | |
56
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
329 | // If there are no wad paths, try assimilate from other sources. |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
330 | assimilateWadPaths (wadpaths); |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
331 | Config::set ("wadpaths", wadpaths); |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
332 | |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
333 | // Try find the wad again |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
334 | path = findWad (wad); |
bdbbde5f754e
Added the ability to automatically look up wad paths from other sources (for now just Doomseeker's configuration). By default, ZCinema will automatically do such a lookup if it fails to find a WAD needed for demo playback. This can also be invoked manually in the config prompt.
Teemu Piippo <tsapii@utu.fi>
parents:
51
diff
changeset
|
335 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
336 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
337 | if (path.isEmpty()) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
338 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
339 | error (tr ("Couldn't find %1!").arg (wad)); |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
340 | return 1; |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
341 | } |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
342 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
343 | if (&wad == &wads.first()) |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
344 | iwadpath = path; |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
345 | else |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
346 | pwadpaths << path; |
8
e8f645d9f28f
Added a prompt for demo information
Teemu Piippo <crimsondusk64@gmail.com>
parents:
6
diff
changeset
|
347 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
348 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
349 | if (not Config::get ("noprompt").toBool()) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
350 | { |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
351 | QString pwadtext; |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
352 | |
48 | 353 | for (int i = 0; i < wads.size(); ++i) |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
354 | { |
48 | 355 | if (i == 0) |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
356 | continue; // skip the IWAD |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
357 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
358 | if (not pwadtext.isEmpty()) |
8
e8f645d9f28f
Added a prompt for demo information
Teemu Piippo <crimsondusk64@gmail.com>
parents:
6
diff
changeset
|
359 | pwadtext += "<br />"; |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
360 | |
48 | 361 | pwadtext += wads[i]; |
8
e8f645d9f28f
Added a prompt for demo information
Teemu Piippo <crimsondusk64@gmail.com>
parents:
6
diff
changeset
|
362 | } |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
363 | |
8
e8f645d9f28f
Added a prompt for demo information
Teemu Piippo <crimsondusk64@gmail.com>
parents:
6
diff
changeset
|
364 | QDialog* dlg = new QDialog; |
e8f645d9f28f
Added a prompt for demo information
Teemu Piippo <crimsondusk64@gmail.com>
parents:
6
diff
changeset
|
365 | Ui_DemoPrompt ui; |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
366 | ui.setupUi (dlg); |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
367 | ui.demoNameLabel->setText (basename (path)); |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
368 | ui.demoRecorder->setText (uncolorize (userinfo.netname)); |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
369 | ui.versionLabel->setText (zanversion); |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
370 | ui.iwadLabel->setText (wads[0]); |
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
371 | ui.pwadsLabel->setText (pwadtext); |
26
9aab482c9125
When launched with no parameters, prompt the user for a demo
Teemu Piippo <crimsondusk64@gmail.com>
parents:
24
diff
changeset
|
372 | dlg->setWindowTitle (versionSignature()); |
41
e985ebb67fdd
Removed trailing tabs
Teemu Piippo <crimsondusk64@gmail.com>
parents:
39
diff
changeset
|
373 | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
374 | if (not dlg->exec()) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
375 | return 0; |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
376 | } |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
377 | |
36 | 378 | QStringList cmdlineList; |
379 | cmdlineList << "-playdemo" << path << "-iwad" << iwadpath; | |
37
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
380 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
381 | if (pwadpaths.size() > 0) |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
382 | cmdlineList << "-file" << pwadpaths; |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
383 | |
c82a86ea87be
Major rework, lots of internal maintenance, version editor removed
Teemu Piippo <crimsondusk64@gmail.com>
parents:
36
diff
changeset
|
384 | // print ("Executing: %1 %2\n", binarypath, cmdlineList.join (" ")); |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
385 | QProcess* proc = new QProcess; |
38 | 386 | proc->start (version.binaryPath, cmdlineList); |
10
bc1414343e19
Overhauled the way versions are handled, it's all kept dynamically now.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
8
diff
changeset
|
387 | proc->waitForFinished (-1); |
6
67b6ef6917ba
Now capable of actually launching demos
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
388 | return 0; |
36 | 389 | } |