1
0
forked from 0ad/0ad
Commit Graph

820 Commits

Author SHA1 Message Date
f55107c114 sysdep: inline vsprintf2 definition (no need for printf.h)
win.cpp: remove hWnd (not needed for clipboard code) and TSC reference
(a temporary hack)

This was SVN commit r1840.
2005-01-27 15:50:11 +00:00
09985eaa7e split thread/mutex/sem defs out of wposix to wpthread (reduce default dependencies)
waio: add include guard; include from waio.cpp

This was SVN commit r1839.
2005-01-27 15:46:02 +00:00
f3a61e4f69 wsdl: add prototypes for VC endian swap routines (avoid warning)
endian.*: split out of lib.* to reduce default dependencies
tex,zip: now include endian.h

This was SVN commit r1838.
2005-01-27 15:40:23 +00:00
faff797cd6 include SDL or lib/input.h where needed (since lib.h no longer pulls it in)
input.h now includes SDL (no more macro hackery to avoid the dependency)

This was SVN commit r1837.
2005-01-27 15:31:06 +00:00
f6c95b259d include exception handler code only if EXCEPTION_HACK_0AD is required. (since some PS-specific code leaked into wdbg.cpp, have to disable that until i get around to cleaning it up)
This was SVN commit r1836.
2005-01-27 15:22:47 +00:00
969ed22f97 - provide for 1-byte ints (debug info is weird; dunno why it's stored as such, but they exist)
- if tag != SymTagDataType, don't dump the symbol (to be safe). this is
unexpected, but Philip reports it triggered.
- assert dialog is resizeable (grr, have to do that manually)

This was SVN commit r1828.
2005-01-26 16:25:56 +00:00
bc1c05b7db wrap operator new call site in nommgr.h / mmgr.h
This was SVN commit r1827.
2005-01-26 16:22:08 +00:00
c756aff9c5 wposix: AllocConsole wrapper is now a standard function call (before, a direct jump saved a few bytes but was unsafe - not smart)
This was SVN commit r1825.
2005-01-26 01:06:48 +00:00
3e82535375 wdll: fixed operator_new (discussed at meeting) issue - turns out that was a bad idea. unless mmgr.h is included, operator_new isn't defined, so it's taken to be a function => it was never getting called in wdll
defining operator_new in a global file is a bad idea-  if we forget
that, hard-to-track errors result
so, no more operator new; instead, #include "nommgr.h" before local
operator new definitions and #include "mmgr.h" again afterwards

This was SVN commit r1824.
2005-01-26 01:05:22 +00:00
2d1ba66dc8 mmgr.cpp: uses assert2 when something fails (so you get a pretty stack trace
mmgr.h: remove everything if !defined(USE_MMGR); move dox to end of file
debug.h: fix stupid n00b bug in assert2 (expr wasn't in "()" )

This was SVN commit r1822.
2005-01-26 00:33:45 +00:00
e7dcbfd19e further cleanup; stack trace + dialog part done for now; will clean up exception part later (discussed with philip)
This was SVN commit r1820.
2005-01-25 23:55:49 +00:00
711bff0d3a lib.h: moved assert2 to sysdep/debug.h
mmgr: remove wdbg calls (was prototype); use sysdep/debug interface
wdbg: no longer call it dbghelp63.h; should be installed normally in
compiler dir
win_internal.h: fix inevitable MS screwups in new dbghelp.h (*sigh*)

This was SVN commit r1816.
2005-01-25 18:54:48 +00:00
0d80a05aec wdbg: much improved dbghelp stack dump, thanks to availability of new dox. should succeed with user-defined types - voodoo programming no more. benefits are reaped when using assert2 in code (recommended!) or an exception is raised.
also made "program error" dialog a bit nicer - it's now attached to
desktop and resizeable.

This was SVN commit r1814.
2005-01-25 18:42:42 +00:00
cb74250a51 - moved assert2 to sysdep/debug.h
- sysdep/debug.h includes platform-specific version, so they can define
debug_break
- no longer a debug_break wrapper that calls to specific versions (so
that the debugger breaks in the target function directly)
- unix-specific stuff is only debug ATM; call it udbg instead of unix.*

This was SVN commit r1813.
2005-01-25 18:27:00 +00:00
c73a3fe2c4 platform-specific debug header (included from sysdep/debug) is responsible for defining debug_break, or mapping it to the implementation function (result: if can be defined as a macro (e.g. on win32 or ia32), debugger breaks directly at the target location, instead of one function lower)
This was SVN commit r1812.
2005-01-25 17:58:15 +00:00
36c5db05cd Added includes for non-pch build
This was SVN commit r1807.
2005-01-24 23:08:30 +00:00
13bcff918e Let Testing/Release builds be built
This was SVN commit r1797.
2005-01-23 22:42:37 +00:00
6ca71568f5 vfs, ps/game.cpp: lint
dbghelp_funcs: no longer needed, since we load dbghelp statically

This was SVN commit r1788.
2005-01-23 19:49:45 +00:00
699b38e350 config: remove HAVE_DEBUGALLOC
Xeromyces.cpp,xmlutils,XercesErrorHandler.cpp: use nommgr.h

This was SVN commit r1787.
2005-01-23 18:25:28 +00:00
8c7df579bc precompiled: hook up mmgr (needs to be included in all files)
tex: lint fixes

unifont: split out glvprintf

This was SVN commit r1786.
2005-01-23 18:23:29 +00:00
4d25441c2a split out of wposix (less dependencies)
SDL_*: $id string

This was SVN commit r1785.
2005-01-23 18:21:20 +00:00
cca00f9555 memory tracker work-in-progress. detects memory leaks, overruns, and all sorts of goodies.
This was SVN commit r1784.
2005-01-23 18:19:28 +00:00
e4bcd210d3 win_internal: move VC debug heaps here to avoid conflicts with mmgr
vfs: lint fixes

mem: remove h_add_ref from mem_get_ptr (was a hack, breaks some code)

This was SVN commit r1783.
2005-01-23 18:17:46 +00:00
4facc59833 new init seg
This was SVN commit r1782.
2005-01-23 18:09:55 +00:00
9cadcd875d lint fixes; no longer dynamically load dbghelp (can always distribute required version)
work in progress: cleaning up debug info, add functions for mmgr to
query caller

This was SVN commit r1781.
2005-01-23 18:07:34 +00:00
4e454b31f0 lint fixes; more armor-plating for SDL_SetVideoMode
This was SVN commit r1780.
2005-01-23 18:05:33 +00:00
9e3ae3bdf2 further lint fixes
new init seg, group "C" called before libc init

better critsec impl, doesn't break if called after shutdown

This was SVN commit r1779.
2005-01-23 18:04:34 +00:00
468fb35ab5 waio.h: moved some signal handler defs here from wposix
This was SVN commit r1778.
2005-01-23 18:04:02 +00:00
9b7af0ce08 safer mutex impl; split some parts out into waio (signal defs, only used in aiocb) and wposix_types
This was SVN commit r1777.
2005-01-23 17:57:52 +00:00
bc52269989 lint fixes; changed wtime init order
This was SVN commit r1776.
2005-01-23 17:56:00 +00:00
85fd8a0f0e stomped various lint warnings:
- /* */ -> //
- clarified expressions
- add casts
- func() -> func(void)
- signed/unsigned

also KB -> KiB, MB -> MiB

This was SVN commit r1775.
2005-01-23 17:54:20 +00:00
44ffb32169 fix include path (relative to lib)
This was SVN commit r1774.
2005-01-23 17:50:07 +00:00
e332d876f8 stomped various lint warnings:
- /* */ -> //
- clarified expressions
- add casts
- func() -> func(void)
- signed/unsigned

This was SVN commit r1773.
2005-01-23 17:48:32 +00:00
a43205148b stomped various lint warnings:
- /* */ -> //
- clarified expressions
- add casts
- func() -> func(void)
- signed/unsigned

This was SVN commit r1772.
2005-01-23 17:45:25 +00:00
4360c501d8 mouse_x/y => g_mouse_x/y
This was SVN commit r1771.
2005-01-23 17:42:28 +00:00
bcf89936c1 Fixed a few memory leaks as well as the CPlayer/SColour crash-on-exit bug
This was SVN commit r1756.
2005-01-23 01:36:47 +00:00
2077698156 New JavaScript interface for the network client, plus some linux/gcc/misc fixes
This was SVN commit r1730.
2005-01-17 04:52:02 +00:00
38b30e5eb4 Corrected ICC errors and some warnings. Removed some unnecessarily verbose logging. Did minor things.
This was SVN commit r1718.
2005-01-13 00:17:31 +00:00
16a3ee4a4b Fixed fix, to correct precedence (as warned about by the friendly compiler ;-) )
This was SVN commit r1707.
2005-01-11 16:40:01 +00:00
629e5999e0 vfs: fixed an apparently untested "quick change" to an assert that was triggering. boo!
This was SVN commit r1704.
2005-01-10 22:51:08 +00:00
3ae57e7b0d Inverted my accidental inversion of logic
This was SVN commit r1697.
2005-01-10 21:07:24 +00:00
fba99c3414 vfs: fix mounting archive contents - now relative to mount point as it should.
added flags to vfs_mount that enable looking for archives and mounting
subdirectories (previously always done, but slow)
main: uses above flags when mounting

This was SVN commit r1695.
2005-01-10 18:44:41 +00:00
e632c0ff1d zip: fix overrun when reading uncompressed data: truncate to output buffer size
vfs: fix archive file add routine: wasn't starting at mount point,
didn't handle files in archive root dir correctly

tex: add tex_is_known_fmt

lib: add ERR_TIMED_OUT

This was SVN commit r1693.
2005-01-10 13:42:10 +00:00
56949e6fc4 lib: add big endian readers; add VC intrinsic bswap routines
tex: improve flip / bgr convert (now generalized "transforms"); add
support for transforming image before encoding

wsdl: add SDL_ShowCursor, minimize when tasking out

main: WriteScreenshot improved, fixes flipped screenshots

This was SVN commit r1689.
2005-01-09 14:23:59 +00:00
37d2d83a9d Adjusted things to work with the new top-down orientation
This was SVN commit r1668.
2005-01-07 14:10:14 +00:00
8633123520 default orientation is now top-down to match Photoshop DDS plugin (thanks, Philip!)
This was SVN commit r1667.
2005-01-07 13:48:49 +00:00
974292c5b7 forgot to add yesterday :/
I/O plugin for libjpg that reads from memory

This was SVN commit r1661.
2005-01-07 11:13:20 +00:00
dd3a0dd657 tex:
- complete+document+fix texture orientation code
- add JPG codec
- file extension check bugfix: now case-insensitive
also some general cleanup.

This was SVN commit r1660.
2005-01-07 02:00:14 +00:00
c5de965814 wsdl:
- add SDL_WaitEvent
- fixed evil bug due to incorrect interpretation of
PIXELFORMATDESCRIPTOR.cColorBits (destabilized ATI drivers)
- remove ps/ dependency in "screenshot" key hook
- fix bug in gamma functions
- remove asm trampolines, replace with plain inline calls (efficiency <
safety)
- SDL thread calls implemented in terms of POSIX functions

This was SVN commit r1659.
2005-01-07 01:25:10 +00:00
f503a1f4e7 handle.h: include guard
vfs: path_append and exact-case handling bugfixes

wtime: added FILETIME->time_t conversion; small improvements

This was SVN commit r1658.
2005-01-07 01:16:43 +00:00
e6a12f76e2 aio: check for NULL aiocb* params; made aio_h get/set static; various small improvements
mem: explicit mem_shutdown call - try to avoid exit order problems

unifont: remove logger calls (dependency on ps/)

This was SVN commit r1657.
2005-01-07 01:13:48 +00:00
577c23d936 cursor: remove dependency on CVFSFile (all lib/res files must not depend on ps/, so that they can be reused in other projects)
wposix:
- FILETIME->time_t conversion for *stat
- improve opendir/readdir etc.; add readdir_stat_np
- add pthread_join and pthread_cancel
- add portable sem_* semaphore functions (alternative to SDL semaphores)

file: use readdir_stat_np instead of reading non-portable struct dirent
fields

This was SVN commit r1656.
2005-01-07 01:10:00 +00:00
090ea2301a wdbg: temporarily removed LOCALIZED_TEXT so this works in another project. must find long-term solution: lib/ must not be dependent on ps/!
sysdep.h: add pick_dir
sysdep/win/win.cpp: .. and its win32 implementation

This was SVN commit r1655.
2005-01-07 00:59:52 +00:00
39783e6a17 lib.h: corrected 2 casts:
- problem when using CHECK_ERR with functions returning a Handle
- incorrect sign conversion when passing non-ascii (> 0x80) chars to
FOURCC

precompiled.h: include lib/types.h

This was SVN commit r1654.
2005-01-07 00:55:53 +00:00
2077d4fd1d timer.cpp: start FPS value = 60 => faster convergence
timer.h: TIMER uses debug_out

main/input: moved game_ticks to input.cpp (only used if input.cpp is
included)

This was SVN commit r1653.
2005-01-07 00:52:05 +00:00
f791239396 Fix for strange machine with no audio
This was SVN commit r1611.
2005-01-02 00:05:33 +00:00
fcd1adcea3 Removed my earlier 'fix' (related to a bug when adding new files to a directory that was previously archived) which was completely rubbish, and replaced it with one that is hopefully less stupid (and actually fixes the problem)
This was SVN commit r1605.
2005-01-01 13:43:43 +00:00
f9c51d8ec7 Replaced - with _ in GUI
This was SVN commit r1604.
2005-01-01 12:06:17 +00:00
855e1a7f81 Small ScEd updates
This was SVN commit r1601.
2004-12-30 23:01:09 +00:00
7efc7a7903 Fixed memory leak
This was SVN commit r1598.
2004-12-30 17:27:53 +00:00
ed55ad4d82 Put crashlog into ScEd.
This was SVN commit r1590.
2004-12-28 20:53:54 +00:00
05c4ec0365 Alterations to ScEd, so that it almost works (except for saving/loading maps). Change the bottom of premake.lua if you want to build it.
This was SVN commit r1580.
2004-12-27 23:27:26 +00:00
46f5c61179 Linux/GCC/glibc Compat
This was SVN commit r1532.
2004-12-18 23:30:28 +00:00
bb2de67c31 fixed incorrect handling of extra fields
(zip archives with extended file attributes failed to load)

improved z_extract_cdfh/z_enum_files.

This was SVN commit r1527.
2004-12-18 14:45:04 +00:00
5bb24a387f fix dir_cancel_watch issue: fail silently if watch=0 (happens if directory mounted only from archive, i.e. there's no real directory to watch)
This was SVN commit r1524.
2004-12-18 03:45:12 +00:00
d8ae8a524c Fixed something that looked like a potential bug
This was SVN commit r1515.
2004-12-16 15:15:24 +00:00
851a30215f add h_add_ref; add leak report (currently disabled, since all textures are leaked)
This was SVN commit r1511.
2004-12-16 01:17:50 +00:00
b259381fbf 1) minor error handling improvements (was passing back invalid handle error, instead of the cause; also added a CHECK_ERR)
2) we attempt to load missing files (see bug #32). with the fix above,
CHECK_ERR would fire every run (which it should until the problem is
fixed :P), which is annoying.
Instead, FileUnpacker now checks if the file exists; if not, it throws
immediately and thereby bypasses the VFS error mechanism.

This was SVN commit r1503.
2004-12-15 14:24:12 +00:00
9f6d085732 oops, removed one const too many. fixed.
This was SVN commit r1484.
2004-12-10 00:14:10 +00:00
9d317d8164 1) removed scaffolding from file
2) VFS: add path_copy convenience routine
3) various lib code: removed unnecessary const cluttering things (like
const char* _const_ name in param list)

