Dennis Schridde
377adc40d6
Another backdrop named "My Pet Turtle" by Cathuria from the "A paltry 30k polys" thread http://forums.wz2100.net/?topic=1361.0
...
License: CC BY-SA 3.0, as allways.
The border and logo look quite good ingame, so 07-bdrop.png should get that, too.
Also: Use a highres version of 07-bdrop.png, also by Cathuria
Also: Change COPYING.README style a bit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3884 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 13:18:44 +00:00
This file is free software, distributed under the terms of the GNU
90f0c23fc9
Port r3878 and r3879 from trunk/
...
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !
Update gettext files to versions found in 0.17
Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded
m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
This file is free software, distributed under the terms of the GNU
General Public License. As a special exception to the GNU General
Public License, this file may be distributed as part of a program
that contains a configuration script generated by Autoconf, under
the same distribution terms as the rest of that program.
to:
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
This removes any GPL licensed files from m4/
po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 13:04:16 +00:00
Dennis Schridde
43fb8fd0d9
Add fixme for bug #11095 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3877 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 01:24:45 +00:00
Dennis Schridde
9b81337df9
Why did QuesoGLC/fontrendering only work on Mac OS X? Because the texture was set conditionaly for it only.
...
This applies patch #961 correctly and thus closes it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3867 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-25 21:58:35 +00:00
Dennis Schridde
1c979f5fd9
Make lex/yacc rules terminals, since lexer/parser files cannot be autogenerated.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3847 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-20 12:06:26 +00:00
Giel van Schijndel
3e2af0fc87
Don't assert on unused sound IDs as that's a valid condition sound is disabled; fixes bug #10989
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3809 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 22:22:21 +00:00
Giel van Schijndel
23230caf2a
* Revert r3804 (replaces usage of strnlen with strnlen with the unsafe strlen)"
...
* Finish r3795 where I nicely #included the correct files but forgot to replace strnlen with strnlen1 - 1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3805 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 17:57:43 +00:00
Ari Johnson
66f662e16a
Removed usage of GNU extension strnlen()
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3804 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 17:48:13 +00:00
Giel van Schijndel
f4d10dd461
Reapply r3643 (or revert r3669): Port NETBroadcastPlayerInfo over to the new netcode API
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3799 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 13:53:17 +00:00
Per Inge Mathisen
f1a62097bf
Netcode: Make NetDir static, and remove some unnecessary function parameters.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3798 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 13:39:23 +00:00
Per Inge Mathisen
ce473ed9fe
Add some more doxygen comments.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3796 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 13:05:34 +00:00
Giel van Schijndel
33759c07c4
Don't use `strnlen` in debug.c as it's a GNU extension (and as such isn't always available), instead use `strnlen1 - 1`
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3795 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 11:53:25 +00:00
Per Inge Mathisen
c614aabe31
Reorganize the packet definitions to avoid duplication and scatter of data.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3787 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-15 20:55:38 +00:00
Giel van Schijndel
22844d16a6
Undo the (accidental) exceptionhandler disabling of r3784
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3785 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-15 19:44:40 +00:00
Giel van Schijndel
2322fe0920
Undo my "fix" in r3782, as it wasn't a fix but a breakage
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3784 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-15 19:43:53 +00:00
Per Inge Mathisen
b92c8c5a33
Dumpt the last two log message calls into the exception handler report.
...
This way we get to see the message given by asserts in the dump file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3781 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-14 22:07:53 +00:00
Per Inge Mathisen
79d13e4d14
Fix typo in exceptionhandler giving noise (at best) in exception output.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3778 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-14 20:50:39 +00:00
Per Inge Mathisen
b02de0a9b4
Fix bad asserts added to debug another assert failure...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3775 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-13 20:31:38 +00:00
Per Inge Mathisen
0fbcf9399b
Fix another NetMsg vs duplicate buffer bug. Also assert corect packet type
...
when decoding them.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3774 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-13 20:25:12 +00:00
Per Inge Mathisen
afb59e5e99
Clean up declaration of NETsetupTCPIP
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3771 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-13 17:22:43 +00:00
Per Inge Mathisen
683d9deb2e
Replace check_extension with one that does not anger valgrind.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3766 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-12 18:57:20 +00:00
Giel van Schijndel
21927c7e74
Add a hack to allow receiving and processing of MSG_PLAYER_STATS in the right place
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3765 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-12 18:56:58 +00:00
Giel van Schijndel
84a36281a5
When retrieving games from the lobby abort on failure to prevent an infinite loop
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3762 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 21:20:25 +00:00
Giel van Schijndel
81fe501660
Bail out when we fail to receive the game count in the lobby code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3759 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:51:24 +00:00
Per Inge Mathisen
ffc6d739a1
Improve some net debug log calls.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3758 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:26:23 +00:00
Per Inge Mathisen
29153d8fe4
Do not use two separate packet globals. Fixes problems with corrupted network data.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3757 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:22:42 +00:00
Giel van Schijndel
7493e9ea3f
Replace some magic numbers with HOST_DPID; patch by Buginator
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3756 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 18:25:35 +00:00
Per Inge Mathisen
d484e2bc98
Fix infinite loop when joining a game. An encode was supposed to be a decode.
...
Also remove some excess logging calls.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3755 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 17:19:12 +00:00
Per Inge Mathisen
917187ca7d
Clean out some excess global defines.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3753 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 16:23:20 +00:00
Per Inge Mathisen
907f684f8a
Remove remains of old external launcher program lobby.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3752 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 16:00:17 +00:00
Per Inge Mathisen
4cff4f49fe
Dump some dead code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3750 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 11:47:07 +00:00
Per Inge Mathisen
eda4c3a0f8
Try to fix bug #10956 by making sure the tab fields are initialized, and
...
add several new asserts to help track down the bug if this does not help.
Please post a new backtrace if this bug happens again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3749 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 11:28:45 +00:00
Per Inge Mathisen
b8ecac8f77
Remove the final remains of the old ugly network code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3746 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 21:03:00 +00:00
Per Inge Mathisen
8a38943349
Remove the code to send and receive whole droids if they are missing. Since we
...
are now using TCP, we should not be missing any droids. See patch #927 for
discussion.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3745 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 21:01:57 +00:00
Per Inge Mathisen
160afd4e7a
Remove some unused code from netplay.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3744 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 20:08:39 +00:00
Giel van Schijndel
d5e7f01ef6
Change magic number to HOST_DPID and document HOST_DPID; file #3791 from patch #975 by Buginator
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3743 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 19:57:47 +00:00
Giel van Schijndel
722303eb84
Turn a lot of already-available function documentation comments into Doxygen documentation
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3739 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:44:53 +00:00
Giel van Schijndel
72003cf9bf
Provide Doxygen documentation for iV_DrawFormattedText() and change its return type to int
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3738 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:25:20 +00:00
Giel van Schijndel
24ba730bdb
* in iV_DrawTextRotated() select the model view matrix and don't depend on that one being selected already
...
* Also push and pop the model view matrix
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3737 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:06:23 +00:00
Giel van Schijndel
637edb1f0d
* in pie_SetTexturePage() _always_ disable texturing when invoked with a negative parameter
...
* In iV_DrawTextRotated() use -1 instead of -2 as texturepage (not that it matters anymore what negative number we use, due to the above change)
* Add some Doxygen documentation to pie_SetTexturePage()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3736 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:03:58 +00:00
Per Inge Mathisen
12bcb52e3d
Truncate strings and binary data sent over the network if larger than expected.
...
Patch by Buginator in patch #974 with changes by me.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3733 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 11:43:08 +00:00
Ari Johnson
adfeb3ab98
Updated Mac OS X port to use QuesoGLC 0.7.0 with a work-around for a
...
text display bug
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3732 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 21:55:02 +00:00
Giel van Schijndel
65a3ff6a8b
perform endian swapping for MSG_PLAYER_INFO messages;
...
NOTE: reverting r3669 (or re-applying r3643) would be better, though unfortunately it doesn't work...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3729 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 18:29:58 +00:00
Per Inge Mathisen
54bcf0cde5
Remove completely mistaken comment from the original code. Textures use
...
0 to 256 range of texture coordinates, and the width of the texture should
therefore not be used to deduce wrap around point for texture animation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3719 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 17:58:37 +00:00
Per Inge Mathisen
b5d2cc00b9
Remove an unused and a duplicate typedef.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3711 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-07 17:02:25 +00:00
Per Inge Mathisen
69418fc1a4
Fix typo in IMD loading error message.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3702 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 13:06:04 +00:00
Gerard Krol
5ee301ec76
Make the radar (minimap) transparent again.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3701 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-05 23:02:59 +00:00
Gerard Krol
31a8a54ddb
Revert r2901 as this is not the correct way to fix the smearing issues. It probably has something to do with the fogbox or
...
looking underground. As last resort r1301 "Speed up for people who are fillrate limited" can be reverted.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3699 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-05 21:35:42 +00:00
Per Inge Mathisen
79db811b58
Remove ugly radar constants from pieblitfunc, where they do not belong.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3691 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 18:03:02 +00:00
Per Inge Mathisen
20620668ef
Move pie_DrawRect into narrower scope, move in some duplicated calling code, and make it static.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3689 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:58:18 +00:00
Per Inge Mathisen
b1ef18e61d
Kill unused PIESTYLE struct and parameter.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3688 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:55:56 +00:00
Giel van Schijndel
491b968833
* Make cdAudio_PlayTrack work with an enum instead of "magic numbers"
...
* Use this enum's values throughout the src/* code
* Replace scripting function playCDAudio(int) by playIngameCDAudio() which is equivalent to cdAudio_PlayTrack(playlist_ingame)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3687 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:46:55 +00:00
Giel van Schijndel
8fe5f93991
Add a workaround/hack to prevent starting of new songs when we switch playlists
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3686 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:35:34 +00:00
Giel van Schijndel
1513ac41e2
Because g_apTrack's size is determined on compile time don't allocate it dynamically but statically
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3678 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 12:25:18 +00:00
Dennis Schridde
cdb9b7bacc
Properly wrap the dummy reference. This issue does not only exist on the Mac and was fixed wrongly in r3659.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3671 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 21:38:43 +00:00
Giel van Schijndel
6d27eabf88
Revert r3643; this fixes #7
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3669 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 20:19:52 +00:00
Giel van Schijndel
70d7e095f0
When bailing out of packet decoding make sure to call NETend()
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3668 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 17:46:03 +00:00
Giel van Schijndel
208a399d73
Turn an ASSERTion into a debug(LOG_NET, as is not safe to simply assume that a player ID is correct (and as such we cannot just ASSERT on it)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3667 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:58:48 +00:00
Giel van Schijndel
4a77f3d8b0
Use NETsendGAMESTRUCT and NETrecvGAMESTRUCT to send & receive GAMESTRUCTs endian safe
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3665 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:39:49 +00:00
Giel van Schijndel
730ef63107
Add functions NETsendGAMESTRUCT and NETrecvGAMESTRUCT to deal with sending & receiving of GAMESTRUCTs in an endian safe way
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3664 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:39:46 +00:00
Giel van Schijndel
459254f306
Update netlog.c's packetname list for r3661
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3662 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 14:42:02 +00:00
Giel van Schijndel
0c7ade394d
* Remove message type MSG_PLAYER_DATA as it sends/receives void* data chuncks which is __not__ endian safe (not to mention struct padding)
...
* Don't maintain player stats in lib/netplay/netplay.c; instead maintain them in src/multistat.c
* Add a new net message type (NET_PLAYER_STATS) to exchange player stats
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3661 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 14:39:31 +00:00
Giel van Schijndel
4354be1e75
Put the "System Net Messages" in an enum rather than #defining them with custom numbers
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3660 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 14:39:12 +00:00
Giel van Schijndel
e7abee3ced
Don't use the OggVorbis callback hack when compiling on the Mac
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3659 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 13:47:48 +00:00
Dennis Schridde
b7e36a5b77
Require devpkg to be in ./devpkg/ for msvc.
...
This saves the trouble of having to edit the paths for lib/include dirs and enables us to have the FlexBison.rules there, too.
Thus FlexBison.rules is removed and to be found in the msvc devpkg from now on.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3657 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 18:17:58 +00:00
Giel van Schijndel
32863ae12a
Remove unused net message types and function declarations which have no implementation
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3651 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 15:13:34 +00:00
Giel van Schijndel
92bc594493
Remove networking message NET_VERSION (used by (send|recv)VersionCheck); as the functions that used them didn't actually do anything
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3650 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 15:04:08 +00:00
Giel van Schijndel
56c5b3bdab
Move MSG_JOIN over to the new netcode API
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3649 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:24 +00:00
Giel van Schijndel
cff2a7b279
Move MSG_PLAYER_LEFT over to the new netcode API
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3648 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:20 +00:00
Giel van Schijndel
9ca2e82364
Move sending & receiving of MSG_PLAYER_JOINED and MSG_ACCEPTED to the new netcode API
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3647 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:17 +00:00
Giel van Schijndel
26844585f8
Move sending & receiving of MSG_GAME_FLAGS over to the new netcode API
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3646 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:13 +00:00
Giel van Schijndel
b76b958bb7
Move sending & receiving of MSG_PLAYER_DATA over to the new netcode API
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3645 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:08 +00:00
Giel van Schijndel
d9c154c970
Rework resize_global_player_data to work with realloc instead of of a combination of malloc and free
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3644 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:04 +00:00
Giel van Schijndel
9926852390
Port NETBroadcastPlayerInfo over to the new netcode API
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3643 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 13:04:32 +00:00
Giel van Schijndel
aafbc90945
Don't use C99 variable struct members
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3632 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 22:12:25 +00:00
Giel van Schijndel
7c204a47ac
Change file-specific comment in Doxygen comment
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3631 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 21:56:02 +00:00
Giel van Schijndel
6e74be4df9
Use C linkage for frameresource.h and debug.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3629 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 21:26:37 +00:00
Giel van Schijndel
07359499ab
Don't define our own custom implementation when compiling with g++ either
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3628 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 21:01:23 +00:00
Giel van Schijndel
6ddb4af1d5
Clean up header files of sound library:
...
* Change file-specific comments into Doxygen comments
* Remove a whole load of unused and unnecessary macros
* When compiling as C++ make sure to use C linkage
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3627 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 20:43:11 +00:00
Giel van Schijndel
a323c83e7c
* Don't use EOF for end-of-string detection; use '\0' instead
...
* Patch #959 by Michel Dänzer (in Debian bug 458733), modified by Paul Wise <pabs>
* Don't cast a variable of type char to char...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3617 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 12:59:42 +00:00
Giel van Schijndel
f558eb0d61
Revert unintentional part of r3612
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3613 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:39:31 +00:00
Giel van Schijndel
4f93b03142
Make function-pointer array pLoadFunction a local (but still static) array instead of global
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3612 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:38:05 +00:00
Giel van Schijndel
ef3d1f5c92
Fix compiling on MSVC; patch #955 by Buginator, slightly modified by me
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3607 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 21:44:12 +00:00
Giel van Schijndel
2b59e6840d
Add a Doxygen parameter description to sound_PlayStreamWithBuf for fileHandle, volume, onFinished and user_data
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3596 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-29 13:05:38 +00:00
Dennis Schridde
411545852f
Cleanup
...
- theSun becomes static (+setter/getter)
- normalsOnTile() doesn't use global vars anymore
- pie_SurfaceNormal3fv() now works more like the pievector.h functions
- pie_SurfaceNormal3fv() was cleaned up and became inline function in piematrix.h
- Use more pievector.h functions
- Remove unnecessary multiplications/divisions from calcTimeIllum()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3592 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 01:29:20 +00:00
Dennis Schridde
06a3b11a62
Revert r3588. I already did that in r3586.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3591 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:51:21 +00:00
Dennis Schridde
7f3c67175c
Comment FP12
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3590 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:43:26 +00:00
Giel van Schijndel
7cf72b6fea
#include <math.h> and "lib/framework/math-help.h" where required
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3588 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:29:19 +00:00
Dennis Schridde
751d0809c5
Use new VectorX_Compare instead of old VectorX_compare which I'll remove shortly.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3587 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:27:21 +00:00
Dennis Schridde
9f9c417240
Include lots of forgotten math.h and roundf() is included in C99.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3586 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:22:02 +00:00
Dennis Schridde
76fddad000
Generic cleanup. Mostly remove struct keyword where unnecessary.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3585 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:02:28 +00:00
Giel van Schijndel
b3a3cecaed
Rename fractions.h to math-help.h and remove most junk from it
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3584 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:01:37 +00:00
Giel van Schijndel
e5885934b7
Utilise sound_PlayStreamWithBuf in cdAudio_OpenTrack to specify a larger buffer count
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3583 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 23:34:25 +00:00
Giel van Schijndel
024c8c1c10
Add function sound_PlayStreamWithBuf to allow specifying custom buffer counts and sizes to use for a stream
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3582 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 23:32:55 +00:00
Giel van Schijndel
6d99a49ef4
Use the sound_.*Stream functions to implement the cdAudio aka playlist code instead of custom crafted code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3580 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 22:31:16 +00:00
Dennis Schridde
c399050b62
Enhance Vector class with some more normalisation, comparison, etc.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3579 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 22:21:15 +00:00
Giel van Schijndel
f880720628
Implement sound_StopStream, sound_PauseStream and sound_ResumeStream for stopping, pausing and resuming of playing streams initially created with sound_PlayStream
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3578 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 21:33:10 +00:00
Giel van Schijndel
6de5602631
* Make sound_PlayStream and audio_PlayStream return a AUDIO_STREAM* pointer instead of a bool
...
This pointer can later on be used to stop, pause & resume playing of the given stream
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3577 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 21:28:35 +00:00
Per Inge Mathisen
e0b92752db
Constify some piematrix functions
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3576 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 21:05:30 +00:00
Per Inge Mathisen
895ba1c8cd
Make less of piematrix.c globally exported.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3575 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 20:57:26 +00:00
Per Inge Mathisen
75c77a4af4
Make drawing code less convoluted and store less state in tileScreenInfo.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3573 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 18:47:08 +00:00
Giel van Schijndel
301c7f64f5
Assume G++ has a proper vsnprintf and snprintf implementation
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3566 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 16:34:39 +00:00
Per Inge Mathisen
15a22f8724
Remove unused netplay macros
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3558 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 13:45:03 +00:00
Per Inge Mathisen
3a6bfab317
Fix more problems with tabs in the GUI, patch #949 by Buginator.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3543 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 20:11:10 +00:00
Dennis Schridde
2d29dc2191
Replace runtime code_part_names size checking by counting with a STATIC_ASSERT on its size.
...
Additionaly:
- Introduce ARRAY_SIZE macro
- Use code_part instead of int where applicable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3539 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 16:03:58 +00:00
Dennis Schridde
cbccd3336c
Revert r3537, as it may not be safe on all compilers...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3538 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 15:47:20 +00:00
Dennis Schridde
d2370600d8
Replace code_part_names() with code_part2string(), which gets us rid of having to check that the array size matches the enum on runtime.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3537 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 15:41:21 +00:00
Dennis Schridde
2ff72516fd
idx -> index
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3534 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 23:08:17 +00:00
Dennis Schridde
86be7e0389
PRINT_B macro -> bool2string function
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3533 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 23:03:04 +00:00
Dennis Schridde
664507be0d
Minor beautification of error messages.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3532 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 22:44:24 +00:00
Dennis Schridde
463aaf53d1
Make TF_ERROR into a readable function.
...
- tagGetErrorString is not provided anymore, all output goes directly to LOG_ERROR.
- The trace contains some more information.
- ASSERT()s in the unit test were removed. The output is already done by TF_ERROR where needed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3531 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 22:33:41 +00:00
Dennis Schridde
f3296ee96b
struct define -> struct _define and define_t
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3530 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 22:19:15 +00:00
Per Inge Mathisen
fec3b1ca08
Indexed colour usage has been eliminated, so remove its support code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3529 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 17:06:31 +00:00
Per Inge Mathisen
921ab82191
Clean up GUI frame drawing and port it to PIELIGHT.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3528 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 16:57:00 +00:00
Dennis Schridde
17b7ffa3f9
Remove dbghelp.h. And update version (wine-0.9.53) is now included in the mingw32 devpkg.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3527 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 00:23:14 +00:00
Ari Johnson
d075817fce
Fixed a typo in the #warning for GLC_TRIANGLE
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3525 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-20 23:48:00 +00:00
Per Inge Mathisen
b9bcbad34c
Port scores code to use PIELIGHT.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3524 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-20 23:01:13 +00:00
Per Inge Mathisen
df19674baf
Save gateways and zones in tagfile format.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3513 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-20 16:52:51 +00:00
Freddie Witherden
4b072b28f7
Commit patch #942 by Buginator.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3506 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-19 18:23:14 +00:00
Per Inge Mathisen
579e2e428e
String code cleanup
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3498 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-16 19:07:15 +00:00
Per Inge Mathisen
08c2a06822
GUI cleanup
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3497 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-16 18:54:16 +00:00
Dennis Schridde
b422209c9a
Rename range() to wrap() and warn about unused results.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3484 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 18:15:13 +00:00
Dennis Schridde
ff34e1fb68
Introduce new functions range() and rangef() to clip a value into a certain range.
...
Use that to cleanup some code.
Because of the lack of a local "math.h", it went into trig.h.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3483 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 18:02:54 +00:00
Dennis Schridde
31a863a90b
Setup eol-style CRLF for vcproj files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3473 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 20:49:48 +00:00
Dennis Schridde
1c44cf8568
path #938 by Bugginator: MSVC projectfile updates. You need the static libraries from http://download.gna.org/warzone/development/devpkg/2.1/msvc80/ now.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3472 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 19:57:50 +00:00
Dennis Schridde
d7bbab46af
Set eol-style and mime-type for vcproj files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3471 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 19:55:59 +00:00
Giel van Schijndel
d938ed3946
* Check wether we're compiling as C99
...
* if not #error about requiring a C99-compliant snprintf & vsnprintf implementation
NOTE: This doesn't affect MSVC as I've already provided a C99-compliant implementation for it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3449 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 13:53:00 +00:00
Giel van Schijndel
6c886470ad
* Rename the MSVC snprintf and vsnprintf replacements to wz_snprintf and wz_vsnprintf respectively to prevent conflicting definitions
...
* #define snprintf and vsnprintf to wz_snprintf and wz_vsnprintf respectively
Thanks to Buginator for pointing out the issue in patch #937 ; the solution is different than his though
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3447 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 11:14:15 +00:00
Per Inge Mathisen
e5e64113ea
Simplify clparse.c by removing unused and/or unusable commands.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3444 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 18:12:22 +00:00
Per Inge Mathisen
49cc91b0ef
Move all skybox page handling to display3d.c to prepare for skybox scriptability.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3438 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 15:10:02 +00:00
Per Inge Mathisen
5b1ec5cfc1
Add new debug mechanic: objTrace(). It works like debug(), but also takes an object parameter.
...
Debugging info given with it will only be displayed for the enabled game object. Default key
to enable debugging info for a game object is CTRL+L. Converted LOG_MOVEMENT to use it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3432 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-11 22:45:04 +00:00
Per Inge Mathisen
f246839359
patch #928 ported map send/rev to new netAPI by Buginator with style fixes by me
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3431 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-11 21:39:41 +00:00
Per Inge Mathisen
2cd496d9c7
Remove unused defines, prettify animation code a bit, and use same electronic
...
warfare effect code for all objects - the one which does not modify individual vertices.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3429 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-10 22:18:20 +00:00
Giel van Schijndel
73d329fde8
* Fix a magic number (28) supposedly representing enum value NET_LEAVING (which is 18)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3423 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 23:07:36 +00:00
Per Inge Mathisen
f7fbf845c0
Small cleanup to animation code, and fix copy&paste typo in 3ds2pie.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3412 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 21:58:05 +00:00
Per Inge Mathisen
5657b38ef0
Hopefully fix bug that would lock fps setting to defaults.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3403 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-07 20:48:29 +00:00
Giel van Schijndel
53abc0a73b
* Correctly fix "clever" use of malloc __without__ introducing a memory leak in the process (r3305 introduced one)
...
* Make sure we use the same signdness in IMAGEDEF as we did before r3302
* Use a correct format specifier ("%u") for printing an unsigned integer
* Turn a bunch of UDWORDs which don't necessarily need to be UDWORD into unsigned ints as one of those __does__ need to be an unsigned int (i does, for the printf format specifier)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3398 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 21:21:31 +00:00
Per Inge Mathisen
441f4038e4
Replace a ton of custom texture clipping code with a single call to OpenGL scissor test.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3380 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 14:05:13 +00:00
Per Inge Mathisen
bfb542e69e
Remove unused animation defines
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3377 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 12:12:26 +00:00
Giel van Schijndel
a2fe74852b
* Fix some errors in the Doxygen documentation
...
* Parameter descriptions for non-existing parameters removed
* Wrong parameter names renamed/fixed
* Syntax errors in passing the a parameter to a Doxygen command at the wrong location
* Prevent HTML interpretation of some comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3373 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 23:42:54 +00:00
Dennis Schridde
b03ab065f9
Fix breakage from r3367: Soundfilenames were forgotten to be changed inside the sourcecode.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3370 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 22:09:56 +00:00
Per Inge Mathisen
ae19f5bd54
Move PHYSFS_APPEND and PHYSFS_PREPEND macros to lib/framework/
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3354 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 14:50:16 +00:00
Per Inge Mathisen
eddebc7f81
Move some initialization code from src/ into lib/framework
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3353 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 13:50:34 +00:00
Ari Johnson
55ecef381b
Fixed error message
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3350 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 00:22:23 +00:00
Ari Johnson
e424aed624
Added /* */ around a comment to permit Warzone to compile again
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3349 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 00:06:40 +00:00
Giel van Schijndel
d249ac2188
* By default perform truncation detection in strlcat and strlcpy (i.e. return the length that would be the resulting length if no truncation occurred)
...
* Add a Doxygen comment for strlcpy & strlcat
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3348 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 23:16:29 +00:00
Giel van Schijndel
65961cbb45
* Use a variable to store the tagfile unittest definition files' names in (rather than copy-pasting those in the tagOpenRead & tagOpenWrite calls)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 20:01:54 +00:00
Giel van Schijndel
34d26a6719
* Don't do "if (ptr != NULL) { ... } if (ptr == NULL) { ... }" instead use an if-else construction: "if (ptr != NULL) { ... } else { ... }"
...
* Use slcatprintf instead of snprintf into a local buffer (on the stack) followed by concatenating to our target string
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3345 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 19:11:16 +00:00
Giel van Schijndel
87a55581f0
* Move the tag definition files over to data/tagdefinitions and move the savegame definitions into data/tagdefinitions/savegame
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3343 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 16:10:51 +00:00
Giel van Schijndel
e722d7ec39
Add some more comments
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3340 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 15:12:01 +00:00
Giel van Schijndel
f3499cc232
Replace asserts on invalid tags with CHECK_TAG_INVALID
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3339 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 14:59:19 +00:00
Freddie Witherden
9a312a7991
Commit the second part of patch #913 which removes (the defunct) AUDIOMSG system.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3335 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 13:38:19 +00:00
Giel van Schijndel
1d83be8064
* s/tagWriteSeparator/tagWriteNext/g for consistency's sake (to match the tagReadNext function, which is the reading equivalent)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3334 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 13:37:42 +00:00
Freddie Witherden
daad83d316
Make NETend(); return TRUE when we are finished decoding.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3331 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 10:32:59 +00:00
Giel van Schijndel
48f32faccf
* Add function resGetNamefromData which complements resGetNamefromData and allows you to retrieve the resource ID (usually filename) for a resource (IMD, IMG, TEXPAGE, WAV, etc.)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3324 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-03 00:35:57 +00:00
Giel van Schijndel
b60b1b121c
* Use const-correct functions for the tagWrite.* stuff
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3322 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-03 00:30:17 +00:00
Giel van Schijndel
785eb69c8b
* Add a forward declaration for tagReads32v into tagfile.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3321 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-03 00:29:10 +00:00
Per Inge Mathisen
2ca1351c13
Add another field to the IMG csv files that describe what it does.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3314 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-02 19:15:45 +00:00
Per Inge Mathisen
dc7a84da62
Log droid death and packet source. Beware: This will make net games incompatible
...
between before and after this commit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3311 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-02 17:08:29 +00:00
Per Inge Mathisen
bb660a0a02
Fix "clever" use of malloc that made MSVC (correctly) complain about assumed size of void.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3305 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 22:13:27 +00:00
Per Inge Mathisen
168a66b89c
Add another backdrop by cathuria.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3303 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 21:40:04 +00:00
Per Inge Mathisen
52cca82fb2
Change the binary IMG files into CSV text files.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3302 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 21:33:47 +00:00
Dennis Schridde
3f6b52bef1
src/game.c: Minor beautification.
...
configure.ac: YY_NO_INPUT prevents Flex from defining input(), which we do not need, since we use our own YY_INPUT instead. Maybe we should use Flex's function instead?
lib/script/script_parser.y: scriptStoreVarTypes() was defined but never used.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3300 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 15:18:25 +00:00
Giel van Schijndel
30d837ec90
* Allow compilation on MSVC again
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3285 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 21:55:02 +00:00
Per Inge Mathisen
eecbccbfb4
Encapsulate time adjustment of value increments in the code and try to
...
document the time code better.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3282 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 18:37:20 +00:00
Per Inge Mathisen
37260b7c2e
tagfile: Allow the specification of an undefined length string in a definition file by
...
making the defined length zero.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3281 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 17:38:04 +00:00
Giel van Schijndel
3d245df0f9
* Provide an implementation of sound_PlayStream
...
* Modify audio_PlayStream's prototype to match sound_PlayStream's implementation & prototype
* In cdspan_PlayInGameAudio use sasprintf instead of a statically sized array and snprintf
* Add some Doxygen comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3276 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 15:16:59 +00:00
Giel van Schijndel
06649908ff
* abort() when out of memory
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3275 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 15:02:29 +00:00
Per Inge Mathisen
a4972d3d38
Reduce verbosity of LOG_3D
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3273 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 14:04:21 +00:00
Giel van Schijndel
de264ad804
* Remove yet some other useless sounds: ID_SOUND_HELP, ID_SOUND_BARB_SCREAM2, ID_SOUND_BARB_SCREAM3
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3270 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 12:02:18 +00:00
Giel van Schijndel
f2118ec871
* Remove cheat "no faults"
...
* Remove sound scream4.ogg (ID_SOUND_NOFAULTS) which it triggered (that's the onlything that cheat did: playing that audiofile)
* All that audiofile contained was a spoken message: "There are no faults, in the renderer, at the moment."
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3266 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 00:28:31 +00:00
Dennis Schridde
9d82dae196
Reduce doubleclick interval from 500 to 250.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3261 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-30 23:42:44 +00:00
Per Inge Mathisen
b4ef4d4349
Add new function attribute WZ_DECL_WARN_UNUSED_RETURN and use it on IdToDroid,
...
whose return must be checked, and fix one bug already detected by it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3260 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-30 21:44:14 +00:00
Per Inge Mathisen
72281bab96
Document and clean up game timer code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3246 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-30 18:06:40 +00:00
Dennis Schridde
6134810a78
My most dumb commit ever: Dummy reference vorbisfile.h symbols to prevent warnings.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3233 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 23:24:33 +00:00
Dennis Schridde
5143e3e165
Add MKID macro for dummy symbols.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3232 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 23:21:20 +00:00
Per Inge Mathisen
877ac6456c
Add lots of doxygenized comments.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3230 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 22:34:41 +00:00
Per Inge Mathisen
5cca5e2893
Make droid experience a floating point in tagfile format, and add better
...
error reporting for user errors when they forget to update definition file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3229 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 19:53:14 +00:00
Per Inge Mathisen
52aa90d200
Fix a few spelling errors, and add a new debug category 'multisync'.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3227 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 17:55:20 +00:00
Ari Johnson
47816967a7
Updated Xcode project and some endian fixes; also changed endian_*() calls
...
to expand to ((void) (x)) on little-endian systems, so that the compiler
will catch little-endian developers who forget to update the endian_*()
calls when they change the names of structure fields.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3205 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:55:34 +00:00
Freddie Witherden
6a338c71ce
Use the endian swapping functions provided by SDL.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3201 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 19:29:53 +00:00
Per Inge Mathisen
0c10287938
Add some doxygen documentation for tagfile code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3196 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:37:15 +00:00
Per Inge Mathisen
f7e7e44329
Add new tagfile method tagRead8vDup which reads an unsigned byte array of unknown
...
length, allocates a memory buffer for it, and returns it. Not recommended for
general usage.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3193 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 14:57:22 +00:00
Per Inge Mathisen
fae5745233
Remove unused function pie_DrawImageFileID. Rename pie_SetColourKeyedBlack to
...
pie_SetAlphaTest, and do not enable it while drawing the ordinary terrain.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3189 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 01:05:37 +00:00
Per Inge Mathisen
2390ed5d63
Remove wrongly set (ie was unused) water xyz for tiles, and fix wrong comments.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3176 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-25 20:37:33 +00:00
Giel van Schijndel
bc66705498
* In Vector3uw explicitly use uint16_t instead of UWORD
...
* Add a function NETVector3uw to use for passing Vector3uw objects more conveniently over the network
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3173 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 23:36:02 +00:00
Dennis Schridde
248a8cb510
Minor indent
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3170 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 22:05:15 +00:00
Giel van Schijndel
06dab81c11
* Update Code::Blocks and MSVC project files to complement the cleanup of sequence code in r3162
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3163 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 16:31:51 +00:00
Gerard Krol
58b82f44ad
Remove all RPL cruft from the sequence code. The new sequence code can be added to sequence.c easily. Projects will need to be updated.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3162 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 15:57:29 +00:00
Giel van Schijndel
fbf03af195
* Remove macros:
...
* ROUND: replace by a static inline function (math_round) instead
* FRACTCONST: this macro just cast both of its arguments to float and then divide the first by the second
* MAKEFRACT_D: this macro would cast to FRACT_D (which was typedef'd as float but should have been typedef'd as double); so cast to double instead (where required)
* FRACTmul_D: would cast both of its arguments to FRACT_D and multiply them
* FRACTdiv_D: would cast both of its arguments to FRACT_D and divide the first by the second
* MAKEINT & MAKEINT_D (where #defined the same); this macro would just cast to SDWORD (aka "int" or "signed int")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3152 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 13:57:19 +00:00
Dennis Schridde
09a8e33f61
Rename PACKAGE_MAINTAINER to PACKAGE_DISTRIBUTOR to clarify.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3144 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 21:14:02 +00:00
Giel van Schijndel
798d10c6d8
* Guarantee that PATH_MAX is large enough to use as the size for Windows API calls (since with MinGW it is 159 bytes while it should be 160)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3136 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 16:44:36 +00:00
Giel van Schijndel
9fe5736f41
* Remove macro FRACTdiv and all places where it was used (all it did was casting both of its parameters to (float) and dividing the first by the second)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3133 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 23:37:30 +00:00
Giel van Schijndel
ae90bd9c0c
* Remove macro FRACTmul and all places where it was used (all it did was casting both of its parameters to (float) and multiply them)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3132 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 23:29:25 +00:00
Giel van Schijndel
aeecc95088
* Remove macro MAKEFRACT and all places where it was used (all it did was casting to (float))
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3131 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 23:13:05 +00:00
Giel van Schijndel
14f2fe750a
* Make sure not to use if (incorrect-condition) { ASSERT(FALSE, ...); }; instead use ASSERT(correct-condition, ...);
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3128 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 21:10:51 +00:00
Per Inge Mathisen
08d665fe1c
Remove unused palette defines
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3121 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 16:55:39 +00:00
Per Inge Mathisen
53aa930d6e
Turn IMD min and max dimensions into vectors.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3111 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 17:34:23 +00:00
Per Inge Mathisen
35277a4b82
Temporary fix for bug introduced with commit 3065 that made direct weapons unable to hit. Patch #886 by Buginator.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3108 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-19 20:18:37 +00:00
Giel van Schijndel
db3d933791
* Add a new cheat/debug-command "showsamples"
...
* This command will cause the amount of samples in the sound library's queues & lists to be constantly displayed (until turned off) on screen
Patch #887 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3107 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-19 20:17:54 +00:00
Giel van Schijndel
29139cc6da
* Fix crashes due to failing to call the callback when sounds are removed from the queue/list
...
Part of patch #887 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3105 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-18 23:25:32 +00:00
Giel van Schijndel
5c4384623e
* Use WZ_DECL_FORMAT for some functions which take printf-like strings
...
* This enables GCC to check the formatting strings and the types and number of the variable list of arguments passed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3087 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 19:37:40 +00:00
Ari Johnson
31fc86ee9f
Moved a space to match formatting
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3085 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 17:22:07 +00:00
Freddie Witherden
e9ae19df7b
Fix warning about redefinition of MIN/MAX on OS X (as arpa/inet.h also contains MIN MAX macros)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3081 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 18:32:38 +00:00
Giel van Schijndel
f1f1a19be4
* Fix a bug in iV_DrawTextRotatedFv where I used sprintf instead of vsprintf
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3076 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 16:02:54 +00:00
Giel van Schijndel
88bf925cb8
* Add functions iV_DrawTextRotatedFv, iV_DrawTextRotatedF, iV_DrawTextFv and iV_DrawTextF to draw text with a printf-like syntax to the screen
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3075 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 15:47:55 +00:00
Ari Johnson
0a9bcf08a3
Xcode project can almost build trunk again. This commit allows the project
...
to download and build the external libraries that Warzone has added since
the last time that trunk would build under Xcode. The actual game currently
will not build due to other issues, but this is phase 1.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3068 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:34:51 +00:00
Giel van Schijndel
eba3731a93
* Put some duplicated code for destroying sound samples in function sound_DestroyIteratedSample
...
* If in sound_Update() we encounter an error simply destroy the current sample we're working on
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3066 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 20:49:02 +00:00
Gerard Krol
65c56b73e3
Fix an invalid pointer reference in the widget code by making sure that the pointer to the widget currently under the mouse is cleared when the
...
widget is freed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3064 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 14:33:56 +00:00
Per Inge Mathisen
e0c450b415
Remove excess display related code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3062 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 12:18:56 +00:00
Per Inge Mathisen
5417afae46
Read tile colour information directly from mapTiles, instead of going through tileScreenInfo
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3057 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 11:08:23 +00:00
Per Inge Mathisen
0484f5e383
We no longer need .wlight to separately store water colour.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3054 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 16:21:12 +00:00
Giel van Schijndel
8fcd2410be
* Apply the last bit of patch #884 by Buginator (openal_track.c)
...
* Make sure that sound_GetError and sound_GetDeviceError are useable in WZ_NOSOUND builds as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3053 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 15:11:59 +00:00
Giel van Schijndel
d179c09f17
* Fix some errors in openal_track.c; part of patch #884 by Buginator
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3052 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 12:13:23 +00:00
Giel van Schijndel
456208fcc3
* Update MSVC project files (part of patch #884 by Buginator)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3051 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 12:12:36 +00:00
Giel van Schijndel
22f762a3c3
* Prevent a linker error when compiling with -DWZ_NOUSOUND (sound_RemoveActiveSample was used but not defined)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3050 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 11:43:15 +00:00
Giel van Schijndel
992ee8583a
* Fix yet another bug introduced in r3047 (the game would hang in an infinite loop because of failing to increase the iterators)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3049 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:54:28 +00:00
Giel van Schijndel
ff44e8c84c
* Fix a bug introduced in r3047 (segfault due to failing to check for a NULL pointer)
...
* Apply patch #879 by Buginator (refactored by me to use less handcrafted code, and more functions instead)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3048 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:47:46 +00:00
Giel van Schijndel
99c55dbf74
* Try to encapsulate knowledge about AUDIO_SAMPLE's internal representation in openal_track.c (i.e. don't use it in client code!)
...
* Look at sound_StopSample specifically
* Use a function to manipulate the linked list of audio samples (i.e. get rid of duplicated code)
* Allow printing of OpenAL vendor, version, renderer and extensions data on multiple debug "channels" to reduce code duplication
* Add openal_error.[ch] for error detection (and producing debug messages for them!)
* Add TOSTRING and AT_MACRO macros to macros.h
* Get rid of some super-nested if-branches where one of them would return (so we don't actually need an else-branch because the function is left anyway)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3047 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:16:03 +00:00
Giel van Schijndel
5f1977c7f6
* Remove #undef WZ_NOMP3 and #define VERSION from config-macosx.h as they're both not needed anymore...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3041 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-12 21:19:29 +00:00
Dennis Schridde
20050d2a3e
Add some more output do debug dumps: The maintainer who created the package.
...
PACKAGE_MAINTAINER and PACKAGE_VERSION should probably also make their way into the logfile...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3040 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-12 18:34:30 +00:00
Giel van Schijndel
c51bd8ae10
* Get rid of a large quantity of unused parameters
...
* Turn some signed integers ("int" or "SDWORD") into unsigned integers where it made more sence (and signed integers caused warnings about comparing signed with unsigned integers)
* At some places cast to an unsigned integer (where the type of the expression is a signed integer but the result of it logically _always_ is an absolute value)
* Remove unused struct-type EVENT_INIT
* Convert use of malloc->memcpy->free to one single realloc call (and now make sure to actually check realloc's return value, which wasn't done with the malloc call)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3037 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 23:15:46 +00:00
Per Inge Mathisen
6118371c0e
Add methods to read/write byte arrays to tagfile format.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3036 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 21:48:27 +00:00
Freddie Witherden
2506b69e1f
Add a CLIP macro for culling a value between a min and max value.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3029 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 18:36:07 +00:00
Giel van Schijndel
51c32760b4
* Fix a bug where would free the wrong pointer (thanks to Buginator for spotting it)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3026 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 23:35:56 +00:00
Giel van Schijndel
cc12f08b1a
* Apply patch #879 by Buginator with some heavy modifications by me
...
* Upon removing BASE_OBJECTs loop through the lists of outstanding AUDIO_SAMPLEs to delete all of those that refer to this BASE_OBJECT
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3023 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 22:36:06 +00:00
Per Inge Mathisen
6c4c61fbb7
PIELIGHT fix for map hightlight. Remove use of colours to communicate a boolean value.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3022 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 21:50:47 +00:00
Per Inge Mathisen
da7b96315c
Final PIELIGHT changes to the widget code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3021 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 21:40:26 +00:00
Dennis Schridde
c64b565f14
Patch #872 by Buginator. Untested by me since in Bugs we trust. ;)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3020 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 19:10:34 +00:00
Per Inge Mathisen
53f11c391f
Add a new vector field to the PIELIGHT union, and send colours to OpenGL
...
as arrays rather than as individual bytes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3019 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 17:41:00 +00:00
Per Inge Mathisen
4ee90ba9e3
Adapt radar view to PIELIGHT scheme. The radar colours have been changed a lot, and
...
we probably need to massage these colours a bit before release. Radar tile colours
in all but objects only mode are a complicated blend of tile height and colour. Closes
patch #858 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3018 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 17:23:34 +00:00
Per Inge Mathisen
4ddd4c28af
Large PIELIGHT cleanup. Please report bad colours.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3017 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 16:09:23 +00:00
Per Inge Mathisen
63211571b0
New utility function pal_Colour() creates PIELIGHT from RGB values.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3011 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 13:11:09 +00:00
Per Inge Mathisen
76840b01d2
Large PIELIGHT cleanup. Also cleans up tile drawing logic somewhat.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3006 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 00:33:03 +00:00
Dennis Schridde
fde3e48eb1
Remove rules which could not ever be matched. The behaviour shouldn't change. If some Lex guru finds a mistake, please tell me. :)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3001 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-08 00:32:51 +00:00
Giel van Schijndel
ec392ef7d4
* Improve the quality of the QuesoGLC error messages produced when fonts cannot be loaded/selected
...
* When we're unable to select a font face give a warning (LOG_WARNING) instead of an error (LOG_ERROR)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2992 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-07 19:31:19 +00:00
Freddie Witherden
299d7bfcfb
Commit patch #871
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2983 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-05 21:56:12 +00:00
Per Inge Mathisen
8d48c5fdd1
Partial conversion from 0.0->1.0 texture coordinate range. For now only terrain
...
textures are converted. Once they are done, the texture matrix hack is restored.
Thanks to devurandom and cybersphinx for help and previous efforts in this area.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2980 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-05 18:54:17 +00:00
Per Inge Mathisen
4519230af1
Split out CLIP_VERTEX from TERRAIN_VERTEX, since the former usages are not really
...
related to terrain, and do not need all terrain fields and future changes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2979 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-04 20:25:25 +00:00
Per Inge Mathisen
cd91da0caa
Add right and left scroll bars to build menu tabs. By Buginator in patch #870 with
...
some cosmetic fixes by me.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2974 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 20:47:05 +00:00
Per Inge Mathisen
f86858109a
Fix texture size warning. It will correctly nag about missing support for 2048x2048 textures.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2973 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 20:29:34 +00:00
Per Inge Mathisen
6da463546f
More PIELIGHT fixes
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2961 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 16:38:21 +00:00
Giel van Schijndel
9a0eecb753
* Revert accidental commit of exceptionhandler in r2952
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2953 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 00:03:52 +00:00
Giel van Schijndel
55526401be
* Copy over the cross compile scripts from the 2.0 branch to trunk (with necessary modifications)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2952 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 00:02:45 +00:00
Giel van Schijndel
ae79833367
* In vasprintf when we have to produce a zero-length string:
...
* Assign the resulting pointer to the char** strp pointer
* Return zero (instead of the pointer)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2948 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 23:44:29 +00:00
Per Inge Mathisen
4bbf490aca
Change the rendering of the normal terrain to use vertex arrays. We still
...
recalculate everything each turn. See patch #865 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2939 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 17:07:03 +00:00
Per Inge Mathisen
afa23e157a
Beauty fixes
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2937 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:55:23 +00:00
Dennis Schridde
d75b63cdb3
Cleanup water-moving:
...
- Remove now unnecessary offset parameter from pie_DrawTerrainTriangle
- Move GL code from display3d.c to piematrix.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2935 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:43:28 +00:00
Per Inge Mathisen
3dfc90107e
Simplify handling and drawing of areas outside the map.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2934 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:35:49 +00:00
Freddie Witherden
b73b28f191
Revert dodgy removal of trig functions. More testing required
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2904 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-29 23:10:54 +00:00
Freddie Witherden
dbcb55414d
Remove the pre-computed trig tables system
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2903 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-29 22:50:25 +00:00
Giel van Schijndel
263f92f24f
* Always clear the colour buffer in pie_ScreenFlip; this should prevent "screen smearing"; hinted by Buginator
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2901 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-28 21:53:59 +00:00
Per Inge Mathisen
134e31b558
More PIELIGHT fixes. Retire iV_BoxFill. Fix "mission achieved" dialog colours.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2895 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 22:59:21 +00:00
Per Inge Mathisen
4dd2dfc63d
More PIELIGHT conversions. Fix colour issue in load/save dialog.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2894 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 22:10:31 +00:00
Per Inge Mathisen
13d1607349
Introduce new palette system WZCOL_* for setting the essential game palette.
...
Change over pie_BoxFill() to PIELIGHT. Fix colour bug when building structures.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2893 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 21:48:36 +00:00
Giel van Schijndel
6c8702a915
* Replace a lot of array indexing code of this form *(array + index) with this form array[index]
...
* This should be a syntactical change only!
* I.e. even the generated assembly should be the same, but behaviour should __definitly__ be the same!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2892 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 21:04:42 +00:00
Giel van Schijndel
da2f84009b
* In addition to the changes of r2853, make passing a NULL pointer safe as well
...
* In the error messages being output, distinguish between a NULL pointer and an empty string
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2890 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 15:57:56 +00:00
Giel van Schijndel
a44aa48f00
* Don't use a C99 variably sized struct member to store the filename of a track (instead a plain pointer will be used)
...
* Make sure to check for a NULL pointer __before__ passing it to strlen
* Allow the loading of a track (in sound_LoadTrackFromFile), even if GetLastResourceFilename() returns a NULL pointer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2889 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 15:16:51 +00:00
Per Inge Mathisen
af40ffa1cb
Convert fog code to PIELIGHT
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2888 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 23:06:24 +00:00
Per Inge Mathisen
fcf0fc8d21
More colour cleanup.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2886 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 22:38:22 +00:00
Per Inge Mathisen
1fd3e84133
Remove unused ALPHA_MODE
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2885 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 22:02:35 +00:00
Per Inge Mathisen
0265339de6
Remove unused TEX_CAP and TEX_MODE.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2884 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:55:40 +00:00
Per Inge Mathisen
7713623a64
Remove unused bilinear mode.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2883 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:47:57 +00:00
Giel van Schijndel
6172bdd498
* Refactor space trailing code in textdraw.c such that it is easier to read (also has some comments now which might help...)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2882 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:43:16 +00:00
Per Inge Mathisen
4e25b2d0fe
Make more use of PIELIGHT.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2880 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:15:08 +00:00
Freddie Witherden
05fdb3af34
Updated the network primitives functions
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2870 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 12:12:03 +00:00
Per Inge Mathisen
0d7d6dee26
Extend tagfile saves to cover droid movement information. Improve tagfile error reporting somewhat.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2868 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 22:23:40 +00:00
Per Inge Mathisen
bacb7975b1
Add new tagfile method to read and write 32bit signed arrays. Fix error that
...
would interpret floating point arrays as 16bit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2867 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 21:05:19 +00:00
Per Inge Mathisen
b5fa689b41
Include SDL_opengl.h instead of GL/gl.h for better portability. This is vital
...
for Mac compilation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2864 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 16:41:00 +00:00
Dennis Schridde
9cc0a628c1
Do parts of the proposed changes in "[Warzone-dev] build issues in FreeBSD system" by Yaroslav Kolomiyets from 24.10.2006:
...
- SDL header includes don't use SDL/ anymore (raw Makefiles and MSVC Project adapted).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2863 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 11:49:51 +00:00
Per Inge Mathisen
36c3cb1b6c
Remove unused PIEVERTLIGHT. Retire iColour type in favour of PIELIGHT. Fix circular headers.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2861 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-23 21:51:48 +00:00
Per Inge Mathisen
8475171be0
Remove iV colour defines
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2860 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 21:29:28 +00:00
Per Inge Mathisen
dadf2ffc00
Vastly improve edit box cursor. Fix improves on patch in bug #10270 by Buginator.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2857 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 20:13:50 +00:00
Per Inge Mathisen
8ad6ff9dc1
Remove double click for keyboard and mouse wheel. Patch by buginator in patch #851 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2854 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 18:51:54 +00:00
Per Inge Mathisen
eeefdc0af0
Do not crash if filename to sound is not set. Modified version of patch #855 by Buginator.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2853 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 18:35:03 +00:00
Per Inge Mathisen
a980ac2ffe
Clean up gamelib, removing nearly empty maxpidef.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2850 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-21 23:06:31 +00:00
Giel van Schijndel
6083c030bf
* revert (unnecessary r2843)
...
* make sure to #define _GNU_SOURCE when compiling on Unix systems with Code::Blocks
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2845 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-20 21:36:36 +00:00
Giel van Schijndel
027b9218a9
* Fix a potential compile error when using asprintf on non-Windows systems
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2843 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-20 21:18:33 +00:00
Per Inge Mathisen
904bfe5f3d
Make some stuff static
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2842 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-20 20:41:13 +00:00
Per Inge Mathisen
345d335790
Reduce max radar zoom to 1, because a value of 2 is buggy. Replace
...
hard-coded radar size values with a slightly better define.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2841 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-19 21:32:35 +00:00
Per Inge Mathisen
d8c8ee9ee1
Remove unused _iVPRIM_DIVTABLE table.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2838 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-19 20:09:01 +00:00
Per Inge Mathisen
647ae8810c
Improve comments and documentation of tagfile code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2835 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-19 19:16:21 +00:00
Giel van Schijndel
1f2d5cbddf
* Add a new debugging level LOG_SAVEGAME or "savegame"
...
* Add a large quantity of debug() calls to game.c
* Correct some spelling errors in comments
Part of patch #853 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2826 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-15 18:32:07 +00:00
Per Inge Mathisen
fb9d667895
Clean up screen.c - make globals static and remove unused vars.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2822 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 22:29:19 +00:00
Per Inge Mathisen
f577a8f269
Remove unused screenGetSurface
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2821 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 21:05:45 +00:00
Per Inge Mathisen
50e99ae933
Remove unused pietexture.c|h files and references.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2820 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 19:51:04 +00:00
Giel van Schijndel
73307a762e
* Lets use valid syntax shall we... (introduced in r2817)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2818 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 19:23:04 +00:00
Giel van Schijndel
714d117c71
* Add a concatenating variant of snprintf and vsnprintf, slcatprintf and vslcatprintf respectively
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2817 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 19:14:27 +00:00
Per Inge Mathisen
66cee9b2d5
Add more sanity checking and error description to tagfile format at the
...
cost of even less sanity for whichever poor soul who reads this code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2816 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 18:47:48 +00:00
Giel van Schijndel
b285cdea7d
* Use vsnprintf instead of snprintf!
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2809 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 19:03:30 +00:00
Giel van Schijndel
1bd1483944
* Use snprintf (in vasprintf) to determine the size of the string we're about to construct
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2807 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 22:09:20 +00:00
Giel van Schijndel
be25c4901b
* Modify sasprintf to take this signature instead: "void sasprintf(char**, const char* fmt, ...)" (take in mind though that it is a macro!)
...
* Add some comments to sasprintf
* Utilize sasprintf and asprintf in src/version.c to drastically cut back in code size and duplication
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2806 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 22:01:05 +00:00
Freddie Witherden
1b9b69048c
Add a stack allocating version of sprintf
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2805 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 21:29:56 +00:00
Giel van Schijndel
6486b5270b
* Add implementations of vasprintf and asprintf for Windows (GNU extensions to the C library that malloc the memory they need)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2804 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 21:12:13 +00:00
Giel van Schijndel
7711572f0a
* Add a new module (printf_ext.c) to contain some printf extensions (C99 printf variants for MSVC)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2803 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 20:58:10 +00:00
Giel van Schijndel
a08e6f07f8
* Provide alloca() on GCC, MinGW and MSVC (and all other WZ_OS_UNIX compilers that provide <alloca.h>
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2801 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 20:04:50 +00:00
Giel van Schijndel
aef7af381e
* Make function NETsetupTCPIP const correct
...
* Don't #include <unistd.h> in source:trunk/src/clparse.c as we don't need it
* Rename a debug message to use the correct function name as prefix (bitimage.c)
* Utilize snprintf instead of sprintf, at two locations
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2796 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:08:41 +00:00
Per Inge Mathisen
ff13be0b96
Do not disable lighting if it was never enabled in the first place, to avoid
...
doing unnecessary OpenGL state changes. Also make sure we turn off normalization.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2778 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:56:14 +00:00
Dennis Schridde
1dd2b54431
wzglobal.h never belonged to Eidos. Instead large parts of the code are copied from Qt and thus belong to Trolltech.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2776 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:25:02 +00:00
Dennis Schridde
5ccaa17971
Correct WZ_CC_TINYC check. (Note the namechange!)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2775 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 12:10:54 +00:00
Dennis Schridde
3a56a479b3
- Extend compiler detection with TinyCC
...
- Add window system detection
- Remove MSDOS from supported OSes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2771 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 00:31:43 +00:00
Dennis Schridde
223bc803e8
Use OLD_TEXTURE_SIZE_FIX instead of 256.0f to scale texcoords, to make clear that this is a fix for the old ...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2759 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 17:43:50 +00:00
Dennis Schridde
cc7840e866
change_int64_t_to_intptr_t.patch from patch #837 by <cybersphinx> Christian Ohm.
...
(Make WZ compile with the Tiny-C-Compiler by using the correct type for storing pointers as ints)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2757 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-08 23:11:59 +00:00
Giel van Schijndel
96d5054729
* Make sure to #include <stdio.h> when compiling on MSVC so that those inline replacements for snprintf and vsnprintf will actually compile....
...
* Lets terminate statements with a semi-colon!!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2745 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 18:36:37 +00:00
Giel van Schijndel
7b2530306c
* On MSVC make sure to #define inline __before__ using it!!
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2744 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 18:30:19 +00:00
Giel van Schijndel
92e013e406
* Add static inline functions vsnprintf and snprintf when compiling with MSVC
...
* These functions comply to the C99 specification and return the amount of characters they would have written if no truncation occurred
Slightly modified form of patch file #3146 attached to bug #10269 by Buginator; applied the changes of this patch to wzglobal.h instead of version.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2742 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 14:07:50 +00:00
Giel van Schijndel
93c387f1fb
* Change "failed to open file" error message, when attempting to load a playlist, from LOG_ERROR to LOG_NEVER as it isn't a real error condition
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2717 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 18:45:57 +00:00
Giel van Schijndel
6268b6fff2
* Don't allocate memory in PlayList_Init() while we don't need it yet
...
* Make sure to set '''global''' pointers to NULL when free()ing them
* Also set the "size" variables belonging to these pointers to zero
* Use a swap(a, b) style function for variable swapping (in PlayList_Shuffle()) rather than obfuscating code
* Make sure that PlayList_CurrentSong() and PlayList_NextSong() return "const char*" rather than "char*" to make sure no one touches memory he/she shouldn't
* Some general changes to conform with coding style (most notably: braces on a line of their own)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2712 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 16:14:24 +00:00
Giel van Schijndel
aa4bb6c529
* Prevent a segfault occuring when quitting from warzone if a non-power of two number of tracks has been loaded into a playlist (due to uninitialized pointers)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2711 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 16:05:11 +00:00
Giel van Schijndel
7a01000da9
* Clean up some of the playlist code:
...
* Make PlayList_Read return a bool instead of char (using 'char' there was a perfect example of premature optimisation; to save memory most likely)
* Remove macro CURRENT_TRACK which expanded to playlist[current_track] (it did _not_ increase readability)
* Make sure to free resources from __all__ return paths from PlayList_Read
* Check realloc's return value
* Don't bitshift but multiply!
* Make sure to follow coding style (in PlayList_Read)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2709 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 15:24:37 +00:00
Giel van Schijndel
5efc500f88
* Fix a bug where (in some cases) file names in the music.wpl playlist would be truncated
...
Bug reported by Jessicatz (on IRC)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2708 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 15:16:56 +00:00
Per Inge Mathisen
e624663f40
Now that we draw water in a separate pass, we can reduce the number of state changes a lot.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2704 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 13:26:04 +00:00
Per Inge Mathisen
01e24bf6ed
Clean up pieblitfunc. Dump dead code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2702 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:48:46 +00:00
Dennis Schridde
94136efe24
Revert to the non-global static_assert, since MSVC is not ready for the global one, yet.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2697 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 21:42:55 +00:00
Giel van Schijndel
c76b591954
* In audio_StopAll() __always__ set psSample->psObj to NULL; this should fix bug #9233 (and bug #9927 , which most likely is a duplicate, as well)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2684 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 02:07:25 +00:00
Giel van Schijndel
e3b3379a83
* Replace malloc() calls immediately followed by memset(0) calls by calloc() calls instead
...
* Refactor a linked list iteration to for-loop
* In audio_StopAll() check whether psSample->psObj is marked for deletion (i.e. audio_ObjectDead(psSample->psObj) returns true); if it is, set the pointer to NULL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2683 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 01:55:11 +00:00
Giel van Schijndel
f69387aa93
* Ignore 4204 warning on MSVC (non-constant aggregrate initializer; aka non-constant struct initializer)
...
Patch by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2682 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 23:33:34 +00:00
Giel van Schijndel
533e7e92bf
* Use spaces for line-out purposes (rather than tabs)
...
* Tune down the volume of the oil-pumps, power-spikes and power hums a bit, to make them less dominant (and annoying) (from patch #822 by Buginator)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2681 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 22:37:20 +00:00
Giel van Schijndel
a316f10a0e
* Don't save the volume with user volume preferences applied (instead save the track-volume so recomputing will be possible)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2680 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 22:19:06 +00:00
Giel van Schijndel
2f3e74a107
* Add include guards to source:trunk/lib/ivis_common/pievector.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2679 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 19:43:56 +00:00
Giel van Schijndel
e19e8814b6
* Add a GPL (v2 or later) header to source:trunk/lib/ivis_common/pievector.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2678 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 19:41:04 +00:00
Per Inge Mathisen
ec232d7e0f
Actually use audio.cfg configuration of sound volume. Patch by Buginator in patch #822
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2677 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 18:47:22 +00:00
Per Inge Mathisen
ccd725073e
Add extra sanity checking to tagfile code to make it fail earlier rather than later.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2673 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-30 18:51:44 +00:00
Per Inge Mathisen
5567ae6e4b
Add debug log call for tagfile errors.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2672 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-30 16:58:35 +00:00
Per Inge Mathisen
6e19e51118
Replace int x,y,z in TERRAIN_VERTEX with a Vector2i, and fix two cases of
...
type punned pointer casts.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2670 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 22:00:55 +00:00
Dennis Schridde
06a469ed5b
Simplify Vector2f_Normalise and update docs
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2669 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 21:43:55 +00:00
Per Inge Mathisen
b99feff92f
Merge PIEVERTEX and SVMESH into TERRAIN_VERTEX and use struct assignment instead of memcpy on it.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2668 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 21:41:38 +00:00
Per Inge Mathisen
fe27053bf7
Fix bug in last commit
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2664 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:51:02 +00:00
Per Inge Mathisen
ec0836efdc
Fix type punning warning where we cast an array as a struct pointer in netplay.c
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2663 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:49:39 +00:00
Per Inge Mathisen
81ccff31f7
Convert hash table to use 64 bit keys instead of 32 bit keys, since they are used
...
to store pointers.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2661 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:28:02 +00:00
Per Inge Mathisen
c086e3c529
Clean up hash table code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2660 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:16:16 +00:00
Per Inge Mathisen
70718282a4
Fix shadows looking bad from opposite view direction of shadows, and fix
...
memory leak in shadow code reported in bug #10190 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2659 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 18:52:43 +00:00
Giel van Schijndel
dcbef6f398
* Don't use variable array, structure members in RES_DATA
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2658 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 17:53:37 +00:00
Per Inge Mathisen
d668738714
Vector normalization should not be carried out if vector length is zero, as this
...
would divide a vector by zero, which is bad. This closes bug #9739 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2654 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-28 16:20:55 +00:00
Giel van Schijndel
0374c67a12
* Add a doxygen comment to source:trunk/lib/framework/strlfuncs.h describing macro STR_L_FUNC_TRUNCATION_DETECT
...
* Replace (the last) strncpy() call in nettyps.c with a strlcpy() call
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2647 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 20:20:35 +00:00
Per Inge Mathisen
49df8ea371
Use GLC_TEXTURE for font rendering. Patch by Bertrand Coconnier in bug #10188 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2646 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 19:20:25 +00:00
Per Inge Mathisen
e808d83f0c
Add comment about quesoglc workaround being fixed upstream as of today.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2645 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 19:00:55 +00:00
Per Inge Mathisen
1d2caebccd
Cleanup fugly code, and add nasty hack around weird bug. See bug #9843 for more info on bug.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2644 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 18:16:15 +00:00
Per Inge Mathisen
9609cb0005
Use full path to frame.h. Patch in bug #10208 by unknown.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2642 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 17:30:49 +00:00
Giel van Schijndel
f5602b4778
* Replace a large amount of strncpy() calls with the safer strlcpy()
...
* Fix an error in src/game.c where we would use the wrong size as parameter to strlcpy()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2640 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 16:18:52 +00:00
Giel van Schijndel
613a38364e
* Make resSetBaseDir const correct (char* -> const char*)
...
* Document the "fileName" parameter of makeLocaleFile in the Doxygen comment
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2639 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 16:12:00 +00:00
Per Inge Mathisen
1811aa0cdb
Use secure version of snprintf on Windows (_snprintf_s).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2638 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 15:50:45 +00:00
Giel van Schijndel
bd37e62cb2
* Replace a lot of strncat(dst, src, sizeof(dst) - strlen(dst) - 1) calls with the less bloated strlcat(dst, src, sizeof(dst)) form
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2637 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 15:47:17 +00:00
Giel van Schijndel
6b4cba1700
* Rename pLevelName to aLevelName (hungarian notation is a pain. Especially when it's wrong!)
...
* Get rid of several magic numbers
* Some const correctness
* Replace a huge amount of strcpy(), strcat(), strncpy() and strncat() calls with a strlcpy() and strlcat() calls respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2635 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 14:35:35 +00:00
Per Inge Mathisen
94421b5b56
Clean up LOG_3D
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2634 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 13:58:01 +00:00
Per Inge Mathisen
9d5f31cbdd
Clean up RPL reader, removing static memory buffer once RPL file is closed. Closes bug #10206 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2633 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 13:30:23 +00:00
Per Inge Mathisen
35bd80b426
Add missing braces after conditionals. Please follow proper coding style :-)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2632 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 23:29:45 +00:00
Per Inge Mathisen
8885cb207c
Try to work around QuesoGLC bug that makes Warzone hang on chat output. Fixes bug #10202 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2631 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 23:25:32 +00:00
Giel van Schijndel
673812b2a4
* Add file strlfuncs.h; this file contains an inline implementation of strlcpy and strlcat (safer variants of strncpy and strncat respectively)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2627 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 17:05:29 +00:00
Dennis Schridde
20bc25c107
Windows MiniDumper: resultMessage is always null-terminated and MessageBox is always shown. => Move out of ifs.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2626 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 23:32:20 +00:00