-
Couldn't load subscription status.
- Fork 269
Follow up to #701 #711
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
base: main
Are you sure you want to change the base?
Follow up to #701 #711
Conversation
|
This conflicts with #701 that takes a different approach. Yours will load the mission every time you select "New game", mine will load the level automatically once the pilot is selected, but only the first time. My use case for |
|
Oh, I didn't aware that there already #701 in PRs. Still, second commit still maybe useful. |
|
haha I thought you just didn't like the way I did it. Let's keep the 2nd commit |
Simplify code, minor cleanup.
7eb9b88 to
e914469
Compare
|
Reworked PR after #701 merged. |
|
|
||
| InitPlayerNewShip(Player_num, INVRESET_ALL); | ||
| InitCameraViews(1); // Turn off all camera views, including rear views | ||
| InitCameraViews(true); // Turn off all camera views, including rear views |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are other instances left using an int argument out there in gamesequence.cpp if you mind fixing as well
| FirstGame = false; | ||
| #ifdef OEM | ||
| if (LoadMission(OEM_MISSION_FILE)) | ||
| mission_name = OEM_MISSION_FILE; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't find the d3oem.mn3 anywhere, we could even delete the #ifdef OEM I think (and even DEMO?)
Pull Request Type
Description
Current
-missioncmdline arg handling is broken. Intended use is direct load specified mission, but currently it fails with Int3().Now Descent3 loads specified mission after selecting pilot and pressing "New game" in main menu.
Simplified code around direct loading missions.
Related Issues
Screenshots (if applicable)
Checklist
Additional Comments