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

STARTREK: New engine (WIP) #1263

Merged
merged 198 commits into from Aug 9, 2018

Conversation

Projects
None yet
5 participants
@Drenn1
Contributor

Drenn1 commented Jul 28, 2018

This adds support for Star Trek: 25th anniversary (only DOS version has been tested so far).

The first 6 of 7 away missions are playable. The sections on the enterprise with pseudo-3d ship combat are not yet implemented, so it currently jumps directly from one away mission to the next. Players will be missing some pre-mission context until this is implemented.

clone2727 and others added some commits Feb 20, 2011

STARTREK: Fixes to file loading.
The "numbered" files that I implemented can also use letters as the last
character.
STARTREK: Begin implementation of showText.
Also started using SharedPtrs.
STARTREK: Implement drawAllSprites properly.
Still need to do the part which calculates sprite priorities.
STARTREK: Begin implementing event system.
Textbox now responds to mouse input.
STARTREK: Implement sound effects in the midis
Removed amiga and mac sound code for now since I can't test it.
STARTREK: Objects and animations.
Testing them with the transporter room.
}
FileStream::~FileStream() {
free(_data);

This comment has been minimized.

@sev-

sev- Aug 3, 2018

Member

Instead of doing this, I suggest to extend MemoryReadStreamEndian class constructor with the optional "disposeMemory" flag, just as the MemoryReadStream does, pass it to MemoryReadStream, and kill this FileStream class altogether.

This comment has been minimized.

@Drenn1

Drenn1 Aug 3, 2018

Contributor

I can do that, but as I'm still using the "_data" field, I'd prefer to still keep this class unless you feel strongly about it.

{
"st25",
"Floppy",
AD_ENTRY1("data.000", "f0918b6d096455ce2ae6dd5ef973292e"),

This comment has been minimized.

@sev-

sev- Aug 3, 2018

Member

Please, comment these out, so we could collect the filesizes. Users will be able to report them.

@sev-

This comment has been minimized.

Member

sev- commented Aug 3, 2018

Only couple things left to do: detection entries and that FileStream class, and I will merge the engine in.

@sev- sev- merged commit 5f1f19b into scummvm:master Aug 9, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@sev-

This comment has been minimized.

Member

sev- commented Aug 9, 2018

Merging. Please, continue your work in-tree

@sev-

This comment has been minimized.

Member

sev- commented Aug 9, 2018

buildbot is not happy for many ports. Please, take care of it ASAP. I made sure it compiles on macOS, but there are tons of warnings, all of those must be addressed. See the buildbot logs:

http://buildbot.scummvm.org/grid?category=changes;category=master

@Strangerke

This comment has been minimized.

Member

Strangerke commented Aug 9, 2018

I'll give a hand this evening, but I can't help while I'm at work.

@Drenn1

This comment has been minimized.

Contributor

Drenn1 commented Aug 9, 2018

Thanks for merging. I'll try to get it fixed, but I don't have push access yet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment