added several new functions to nwnx_areas. added new hexdump utility. #128
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
February 16, 2018 23:21
…routine to nwn2 lib. - plugins/areas/nwnx_areas.nss - added GetAreaTileset, GetAreaHeight, GetAreaWidth, GetAreaLighting, GetNoRest, Set/GetAreaListenMod, Set/GetAreaSpotMod, DumpArea - plugins/areas/NWNXAreas.cpp - integrated above functions - plugins/areas/area_info.h - support structure for area info output routines - plugins/areas/NWNXAreas.h - include area_info.h - plugins/areas/funcs/GetAreaHeight.cpp - implementation of above-named function - plugins/areas/funcs/GetAreaLighting.cpp - implementation of above-named function - plugins/areas/funcs/GetAreaListen.cpp - implementation of above-named function - plugins/areas/funcs/GetAreaSpot.cpp - implementation of above-named function - plugins/areas/funcs/GetAreaTileset.cpp - implementation of above-named function - plugins/areas/funcs/GetAreaWidth.cpp - implementation of above-named function - plugins/areas/funcs/GetNoRest.cpp - implementation of above-named function - plugins/areas/funcs/SetAreaListen.cpp - implementation of above-named function - plugins/areas/funcs/SetAreaName.cpp - implementation of above-named function - plugins/areas/funcs/SetAreaSpot.cpp - implementation of above-named function - plugins/areas/funcs/DumpArea.cpp - dump an area structure to log file - plugins/areas/funcs/Funcs.h - advance declarations for above functions - plugins/areas/CMakeLists.txt - added above files - plugins/funcs/funcs/area/f_GetFirstNextArea.c - fastidious variable declaration to avoid compile-time warnings - plugins/funcs/funcs/other/f_DumpObject.c - updated to output more intelligent header and use new hexdump utility - CMakeLists.txt - added hexdump to lib - lib/hexdump.c - new hexdump utility - include/hexdump.h - required for linkage to new hexdump utility
new functions: GetAreaLoadscreen(), GetAreaPVP(), GetTileAtLocation() new structure: tile_info.h updates to area_info.h, DumpArea().
virusman
requested changes
Mar 21, 2018
| # - no-omit-frame-pointer: breaks assembly on -O1/-O2 for some plugins | ||
| # - no-accumulate-outgoing-args: same | ||
| SET(OUR_CFLAGS_MUST_HAVES "${OUR_CFLAGS_MUST_HAVES} -mno-accumulate-outgoing-args -fno-omit-frame-pointer -fno-pic") | ||
| SET(OUR_CFLAGS_MUST_HAVES "${OUR_CFLAGS_MUST_HAVES} -mno-accumulate-outgoing-args -fno-omit-frame-pointer") |
Member
There was a problem hiding this comment.
This removes flags that were added recently. Seems like an unintentional change. Can you revert this?
virusman
requested changes
Mar 21, 2018
| area_info.h | ||
| this structure details the information contained in the nwn in-memory | ||
| area structure. it differs from CNWSArea in that this structure is | ||
| complete, whereas CNWSArea contains data starting only from offset 0xd4. |
Member
There was a problem hiding this comment.
CNWSArea inherits from superclasses, so their fields precede CNWSArea fields and run until 0xd4. This is expected.
| # removes stuff like -fPIC, which breaks nwnx plugin loading | ||
| set(CMAKE_SHARED_LIBRARY_C_FLAGS "") | ||
| set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "") | ||
| set(CMAKE_POSITION_INDEPENDENT_CODE FALSE) |
| #include "../NWNXAreas.h" | ||
| #include "hexdump.h" | ||
|
|
||
| void dump_area(struct area_info *ap) |
Member
There was a problem hiding this comment.
Why is it a separate method from NWNXDumpArea?
| areas.Log(0, "dump_area: DUMP ENDS ----------------\n"); | ||
| } | ||
|
|
||
| void NWNXDumpArea(void *pModule, dword areaId) |
Member
There was a problem hiding this comment.
This implementation uses custom structs instead of the API, while nwnx_areas has been updated to use the new API, and also it's mostly for debug purposes.
I think it should go into nwnx_funcs, with the other object dump function.
Contributor
Author
|
Victor Babenko wrote:
***@***.**** requested changes on this pull request.
[snip]
This removes flags that were added recently. Seems like an unintentional
change. Can you revert this?
no problem. the change was intentional, and seemed to resolve the issue, but i'll search for other possible reasons.
|
Contributor
Author
|
Victor Babenko wrote:
CNWSArea inherits from superclasses, so their fields precede CNWSArea
fields and run until 0xd4. This is expected.
yes, i understand that, but there's a major problem with that approach : it makes half the area data unavailable. i.e., there are vital data specific to areas only [and not other objects] which appear even starting from 0x04 -- well before the area object begins. for this reason, trying to get the data from the CNWSArea object got from the game object won't work. is there a different class you'd prefer that i use ?
In plugins/areas/funcs/DumpArea.cpp
[snip]
+#include "../NWNXAreas.h"
+#include "hexdump.h"
+
+void dump_area(struct area_info *ap)
Why is it a separate method from NWNXDumpArea?
i wanted the actual dump routine to be available to other routines that might be written in the future, which could call it with a more-obvious area pointer. since NWNXDumpArea is the neverscript entry point and therefore expects other parameters, it seemed clearer to me to do it this way. if you don't think there'd be any use for such a routine, of course i can put everything in NWNXDumpArea. let me know which you want.
In plugins/areas/funcs/DumpArea.cpp
[snip]
This implementation uses custom structs instead of the API, while
nwnx_areas has been updated to use the new API, and also it's mostly for
debug purposes.
I think it should go into nwnx_funcs, with the other object dump function.
i'd be happy to move the dump routine to nwnx_funcs, but there's just one small hitch : all of the new area routines i wrote depend on the new struct, not just the dump routine. so i'd also have to do one of the following :
- move all of the other new area routines into nwnx_funcs too
- move area_info.h into ~/include/structs and include in all.h.
- delete NWNXDumpArea+dump_area completely. [since, as you surmised, it is mainly for debugging anyway]
which would you prefer ?
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this pull request SUPERSEDES pull request #127. it is functionally identical to #127, but solves the dev conflicts that arose due to my taking so long on this. there should now be no conflicts w/dev work done by other contributors. please DISREGARD pull request #127 and use this one in its place.
sorry about the mix-up !
=== details ===