MantisBT - Doomseeker |
| View Issue Details |
|
| ID | Project | Category | View Status | Date Submitted | Last Update |
| 0003909 | Doomseeker | UI | public | 2021-10-18 01:14 | 2022-03-22 11:11 |
|
| Reporter | AlexMax | |
| Assigned To | Zalewa | |
| Priority | normal | Severity | major | Reproducibility | N/A |
| Status | closed | Resolution | fixed | |
| Platform | | OS | | OS Version | |
| Product Version | 1.3.2 | |
| Target Version | 1.3.3 | Fixed in Version | 1.3.3 | |
|
| Summary | 0003909: Odamex 10.0 support |
| Description | A number of Odamex 10.0 servers are not being properly queried by Doomseeker, resulting in <ERROR>. |
| Steps To Reproduce | Open Doomseeker and reload the Odamex server list. There are a number of servers at 74.91.112.85 that do not work. |
| Additional Information | I investigated this myself on my own time and I believe I know why this happens. The server query request is versioned, and our large jump in version from 0.9.5 to 10.0 (note the use of the major version number) is outside of the range of the version contained in your server query string.
What we do - push the four parts of the packet separately.
'https://github.com/odamex/odamex/blob/stable/odalpapi/net_packet.cpp#L625 [^]'
Doomseeker appears to bundle the entire packet into one.
'https://bitbucket.org/Doomseeker/doomseeker/src/fc903e1a484a3ac314d9205727eee63ea3828b59/src/plugins/odamex/odamexserver.cpp#lines-48 [^]'
This should probably be bumped to something reasonable. It might make more sense to bring in our version construction macros to make updating this easier in the future.
'https://github.com/odamex/odamex/blob/stable/odalpapi/net_packet.h#L54 [^]'
And while you're updating the protocol to support 10.0, it's probably a good idea to add support for the headliner feature of Odamex 10.0 - Horde.
In your gametype conditional for Odamex, "Survival Horde" is sv_gametype 4 and g_lives > 0, "Horde" is sv_gametype 4 in other cases. |
| Tags | No tags attached. |
| Relationships | |
| Attached Files | |
|
| Issue History |
| Date Modified | Username | Field | Change |
| 2021-10-18 01:14 | AlexMax | New Issue | |
| 2021-10-18 01:15 | AlexMax | Note Added: 0021786 | |
| 2021-10-22 09:03 | WubTheCaptain | Status | new => acknowledged |
| 2021-10-22 09:06 | WubTheCaptain | Target Version | => 1.3.3 |
| 2021-12-10 11:10 | Pol M | Note Added: 0021869 | |
| 2021-12-10 11:11 | Pol M | Assigned To | => Pol M |
| 2021-12-10 11:11 | Pol M | Status | acknowledged => assigned |
| 2021-12-11 00:52 | Pol M | Note Added: 0021872 | |
| 2021-12-11 00:52 | Pol M | Status | assigned => needs review |
| 2021-12-11 00:52 | Pol M | Assigned To | Pol M => Zalewa |
| 2021-12-11 00:52 | Pol M | Status | needs review => assigned |
| 2021-12-11 00:52 | Pol M | Status | assigned => needs review |
| 2021-12-11 02:27 | WubTheCaptain | Note Added: 0021874 | |
| 2021-12-11 02:27 | WubTheCaptain | Note Edited: 0021874 | bug_revision_view_page.php?bugnote_id=21874#r13429 |
| 2021-12-11 03:21 | WubTheCaptain | Note Added: 0021878 | |
| 2021-12-11 12:52 | Zalewa | Note Added: 0021879 | |
| 2021-12-11 12:52 | Zalewa | Status | needs review => needs testing |
| 2021-12-11 15:51 | WubTheCaptain | Note Added: 0021880 | |
| 2021-12-11 15:54 | WubTheCaptain | Status | needs testing => needs review |
| 2021-12-11 16:28 | Zalewa | Note Added: 0021881 | |
| 2021-12-11 16:28 | Zalewa | Status | needs review => needs testing |
| 2021-12-11 16:28 | Zalewa | Note Edited: 0021881 | bug_revision_view_page.php?bugnote_id=21881#r13431 |
| 2021-12-11 16:29 | Zalewa | Note Edited: 0021881 | bug_revision_view_page.php?bugnote_id=21881#r13432 |
| 2021-12-11 17:19 | WubTheCaptain | Note Added: 0021882 | |
| 2021-12-11 17:19 | WubTheCaptain | Status | needs testing => resolved |
| 2021-12-11 17:19 | WubTheCaptain | Fixed in Version | => 1.3.3 |
| 2021-12-11 17:19 | WubTheCaptain | Resolution | open => fixed |
| 2021-12-11 19:57 | Zalewa | Note Added: 0021883 | |
| 2021-12-11 20:03 | Zalewa | Note Edited: 0021883 | bug_revision_view_page.php?bugnote_id=21883#r13434 |
| 2021-12-12 23:32 | Pol M | Note Added: 0021890 | |
| 2022-03-22 11:11 | WubTheCaptain | Status | resolved => closed |
|
Notes |
|
|
|
|
For the record, 10.0 is not out yet, but we anticipate that it will be out before the end of 2021. |
|
|
|
(0021869)
|
|
Pol M
|
|
2021-12-10 11:10
|
|
Wrote a fix for this during the morning :)
Yep, seems like updating the server challenge did the trick. I'll also add support for the new game mode before pushing.
Sorry for the delay, I hadn't checked the tracker for quite a while. |
|
|
|
(0021872)
|
|
Pol M
|
|
2021-12-11 00:52
|
|
|
|
|
|
Quote
gameModesList << GameMode::ffaGame(MODE_SURVIVAL_HORDE, "Survival horde");
"Survival Horde" or "Survival horde"? OP said "Survival Horde" and capitalizing the first letter of every word seems to be common for other gamemodes.
|
|
|
|
|
|
Pol M: You could also add your copyright header to those files if desired. |
|
|
|
(0021879)
|
|
Zalewa
|
|
2021-12-11 12:52
|
|
I've deployed the new version of the Odamex plugin to the beta auto-update channel. From what I see it can now parse the challenge responses from the Oda 10.0 servers.
Thanks go to Pol for solving this matter. |
|
|
|
|
|
Zalewa: My notes above (code review) remain unaddressed by the merge. |
|
|
|
(0021881)
|
|
Zalewa
|
2021-12-11 16:28
(edited on: 2021-12-11 16:29) |
|
Oh yes right, the capitalization. I corrected it ('https://bitbucket.org/Doomseeker/doomseeker/commits/4614e828b8bd8c16181c85d225bfc5965e2ea3bd [^]' ). I'll refrain from releasing another version of the plugin for now given the minority of this change.
As far as the copyright blurbs go we never had an exact policy for those. Each file that was just added to the project received the standard blurb plus the current year. I believe I only modified the copyright info when I felt that the file was changed so significantly so that one could consider that this is a new file entirely. Frankly speaking I don't care much about those blurbs.
|
|
|
|
|
Quote
A number of Odamex 10.0 servers are not being properly queried by Doomseeker, resulting in <ERROR>.
These are now displayed in the server browser.
Quote
And while you're updating the protocol to support 10.0, it's probably a good idea to add support for the headliner feature of Odamex 10.0 - Horde.
Create Game now has the two Horde options and the server browser can now display servers with those two game types. |
|
|
|
(0021883)
|
|
Zalewa
|
2021-12-11 19:57
(edited on: 2021-12-11 20:03) |
|
Quote
Create Game now has the two Horde options
Overlooked this too. This will need some work - the modes do appear in the box, that's true, but the +sv_gametype option isn't appended to the command line.
And that's not all. The Odamex plugin has more problems with selecting the game mode in the "Create Game" box, unfortunately. The only functional choices there are "Coop", "Deathmatch", "Team DM" and "CTF". These 4 are converted to their respective mode numbers and then passed to +sv_gametype. Everything else is ignored. You can see the code that does this here:'https://bitbucket.org/Doomseeker/doomseeker/src/6fdd469a5327e5041971883e2e84c8048b2c7bf1/src/plugins/odamex/odamexgamehost.cpp#lines-62 [^]'
I can add `modeNum = 4` for the Horde mode, but fixing this properly will be tricky. Odamex decides upon different gamemodes depending on whether other flags (g_sides and g_lives) are non-zero. I think we need a separate issue for that - 0003937.
|
|
|
|
(0021890)
|
|
Pol M
|
|
2021-12-12 23:32
|
|
Don't worry wub, no need to update licence comments. In general I'm fine with everything as long as doomseeker doesn't decide to all of a sudden drastically change the licence. (And I'm not talking of going from LGPL to Apache ;) )
Once I have time again in (late) January, I'll probably look into fixing the odamex plugin further if it hasn't been fixed yet. |
|