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
ea9bd61195
now correctly set m_UnpackPos
...
This was SVN commit r1169.
2004-09-19 19:22:18 +00:00
69e9f3ef79
now stores its data in buffer, rather than copying to std::vector
...
This was SVN commit r1168.
2004-09-19 18:51:19 +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
022964c43b
moved low-level sound code to res/snd.cpp. CMusicPlayer is now an empty shell, pretty much; it will contain higher-level music logic (selecting track, fading in/out) implemented via snd calls
...
This was SVN commit r1164.
2004-09-19 16:01:41 +00:00
6fd0c451c2
changed to include sound code (test "rig")
...
This was SVN commit r1163.
2004-09-19 15:58:13 +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
18e016578d
fix tex_load return value check - Handle invalid <==> <= 0
...
This was SVN commit r1153.
2004-09-19 11:39:47 +00:00
167a077bc2
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 r1152.
2004-09-19 11:38:54 +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
e675dbca5f
no longer delay load ogg dlls (new sound code is using openal ogg support); avoids warnings in the meantime
...
This was SVN commit r1149.
2004-09-18 12:51:14 +00:00
dbee9e74fd
Fixed lack of termination when log messages exceed 512 chars
...
This was SVN commit r1148.
2004-09-17 23:13:38 +00:00
b1a5f53284
Testing system for the i18n code, to make sure I don't break anything. (Now on CVS to make it less lonely.)
...
This was SVN commit r1145.
2004-09-17 17:49:12 +00:00
ca862b8332
Minor adjustments to i18n code
...
This was SVN commit r1144.
2004-09-17 17:45:44 +00:00
8760a86c13
Unfinished utility for extracting to-be-translated strings from all the game's data files
...
This was SVN commit r1142.
2004-09-10 13:42:02 +00:00
03e3de50ed
When I said "Now fixed", I was wrong. But it's fixed now.
...
This was SVN commit r1140.
2004-09-06 12:54:35 +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
806dea648c
Er... broke stuff. Now fixed.
...
This was SVN commit r1138.
2004-09-06 11:37:15 +00:00
e532b59ead
Utilised the corrected CStr8/W conversion
...
This was SVN commit r1137.
2004-09-06 11:35:42 +00:00
a9d7f0dae8
Fixed minor bug when displaying text containing a "%". Used LOG_ONCE to avoid continuous error logging. Removed redundant Trim (Xeromyces always trims element text)
...
This was SVN commit r1136.
2004-09-06 11:34:46 +00:00
7008e5b53c
Updated to handle Unicode strings
...
This was SVN commit r1135.
2004-09-06 11:28:30 +00:00
5df205084f
Made JSString->wstring conversion slightly easier
...
This was SVN commit r1134.
2004-09-06 11:28:04 +00:00
13974087c3
Fixed memory leak
...
This was SVN commit r1133.
2004-09-06 11:18:47 +00:00
0dc2f34676
GCC whine avoidance: newlines at ends of files
...
This was SVN commit r1132.
2004-09-06 11:18:22 +00:00
f791e5f665
Altered the automatic CStr8/CStrW conversion -- it seems to work now
...
This was SVN commit r1131.
2004-09-06 11:15:43 +00:00
d373e7a559
Moved language selection into the .cfg file
...
This was SVN commit r1130.
2004-09-06 11:13:36 +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
071bb19282
no message
...
This was SVN commit r1128.
2004-09-06 03:05:36 +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
Gee
da465ae1dc
Made a little change only to make it compile, hopefully it won't do too much damage until Philip can correct this.
...
This was SVN commit r1126.
2004-09-06 02:22:38 +00:00
Gee
9133042540
GUI: Translates and outputs localised string in Unicode... hooray!
...
This was SVN commit r1125.
2004-09-06 02:21:21 +00:00
3a3a5b6c34
Added getFPS(), so the GUI can draw the FPS counter. Also added getLanguageID(), so it knows what language it's using
...
This was SVN commit r1122.
2004-09-05 11:28:59 +00:00
959600b0d1
Removed FPS display
...
This was SVN commit r1121.
2004-09-05 11:27:23 +00:00
3b15f3f1e4
Text alignment alterations
...
This was SVN commit r1119.
2004-09-04 20:35:12 +00:00
933f51d48b
Made text always be placed at integer positions, to avoid it looking too ugly
...
This was SVN commit r1118.
2004-09-04 19:05:25 +00:00
4da6db92d2
Fixed typo in complex mathematical equation (center = "top+bottom/2.f")
...
This was SVN commit r1117.
2004-09-04 18:30:12 +00:00
3ef7b1b67b
Corrected JS_AddRoot usage (it wants a JSObject**/JSString**/jsval*/etc)
...
This was SVN commit r1116.
2004-09-04 14:43:23 +00:00
51e20e6ef6
Realised that there's no need to store the JSObject* as a void*
...
This was SVN commit r1115.
2004-09-04 14:40:06 +00:00
c164d9b32c
Made buffer-zone consistently a float
...
This was SVN commit r1114.
2004-09-03 21:37:39 +00:00
9b1127d82f
Type checking in dangerous pointer-using code
...
This was SVN commit r1113.
2004-09-03 21:25:39 +00:00
78934b50c1
split up call to _CrtSetDbgFlag
...
This was SVN commit r1112.
2004-09-03 20:21:09 +00:00
c0342b1ff7
JS GUI interface changes to handle floating-point sizes, plus a few fewer bugs
...
This was SVN commit r1111.
2004-09-03 14:12:43 +00:00
348505ee14
Added g_ScriptingHost.[GS]etObjectProperty_Double, as a randomly useful function
...
This was SVN commit r1110.
2004-09-03 14:10:48 +00:00
03ae01c44a
Replaced all CStr16 with CStrW, because its name was too confusing
...
This was SVN commit r1109.
2004-09-03 14:08:12 +00:00
Gee
ec7ace7016
no message
...
This was SVN commit r1108.
2004-09-03 05:49:20 +00:00
Gee
d42de50280
Updated everything that's related to screen position to use floats
...
This was SVN commit r1107.
2004-09-03 05:48:47 +00:00
Gee
ab63c17678
no message
...
This was SVN commit r1106.
2004-09-02 19:35:07 +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
756c89d85d
Removed GUI TEMPmessage
...
This was SVN commit r1104.
2004-09-02 19:18:14 +00:00
Gee
6b384432e0
no message
...
This was SVN commit r1101.
2004-09-02 03:05:16 +00:00
Gee
f2a615f0a3
Updates, mostly about centering text.
...
This was SVN commit r1099.
2004-09-02 03:02:32 +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
8a19257cd4
Fixed conversion of non-NULL-terminated strings
...
This was SVN commit r1096.
2004-09-01 19:49:23 +00:00
29e0bfea5b
Added CStr constructor for non-NULL-terminated char*s
...
This was SVN commit r1095.
2004-09-01 19:48:51 +00:00
18fea5478f
Updated i18n code
...
This was SVN commit r1094.
2004-09-01 19:48:03 +00:00
44ddbd201f
Removed an old unused #define
...
This was SVN commit r1092.
2004-09-01 19:23:02 +00:00
Gee
e2a8eb4def
Removed some debug output in log only I need to see.
...
This was SVN commit r1091.
2004-08-31 03:25:36 +00:00
Gee
51b5254a9d
Added a GUI file to load
...
This was SVN commit r1086.
2004-08-31 02:10:40 +00:00
Gee
924b0bf1b4
Major fixes and updates. Let me know if I screwed up resolving conflicts.
...
This was SVN commit r1085.
2004-08-31 02:09:58 +00:00
3b91514dbe
buildTime() function, as a temporary version identifier for distributed builds
...
This was SVN commit r1084.
2004-08-30 11:20:59 +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
5a3c99d506
Removed some debug logging, since the bug seems to have been successfully removed
...
This was SVN commit r1075.
2004-08-27 22:10:25 +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
9280aa15a7
Adjusted error handling minorly
...
This was SVN commit r1073.
2004-08-27 21:14:23 +00:00
b359da4095
Altered point size to match Windows. Fixed bug with alignment of bold text.
...
This was SVN commit r1071.
2004-08-27 20:24:15 +00:00
880b768abd
Noticed "Engine exited successfully on " << __DATE__
...
This was SVN commit r1069.
2004-08-27 18:47:14 +00:00
405d5c476f
Made ThrowError(code) visible
...
This was SVN commit r1068.
2004-08-27 17:43:04 +00:00
97777fe688
LOG_ONCE, to avoid flooding the log with the same message every frame
...
This was SVN commit r1067.
2004-08-27 17:41:02 +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
9c579eb89d
Executable version of the exception-stuff generator
...
This was SVN commit r1060.
2004-08-26 10:34:09 +00:00
4041b7880e
Made missing textures non-fatal
...
This was SVN commit r1059.
2004-08-26 10:31:34 +00:00
918cb99c7f
now verify glActiveTexture != 0 in GL extension check (in response to bug #18 )
...
This was SVN commit r1055.
2004-08-25 11:44:11 +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
49e284ae5e
now uses vfs_load instead of vfs_map (faster, doesn't break if the files are in an archive and compressed)
...
This was SVN commit r1048.
2004-08-24 17:26:35 +00:00
68aa9a81f3
Removed the single-pixel borders between glyphs; most font textures are now half their former size
...
This was SVN commit r1045.
2004-08-24 14:58:50 +00:00
f0e6936b94
Updated
...
This was SVN commit r1044.
2004-08-24 11:42:44 +00:00
d5a5f4c300
Now uses plain English messages when calling translate() before loading a language, rather than crashing
...
This was SVN commit r1043.
2004-08-24 11:32:32 +00:00
83fb95dbde
Removed hard-coded filenames
...
This was SVN commit r1042.
2004-08-24 11:29:40 +00:00
c6d292dc87
Slightly better dictionary handling
...
This was SVN commit r1041.
2004-08-24 11:28:18 +00:00
49b5c5c2b8
Trivial wrapper around vfs_next_dirent, to make some other code a little tidier
...
This was SVN commit r1040.
2004-08-24 11:26:32 +00:00
a684d27654
Error code to exception conversion, via ThrowError(code)
...
This was SVN commit r1039.
2004-08-24 11:09:11 +00:00
9fa5e3b57a
Better Unicode support in the console
...
This was SVN commit r1038.
2004-08-24 11:07:50 +00:00
506b283844
Now actually uses IsInitialised() correctly, to avoid crashing when logging messages before the config DB is loaded
...
This was SVN commit r1037.
2004-08-24 11:05:41 +00:00
003bf13eb0
GCC fixes: things
...
This was SVN commit r1035.
2004-08-21 12:57:10 +00:00
6873de4ed0
GCC fixes: string.c_str() in LOG
...
This was SVN commit r1034.
2004-08-21 12:55:43 +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
0e55379b36
Initial i18n integration
...
This was SVN commit r1029.
2004-08-21 11:45:01 +00:00
9e4ee4b8d9
Quadrupled stack size, since we had too many files
...
This was SVN commit r1027.
2004-08-21 11:35:46 +00:00
6e9c7dd532
Fixed minor type-conversion warnings
...
This was SVN commit r1026.
2004-08-20 14:03:49 +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
0ac6b7839f
(That last message didn't make much sense at all, and the code was slightly wrong anyway)
...
Check for error definitions in .cpp/.h files inside directories whose
names contain digits.
This was SVN commit r1024.
2004-08-20 12:53:24 +00:00
88ab133c1f
Check for errors in directory names containing digits (e.g. "i18n")
...
This was SVN commit r1023.
2004-08-20 12:41:08 +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
ac8cfef8d0
bugfix: was memsetting the memory log /stream/, not buffer. while at it, we just alloc via calloc
...
This was SVN commit r1013.
2004-08-18 01:51:23 +00:00
589106ae1c
increase memory buffer size (due to boundschecker overrun warning)
...
This was SVN commit r1012.
2004-08-18 01:32:05 +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
fdaa535fc2
Removed memory leak
...
This was SVN commit r1008.
2004-08-17 12:34:07 +00:00
16b198b05d
Fixed calling convention for IPv6 function pointers
...
This was SVN commit r1007.
2004-08-16 18:13:22 +00:00
4d9c7684df
w00t! first batch of actual network support!
...
This was SVN commit r1006.
2004-08-16 15:19:17 +00:00
d79dad28d0
Fixed scrolling for windowed mode - stop scrolling when the mouse moves outside the window
...
This was SVN commit r1005.
2004-08-16 14:33:26 +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
d41cdc4dff
Allow NULL categories, and make them very interesting
...
This was SVN commit r996.
2004-08-15 21:10:49 +00:00
9cd4cab693
A few log categories
...
This was SVN commit r994.
2004-08-15 20:57:31 +00:00
0037a0c6c0
Now allows categorised logging with user-configurable interest levels. By default, all errors and warnings are 'interesting' (reported in interestinglog.html and the console), and system.cfg lets you alter your interest in particular categories.
...
This was SVN commit r993.
2004-08-15 20:57:04 +00:00
98a4cea133
IsInitialised() on singletons, for when you need to know whether certain things (e.g. the config database) exist yet
...
This was SVN commit r992.
2004-08-15 20:47:25 +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
00a70deafd
Fixed the console's border
...
This was SVN commit r989.
2004-08-14 11:40:40 +00:00
ed9671e8d7
Fixed JS complaints about missing 'prototype'
...
This was SVN commit r988.
2004-08-14 11:23:38 +00:00
