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

GRIFFON ENGINE: Fix final boss is sluggish #1997

Closed
wants to merge 2 commits into from

Conversation

@harshbawari
Copy link
Contributor

harshbawari commented Jan 11, 2020

This PR fixes the Final Boss is Sluggish issue.

Game can now be completed by killing the final boss.

@bluegr

This comment has been minimized.

Copy link
Member

bluegr commented Jan 11, 2020

The commits should be like:
GRIFFON: Blah blah

Please, fix them. Also, part of this has already been submitted in your previous pull request

The functions have been adapted for different structures and coordinate
systems.
*/

This comment has been minimized.

Copy link
@bluegr

bluegr Jan 12, 2020

Member

These whitespace changes should not be submitted

@@ -183,6 +183,8 @@ void GriffonEngine::drawHud() {
//sprintf(line, "_fps: %i, map: %i, exp: %i/%i", (int)_fps, _curmap, _player.exp, _player.nextlevel);
//drawString(_videobuffer, line, 0, 0, 0);

_itemyloc = 0;

This comment has been minimized.

Copy link
@bluegr

bluegr Jan 12, 2020

Member

This change is new compared to the ones done in pull request #1996

@@ -625,6 +631,8 @@ void GriffonEngine::loadMap(int mapnum) {
_npcInfo[i].spellDamage = 60;

_npcInfo[i].walkspd = 1;
_npcInfo[i].frame2 = 0;
_npcInfo[i].attackattempt = 0;

This comment has been minimized.

Copy link
@bluegr

bluegr Jan 12, 2020

Member

This change is new compared to the ones done in pull request #1996

@harshbawari harshbawari force-pushed the harshbawari:final-boss-sluggish branch from 5350b48 to b7a22d7 Jan 12, 2020
@harshbawari

This comment has been minimized.

Copy link
Contributor Author

harshbawari commented Jan 12, 2020

Added GRIFFON ENGINE to commit message

@sev-

This comment has been minimized.

Copy link
Member

sev- commented Jan 12, 2020

@harshbawari please follow what @bluegr mention and fix the commit log messages.

You may read about our commit guidelines on our Wiki on the Developer Central page.

@sev-

This comment has been minimized.

Copy link
Member

sev- commented Jan 12, 2020

Also, please rebase you tree to avoid the duplicates.

@harshbawari harshbawari force-pushed the harshbawari:final-boss-sluggish branch 2 times, most recently from b7a22d7 to 40c7c3f Jan 15, 2020
@harshbawari harshbawari force-pushed the harshbawari:final-boss-sluggish branch from 40c7c3f to 75360a6 Jan 15, 2020
@sev-

This comment has been minimized.

Copy link
Member

sev- commented Jan 16, 2020

Thanks for fixing the commit log messages. What about other things which we discussed: rebase it to the current master and remove incorrect changes outside of griffon engine?

@harshbawari

This comment has been minimized.

Copy link
Contributor Author

harshbawari commented Jan 16, 2020

I did rebase it. For those whitespaces, I saw bluegr reverted that merge.

@sev-

This comment has been minimized.

Copy link
Member

sev- commented Jan 16, 2020

If you rebased it, then why it is based on the code 7 days ago? Look here: https://github.com/harshbawari/scummvm/commits/final-boss-sluggish

@sev-

This comment has been minimized.

Copy link
Member

sev- commented Jan 16, 2020

Also, although with these changes actor started to move, still it does not move smoothly as on the previous screen. As such, the commits do not really fix the issue fully.

@sev-

This comment has been minimized.

Copy link
Member

sev- commented Jan 16, 2020

I did rebase it. For those whitespaces, I saw bluegr reverted that merge.

Yes, but you are reintroducing this change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.