minor error reporting / wording changes while cruising through.
This was SVN commit r2691.
This commit is contained in:
parent
494d27bdd4
commit
3c9ad073bc
@ -682,7 +682,7 @@ int sys_cursor_free(void* cursor)
|
|||||||
typedef int(*_PIFV)(void);
|
typedef int(*_PIFV)(void);
|
||||||
|
|
||||||
// pointers to start and end of function tables.
|
// pointers to start and end of function tables.
|
||||||
// note: COFF throws out empty segments, so we have to put in one value
|
// note: COFF tosses out empty segments, so we have to put in one value
|
||||||
// (zero, because call_func_tbl has to ignore NULL entries anyway).
|
// (zero, because call_func_tbl has to ignore NULL entries anyway).
|
||||||
#pragma data_seg(WIN_CALLBACK_PRE_LIBC(a))
|
#pragma data_seg(WIN_CALLBACK_PRE_LIBC(a))
|
||||||
_PIFV pre_libc_begin[] = { 0 };
|
_PIFV pre_libc_begin[] = { 0 };
|
||||||
|
@ -445,15 +445,13 @@ static void InitVfs(const char* argv0)
|
|||||||
// allowed to overwrite critical game (or worse, OS) files.
|
// allowed to overwrite critical game (or worse, OS) files.
|
||||||
// the VFS prevents any accesses to files above this directory.
|
// the VFS prevents any accesses to files above this directory.
|
||||||
int err = file_rel_chdir(argv0, "../data");
|
int err = file_rel_chdir(argv0, "../data");
|
||||||
if(err < 0)
|
WARN_ERR(err);
|
||||||
throw err;
|
|
||||||
|
vfs_init();
|
||||||
|
vfs_mount("", "mods/official", VFS_MOUNT_RECURSIVE|VFS_MOUNT_ARCHIVES|VFS_MOUNT_WATCH);
|
||||||
|
vfs_mount("screenshots/", "screenshots");
|
||||||
|
vfs_mount("profiles/", "profiles", VFS_MOUNT_RECURSIVE);
|
||||||
|
|
||||||
{
|
|
||||||
vfs_init();
|
|
||||||
vfs_mount("", "mods/official", VFS_MOUNT_RECURSIVE|VFS_MOUNT_ARCHIVES|VFS_MOUNT_WATCH);
|
|
||||||
vfs_mount("screenshots/", "screenshots");
|
|
||||||
vfs_mount("profiles/", "profiles", VFS_MOUNT_RECURSIVE);
|
|
||||||
}
|
|
||||||
extern void vfs_dump_stats();
|
extern void vfs_dump_stats();
|
||||||
vfs_dump_stats();
|
vfs_dump_stats();
|
||||||
// don't try vfs_display yet: SDL_Init hasn't yet redirected stdout
|
// don't try vfs_display yet: SDL_Init hasn't yet redirected stdout
|
||||||
|
@ -26,8 +26,7 @@ void CPlayList::load(const char* file)
|
|||||||
void* p;
|
void* p;
|
||||||
size_t size;
|
size_t size;
|
||||||
Handle hm = vfs_load(file, p, size);
|
Handle hm = vfs_load(file, p, size);
|
||||||
if(hm <= 0)
|
WARN_ERR_RETURN(hm);
|
||||||
throw "CPlaylist::Load failed";
|
|
||||||
|
|
||||||
const char* playlist = (const char*)p;
|
const char* playlist = (const char*)p;
|
||||||
const char* track;
|
const char* track;
|
||||||
|
@ -24,9 +24,8 @@ JSI_Sound::JSI_Sound( const CStr& Filename )
|
|||||||
// open failed. raising an exception is the only way to report errors,
|
// open failed. raising an exception is the only way to report errors,
|
||||||
// since we're in the ctor and don't want to move the open call elsewhere
|
// since we're in the ctor and don't want to move the open call elsewhere
|
||||||
// (by requiring an explicit open() call).
|
// (by requiring an explicit open() call).
|
||||||
// will be caught by JSI_Sound::Construct.
|
|
||||||
if(m_Handle <= 0)
|
if(m_Handle <= 0)
|
||||||
throw (int)m_Handle;
|
throw (int)m_Handle; // caught by JSI_Sound::Construct.
|
||||||
|
|
||||||
snd_set_pos( m_Handle, 0,0,0, true);
|
snd_set_pos( m_Handle, 0,0,0, true);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user