This was SVN commit r1483.
2004-12-09 23:12:02 +00:00
cc02422908 1) TIMER added to timer.h (moved from main)
2) wposix: cache file status in struct dirent (Win32 specific)
3) vfs: speed up vfs_mount (via 2) and zip_cb path lookup caching
scheme)
4) temp scaffolding added to file.cpp to measure performance

This was SVN commit r1482.
2004-12-09 20:17:09 +00:00
643810a276 cleaned up VFS after yesterday's new code;
explicit shutdown, instead of atexit

This was SVN commit r1472.
2004-12-07 22:10:46 +00:00
0f18178fda fixed sched. priority code: wouldn't work for all values.
This was SVN commit r1468.
2004-12-07 03:01:12 +00:00
e76871e7b0 - heavy changes to VFS tree internals: now allows loose files and archives to coexist, choosing archive if they're the same date+size
- reworked tree_lookup: dir names now require trailing '/' to
disambiguate. exception: vfs_open_dir (convenience)
- display VFS tree in stdout.txt unless g_Quickstart

This was SVN commit r1466.
2004-12-07 01:22:25 +00:00
e15562b7ae 1) file: clean up path conversion call sites (was using private routine)
2) all: change file_enum and cohorts to pass struct stat instead of just
size

3) minor cleanup

