thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Removed most uses of the 'inline' keyword. It is usually better to let the compiler figure out what to inline. As it is, most of these looked as if they were randomly placed ;)

Browse source 
svn-id: r39352
This commit is contained in:
Max Horn 2009-03-12 03:26:47 +00:00
parent 40b313c28e
commit 642bad22d8
22 changed files with 84 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/sci/engine/seg_manager.cpp
View file

@ -54,7 +54,7 @@ namespace Sci {
#define INVALID_SCRIPT_ID -1
inline int SegManager::findFreeId(int *id) {
int SegManager::findFreeId(int *id) {
bool was_added = false;
int retval = 0;
@ -719,7 +719,7 @@ static void SegManager::sm_set_variables(reg_t reg, int obj_index, reg_t variabl
}
#endif
inline int SegManager::relocateBlock(reg_t *block, int block_location, int block_items, SegmentId segment, int location) {
int SegManager::relocateBlock(reg_t *block, int block_location, int block_items, SegmentId segment, int location) {
int rel = location - block_location;
int index;
@ -742,14 +742,14 @@ inline int SegManager::relocateBlock(reg_t *block, int block_location, int block
return 1;
}
inline int SegManager::relocateLocal(Script *scr, SegmentId segment, int location) {
int SegManager::relocateLocal(Script *scr, SegmentId segment, int location) {
if (scr->locals_block)
return relocateBlock(scr->locals_block->locals, scr->locals_offset, scr->locals_block->nr, segment, location);
else
return 0; // No hands, no cookies
}
inline int SegManager::relocateObject(Object *obj, SegmentId segment, int location) {
int SegManager::relocateObject(Object *obj, SegmentId segment, int location) {
return relocateBlock(obj->variables, obj->pos.offset, obj->variables_nr, segment, location);
}
@ -1186,7 +1186,7 @@ void SegManager::scriptFreeUnusedObjects(SegmentId seg) {
}
/*
static inline char *SegManager::dynprintf(char *msg, ...) {
static char *SegManager::dynprintf(char *msg, ...) {
va_list argp;
char *buf = (char *)sci_malloc(strlen(msg) + 100);