Skip to content

Remove use of Container.cpp#236

Merged
Asdow merged 6 commits into
masterfrom
container
Oct 10, 2023
Merged

Remove use of Container.cpp#236
Asdow merged 6 commits into
masterfrom
container

Conversation

@Asdow
Copy link
Copy Markdown
Contributor

@Asdow Asdow commented Oct 8, 2023

Inspired by this comment at the top of the file

// 1998 KM Detached all references to this file from JA2 as it caused a lot of hard to debug crashes
//The VOBJECT/VSURFACE lists are now self-maintained and no longer use the
//this crap. DON'T USE THIS -- NO MATTER WHAT!!!

I'm removing all references to these old custom containers from the code. Contrary to the comment, they actually were still in use for example for VSURFACE.

implemented in container.cpp
@Asdow
Copy link
Copy Markdown
Contributor Author

Asdow commented Oct 8, 2023

As of now, the only reference left is to HCONTAINER in FileMan.cpp -> GetFilesInDirectory() but that function is not used in the code. It's probably related to alternate code paths if VFS is not used. Might make sense to only remove it, and ultimately container.h & .cpp after we nuke all the #ifdefs related to VFS.

@Asdow Asdow requested a review from majcosta October 8, 2023 12:10
Comment thread Standard Gaming Platform/vsurface.cpp Outdated
Comment thread Tactical/Dialogue Control.cpp Outdated
Comment thread Tactical/Dialogue Control.cpp Outdated
Comment thread Tactical/Dialogue Control.cpp Outdated
Comment thread Tactical/Dialogue Control.cpp Outdated
Comment thread Standard Gaming Platform/vsurface.cpp Outdated
Comment thread Standard Gaming Platform/vsurface.cpp Outdated
Comment thread Standard Gaming Platform/vsurface.cpp Outdated
Comment thread Utils/Event Pump.cpp Outdated
Comment thread Utils/Event Pump.cpp Outdated
Comment thread Utils/Event Pump.cpp Outdated
Asdow added 4 commits October 9, 2023 23:01
Replaces the use of old custom list implementation in container.cpp
instead of old custom code from container.cpp

* Removed initialize and shutdown event manager calls from Init.cpp as they were only used to create and destroy the old HLIST globals

* Moved code from Event Manager.cpp to Event Pump.cpp as the event queue system is only used in said file.

* Removed now useless event manager.cpp and .h files
* Dialogue control.cpp
* vsurface.cpp
* Event pump.cpp
@Asdow Asdow marked this pull request as ready for review October 10, 2023 17:12
@Asdow Asdow merged commit 7483829 into master Oct 10, 2023
@Asdow Asdow deleted the container branch October 10, 2023 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants