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
Closed
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -48,6 +48,7 @@ namespace Griffon {

void GriffonEngine::title(int mode) {
float xofs = 0;
_itemyloc = 0;
bool exitTitle = false;

rcSrc.left = 0;
@@ -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

game_fillrect(_videoBuffer2, 0, 0, 320, 240, 0);

for (int i = 0; i < kMaxFloat; i++) {
@@ -54,6 +54,7 @@ void Player::reset() {
hp = 0;
maxHp = 0;
hpflash = 0;
hpflashb = 0;
level = 0;
maxLevel = 0;
sword = 0;
@@ -65,6 +66,7 @@ void Player::reset() {
inventory[i] = 0;
}
attackStrength = 0;
itemselshade = 0;
spellDamage = 0;
swordDamage = 0;
exp = 0;
@@ -618,6 +618,11 @@ void GriffonEngine::checkTrigger() {

_canUseKey = false;

for (int i = 0; i < kMaxFloat; i++) {
_floatText[i].framesLeft = 0;
_floatIcon[i].framesLeft = 0;
}

if (_triggerLoc[lx][ly] > -1)
processTrigger(_triggerLoc[lx][ly]);
}
@@ -192,6 +192,12 @@ void GriffonEngine::loadMap(int mapnum) {
_spellInfo[i].frame = 0;

_roomLock = false;
_saidLocked = false;
_saidJammed = false;
_itemSelOn = false;
_selEnemyOn = false;
_curItem = 0;
_player.itemselshade = 0;

char name[256];
// read *.map file
@@ -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


_npcInfo[i].floating = RND() * 16;
}
@@ -749,43 +749,30 @@ void TransparentSurface::setAlphaMode(AlphaType mode) {


/*
The below two functions are adapted from SDL_rotozoom.c,
taken from SDL_gfx-2.0.18.
Its copyright notice:
=============================================================================
SDL_rotozoom.c: rotozoomer, zoomer and shrinker for 32bit or 8bit surfaces
Copyright (C) 2001-2012 Andreas Schiffler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
Andreas Schiffler -- aschiffler at ferzkopp dot net
=============================================================================
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



ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.