011666f393
Minor fixes for Linux/GCC
...
This was SVN commit r1201.
2004-09-26 21:21:34 +00:00
Calefaction
39501530d4
Updated to properly update material parameters.
...
This was SVN commit r1200.
2004-09-26 04:09:57 +00:00
Calefaction
4e93961f92
Minot change. The renderer now no longer does any work unless the game state is indicated as "started" by g_Game->IsGameStarted()
...
This was SVN commit r1199.
2004-09-26 04:05:35 +00:00
Calefaction
f888544789
*** empty log message ***
...
This was SVN commit r1198.
2004-09-24 03:52:32 +00:00
Calefaction
b1c269b72e
Complete materials checkin
...
This was SVN commit r1197.
2004-09-24 03:52:03 +00:00
7f962ea9c4
Fixed very minor bug
...
This was SVN commit r1196.
2004-09-23 13:23:42 +00:00
6d4f94112d
Fixed memory leak
...
This was SVN commit r1195.
2004-09-23 12:42:37 +00:00
Calefaction
0a05c2977a
Updated to reflect MaterialManager
...
This was SVN commit r1194.
2004-09-23 05:21:18 +00:00
Calefaction
831053d680
Update to the material system
...
This was SVN commit r1193.
2004-09-23 05:10:03 +00:00
Calefaction
4fff66cfce
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them.
...
This was SVN commit r1192.
2004-09-23 04:00:56 +00:00
9c2fb5a466
stomped on vc2k5 warning (size_t -> uint)
...
This was SVN commit r1191.
2004-09-22 18:14:00 +00:00
df1b502bbd
Linux Compat and some updated PARANOIA code
...
This was SVN commit r1189.
2004-09-22 15:20:58 +00:00
ab7b542c20
console height now relative to y resolution instead of always 600 pixels
...
This was SVN commit r1188.
2004-09-22 14:01:50 +00:00
7c157c5f90
Avoided minor for-scoping complaints
...
This was SVN commit r1187.
2004-09-22 11:51:43 +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
4a7757dac6
VC2k5 fix: avoided ambiguous parameter naming
...
This was SVN commit r1185.
2004-09-21 22:11:33 +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
eb2989176e
startGame() shouldn't crash and burn if the game's already been started
...
This was SVN commit r1181.
2004-09-21 16:10:46 +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
6787a32b3c
potential vsnprintf buffer overflow
...
This was SVN commit r1179.
2004-09-21 14:35:30 +00:00
92ade065c3
vector<char> magic changed into a nicer std::string constructor (heap corruption induced paranoia =] )
...
This was SVN commit r1178.
2004-09-21 14:33:13 +00:00
a9075a887f
- Chat fix (server user didn't see his own text)
...
- Removed filter for Ctrl-Alt combinations (some pretty useful chars
like {[]} are on AltGr/CtrlAlt combinations here in Sweden)
This was SVN commit r1177.
2004-09-21 14:31:02 +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
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
