Zandronum Chat on our Discord Server Get the latest version: 3.1
Source Code

View Issue Details Jump to Notes ] Issue History ] Print ]
IDProjectCategoryView StatusDate SubmittedLast Update
0002107Zandronum[All Projects] Suggestionpublic2015-02-19 05:492018-09-30 22:22
ReporterDusk 
Assigned ToDusk 
PrioritynormalSeverityminorReproducibilityN/A
StatusclosedResolutionfixed 
PlatformOSOS Version
Product Version 
Target Version3.0Fixed in Version3.0 
Summary0002107: PWO rewrite
DescriptionI rewrote the PWO code a month ago or so due to the dubious quality of the code and due to the unnecessary dependency of the ORDERDEF lump. The new code automatically picks up which weapons are to be subjected to PWO. The ORDERDEF support is removed and any ORDERDEF lumps in wads are silently ignored.

The menu now uses sliders from -10 to 10, where 0 is the default value, putting the PWO default in the middle of the slider. Weapons are grouped per class when possible (see for yourself in Hexen). Configuration is stored in a separate section in the config instead of in CVars.

The code works by picking up weapons from player's weapon slots, due to this it won't see weapon slots defined in KEYCONF (which is deprecated anyway!).
Steps To ReproduceSandbox branch: pwo
Testing build: 150328-0051
Additional InformationI need this tested because I'm not certain that weapon switching behavior is intact (and in general it could use some testing).

Of note is that it does not pick up AOW weapons at all (due to AOW using KEYCONF). Most of Samsara's weapons are found but are not grouped properly, as Samsara's weapon slots are defined in the weapon classes, thus causing the weapons be slotted for all players. Some are only slotted in KEYCONF again so those are not picked up. I'll need to see if I can circumvent this.
Attached Files

- Relationships
related to 0002199closedDusk [MENUDEF] Weapon setup needs to be rebuilt 

-  Notes
User avatar (0011726)
Dusk (developer)
2015-02-20 16:52
edited on: 2015-02-20 16:53

New build 150220-1621:
- the best weapon choosing was fixed so that selection order kicks in when pwo weapons have the same weight
- KEYCONF weapons no longer screw up the weapon listing in the menu
- ccmd pwoinfo added (not much use to the end user though)

I think it's 100% ready for testing now.

User avatar (0011901)
Dusk (developer)
2015-03-28 01:01

New build 150328-0051: should actually save things to ini properly now..
User avatar (0011903)
Ru5tK1ng (updater)
2015-03-28 01:55

I tested out the new build and it saves correctly into the config file. PWO worked for me using vanilla weapons and the option to switch on same weight didn't give me any problems. I loaded up eonweapons and the build picked up the custom weapons without any issue and put them in their correct slots. Weapons with 0 weight were not saved into the cfg until they were changed so that is working correctly. All the PWO weights were saved under the heading: [Doom.PreferredWeaponOrder].
User avatar (0013145)
Torr Samaho (administrator)
2015-08-09 11:10

Dusk, can you port this to the new repo and 3.0?
User avatar (0013228)
Dusk (developer)
2015-08-17 20:46

Oh yeah. I'll get to that.
User avatar (0013230)
cobalt (updater)
2015-08-18 11:39

Issue addressed by commit afdacbb: Rewrote support for preferred weapon order, removing the ORDERDEF lump in the process (addresses 2107).
Committed by Teemu Piippo [Dusk] on Tuesday 18 August 2015 03:46:38

Changes in files:

 docs/zandronum-history.txt | 1 +
 src/c_cvars.cpp | 5 +
 src/d_main.cpp | 4 +-
 src/g_shared/a_weapons.cpp | 68 +++----
 src/g_shared/pwo.cpp | 806 +++++++++++++++++++++++++++++++++++-------------------------------------------------------------
 src/g_shared/pwo.h | 135 +++++++++------
 src/gameconfigfile.cpp | 22 ++
 src/gameconfigfile.h | 1 +
 src/menu/menu.h | 9 +-
 src/menu/multiplayermenu.cpp | 53 ++++++
 src/menu/optionmenu.cpp | 11 +-
 src/menu/optionmenuitems.h | 12 +-
 src/p_user.cpp | 25 ++-
 wadsrc/static/menudef.za | 4 +-
 14 files changed, 529 insertions(+), 627 deletions(-)