This was SVN commit r1465.
2004-12-07 01:19:10 +00:00
1d1a2ce3e4 use VC's stat() for now, even if slower - mtime time conversion is a pain to implement
This was SVN commit r1464.
2004-12-07 01:12:35 +00:00
a2a6f29ab3 s/Prometheus/Pyrogenesis/
This was SVN commit r1459.
2004-12-05 21:56:09 +00:00
936fc885a1 Don't convert paths here since it's already done by the caller (API change)
This was SVN commit r1449.
2004-12-04 20:27:07 +00:00
3fb241054f add master sound disable, triggered if g_Quickstart == true.
(skips OpenAL init => speeds up startup)

This was SVN commit r1437.
2004-12-01 22:19:58 +00:00
f1dac9c626 better error handling: lots of little changes.
added some error codes, tried to eliminate unspecific return -1  where
it made sense.

This was SVN commit r1436.
2004-12-01 21:37:01 +00:00
6c2f455547 added tga and raw encoders (based on common routine extracted from bmp encoder), so I wouldn't have to add NOT_IMPLEMENTED error returns :P
This was SVN commit r1435.
2004-12-01 21:34:49 +00:00
2c0d5c0248 bugfix: needs to use full path conversion routine
This was SVN commit r1434.
2004-12-01 21:34:01 +00:00
c0ef326340 1) file.cpp: add functions for relative path conversion, also better dox
2) ERR_PATH_LENGTH (instead of ERR_VFS_): now used by file.cpp also
3) better document file_enum and FileCB

