0fbdda02f7
Add some warnings for Zarel.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11057 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-27 07:49:21 +02:00
204cd2df91
2.3: Handle null return value from sound_CreateOggVorbisDecoder.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11055 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-27 07:49:21 +02:00
301c6114e7
Trunk: Set tcp_socket to NULL after free'ing it. Fixes #1869 .
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11052 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-27 07:49:21 +02:00
8bfd8e33e9
Add a new macro, wz_assert() to fix the ASSERT_FAILURE() macro to work again on MSVC compilers.
...
refs ticket:1940
2.3: r11049
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11050 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-27 07:49:21 +02:00
3c02124171
In our assert macros, raise(SIGTRAP) instead of assert().
...
Also ignore SIGTRAP, so no crashdump will be generated for it. Makes it
possible to continue after an assert while debugging. Closes #1940 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11046 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-26 22:43:34 +02:00
0b0e986ec6
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/gamelib/gtime.c
lib/netplay/netplay.c
macosx/Warzone.xcodeproj/project.pbxproj
src/multiint.c
src/multisync.c
2010-06-26 22:42:44 +02:00
5c654430d4
Final pass closing ticket:1651 remove floating point move precision, turning speed
...
from float to int. Now all that remains is float in contentious code that need to
be rewritten anyway.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11044 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-26 21:35:47 +02:00
ba2433fa11
Remove the redundant avSetStatus().
...
It does exactly the same as setRevealStatus(), and was only called together
with war_SetFog(), which calls setRevealStatus() anyway.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11041 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-26 21:35:47 +02:00
c665480274
Include/declaration cleanup for src/frontend.c/h.
...
Also rename the various GameOptionsX to what they actually do, e.g.
AudioOptions. Refs #1647 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11040 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-26 21:35:47 +02:00
248052cda4
newnet: Disable floating point sanity and consistency assertion.
2010-06-26 20:58:12 +02:00
1e236efdb6
Add clang and LLVM to the list of compilers.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11036 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-26 19:50:22 +02:00
6daf4464de
Make sure that 64bit incompatible code only is used when we are 32bit.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11035 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-26 19:50:22 +02:00
94fef64201
Clean up the link phase.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11034 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-26 19:50:22 +02:00
4e51a7c144
Fix showing the unit count in debug mode
...
2.3: r11030
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11031 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-25 12:44:43 +02:00
c77a8f43f9
Change compilers around to make Vorbis happy.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11029 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-24 20:00:16 +02:00
64b75224e7
Support for Mac OS X 10.4 is now dropped; the binaries may still work on 10.4 but this is no longer supported.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11026 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-23 23:42:28 +02:00
4596f45dcb
Replace std::find with std::lower_bound. (Oops.)
...
Since std::find does a linear, not a binary search. Visibility lookup tables should be generated faster now.
2010-06-23 15:16:35 +02:00
9a22573863
Clean up getMultiStats() to remove unused parameter.
...
2.3: r11017
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11019 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-23 14:33:10 +02:00
6a7e9bb725
Update sync timings to more reasonable values, especially for the score.
...
2.3: r11016
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11018 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-23 14:33:10 +02:00
00d3899eb4
Addition to the menu fixes.
...
Add two places I missed before, and simplify the code a bit.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11013 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-22 13:43:33 +02:00
8b84053cba
Fix menu navigation.
...
Always go back to the previous menu, also when pressing escape.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11008 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-22 13:43:32 +02:00
5a15ae67cc
Remove some dead code.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11007 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-22 13:43:32 +02:00
6e88ea7a6e
Simplify CancelPressed().
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11006 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-22 13:43:31 +02:00
13c3a3020b
Use system provided versions of ntohs, ntohl, htons, and htonl, since they actually
...
work for the big-endian to big-endian case, whereas our own home-brewed one did not.
Patch reviewed by SafetyOff and Zarel.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11002 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-22 13:43:31 +02:00
36c9e166b8
Include library patches for the Windows cross-build in the tarball.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10998 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-22 13:43:30 +02:00
073bf20ef8
Make removeFeature clear the correct tiles. Closes #1885 .
...
Patch by Per and I.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10993 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-18 08:47:36 +02:00
9bf30eab6b
Add crc.(cpp|h) to the xcode project.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10992 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-18 08:47:35 +02:00
73772a54fe
Merge pointtree stable sort fix from newnet branch.
2010-06-17 19:06:27 +02:00
b553072b90
Merge fpath improved threading from newnet branch.
2010-06-17 19:04:11 +02:00
692957ee70
Merge CRC from newnet branch (was supposed to be in previous commit).
2010-06-17 18:35:37 +02:00
48c8d42245
Merge trig+CRC changes from newnet branch (all of lib/framework).
2010-06-17 18:32:54 +02:00
fba040f3e8
Initialize video and radar textures to black.
...
Prevents random crap from being blended into the borders and shown for the
first video frame.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10986 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-17 07:52:15 +02:00
f929629d1e
Add `/Library/Application Support/Warzone 2100/` to search path for OS X.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10984 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-16 07:28:28 +02:00
1d19c75c5e
Fit the fixed radar into the corner.
...
The rotating radar needs space for rotation, and so position is calculated
using the longer side for non-square maps. The fixed radar doesn't need that
space, and so can be put snugly in the corner.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10983 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-16 07:28:28 +02:00
6cc5dacf2f
Stylistic cleanup of plotStructurePreview16().
...
No real code changes. Rename sizeOfSaveStruture to sizeOfSaveStructure,
initialize it in the declaration (removes one else branch) and improve some
debug messages. Refs #1914 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10980 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-15 20:58:19 +02:00
edb6e9aca7
Simplify plotStructurePreview16() further.
...
All structure structs up to v19 are compatible with v2, and all newer ones with
v20, so handle only those two cases. Refs #1914 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10979 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-15 20:58:18 +02:00
c61d6d94f9
Remove useless code from plotStructurePreview16().
...
All we care about are position and player of a structure, so we don't need to
endian-correct any other values. Refs #1914 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10978 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-15 20:58:14 +02:00
d7db005f71
Merge remote branch 'origin/master' into newnet
...
Conflicts:
.gitignore
configure.ac
data/base/images/intfac.img
data/base/images/intfac5.png
lib/netplay/makefile.win32
lib/netplay/netlog.c
lib/netplay/netplay.c
lib/netplay/netplay.h
lib/netplay/netplay.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
po/POTFILES.in
src/hci.c
src/intfac.h
src/keybind.c
src/multibot.c
src/multiint.c
src/multijoin.c
src/multiplay.c
src/multistruct.c
src/multisync.c
src/scriptai.c
2010-06-15 08:35:52 +02:00
cf8976e36e
Improve the changelog script.
...
Change all items to [*], and enclose them in list tags. Just one thing needs to
be done manually, moving the "[/list]" tag at the beginning to the end.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10968 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-13 11:24:14 +02:00
f9ac798dc5
Make A* generate paths that do not lead droids to cut corners on impassable tiles, inevitably leading
...
to clipping and positioning themselves on illegal tiles, even with strict path walking. From ticket:1649
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10960 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-13 11:24:13 +02:00
f724a129be
Use desktop resolution by default.
...
When no (or an invalid) resolution is set (mainly when there's no config file
yet), use the current desktop resolution instead of 640x480. Refs #1912 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10958 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-12 17:39:01 +02:00
58f5ed29cf
Russian translation update by Filipp Chertiev.
...
Closes #1908 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10955 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-12 07:51:15 +02:00
5ce7fee1f1
remove the lancer rof upgrades to keep the old balance.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10954 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-10 10:53:52 +02:00
e3af841200
Brazilian translation update by Tucalipe.
...
Closes #1899 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10940 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-09 10:29:13 +02:00
00cd1a7a47
Use whole screen for backdrops.
...
Cut off some parts instead of showing black borders.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10932 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-08 12:41:34 +02:00
aebccdcf90
Always use linear filtering for backdrops.
...
Makes them filtered again after showing the map preview.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10931 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-08 12:41:34 +02:00
54bb22d56e
Updated Russian translation by Filipp Chertiev.
...
Closes #1902 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10930 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-08 12:41:34 +02:00
565983ffc7
Upgrade gettext to 18.1.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10929 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-06 09:57:27 +02:00
6c8d3e15ba
Show videos with correct aspect ratio.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10926 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-06 09:57:27 +02:00
9688b906a7
Show backdrops with correct aspect ratio.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10925 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-06 09:57:26 +02:00
dak180
Safety0ff
Buginator
Christian Ohm
Cyp
Per Inge Mathisen
Guangcong Luo
René Jürgens