1685f723be
Fix two warnings in scrap.c in Mac OS X.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9316 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:18 +01:00
211781cbfa
src/component.c: Remove 134 lines of code duplication. Remove a dead function and some undefined functions noticed by Safety0ff.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9315 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:18 +01:00
af1d9865c0
Add "Laser satellite firing" and "Incoming laser satellite strike" to the list of occasions that deserve a radar blip representing where they're occurring.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9314 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:16 +01:00
9799fb87c7
Add "ALL ROUNDER" as an alias for the "ANTI AIRCRAFT" weapon type. Should save future modders a bit of confusion over why cannons and rails are anti-aircraft weapons. ;)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9312 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:16 +01:00
411d327a22
Mitigate bug #1421 - Brings it back to before-r9272 conditions using some black magic I really don't understand. Anyone who knows what's going on is welcome to go and fix things.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9310 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:16 +01:00
90770d0c2b
Fix bug #1154 - tons of power given in certain conditions - with help from Safety0ff.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9309 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:16 +01:00
b2fe5203cd
win32: Move declaration out of for loop.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9308 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:15 +01:00
3ac9f53bf8
Add support for Cmd/Meta keyboard shortcuts. Make keyboard shortcuts look nicer: "lctrl - f11" to "Ctrl + F11" (Warzone keyboard shortcuts accept both LCtrl and RCtrl)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9306 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:15 +01:00
c307435927
win32: Add extern "C", in case it helps.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9305 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:15 +01:00
deb4a10401
make/win32: Add pointtree.cpp, since it's probably hard to link without that one, too.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9304 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:15 +01:00
b1264d7e24
make/win32: Update mapgrid.c to mapgrid.cpp, apparently this makefile isn't autogenerated.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9303 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:14 +01:00
73ba2e11e0
Better version numbers and kill some warnings.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9301 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:14 +01:00
95d8e79161
Fix typo in r9297/r9298.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9299 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:14 +01:00
ada08d0040
Fix bug #1418 - transports can be controlled sometimes.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9298 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:14 +01:00
ffa10c5113
make: Don't give make errors when switching between trunk and branches, even with out of tree builds.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9296 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:14 +01:00
9568ac7987
Close ticket #1134 - add radar blips for events such as "structure under attack"
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9293 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:13 +01:00
2025407222
Commit mod list patch #1415 :
...
1. Adds a specific autoload folder, `mods/autoload/`. This is essential for a good mod community.
2. Searches the `mods/` folder for global mods, as well as `mods/global/`. This is the first step in merging the three mod folders together, but I'm not planning on merging them completely in 2.3.
3. Constructs a list of loaded mods, and displays the list in the VersionString (including the list of games in the lobby).
4. Grays out games with incompatible mods in the NetPlay game list, and gives a warning in the tooltip: "Your loaded mods are incompatible with this game. (Check mods/autoload/?)"
5. Gives a warning when a game with an incompatible mod is clicked: "You have an incompatible mod."
6. Displays a list of mods above the Warzone logo.
7. Lists mods in hosting screen, and warns hosts that all players need the same mods loaded.
Closes ticket:1415.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9291 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:13 +01:00
809098735d
make: Don't give make errors when switching between branches.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9286 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:13 +01:00
a8a2bcb161
Fix --selftest. Had to comment out the sound test for now.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9282 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:13 +01:00
06f8f2588d
Add ai.slo to POTFILES.in
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9281 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:13 +01:00
b5471fc186
Calculate gameTime2 using the correct time offset (fixes strange animations on some nonstandard game speeds).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9279 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:12 +01:00
1a99e9038b
visibility.c: Increase query range, since objects are looking for things to be looked at by. That didn't make sense, but neither does the function.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9278 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:12 +01:00
a341785d23
In aiUpdateDroid - Move on to the next target if current target is probably doomed.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9276 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:12 +01:00
6033e63f0b
Update the xcode file to work with Cyp's new code.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9275 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:12 +01:00
eb7aa25d51
pointtree: Use ULL postfix on 64-bit integers, so it compiles with -m32.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9274 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:11 +01:00
f73d44e982
Make the Tab "hide interface" keyboard shortcut hide the entire interface.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9272 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:11 +01:00
18fb0f81cb
visibility.c: Reduce query range to sensorRange (now that queries have variable range).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9271 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:11 +01:00
60c4f603da
Use the configured game port instead of hardcoding it.
...
Also make the port variables static.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9269 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:11 +01:00
bf1541a626
Fix typo in gtime.c
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9266 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:11 +01:00
b4919db163
pointtree: Remove grid system calls which are no longer used.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9265 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:10 +01:00
97e852b5ec
pointtree: Eliminate all traces of "naybor".
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9264 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:10 +01:00
2f62c98240
pointtree: Remove "naybor" from projectiles.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9263 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:10 +01:00
78389d6bb2
pointtree: Remove "naybor" from droids.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9262 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:10 +01:00
d6d0070530
pointtree: Kill mapgrid.c. Reincarnate as mapgrid.cpp, using the new PointTree.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9261 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:10 +01:00
5c9585e8cb
pointtree: Find points quickly.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9260 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:09 +01:00
5da6588fb0
Initialize timeOffset correctly.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9258 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:09 +01:00
dabc178157
Some hacks to paper over the time travel bug.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9257 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:09 +01:00
1f20309350
Fix design form not updating sometimes.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9256 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:08 +01:00
103dd4feec
DORDER_TEMP_HOLD counts as doing nothing for the purposes of aiUpdateDroid.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9253 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:08 +01:00
cf8265e6c8
An assert to figure out why time travel is occurring.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9250 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:08 +01:00
3e47b4ac89
Commit Safety0ff's audio fix.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9249 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:08 +01:00
bd1a8d1e9d
Always clear selection when units are assigned to a sensor.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9247 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:08 +01:00
fbd7ba368a
More search path changes.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9244 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
423ac3df4f
Use chained events instead of relying on a 40 second repeat trigger for research. This
...
makes the AI much faster at researching, as it eliminates long delays. Also clean up
the base expansion code and make it stop trying to expand when out of power.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9243 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
7a9bd0c47b
Make sure AI triggers get sent when we receive research from allies. Update GUI properly
...
also when AI is in control for easier debugging. Make allied AIs not research the same techs.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9242 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
1015c07cac
I forgot one debug line in the previous commit. Oops.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9241 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
2f5eb36268
Clean up 'work harder' cheat handling so that it does not confuse AI scripts.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9240 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
a9ba027836
Remove some dead code
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9239 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
ceed2c4ce1
Clean up definitions
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9238 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
a0af4638af
Try to make "Copy game data" faster.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9235 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
Guangcong Luo
Cyp
dak180
Per Inge Mathisen
Christian Ohm