ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

WINTERMUTE: Transfer Rect32s explicitly when saving/loading.

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen
2013-10-29 02:59:52 +01:00
parent dc4e3150f3
commit 95d2ed1a9b
12 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/wintermute/ad/ad_inventory_box.cpp
+1 -1
View File
@@ -374,7 +374,7 @@ bool AdInventoryBox::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferPtr(TMEMBER_PTR(_closeButton));
persistMgr->transferBool(TMEMBER(_hideSelected));
persistMgr->transfer(TMEMBER(_itemHeight));
persistMgr->transfer(TMEMBER(_itemsArea));
persistMgr->transferRect32(TMEMBER(_itemsArea));
persistMgr->transfer(TMEMBER(_itemWidth));
persistMgr->transfer(TMEMBER(_scrollBy));
persistMgr->transfer(TMEMBER(_scrollOffset));
engines/wintermute/ad/ad_response_box.cpp
+1 -1
View File
@@ -587,7 +587,7 @@ bool AdResponseBox::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_lastResponseText));
persistMgr->transfer(TMEMBER(_lastResponseTextOrig));
_respButtons.persist(persistMgr);
persistMgr->transfer(TMEMBER(_responseArea));
persistMgr->transferRect32(TMEMBER(_responseArea));
_responses.persist(persistMgr);
persistMgr->transfer(TMEMBER(_scrollOffset));
persistMgr->transferPtr(TMEMBER_PTR(_shieldWindow));
engines/wintermute/base/base_game.cpp
+1 -1
View File
@@ -3099,7 +3099,7 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_soundBufferSizeSec));
persistMgr->transferBool(TMEMBER(_suspendedRendering));
persistMgr->transfer(TMEMBER(_mouseLockRect));
persistMgr->transferRect32(TMEMBER(_mouseLockRect));
_windows.persist(persistMgr);
engines/wintermute/base/base_object.cpp
+1 -1
View File
@@ -975,7 +975,7 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_sFXStart));
persistMgr->transfer(TMEMBER(_sFXVolume));
persistMgr->transferBool(TMEMBER(_ready));
persistMgr->transfer(TMEMBER(_rect));
persistMgr->transferRect32(TMEMBER(_rect));
persistMgr->transferBool(TMEMBER(_rectSet));
persistMgr->transferBool(TMEMBER(_registrable));
persistMgr->transferBool(TMEMBER(_shadowable));
engines/wintermute/base/base_persistence_manager.cpp
+1 -1
View File
@@ -788,7 +788,7 @@ bool BasePersistenceManager::transferByte(const char *name, byte *val) {
//////////////////////////////////////////////////////////////////////////
// RECT
bool BasePersistenceManager::transfer(const char *name, Rect32 *val) {
bool BasePersistenceManager::transferRect32(const char *name, Rect32 *val) {
if (_saving) {
_saveStream->writeSint32LE(val->left);
_saveStream->writeSint32LE(val->top);
engines/wintermute/base/base_persistence_manager.h
+1 -1
View File
@@ -80,7 +80,7 @@ public:
bool transfer(const char *name, double *val);
bool transferBool(const char *name, bool *val);
bool transferByte(const char *name, byte *val);
bool transfer(const char *name, Rect32 *val);
bool transferRect32(const char *name, Rect32 *val);
bool transfer(const char *name, Point32 *val);
bool transfer(const char *name, const char **val);
bool transfer(const char *name, char **val);
engines/wintermute/base/base_sub_frame.cpp
+1 -1
View File
@@ -393,7 +393,7 @@ bool BaseSubFrame::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferBool(TMEMBER(_editorSelected));
persistMgr->transfer(TMEMBER(_hotspotX));
persistMgr->transfer(TMEMBER(_hotspotY));
persistMgr->transfer(TMEMBER(_rect));
persistMgr->transferRect32(TMEMBER(_rect));
persistMgr->transferBool(TMEMBER(_wantsDefaultRect));
persistMgr->transfer(TMEMBER(_surfaceFilename));
engines/wintermute/base/base_viewport.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ bool BaseViewport::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferPtr(TMEMBER_PTR(_mainObject));
persistMgr->transfer(TMEMBER(_offsetX));
persistMgr->transfer(TMEMBER(_offsetY));
persistMgr->transfer(TMEMBER(_rect));
persistMgr->transferRect32(TMEMBER(_rect));
return STATUS_OK;
}
engines/wintermute/base/particles/part_emitter.cpp
+1 -1
View File
@@ -1183,7 +1183,7 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferBool(TMEMBER(_running));
persistMgr->transfer(TMEMBER(_overheadTime));
persistMgr->transfer(TMEMBER(_border));
persistMgr->transferRect32(TMEMBER(_border));
persistMgr->transfer(TMEMBER(_borderThicknessLeft));
persistMgr->transfer(TMEMBER(_borderThicknessRight));
persistMgr->transfer(TMEMBER(_borderThicknessTop));
engines/wintermute/base/particles/part_particle.cpp
+1 -1
View File
@@ -232,7 +232,7 @@ bool PartParticle::fadeOut(uint32 currentTime, int fadeTime) {
bool PartParticle::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_alpha1));
persistMgr->transfer(TMEMBER(_alpha2));
persistMgr->transfer(TMEMBER(_border));
persistMgr->transferRect32(TMEMBER(_border));
persistMgr->transferVector2(TMEMBER(_pos));
persistMgr->transferFloat(TMEMBER(_posZ));
persistMgr->transferVector2(TMEMBER(_velocity));
engines/wintermute/ui/ui_tiled_image.cpp
+9 -9
View File
@@ -369,16 +369,16 @@ void UITiledImage::correctSize(int32 *width, int32 *height) {
bool UITiledImage::persist(BasePersistenceManager *persistMgr) {
BaseObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_downLeft));
persistMgr->transfer(TMEMBER(_downMiddle));
persistMgr->transfer(TMEMBER(_downRight));
persistMgr->transferRect32(TMEMBER(_downLeft));
persistMgr->transferRect32(TMEMBER(_downMiddle));
persistMgr->transferRect32(TMEMBER(_downRight));
persistMgr->transferPtr(TMEMBER_PTR(_image));
persistMgr->transfer(TMEMBER(_middleLeft));
persistMgr->transfer(TMEMBER(_middleMiddle));
persistMgr->transfer(TMEMBER(_middleRight));
persistMgr->transfer(TMEMBER(_upLeft));
persistMgr->transfer(TMEMBER(_upMiddle));
persistMgr->transfer(TMEMBER(_upRight));
persistMgr->transferRect32(TMEMBER(_middleLeft));
persistMgr->transferRect32(TMEMBER(_middleMiddle));
persistMgr->transferRect32(TMEMBER(_middleRight));
persistMgr->transferRect32(TMEMBER(_upLeft));
persistMgr->transferRect32(TMEMBER(_upMiddle));
persistMgr->transferRect32(TMEMBER(_upRight));
return STATUS_OK;
}
engines/wintermute/ui/ui_window.cpp
+2 -2
View File
@@ -1261,7 +1261,7 @@ bool UIWindow::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferBool(TMEMBER(_clipContents));
persistMgr->transfer(TMEMBER(_dragFrom));
persistMgr->transferBool(TMEMBER(_dragging));
persistMgr->transfer(TMEMBER(_dragRect));
persistMgr->transferRect32(TMEMBER(_dragRect));
persistMgr->transferBool(TMEMBER(_fadeBackground));
persistMgr->transfer(TMEMBER(_fadeColor));
persistMgr->transferPtr(TMEMBER_PTR(_fontInactive));
@@ -1272,7 +1272,7 @@ bool UIWindow::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferPtr(TMEMBER_PTR(_shieldButton));
persistMgr->transferPtr(TMEMBER_PTR(_shieldWindow));
persistMgr->transfer(TMEMBER_INT(_titleAlign));
persistMgr->transfer(TMEMBER(_titleRect));
persistMgr->transferRect32(TMEMBER(_titleRect));
persistMgr->transferBool(TMEMBER(_transparent));
persistMgr->transferPtr(TMEMBER_PTR(_viewport));
persistMgr->transferBool(TMEMBER(_pauseMusic));