mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-17 15:33:23 +00:00
7f4cda6622
reported by Crilith. To elaborate a bit, the engine no longer accesses resource data through packed structs. Instead it uses memory streams and the READ/WRITE functions. If data is mainly read, not written, I have replaced the old struct with a new one with a read() function to read the whole thing from memory into the struct's variables, and a write() function to dump the struct's variables to memory. In fact, most of these write() functions remain unused. If data is both read and written, I have replaced the struct with a class with individual get/set functions to replace the old variables. This manipulates memory directly. Since I'm fairly sure that these structs are frequently stored as local variables for a script, all script variables (both local and global) are stored as little-endian and accessed through the READ/WRITE functions, rather than being treated as arrays of 32-bit integers. On a positive note, the functions for doing endian conversion of resources and save games have been removed, and some general cleanups have been made to assist in the rewrite. Initial reports indicate that this patch indeed fixes alignment issues, and that I have not - surprisingly - broken the game on big-endian platforms. At least not in any immediately obvious way. And there's still plenty of time to fix regressions before 0.9.0, too. svn-id: r19366
41 lines
1.3 KiB
C++
41 lines
1.3 KiB
C++
/* Copyright (C) 1994-1998 Revolution Software Ltd.
|
|
* Copyright (C) 2003-2005 The ScummVM project
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* $Header$
|
|
*/
|
|
|
|
#ifndef _ICONS
|
|
#define _ICONS
|
|
|
|
#define MENU_MASTER_OBJECT 44
|
|
#define TOTAL_subjects (375 - 256 + 1) // the speech subject bar
|
|
#define TOTAL_engine_pockets (15 + 10) // +10 for overflow
|
|
|
|
namespace Sword2 {
|
|
|
|
// define these in a script and then register them with the system
|
|
|
|
struct MenuObject {
|
|
int32 icon_resource; // icon graphic graphic
|
|
int32 luggage_resource; // luggage icon resource (for attaching to
|
|
// mouse pointer)
|
|
};
|
|
|
|
} // End of namespace Sword2
|
|
|
|
#endif
|