Commit Graph

431 Commits

Author SHA1 Message Date
064dd5699d - read() and write() are now implemented as functions (avoids having to #undef them)
- HAVE_DEBUGALLOC renamed to HAVE_VC_DEBUG_ALLOC

This was SVN commit r2426.
2005-06-22 03:14:35 +00:00
f3951fbfae all JS-dependent code now includes scripting/SpiderMonkey.h instead of <js*.h> directly - see rationale in that header.
singleton: removed unnecessary headers

This was SVN commit r2425.
2005-06-22 02:23:46 +00:00
d4617cbd3e Minor warning-fixes and miscellaneous tidiness
This was SVN commit r2416.
2005-06-20 22:04:08 +00:00
7577d224a6 Terrain XML loading, plus mouse/JS portability and some misc stuff to mix it up
This was SVN commit r2412.
2005-06-20 15:14:36 +00:00
92d221f183 Interact.cpp: Use double instead of float for storing absolute times (since the precision is required).
Atlas: Nicer handling of menus.

This was SVN commit r2400.
2005-06-17 23:14:06 +00:00
471fd5d6f3 Unbroke more; plus some minor changes.
This was SVN commit r2398.
2005-06-17 01:28:35 +00:00
40b26227d7 singleton.h: use assert2 (avoid trouble in wdbg code)
lib.h: reorder error codes (more clear) and add a few

detect.cpp, gfx.h: move gfx_mem (amount of video memory) here from ogl

This was SVN commit r2391.
2005-06-16 21:46:33 +00:00
dd3c8f6fb5 Use the standard Singleton for CLogger, to fix problems with unordered shutdown
This was SVN commit r2383.
2005-06-13 19:31:48 +00:00
b657a1cbca Added CStr and some other things to precompiled.h, to reduce build times.
Altered CStr/UniDoubler's macros, to avoid polluting/conflicting/etc.
Fixed headers in non-PCH builds.
Used the _d version of vorbisfile*.lib in Debug builds.

This was SVN commit r2366.
2005-06-01 20:12:45 +00:00
982e051c54 Changed PSERROR to inherit from std::exception
This was SVN commit r2344.
2005-05-24 00:00:40 +00:00
aa027d20ec Fixed ScEd again - renamed the network system's CCommand to CNetCommand, since ScEd used that name first :-P
This was SVN commit r2337.
2005-05-23 02:39:07 +00:00
21149d9fd0 Renamed translate() to I18n::translate(), to minimise conflicts
This was SVN commit r2334.
2005-05-22 22:58:27 +00:00
0331883a86 Temporary fix for mouse input. Improved performance in player-colour model renderer. Also improved performance in lighting, at least in unoptimised builds.
This was SVN commit r2328.
2005-05-20 17:09:47 +00:00
f1e9bf6227 Fixed warnings
This was SVN commit r2319.
2005-05-18 21:19:56 +00:00
d0f7cb015c - Linux/GCC (as usual :P)
- Ported lockless code to gcc inline assembly
- A few new net messages (gather, attack, add waypoint)
- Support for new messages in network->entity order converter
- Implemented rudimentary JS interface for Interaction
- issueCommand JS API, connected to the network
- Removed Interaction stuff now replaced by JS
- And something in there should probably break VS builds :P

This was SVN commit r2316.
2005-05-18 05:32:09 +00:00
fd4eb91e93 debug_out -> debug_printf; MICROLOG moved to ps/Pyrogenesis.h
This was SVN commit r2285.
2005-05-11 18:56:30 +00:00
1ff0d112d2 revise loader return values - nicer interface now.
This was SVN commit r2281.
2005-05-11 04:39:21 +00:00
ab980c1a31 Updated map format, to store lighting information in XML. Also, vital whitespace consistency improvements.
This was SVN commit r2276.
2005-05-11 03:07:08 +00:00
bc5122fa08 UTF-8->CStrW conversion; used in saved console history.
This was SVN commit r2272.
2005-05-10 18:15:03 +00:00
MarkT
86dc351205 Projectile code and updates to some actors that can use it (celt_ijv and hele_iar)
This was SVN commit r2266.
2005-05-10 07:13:25 +00:00
229a6b7a16 Loader: reword comment
EntityHandles.cpp: 4096 -> MAX_HANDLES

This was SVN commit r2259.
2005-05-09 04:37:36 +00:00
01588f267f Corrected garbage collection problem
This was SVN commit r2255.
2005-05-09 03:26:04 +00:00
f8f94e02aa add high-level dox and updated some comments
This was SVN commit r2249.
2005-05-06 20:02:00 +00:00
daddeed4bb fix really stupid bug in ReadFileLines - was always setting first array element
This was SVN commit r2246.
2005-05-05 16:41:16 +00:00
1bcf156680 added macro that takes care of boilerplate "check for timeout and return progress" code.
This was SVN commit r2242.
2005-05-04 23:10:11 +00:00
05a2ec78d3 add default ctors for XMBElement and XMBElementList (required by ReadXML closure)
This was SVN commit r2234.
2005-05-03 21:39:51 +00:00
22ee082694 - more accurate progress calculation (avoids accumulating errors)
- revised time accounting allows updates during a task that's
interrupted
- cleaned up LDR_NonprogressiveLoad

This was SVN commit r2233.
2005-05-03 21:39:03 +00:00
1f1642bfe3 revise thunks to not free their MemFun_t if the registered function times out
This was SVN commit r2232.
2005-05-03 21:37:49 +00:00
f0e311440e all functions called via delay-load mechanism now return int (allows closures that can interrupt themselves when time is up)
This was SVN commit r2231.
2005-05-03 21:36:57 +00:00
f34cd1ee08 more revisions to comments to match dox
This was SVN commit r2229.
2005-05-03 16:57:56 +00:00
b8cb80898f split common error handling code into macro.
documented each function (contents from wiki)

This was SVN commit r2228.
2005-05-03 16:41:09 +00:00
c79a71ec4d This was SVN commit r2225. 2005-05-03 05:16:10 +00:00
ee9757b79b - add usage comment for each function
- remove unnecessary vfs_exists
- improve error handling
- <path> is already dir+name

This was SVN commit r2224.
2005-05-03 05:15:18 +00:00
03a3fd6091 update EnumDirEnts docs. disambiguate <path> parameter - it's dir+name
This was SVN commit r2220.
2005-05-03 05:03:27 +00:00
MarkT
c8cd52578a Put the extra animation event in the struct def, also adding Jan's VFS script wrapper.
This was SVN commit r2218.
2005-05-03 04:27:07 +00:00
87f4cc2592 This was SVN commit r2212. 2005-05-02 19:47:06 +00:00
MarkT
db168702df Jason's animation events. Also reworked entity-types system.
This was SVN commit r2209.
2005-05-01 19:09:13 +00:00
dc210f9f0e playercolor adjustments
This was SVN commit r2205.
2005-05-01 11:51:07 +00:00
64c7bbd91d Player color tweaks
This was SVN commit r2202.
2005-05-01 00:05:34 +00:00
889b81433a [Subtle hint to the autobuilder that it might want to upload the newest version...]
This was SVN commit r2192.
2005-04-29 04:46:14 +00:00
7327e942d6 replaced Ykkrosh clone with "Clausewitz". exercise for the reader: who's that? >:-)
This was SVN commit r2176.
2005-04-26 20:49:08 +00:00
MarkT
bcabe3aa53 Script integration work - valueOf() is no longer required most of the time; also property-change watches and enumeration over entities (but not yet other native objects), rudimentary beginnings of a global events system, and adjusted the status orb to update only on changes.
This was SVN commit r2157.
2005-04-22 07:12:55 +00:00
MarkT
2120576bc7 Gathering and unit training (engine-side); also other minor improvements
This was SVN commit r2132.
2005-04-15 04:23:33 +00:00
d2948937a0 Fixed prop player-colouring. Allowed per-object colours. (Coming soon: data to demonstrate it.)
This was SVN commit r2113.
2005-04-07 04:29:07 +00:00
6a0b5fa0ab ScEd: Added unit deletion. Made zoom less frustrating. Let >2 players work.
Fixed random actor props.

This was SVN commit r2109.
2005-04-03 05:02:00 +00:00
5e742f5615 Setup all the sample players in SP games [bug #52]
This was SVN commit r2099.
2005-03-31 05:14:17 +00:00
0eb78450c0 Maybe fixed GUI event-handler function things. Other minor changes and fixes.
This was SVN commit r2096.
2005-03-30 22:33:10 +00:00
MarkT
701fd17595 Sorry, SVN doesn't seem to be picking up modifications today.
This was SVN commit r2093.
2005-03-30 18:32:16 +00:00
MarkT
bb7a22f32a First draft of a GPG3-style profiler (including tracing into scripts, after a fashion)
This was SVN commit r2090.
2005-03-30 16:14:19 +00:00
8b12c84df7 ScEd: allowed creation of non-entity objects, pending total entitisation
This was SVN commit r2085.
2005-03-30 05:43:22 +00:00
22dd4dd67b Entities: Removed Tag attribute; it is taken from the filename instead. Made entity XML files be loaded on demand. Probably stopped crash when maps contain non-existent entities. Fixed a few bugs in entity definitions.
Maps: Stored non-entity objects in XML instead of PMP, for easier manual
editing. Updated existing maps to newest format, so that they can still
work. Added undocumented _rewriteMaps() JS function. Also renamed _mem
to vmem, and reclassified its undocumentedness as unintentional, since
it's reasonably useful.
Loader: added NonprogressiveLoad function, for ScEd/_rewriteMaps/etc
which don't care about progressiveness.
main.cpp: re-enabled vfs_display, since it doesn't crash now
Vector3D: stopped warning

This was SVN commit r2078.
2005-03-29 20:50:04 +00:00
MarkT
3c99f0f2eb Minor JavaScript updates
This was SVN commit r2073.
2005-03-28 22:13:47 +00:00
2fa430a4e6 - fix bug (wasn't setting mount_point of dir being mounted => crash while writing screenshot)
- add check for changing filters while enumerating dirents
- add path_component_valid
- change iterator to only return valid entries (removing that burden
from user code)

This was SVN commit r2067.
2005-03-27 17:27:49 +00:00
a1981970e5 new EnumDirEnts call; replaces previous implementation in BaseEntityCollection.cpp that didn't handle subdirectories
This was SVN commit r2057.
2005-03-27 01:44:41 +00:00
ba636ca96c wposix: fix for USE_MMGR: undef getcwd
singleton: switch to assert2
loader: simpler HaveTimeForNextTask check

This was SVN commit r2056.
2005-03-27 01:37:10 +00:00
020645d583 Hacked up ScEd a bit, to disable its actor editor and to let users place entities (rather than actors) on the map.
This was SVN commit r2039.
2005-03-22 23:31:30 +00:00
f19d8dafee improved update frequency and accuracy of progress bar (by splitting up more init functions).
also add thunk mechanism to ease binding to member functions;
finally, added instrumentation to measure how long functions really take

This was SVN commit r2038.
2005-03-22 21:00:56 +00:00
5b11dbb6b0 Corrected string conversion slightly
This was SVN commit r2034.
2005-03-22 12:09:11 +00:00
6d792365aa rough but functional loading progress bar support.
numerous TODOs remaining - initial update instead of only after
completing first job; fix GUI overdraw issue; decrease granularity
(currently only 3 updates)

This was SVN commit r2033.
2005-03-22 02:17:55 +00:00
5e3b0f06ec documented and revised after review by philip (thanks!) - progress is now calculated from estimated duration; next instead of current description is returned
This was SVN commit r2032.
2005-03-21 13:33:21 +00:00
77d3c5d0b5 initial loader implementation - provides a queue that is worked off from the main loop; a timeout ensures responsiveness.
this is the framework that will allow progress bar updates.

This was SVN commit r2027.
2005-03-20 14:32:43 +00:00
219509f00f Fixed another missing posix.h. Documented a little bit of main.cpp.
This was SVN commit r2016.
2005-03-18 23:04:29 +00:00
468657479c philip points out precompiled.h -> string_s.h includes posix.h - too heavy for the PCH
replaced that with posix_types.h, which now defines size_t.
this change exposed a lot of code that relied on posix.h being included
implicitly; fixed those as well.

This was SVN commit r2015.
2005-03-18 22:44:55 +00:00
475dfb2c78 Partial support for new actor format. Partialer support for missing actors without crashing.
This was SVN commit r2014.
2005-03-18 22:30:23 +00:00
308535d58d add instrumentation to see what's slow when starting a session
renderer: also move list of alpha maps here from InitResources

This was SVN commit r2007.
2005-03-18 22:02:20 +00:00
af0800fbdd uses 32 bit hash instead of 64 - faster (clears up long standing TODO)
This was SVN commit r2006.
2005-03-18 21:57:07 +00:00
2b33ba8ade security push: checked every strcpy / strncpy. converted most to strcpy_s; some are flagged as "safe" (e.g. if copying literal that's obviously OK)
This was SVN commit r1962.
2005-03-01 20:13:00 +00:00
da5816e971 Re-enabled VC's memory debugging by default (when not using USE_MMGR). Hopefully fixed the resulting memory leaks. Also fixed incompatibilities with VC2005.
This was SVN commit r1950.
2005-02-27 22:11:26 +00:00
e6c8cef293 types.h => lib/types.h (avoid name collision)
This was SVN commit r1935.
2005-02-26 15:13:15 +00:00
85a95e3e41 Fixed warnings. Made invalid-player-ID complaint less annoying.
This was SVN commit r1930.
2005-02-21 19:49:20 +00:00
7bcc12373b - Created JSMap
- Changed player colour JS interface: setColour(...) instead of a colour
property
- Introduced a network log and replaced most network LOG() calls with
NET_LOG()
- Moved to a slot-based system for Pre-Game and extended a lot of the JS
APIs to networking stuff
- A bit of cleanup in the low-level network code (Unix parts)
- Clients now keep track of all other connected clients on the server
(And exposes this info to JS)
- Split out GameAttributes to its own file
- Removed unused class AttributeMap
- Changed CJSObject to use T* pointers in JS_SetPrivate (needed to make
ToScript work with multiple inheritance)

This was SVN commit r1929.
2005-02-21 17:13:31 +00:00
3776f91aeb Stopped crash when restarting a game
This was SVN commit r1926.
2005-02-20 23:55:07 +00:00
03a6b6e804 Stopped ScEd crashing when loading maps. Avoided crashes from invalid animations. Moved game-specific code out of XMLWriter.
This was SVN commit r1920.
2005-02-11 12:57:19 +00:00
880634b598 Small changes to ScEd, to remove some hacky bits and to make it not crash with player-colours
This was SVN commit r1899.
2005-02-04 23:16:42 +00:00
5d9fe41fec NetServer onChat event and NetClient onDisconnect event added
This was SVN commit r1894.
2005-02-02 16:57:15 +00:00
4ed4a7e16d Fix for the crash when a client connects, as well as some minor additions to client/server code
This was SVN commit r1861.
2005-01-29 16:51:13 +00:00
60ee5acd2b Made invalid-attempt-to-get-player errors less subtle. Word-wrapping in assert2 dialog box.
This was SVN commit r1857.
2005-01-29 00:11:50 +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
NoMonkey
d7b3d6b0c7 Added a new material, "player_trans.xml" which will give a model player color. So now if you want a player to be colored, just add this material!
This was SVN commit r1830.
2005-01-27 02:52:26 +00:00
NoMonkey
12bbe9cda1 This was SVN commit r1808. 2005-01-25 00:25:13 +00:00
NoMonkey
b2e50cfea9 This was SVN commit r1805. 2005-01-24 08:28:03 +00:00
NoMonkey
02cc4d9c8e This was SVN commit r1793. 2005-01-23 22:21: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
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
fbc212ea5d mouse_x/y => g_mouse_x/y
This was SVN commit r1770.
2005-01-23 17:41:01 +00:00
d7bf0b7fbe use of new made suitable for mmgr's macro
This was SVN commit r1769.
2005-01-23 17:37:45 +00:00
ad16ecfb36 fix bug: was assigning char to pointer, instead of writing to *pointer
This was SVN commit r1768.
2005-01-23 17:36:57 +00:00
e8121ca394 Also allow access to the last player ;-)
This was SVN commit r1765.
2005-01-23 12:54:14 +00:00
6dcac374e7 Oops, forgot to add the PS_MAX_PLAYERS constant
This was SVN commit r1757.
2005-01-23 04:14:49 +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
e717aaf997 Fixed warnings
This was SVN commit r1751.
2005-01-22 18:38:58 +00:00
ae38aee3d2 Revamped CNetClient/CNetServer JS Interface and new CGameAttributes
implementation (moving towards a merger of CGameAttribs into CGame).

This was SVN commit r1746.
2005-01-19 22:32:25 +00:00
a410c2852c Updated ScEd's handling of players (though in a rather nasty way, since it doesn't actually have a CGame, and so it has no CPlayers, and so there are loads of HACK comments everywhere)
This was SVN commit r1740.
2005-01-18 12:45:56 +00:00
MarkT
9a2979edec This was SVN commit r1738. 2005-01-18 10:57:17 +00:00
MarkT
20ce33094f This was SVN commit r1735. 2005-01-18 10:49:06 +00:00
MarkT
6b64327a19 This was SVN commit r1734. 2005-01-18 10:48:51 +00:00
MarkT
25fdbfd931 Fixes for two pathfinding bugs (neither of which were actually pathfinding bugs), added player objects (details in TM)
This was SVN commit r1733.
2005-01-18 00:46:18 +00:00
4b5aff926d Fixed compilation errors
This was SVN commit r1731.
2005-01-17 10:20: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