User avatar (0013256)
Ru5tK1ng (updater)
2015-08-23 19:08

The option to toggle switching on/off same ranked weapons is missing (guessing will come after the menu rebuilding?) but otherwise the PWO works and the data is saved to the ini correctly.

The only other issue seemed when switching between pickup types. If I was using never switch on pickup and changed to PWO, the behavior would be always pickup until I either changed maps or restarted my client.
User avatar (0013264)
Dusk (developer)
2015-08-25 10:09
edited on: 2015-08-25 10:36

Whoops. I guess I forgot those out from the menu. I'll fix.

EDIT: Done:'https://bitbucket.org/Torr_Samaho/zandronum/pull-requests/11 [^]'

User avatar (0013270)
cobalt (updater)
2015-08-25 19:24

Issue addressed by commit b7f6157: Re-add two PWO options into the menu.
Committed by Teemu Piippo [Dusk] on Tuesday 25 August 2015 13:21:24

Changes in files:

 src/g_shared/pwo.cpp | 4 +++-
 wadsrc/static/menudef.za | 1 +
 2 files changed, 4 insertions(+), 1 deletions(-)


Issue Community Support
This issue is already marked as resolved.
If you feel that is not the case, please reopen it and explain why.
Supporters: Ru5tK1ng
Opponents: No one explicitly opposes this issue yet.

- Issue History
Date Modified Username Field Change
2015-02-19 05:49 Dusk New Issue
2015-02-19 05:49 Dusk Status new => assigned
2015-02-19 05:49 Dusk Assigned To => Dusk
2015-02-19 06:05 Dusk Description Updated View Revisions
2015-02-19 13:36 Dusk Steps to Reproduce Updated View Revisions
2015-02-20 16:51 Dusk Status assigned => needs testing
2015-02-20 16:51 Dusk Steps to Reproduce Updated View Revisions
2015-02-20 16:52 Dusk Note Added: 0011726
2015-02-20 16:53 Dusk Note Edited: 0011726 View Revisions
2015-02-20 16:53 Dusk Note Edited: 0011726 View Revisions
2015-02-20 17:00 Dusk Additional Information Updated View Revisions
2015-03-28 01:01 Dusk Note Added: 0011901
2015-03-28 01:02 Dusk Steps to Reproduce Updated View Revisions
2015-03-28 01:55 Ru5tK1ng Note Added: 0011903
2015-04-19 21:53 Dusk Relationship added related to 0002199
2015-04-19 21:53 Dusk Target Version 2.1 => 3.0
2015-08-09 11:10 Torr Samaho Note Added: 0013145
2015-08-09 11:11 Torr Samaho Status needs testing => feedback
2015-08-17 20:46 Dusk Note Added: 0013228
2015-08-17 20:46 Dusk Status feedback => assigned
2015-08-18 11:39 cobalt Status assigned => needs testing
2015-08-18 11:39 cobalt Description Updated View Revisions
2015-08-18 11:39 cobalt Steps to Reproduce Updated View Revisions
2015-08-18 11:39 cobalt Additional Information Updated View Revisions
2015-08-18 11:39 cobalt Note Added: 0013230
2015-08-23 19:08 Ru5tK1ng Note Added: 0013256
2015-08-25 10:09 Dusk Note Added: 0013264
2015-08-25 10:36 Dusk Note Edited: 0013264 View Revisions
2015-08-25 10:37 Dusk Status needs testing => needs review
2015-08-25 19:24 cobalt Status needs review => needs testing
2015-08-25 19:24 cobalt Note Added: 0013270
2015-08-27 22:38 cobalt Note Added: 0013298
2015-08-29 09:54 Dusk Note Deleted: 0013298
2015-09-01 16:24 Dusk Status needs testing => resolved
2015-09-01 16:24 Dusk Fixed in Version => 3.0
2015-09-01 16:24 Dusk Resolution open => fixed
2018-09-30 22:22 Blzut3 Status resolved => closed






Questions or other issues? Contact Us.

Links


Copyright © 2000 - 2024 MantisBT Team
Powered by Mantis Bugtracker