This was SVN commit r1433.
2004-12-01 18:44:38 +00:00
f04af0077e ignore .svn folders (and their contents) when mounting dirs
This was SVN commit r1432.
2004-12-01 08:16:01 +00:00
4d83cba7e6 add required precompiled header include
This was SVN commit r1431.
2004-12-01 06:52:39 +00:00
2eed8a8b45 even longer SND_CARD_LEN
This was SVN commit r1430.
2004-11-30 23:40:44 +00:00
d9f30a5d42 Faster Ogg reading (~2.5x in extremely unoptimised builds)
This was SVN commit r1408.
2004-11-27 04:14:34 +00:00
fe54b3deeb Fixed minor warnings
This was SVN commit r1406.
2004-11-27 03:22:04 +00:00
c82c7d2e2a Increased SND_CARD_LEN to handle "Realtek AC97 Audio"
This was SVN commit r1405.
2004-11-27 02:57:54 +00:00
Gee
caff02e8da I had to ask some things to make some word-processing easier/faster. Feel free to adjust anything that's crooked.
This was SVN commit r1395.
2004-11-24 23:47:48 +00:00
30ad195c0b Linux/GCC Compat
This was SVN commit r1393.
2004-11-23 23:56:10 +00:00
d9ed18f8ca fixed stupid bug, simplified vfs_next_dirent
This was SVN commit r1389.
2004-11-23 23:51:34 +00:00
313df4064c vfs_next_dirent filter can now match *? wildcards (no longer limited to extensions)
updated dox, and added ERR_VFS_DIR_END code

This was SVN commit r1386.
2004-11-23 21:12:18 +00:00
5857361da2 add ERR_VFS_DIR_END code
This was SVN commit r1384.
2004-11-23 21:08:59 +00:00
9a00cd11d5 add match_wildcard function (for vfs_next_dirent)
This was SVN commit r1383.
2004-11-23 20:52:03 +00:00
03db724b99 better error handling: no assert blowing up in your face if SndData_reload fails (or is made to fail)
This was SVN commit r1382.
2004-11-23 19:08:30 +00:00
4596b7dfc8 sound driver version detect code takes DLL search path into account; hardened
This was SVN commit r1378.
2004-11-22 07:41:02 +00:00
3b5ab280d4 add win_exe_dir (application's start directory)
This was SVN commit r1377.
2004-11-22 07:40:32 +00:00
affc35521f remove dsound.h - fixes compile error on vc6/7 hybrid (probably mismatched DX headers)
This was SVN commit r1376.
2004-11-22 03:03:25 +00:00
b2ba38e7a4 define ZLIB_DLL before zlib.h
This was SVN commit r1374.
2004-11-22 00:17:37 +00:00
af56d5829b improved png write code while searching for cause of bug #24
This was SVN commit r1373.
2004-11-22 00:10:16 +00:00
bfd2a43dfb sound code: now uses DX5 (instead of default of DX8), more error checking vs. bug #33
This was SVN commit r1371.
2004-11-21 08:41:40 +00:00
c6cf8593c9 add windows sound card info query (via directsound; OpenAL is entirely unhelpful)
This was SVN commit r1362.
2004-11-19 22:43:02 +00:00
d489c48652 safer check if TSC is useable (and CPU detect has occurred)
This was SVN commit r1361.
2004-11-19 22:42:20 +00:00
2f9a735232 add win_sys_dir for win-specific code
This was SVN commit r1360.
2004-11-19 22:41:37 +00:00
1ba56151ca explicit string size; remove reference to detect()
This was SVN commit r1359.
2004-11-19 22:41:05 +00:00
d5473db68e warning fix: remove redundant uint >= 0
This was SVN commit r1358.
2004-11-19 22:40:27 +00:00
4a9fc1e1d1 add sound card info; remove central detect() call
This was SVN commit r1357.
2004-11-19 22:40:00 +00:00
e1bb0a3d2e get ride of separate snd_open_def (simplifies JS interface)
filename is assumed to be a definition file if extension == .txt

This was SVN commit r1329.
2004-11-15 18:34:13 +00:00
MarkT
793794649f Combat code, some scripting, broken network, and fixed some bugs.
This was SVN commit r1301.
2004-11-11 07:09:32 +00:00
f66de9d098 log when files are opened (used to arrange files in zip archive)
also added mtime to *_stat calls for XMB (check date instead of
checksum)

This was SVN commit r1288.
2004-11-07 23:00:32 +00:00
3136791492 Linux/GCC Compat(tm)
This was SVN commit r1284.
2004-11-07 21:30:47 +00:00
2cf79ca6cf more dox :]
This was SVN commit r1279.
2004-10-30 15:17:19 +00:00
4e7b6bd165 improved dox a bit; explicit deque_finished_bufs call, instead of changing update behavior via VS_ flags.
This was SVN commit r1278.
2004-10-25 13:07:34 +00:00
06051e3628 cleaned up and documented. ready for use.
This was SVN commit r1275.
2004-10-23 19:55:41 +00:00
96807dd6f3 remove resource.h include - not needed, was actually referring to sced resource.h
This was SVN commit r1273.
2004-10-23 18:41:02 +00:00
MarkT
d33d2e4450 Added some support for user profiles
This was SVN commit r1270.
2004-10-23 14:39:28 +00:00
01456b797c further cleanup + fixed another shutdown order bug via h_force_close
This was SVN commit r1269.
2004-10-22 22:00:57 +00:00
6f114dcd5e h_force_close support for sound shutdown issue
This was SVN commit r1268.
2004-10-22 21:58:03 +00:00
0f93e53e61 \n on debug_out
This was SVN commit r1266.
2004-10-21 15:08:10 +00:00
27d52a8c45 WIP. have added some dox and armor-plated the lower-level components.
fixed shutdown order issue mentioned in task report.

