libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-05 17:20:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRIM: Save duration of text objects.

Browse Source
This commit is contained in:
Giulio Camuffo 2011-05-23 16:28:05 +02:00
parent 1bbe821624
commit 698ca807d4
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/grim/grim.cpp
View File

@ -1234,6 +1234,7 @@ void GrimEngine::restoreTextObjects(SaveGame *state) {
_sayLineDefaults.setWidth(state->readLESint32());
_sayLineDefaults.setX(state->readLESint32());
_sayLineDefaults.setY(state->readLESint32());
_sayLineDefaults.setDuration(state->readLESint32());
killTextObjects();
@ -1503,6 +1504,7 @@ void GrimEngine::saveTextObjects(SaveGame *state) {
state->writeLESint32(_sayLineDefaults.getWidth());
state->writeLESint32(_sayLineDefaults.getX());
state->writeLESint32(_sayLineDefaults.getY());
state->writeLESint32(_sayLineDefaults.getDuration());
state->writeLESint32(_textObjects.size());
for (TextListType::iterator i = _textObjects.begin(); i != _textObjects.end(); ++i) {

32
engines/grim/textobject.cpp
View File

@ -27,8 +27,6 @@
#include "engines/grim/colormap.h"
#include "engines/grim/font.h"
#include "common/system.h"
namespace Grim {
Common::String parseMsgText(const char *msg, char *msgId);
@ -77,11 +75,13 @@ void TextObject::saveState(SaveGame *state) const {
state->writeLESint32(_height);
state->writeLESint32(_justify);
state->writeLESint32(_numberLines);
state->writeLESint32(_duration);
state->writeLESint32(_disabled);
state->writeLESint32(_blastDraw);
state->writeLESint32(_isSpeech);
state->writeLESint32(_created);
state->writeLESint32(_elapsedTime);
state->writeLEUint32(_font->getId());
@ -93,17 +93,19 @@ bool TextObject::restoreState(SaveGame *state) {
_fgColor = g_grim->getColor(state->readLEUint32());
_x = state->readLESint32();
_y = state->readLESint32();
_width = state->readLESint32();
_height = state->readLESint32();
_justify = state->readLESint32();
_numberLines = state->readLESint32();
_x = state->readLESint32();
_y = state->readLESint32();
_width = state->readLESint32();
_height = state->readLESint32();
_justify = state->readLESint32();
_numberLines = state->readLESint32();
_duration = state->readLESint32();
_disabled = state->readLESint32();
_blastDraw = state->readLESint32();
_isSpeech = state->readLESint32();
_created = state->readLESint32();
_disabled = state->readLESint32();
_blastDraw = state->readLESint32();
_isSpeech = state->readLESint32();
_created = state->readLESint32();
_elapsedTime = state->readLESint32();
_font = g_grim->getFont(state->readLEUint32());
@ -303,7 +305,7 @@ void TextObject::createBitmap() {
message.deleteChar(0);
}
_created = true;
_endTime = g_system->getMillis() + _duration;
_elapsedTime = 0;
}
void TextObject::subBaseOffsetY() {
@ -389,8 +391,8 @@ void TextObject::update() {
return;
}
int time = g_system->getMillis();
if (time > _endTime) {
_elapsedTime += g_grim->getFrameTime();
if (_elapsedTime > _duration) {
_disabled = true;
}
}

2
engines/grim/textobject.h
View File

@ -117,7 +117,7 @@ protected:
uint8 *_textBitmap;
int *_bitmapWidthPtr;
GfxBase::TextObjectHandle **_textObjectHandle;
float _endTime;
int _elapsedTime;
friend class GrimEngine;
};