0ca183c6ce
Fix some spelling and indentation mistakes in action.c.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7733 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:33 +02:00
279458f584
Show translations for finished research display
...
This fixes the not-translated strings mentioned in
http://forums.wz2100.net/viewtopic.php?&t=3152 , by translating the strings on
display. Translating them on load would be preferable; I guess they are loaded
in src/message_parser.y, but I have no idea how to put the gettext stuff in
there.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7732 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:33 +02:00
c7e0bea7fc
Reduce line spacing in the research display.
...
Makes the text actually fit into the box again.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7731 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:33 +02:00
6ed7492b61
Clean up continent check for return for repair, and add one for return for recycle. Patch reviewed by stiv and EvilGuru.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7728 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:33 +02:00
0111587288
Use new fpathCheck() to implement new continent based path checks for repair orders.
...
Also introduce two new utility functions - objPosDiffSq and droidSqDist for easy
position comparisons, the latter with continent check built-in. Reviewed by Buginator.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7727 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:33 +02:00
ccacb3aade
Temporary fix for the seam issue, if user has specified a texture resolution above what the max tile texture size is. Currently that is 128x128.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7723 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:33 +02:00
50fc6a0060
No spaces in filenames
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7721 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:32 +02:00
79a8dbf4f4
Add #define NET_TIMEOUT_DELAY 2500 to allow for easier changing of the constant.
...
No real code changes.
closes ticket:613
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7719 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:32 +02:00
c336edbcff
Fix the blasted seam issue once and for all.
...
(For trunk, it is mainly for the decals, since we don't handle terrain the same way. For 2.2, it is terrain & decals--basically everything in the tileset)
Fixes ticket:496
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7717 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:32 +02:00
ff4e42123a
NTW Mod: deleting textures > bpp are to low.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7712 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:32 +02:00
601623a346
NTW Mod: deleting textures > bpp are to low.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7711 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:32 +02:00
8a27aa90ae
NTW Mod: deleting textures > bpp are to low.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7710 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:31 +02:00
3c326ec0cf
NTW Mod: deleting textures > bpp are to low.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7709 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:31 +02:00
9c52d2d07f
Do not add effects to the wrong map in off-world missions. Fix bug introduced in r7097.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7708 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:31 +02:00
4e0fc39ebb
Do not bother to process visibility for off-world mission structures, since this leads us to iterate
...
over tiles on the wrong map. This closes ticket:503.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7707 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:31 +02:00
a2ca629107
Fix crash in away mission when completing buildings. Patch by Samowar. Closes ticket:584.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7706 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:31 +02:00
24d699f0b7
Tile fixes for C1, C2 & C3 tilesets done by Mysteryem.
...
A *huge* shout out to him. :)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7705 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-16 22:28:31 +02:00
d93e1751c0
Add new utility function PHYSFS_printf() to easily write text files with PhysicsFS.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7704 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:28 +02:00
b598cfbc6a
Make scavenger option behave more like other pre-game options.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7703 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:28 +02:00
95b070014e
In the new netplay code, mayhem mode has been changed to a enable/disable scavengers checkbox.
...
This does not work yet. Attached is a hack that at least gets it sort of working. When scavengers
are turned on, we do not change game.type and the map type to something else, we still use
skirmish, which is far cleaner, but now scavengers won't build anything. Closes ticket:607
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7702 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:27 +02:00
b1c02b0e03
When AI sends massive armies to attack, they often get clogged up and stuck completely
...
by droids on their way back to repair, or doing other orders. This patch fixes this
problem by introducing a hack for AI only that detects if a droid is stuck, and if so,
resets its current order. This closes ticket:597.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7698 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:27 +02:00
cfbc5dec39
Don't crash if an order is cancelled and you still have a valid action related to that order with a NULL target stat.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7697 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:27 +02:00
d0e023a236
Change the config directory.
...
It is now "Warzone 2100 Trunk" on Windows/MacOS, and ".warzone2100-trunk" on
Linux.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7696 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:27 +02:00
1dd96730f4
Fix the "Mesa" string that was wrong for testing.
...
Actually fixes #608 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7695 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
b9b1a4bac7
Move the "Mesa hack" from GLee.c into screen.c:screenInitialise()
...
There we can check the GL_RENDERER string for more fine control. Currently it
is enabled when the string starts with "Mesa", so it doesn't affect any other
drivers. It might need more checks if new Mesa versions break this.
Fixes #608 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7694 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
fe7b8fc515
mapconv: Fix key typos. Implement scroll limits and level name.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7693 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
ec95a12e54
Implement entire Deliverance format in new PNG/INI format. That is, the binary map format
...
delivered by editworld and used for skirmish and campaign maps.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7692 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
5a5a637ecd
Clean up map tools a bit. Add new tool mapconvert that converts existing maps to proposed new map format
...
based on INI and PNG files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7691 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:25 +02:00
054ea6be3b
Missed a directory to remove from search path
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7690 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:24 +02:00
51a28557b9
Make sure pointer is valid before attempting to remove it from the list.
...
Remove more useless abort()s.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7688 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:24 +02:00
5a8cab42d9
Bump up timeout period to 2500ms from 1000ms for dial-up modem users.
...
Fixes ticket:543
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7687 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:24 +02:00
0e7ef7d20c
Add missing mod directories, and remove 'autoload' from trunk as well.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7686 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:23 +02:00
f2a6546000
Don't allow 2x experience points in campaign games if it is supposed to be only for MP games.
...
Fixes ticket:562
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7685 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:22 +02:00
61e9a25ea2
Allow mist fog type in campaign games. (Fog type is set by user preferences)
...
Patch by Vermithrax
closes ticket:561
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7684 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:22 +02:00
eaec14b3c0
Do not strip away unused players in scavenger multiplayer mode anymore.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7683 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:21 +02:00
79ed9b96e8
Do not make power option go away in pre-game dialog when turning scavengers on.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7682 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:20 +02:00
8e237aefcb
Fix warning reported in ticket:586.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7681 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:19 +02:00
70ebec41b0
Fix compile issue
...
Thanks to stiv for the report.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7679 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:18 +02:00
cdbe56c1c5
Merge netplay (anti-dpid) branch to trunk.
...
netplay branch ceases to exists anymore.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7678 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:17 +02:00
dd412c3e95
NTW Mod: cyborg armors increased
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7675 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:15 +02:00
cf79203cb5
NTW Mod 1.8.6c image
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7674 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:14 +02:00
274b0483f9
Fix size of flashing timer box in campaign. This closes ticket:596 "Time ends warning quad is to small".
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7672 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:12 +02:00
8c16a47ef0
Fix broken sources after 'make clean' in tarball generated by 'make dist'. Reported by 'JimPansen' in the forums.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7671 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:11 +02:00
e4e6bbf992
NTW Mod: cyborg armor upgrade fix and all cyborgs cost 20 more.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7665 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:10 +02:00
f3b754c4eb
Purely cosmetic improvement to rarely touched code.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7662 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:09 +02:00
cbe998956a
Slight cleanup of glOrtho parameters that should be double floats.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7660 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:06 +02:00
788f399615
Adding crash handler testing code. (to test crash dump reports)
...
enable it by --crash on the command line.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7659 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:06 +02:00
bff6a7c84e
Change texLoad to a bool function, to correctly handle tertiles that are of the wrong depth.
...
This is in response to refs ticket:578 where the wrong tertile depth is used on some tiles, causing GL drivers to crash.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7658 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:06 +02:00
a76f71463a
Update tile-62 decal
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7657 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:05 +02:00
bf5f17d46f
Make it possible to drag a line of rearm pad production similar to how walls and defenses
...
can be built by dragging the production with the mouse. It also removes the obligatory
empty tile between rearm pads. Instead, it allows units to drive over rearm pads that are
not currently busy rearming. This closes ticket:569
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7654 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:05 +02:00
Freddie Witherden
Christian Ohm
Per Inge Mathisen
Buginator
René Jürgens