further refactoring expected for vsrc_update et al (messy) and list_*

This was SVN commit r1264.
2004-10-20 23:18:52 +00:00
0540792825 add ERR_AGAIN error
This was SVN commit r1262.
2004-10-20 13:36:49 +00:00
1ef7ce088c add support for forcibly closing cached files (needed when closing all active sounds before resetting openal)
This was SVN commit r1261.
2004-10-20 00:58:55 +00:00
0afc3c159d trivialities: add extern, add assert to make sure oglInit called
This was SVN commit r1260.
2004-10-19 17:49:12 +00:00
8764693bd8 allow 0-length allocs without complaint (required when vfs_loading 0-length files, as happens with current art pack)
This was SVN commit r1258.
2004-10-19 13:29:51 +00:00
3c9823fd31 Don't override the printscreen key when the user's looking at some other program
This was SVN commit r1257.
2004-10-18 22:08:21 +00:00
34b553e2b2 remove ogg_display junk
This was SVN commit r1256.
2004-10-18 14:25:13 +00:00
b5d9f886a4 Don't complain when shutting down without having played a sound
This was SVN commit r1252.
2004-10-17 10:21:06 +00:00
f144aa0686 as per meeting today, disabled use of OpenAL ogg extension; wrote a quick, ugly, no-good hack to decode OGG files 'manually' (using vorbis)
(it doesn't stream, it loads the whole thing into memory - baad)
but the steaming pile seems to work! all is good ;)

This was SVN commit r1250.
2004-10-16 20:54:24 +00:00
d272a7ebb4 remove ofs field for vfs_start_io - never used
This was SVN commit r1249.
2004-10-16 20:52:18 +00:00
cd24c9c6f7 fixes for RES_UNIQUE (used by sound instances) - no longer add such handles to the h_find lookup data struct, because it can't handle several instances backed by the same file
This was SVN commit r1239.
2004-10-15 13:19:37 +00:00
6f2c1fbb8c WIP; still tons of debug code
now theoretically supports 3d positional sound; solidified snd data
provider -> VSource code

This was SVN commit r1238.
2004-10-15 13:18:34 +00:00
Gee
5b74afce82 Added unifont_height...
This was SVN commit r1235.
2004-10-14 10:09:51 +00:00
67d95dd3af add ARRAY_SIZE
This was SVN commit r1214.
2004-10-06 14:11:55 +00:00
4f230f061d less dependencies: handle.h forward-defines Handle, so that not everything that uses res headers is dependent on h_mgr
This was SVN commit r1213.
2004-10-06 14:00:43 +00:00
fecb8e38de buggy, work-in-progress. can now again play sounds. basic culling/prioritization code in place.
This was SVN commit r1210.
2004-10-05 13:11:28 +00:00
7a0cf92c25 add RES_UNIQUE, required for sound code
This was SVN commit r1209.
2004-10-05 13:10:49 +00:00
13dfff0e12 removed unnecessary (unused) calc
This was SVN commit r1208.
2004-10-05 13:07:25 +00:00
10a81394ff removed test rig crap
This was SVN commit r1207.
2004-10-03 23:28:57 +00:00
b6c1ad7126 had a look at CPU freq detect due to win32asm thread.
added comments + slight improvement (get system time first, then rdtsc)
=> good bit more accurate

