GRIFFON: Fix slugginess in final boss and a crash when loading the Griffon.s03 map
This commit is contained in:
parent
a692905eb2
commit
6bf14cf547
5 changed files with 14 additions and 13 deletions
|
@ -48,6 +48,7 @@ namespace Griffon {
|
|||
|
||||
void GriffonEngine::title(int mode) {
|
||||
float xofs = 0;
|
||||
_itemyloc = 0;
|
||||
bool exitTitle = false;
|
||||
|
||||
rcSrc.left = 0;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue