Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Order functions up to the end of GasStation, match GasStation::ReadyWorld #1311

Merged
merged 3 commits into from
Jan 5, 2025

Conversation

foxtacles
Copy link
Member

@foxtacles foxtacles commented Jan 5, 2025

Everything lines up in GasStation - we do have a constant diff of 16 bytes, but this discrepancy is because of a function that doesn't match in the preceding compilation unit, Helicopter.

GasStation::ReadyWorld matches 100% now.

0001:000036a0   0001:000036b0         16  fun  198     GasStation::GasStation
0001:00003770   0001:00003780         16  fun  3       GasStation::VTable0x5c
0001:00003780   0001:00003790         16  fun  6       GasStation::ClassName
0001:00003790   0001:000037a0         16  fun  266     GasStation::IsA
0001:000038a0   0001:000038b0         16  fun  30      GasStation::`scalar deleting destructor'
0001:000038c0   0001:000038d0         16  fun  205     GasStation::~GasStation
0001:00003990   0001:000039a0         16  fun  198     GasStation::Create
0001:00003a60   0001:00003a70         16  fun  203     GasStation::Notify
0001:00003b30   0001:00003b40         16  fun  2552    GasStation::ReadyWorld
0001:00004530   0001:00004540         16  fun  88      MxDSObject::SetAtomId
0001:00004590   0001:000045a0         16  fun  198     GasStation::PlayAction
0001:00004660   0001:00004670         16  fun  702     GasStation::HandleEndAction
0001:00004920   0001:00004930         16  fun  50      GasStation::HandleKeyPress
0001:00004960   0001:00004970         16  fun  437     GasStation::HandleButtonDown
0001:00004b20   0001:00004b30         16  fun  288     GasStation::HandleControl
0001:00004c40   0001:00004c50         16  fun  77      GasStation::Enable
0001:00004c90   0001:00004ca0         16  fun  479     GasStation::Tickle
0001:00004e70   0001:00004e80         16  fun  52      GasStation::Escape
0001:00004eb0   0001:00004ec0         16  fun  144     GasStationState::GasStationState
0001:00004f40   0001:00004f50         16  fun  79      LegoState::~LegoState
0001:00004f90   0001:00004fa0         16  fun  3       LegoState::IsSerializable
0001:00004fa0   0001:00004fb0         16  fun  3       LegoState::Reset
0001:00004fb0   0001:00004fc0         16  fun  126     LegoState::Serialize
0001:00005030   0001:00005040         16  fun  145     LegoFile::WriteString
0001:000050d0   0001:000050e0         16  fun  6       LegoState::ClassName
0001:000050e0   0001:000050f0         16  fun  114     LegoState::IsA
0001:00005160   0001:00005170         16  fun  103     LegoState::`scalar deleting destructor'
0001:000051d0   0001:000051e0         16  fun  6       GasStationState::ClassName
0001:000051e0   0001:000051f0         16  fun  162     GasStationState::IsA
0001:00005290   0001:000052a0         16  fun  97      GasStationState::`scalar deleting destructor'
0001:00005300   0001:00005310         16  fun  290     GasStationState::Serialize
0001:00005430   0001:00005440         16  fun  33      GasStationState::PlayAction
0001:00005460   0001:00005470         16  fun  39      GasStationState::StopAction
0001:00005490   0001:000054a0         16  fun  63      GasStationState::StopActions

@foxtacles foxtacles merged commit 72aa7e3 into isledecomp:master Jan 5, 2025
12 checks passed
@foxtacles foxtacles deleted the gasstation-order branch January 5, 2025 17:40
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.

1 participant