This was SVN commit r1206.
2004-10-03 13:06:37 +00:00
df1b502bbd Linux Compat and some updated PARANOIA code
This was SVN commit r1189.
2004-09-22 15:20:58 +00:00
c28c5a1beb fix of VC2k5 fix (both pointers to tokenized string are now char*)
This was SVN commit r1186.
2004-09-22 00:46:12 +00:00
a1bd91d198 VC2k5 fix: don't keep converting char* -> const char* -> char*
This was SVN commit r1184.
2004-09-21 22:10:49 +00:00
0868b2ee6c VC2k5 fix: strchr return value saved as const char* (cf Stu's CVS report #161)
This was SVN commit r1183.
2004-09-21 18:43:58 +00:00
ff4af72da1 fix incorrect round up calculation
This was SVN commit r1182.
2004-09-21 16:59:50 +00:00
777f06143d - A lot of small network fixes
- Connecting client(s) to a server and giving orders to a shared set of
entities now works - Yeah!
- Removed thread sync from CNetServer

This was SVN commit r1180.
2004-09-21 14:40:43 +00:00
8b2e918e05 cleanup + bulletproofing
This was SVN commit r1176.
2004-09-21 13:40:14 +00:00
dce92ce677 fix 2 stupid bugs causing crashes when loading from loose files - wasn't detecting all causes where transfers are unaligned => read rounded-up amount of data into original buffer as opposed to realign buffer => clobbered the heap.
This was SVN commit r1175.
2004-09-21 11:58:22 +00:00
7925a3fc4d Avoid crashing when something minor that should never fail fails (though the cause of that failure is fairly major (but currently unknown))
This was SVN commit r1174.
2004-09-20 18:27:22 +00:00
ae2d42bbad fix incorrect buffer free (now handled by ALBuffer); work in progress
This was SVN commit r1172.
2004-09-19 19:29:03 +00:00
85cf439f62 slight changes (memset IOSlot; if(.. < 0) -> CHECK_ERR)
This was SVN commit r1171.
2004-09-19 19:28:00 +00:00
b459e7e640 fixed debug_check_heap definition
This was SVN commit r1170.
2004-09-19 19:27:04 +00:00
a0f0215c15 fixed debug_check_heap definition
This was SVN commit r1167.
2004-09-19 18:45:04 +00:00
c3ed7df432 0 -> FALSE + add/removed debug code
This was SVN commit r1166.
2004-09-19 18:44:21 +00:00
1166c2a22c workaround for stupid "void* -> unsigned cast" warning
This was SVN commit r1165.
2004-09-19 17:27:03 +00:00
cfe4562e6a move low-level sound/music code from musicplayer to res/snd; also put oal.* in there
work in progress.

This was SVN commit r1162.
2004-09-19 15:57:20 +00:00
f6cfcd0555 slight change to interface (FileIO* vs simple void* output value) to simplify Zip interface (needed to change because now it has to store data of its own in IOs when doing partial reads)
This was SVN commit r1161.
2004-09-19 15:51:12 +00:00
5db49638cf worked on partial zip reads. also changed to bring in line with file/vfs for slightly changed streaming interface
This was SVN commit r1160.
2004-09-19 15:49:46 +00:00
d3f452cd80 - add vfs_io_complete (wasn't in header) and vfs_size (convenience function)
- have vfs_load allocate the buffer, so mem_assign is no longer needed.
exposes buffer alignment requirement to VFS, but hey. simplifies things
a good bit.
- moved performance measuring crap to vfs_timed_io, a wrapper function
- various fixes for streaming code

This was SVN commit r1159.
2004-09-19 15:42:32 +00:00
b3a5bad377 fix 2 stupid h_mgr_shutdown bugs leading to failure to close some leaked handles at exit (see bug 26)
- was iterating over all HDATA slots up to last_in_use, but it is
inclusive
- when closing, wasn't resetting refcount, so h_free kept those with
refcount > 1 open

This was SVN commit r1158.
2004-09-19 13:46:38 +00:00
a872461a47 no longer 2 tex_write calls - just one that fills a TexInfo directly => no longer need mem_assign to wrap a pointer, only to dereference immediately thereafter
This was SVN commit r1157.
2004-09-19 13:43:53 +00:00
d46cf9cf1f remove mem_assign and mem_assign_user (all call sites rewritten so that they're no longer needed)
still available in source, but shouldn't be necessary.

This was SVN commit r1156.
2004-09-19 13:41:49 +00:00
e4f160df27 fix headers: ogl_tex.h is user-level texture stuff, tex.h is only the texture loader.
this came up due to header change - some unnecessary stuff isn't
included by default anymore.

This was SVN commit r1155.
2004-09-19 11:57:51 +00:00
02ec0a7e62 add comment: tex_upload binds texture as a side effect
This was SVN commit r1154.
2004-09-19 11:40:42 +00:00
7c269d7735 better encapsulation of header (=> less dependencies)
This was SVN commit r1151.
2004-09-19 11:36:26 +00:00
5a8dd803a7 fix for gcc: philip reports it doesn't have upper_bound (although it's part of STL). replaced with equal_range
This was SVN commit r1150.
2004-09-19 11:23:12 +00:00
2d153bac2d Increased paranoia, in case the i18n system crashes while translating the crash message
This was SVN commit r1139.
2004-09-06 11:39:27 +00:00
Gee
5c2838f7cf Forgot to remove a temp log-output
This was SVN commit r1129.
2004-09-06 03:21:56 +00:00
Gee
6e07632775 Changed a function that the GUI uses to Unicode.
This was SVN commit r1127.
2004-09-06 02:24:34 +00:00
3b15f3f1e4 Text alignment alterations
This was SVN commit r1119.
2004-09-04 20:35:12 +00:00
78934b50c1 split up call to _CrtSetDbgFlag
This was SVN commit r1112.
2004-09-03 20:21:09 +00:00
f57e5ab737 Localised crash message (try ":loadLanguage("pseudogreek"), crash()" in the console in a non-Debug build)
This was SVN commit r1105.
2004-09-02 19:24:29 +00:00
72e730be3a minor improvements / commenting
This was SVN commit r1098.
2004-09-02 02:47:11 +00:00
71b62dc484 more explanation of auto-init system
This was SVN commit r1097.
2004-09-02 02:46:50 +00:00
f05afa04a2 fix incorrect Tex_reload state handling (caused actual reloads to fail, i.e. display white texture)
This was SVN commit r1079.
2004-08-28 17:44:28 +00:00
b7ceaa0652 fix init segment names (must not be A or Z); see meeting log, 2004-08-28
This was SVN commit r1078.
2004-08-28 17:34:06 +00:00
c630437a9e Removed -- it was no longer used (replaced by unifont.(cpp|h)) and causing conflicts with ps/Font.cpp
This was SVN commit r1077.
2004-08-28 13:35:48 +00:00
39a2589e2c mk_handle -> cast_to_HANDLE (less confusion)
This was SVN commit r1076.
2004-08-28 11:14:23 +00:00
70d84beab2 Altered font handling -- now uses CFont in preference to unifont_* (yay, pointless OO) and allows font mapping ("default"=>"palatino12", etc) using .cfg files
This was SVN commit r1074.
2004-08-27 22:08:30 +00:00
1aae7dcead more dox!
also found problem with partial reads from zip; not important since all
files are currently loaded in one go, but will attack tomorrow.

This was SVN commit r1065.
2004-08-27 00:33:20 +00:00
d607aad4db had a look at mmap() due to gamedev post. cleaned it up; now bulletproof and armor-plated (I hope :)).
This was SVN commit r1064.
2004-08-27 00:29:46 +00:00
c01f1f00a8 Minorly better error handling
This was SVN commit r1053.
2004-08-24 21:07:20 +00:00
4ce93a9f12 remove misalign warning (no longer relevant)
This was SVN commit r1052.
2004-08-24 17:42:46 +00:00
df5ba1f690 simplification: only VFS allocates output buffer
This was SVN commit r1051.
2004-08-24 17:34:00 +00:00
13e5f5dc11 underwent review, armor-plating and documentation. "finished" (i hope) except for one last outstanding issue:
special-casing uncompressed files in archive. the impl is hackish ATM,
and requires further work on the file_io cache.

This was SVN commit r1050.
2004-08-24 17:29:54 +00:00
fb0b498de2 pthread_mutex update - now uses CRITICAL_SECTIONs. quite hacky; awaiting word from simon how he'd like it :)
This was SVN commit r1049.
2004-08-24 17:27:51 +00:00
59fd28fc93 GCC fixes: made zip_archive_open/close not inline
This was SVN commit r1033.
2004-08-21 12:54:25 +00:00
57fad52ef3 GCC non-fixes: marked broken code
This was SVN commit r1032.
2004-08-21 12:53:17 +00:00
d1e29b1d16 GCC fixes: avoid warnings about XP_UNIX
This was SVN commit r1031.
2004-08-21 12:52:31 +00:00
a8f64267a2 GCC fixes: evil goto.
This was SVN commit r1030.
2004-08-21 12:50:55 +00:00
35baf71fe8 Define XP_* globally, for anything that uses SpiderMonkey directly
This was SVN commit r1025.
2004-08-20 14:02:53 +00:00
f94ecbd6d7 hide ugly multimap code behind interface
This was SVN commit r1022.
2004-08-19 12:03:15 +00:00
e6324c95d6 add rationale for non-caching async IO and not prefetching
This was SVN commit r1021.
2004-08-19 12:02:58 +00:00
0706801286 heeding thoreau's "simplify" call. fat trimmed from tree_lookup and remount;
no longer support single archives: discussed with stu, it's not
necessary

This was SVN commit r1020.
2004-08-19 12:02:15 +00:00
95453aa2c6 add STL_HASH_(MULTI)MAP
This was SVN commit r1018.
2004-08-18 02:13:53 +00:00
d58e16e0ff work in progress. caching moved to sync IO code (simplifies things).
This was SVN commit r1017.
2004-08-18 02:12:52 +00:00
e2970992fd fix FileIO type; also new transfer mode for uncompressed files that allows using the file cache (HACK!)
This was SVN commit r1016.
2004-08-18 02:11:50 +00:00
3d455fc05f h_find now via hash multimap instead of linear search (it's called often)
This was SVN commit r1015.
2004-08-18 02:08:15 +00:00
4934c7cbe2 don't cache VDir (not copy equivalent). fixes bug that caused terrain textures not to load.
also renamed FileIO

This was SVN commit r1014.
2004-08-18 02:06:23 +00:00
0d6477d83b add note and added (currently commented out) debug_outs to determine when/why handles are being allocated
This was SVN commit r1011.
2004-08-17 21:06:08 +00:00
a8b8471a23 no longer require aiocb to be zeroed (real aio doesn't).
removed user-visible pointer in aiocb; cb -> req mapping is now better.

This was SVN commit r1010.
2004-08-17 13:40:55 +00:00
af85086e3b no longer register atexit call to free mutex in pthread_mutex_initializer - user code should do that.
brought to light by simon's network / thread util itself freeing the
mutex, leading to invalid handle atexit.

This was SVN commit r1009.
2004-08-17 13:36:03 +00:00
16b198b05d Fixed calling convention for IPv6 function pointers
This was SVN commit r1007.
2004-08-16 18:13:22 +00:00
5575409959 Fix for pthread_create - assumed new thread started before _beginthread returns. Fixed by heap-allocating the parameter to thread_start
This was SVN commit r1004.
2004-08-16 14:30:18 +00:00
8e823492b5 better names for inf_* routines
This was SVN commit r1003.
2004-08-16 13:20:53 +00:00
611ec4f10d add throughput measure
This was SVN commit r1002.
2004-08-16 13:19:10 +00:00
94316413db rough initial implementation of revised L3 file block cache. works, considerable speedup.
also: async routines now fill a control block, instead of returning a
handle (that's now done by VFS)

This was SVN commit r1001.
2004-08-15 21:50:29 +00:00
48ecbe3c48 VFS wraps async IO control block in a handle (better separation of powers ;))
This was SVN commit r1000.
2004-08-15 21:49:17 +00:00
caedad6fc4 allow freeing 0 ptrs
This was SVN commit r999.
2004-08-15 21:48:34 +00:00
788b177e81 async routines now fill a control block, instead of returning a handle (that's now done by VFS)
This was SVN commit r998.
2004-08-15 21:47:47 +00:00
5ff6c98c95 bugfix in IO callback (was incorrectly reporting # bytes read); async routines now fill a control block, instead of returning a handle (that's now done by VFS)
This was SVN commit r997.
2004-08-15 21:47:32 +00:00
9cd4cab693 A few log categories
This was SVN commit r994.
2004-08-15 20:57:31 +00:00
5edadf1433 don't cache handles that don't have a key (i.e. couldn't be found when reloading)
This was SVN commit r991.
2004-08-14 12:36:03 +00:00
3ba9855b2e wasn't converting native path to portable before sending to VFS.
fixes assert after screenshot write reported by stu

This was SVN commit r990.
2004-08-14 12:28:54 +00:00
cc9ae228f9 _mem() JS function, for extremely basic VRAM usage information
This was SVN commit r987.
2004-08-14 11:21:29 +00:00
7e1bcd5159 Slightly nicer cursor loading (using the resource system for caching)
This was SVN commit r986.
2004-08-12 17:36:48 +00:00
4e7b132bfd sound/music player now responsible for calling oal_Init, due to delay-loading.
This was SVN commit r985.
2004-08-12 17:32:37 +00:00
6637011982 removed winsock dependency (now uses GetFileType)
This was SVN commit r984.
2004-08-12 17:32:16 +00:00
3459ad5d8f less MAX_REQS (64 was unnecessarily high)
This was SVN commit r981.
2004-08-12 17:19:20 +00:00
cfa6dd3dfe bugfix: free GLRC before HDC, but BC still complains that there are unfreed GDI objects
This was SVN commit r980.
2004-08-12 17:18:54 +00:00
18221110cf removed debug output from FPS code
This was SVN commit r979.
2004-08-12 16:06:47 +00:00
0b452320ef add callback for sync I/O (useful for reporting progress)
This was SVN commit r978.
2004-08-12 15:51:31 +00:00
df9dcc5711 opening files as a directory -> problem with dir_watch. solved
This was SVN commit r977.
2004-08-11 23:25:37 +00:00
3dff0dbb90 re-enable warning when ReadDirectoryChanges fails (underlying problem solved)
This was SVN commit r976.
2004-08-11 23:25:09 +00:00
04c4e7ae02 now case-insensitive; added tags to each path variable to tell what kind
also fixed some bugs, Zip loading is successfully integrated.

This was SVN commit r975.
2004-08-11 20:24:26 +00:00
1f2ebb678e slightly change file_enum interface (don't need flags); comments
This was SVN commit r974.
2004-08-11 20:23:22 +00:00
c5701c8299 add higher-level dox, fix some bugs, made case-insensitive
This was SVN commit r973.
2004-08-11 20:21:42 +00:00
e67ed4acc0 pass dir_watch the native path, so that it has a chance at working ;p
This was SVN commit r972.
2004-08-11 20:20:03 +00:00
93b40f835e improvement: don't cache if reload failed
This was SVN commit r971.
2004-08-11 20:19:31 +00:00
10180a7dba fat-fingered commit; ignore the previous change (now undone)
This was SVN commit r963.
2004-08-10 16:06:17 +00:00
77eb2d7db8 finally removing; it has no function
This was SVN commit r962.
2004-08-10 16:04:21 +00:00
023592d23f bugfixes related to "lying about user's buffer" feature
also rearranged + cleaned up a bit

This was SVN commit r959.
2004-08-10 16:01:04 +00:00
7c36638fd0 minor bugfix / commenting
This was SVN commit r958.
2004-08-10 15:59:11 +00:00
e4867475dd no longer use LOC_ZIP
This was SVN commit r957.
2004-08-10 15:58:54 +00:00
b81d75a0f3 add file_io_complete call for polling.
also some bugfixes related to reading from zip

This was SVN commit r956.
2004-08-10 15:57:35 +00:00
59231be9a7 massive cleanup, commenting, hardening, bugfixes => mostly works :)
This was SVN commit r955.
2004-08-10 15:56:04 +00:00
6e1887ad8b removed LOC_ZIP (not needed; callback can determine via Loc.archive if it's a zip file)
This was SVN commit r954.
2004-08-10 15:55:24 +00:00
230731c69d Allow the standard Windows PrtSc action (i.e. copy to clipboard) if HOTKEY_SCREENSHOT has been redefined
This was SVN commit r951.
2004-08-09 20:58:32 +00:00
0b3361b6f5 several bugfixes for loading from Zip (currently broken)
This was SVN commit r950.
2004-08-09 16:46:57 +00:00
687aea271e fixed alignment (broken after last user_p change)
This was SVN commit r949.
2004-08-09 16:44:42 +00:00
1768ccded3 Miscellaneous GCC fixes
This was SVN commit r948.
2004-08-09 16:44:08 +00:00
937ce1dcb5 Unbroke GCC
This was SVN commit r946.
2004-08-09 16:31:34 +00:00
65ec0b468d Added vsnprintf2, a wrapper around vsnprintf to make it more gcc-like (allowing %lld, %1$d, etc)
This was SVN commit r944.
2004-08-09 15:44:35 +00:00
abfe9faadc New zlib/libpng libraries
This was SVN commit r942.
2004-08-08 18:50:44 +00:00
7545ad13b8 Corrected cursor orientation
This was SVN commit r941.
2004-08-08 18:38:42 +00:00
ec7e3c890c texture loaders now flip png (always) and bmp+tga (if top-down)
also more clear TGA header use (struct instead of direct offset)

This was SVN commit r939.
2004-08-08 18:07:46 +00:00
5bdfaf5758 fix several bugs related to tag reset when reopening cached handles
This was SVN commit r938.
2004-08-08 18:04:03 +00:00
f08cd3466c increase REF_BITS to 16 (=> 64k refs possible)
This was SVN commit r936.
2004-08-08 16:40:59 +00:00
ca9174e1d8 update vfs_load; now returns handle with the correct file size (i.e. leaving out padding)
This was SVN commit r934.
2004-08-07 13:45:03 +00:00
58a0437e66 fix comment on not storing aiocb in struct File
This was SVN commit r933.
2004-08-07 13:44:28 +00:00