1
0
forked from 0ad/0ad
Commit Graph

522 Commits

Author SHA1 Message Date
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